[META] Remove toska sub- and prefixes from function names

Author: santeri0200

services/backend/src/middleware/currentUser.ts

@@ -3,7 +3,7 @@ import { NextFunction, Request, Response } from 'express'
 import { intersection } from 'lodash-es'
 
 import { requiredGroup } from '../config'
-import { getMockedUser, getOrganizationAccess, getUserToska } from '../services/userService'
+import { getMockedUser, getOrganizationAccess, getUser } from '../services/userService'
 import { ApplicationError } from '../util/customErrors'
 import logger from '../util/logger'
 
@@ -24,7 +24,7 @@ type Headers = {
   'x-show-as-user'?: string
 }
 
-const toskaUserMiddleware = async (req: Request, _: Response, next: NextFunction) => {
+export default async (req: Request, _: Response, next: NextFunction) => {
   const {
     'shib-session-id': sessionId,
     'x-show-as-user': showAsUser,
@@ -60,7 +60,7 @@ const toskaUserMiddleware = async (req: Request, _: Response, next: NextFunction
   const user =
     showAsUser && specialGroup?.superAdmin
       ? await getMockedUser({ userToMock: showAsUser, mockedBy: username })
-      : await getUserToska({
+      : await getUser({
           username,
           name: name!,
           email: email!,
@@ -79,5 +79,3 @@ const toskaUserMiddleware = async (req: Request, _: Response, next: NextFunction
 
   next()
 }
-
-export default toskaUserMiddleware

services/backend/src/middleware/headers.ts

@@ -1,7 +1,4 @@
 import headersMiddleware from 'unfuck-utf8-headers-middleware'
 
-const headersToska = ['uid', 'displayName', 'shib-session-id', 'hyGroupCn', 'mail', 'hyPersonSisuId']
-
-const headers = headersToska
-
+const headers = ['uid', 'displayName', 'shib-session-id', 'hyGroupCn', 'mail', 'hyPersonSisuId']
 export default headersMiddleware(headers)

services/backend/src/routes/feedback.ts

@@ -1,6 +1,6 @@
 import { Request, Response, Router } from 'express'
 
-import { sendFeedbackToToska } from '../services/mailService'
+import { sendFeedback } from '../services/mailService'
 import { ApplicationError } from '../util/customErrors'
 import logger from '../util/logger'
 
@@ -20,7 +20,7 @@ router.post('/email', async (req: EmailRequest, res: Response) => {
     throw new ApplicationError('User not found', 404)
   }
 
-  await sendFeedbackToToska({
+  await sendFeedback({
     feedbackContent: content,
     user,
   })

services/backend/src/services/mailService.ts

@@ -27,13 +27,7 @@ const sendEmail = async (options = {}) => {
   return await pateClient.post('/', options)
 }
 
-export const sendFeedbackToToska = async ({
-  feedbackContent,
-  user,
-}: {
-  feedbackContent: string
-  user: FormattedUser
-}) => {
+export const sendFeedback = async ({ feedbackContent, user }: { feedbackContent: string; user: FormattedUser }) => {
   const { name, userId, email } = user
   const userDetails = `Sent by ${name}, userid: ${userId}, email: ${email}`
   const text = [feedbackContent, userDetails].join('<br />')

services/backend/src/services/userService.ts

@@ -231,7 +231,7 @@ export const getMockedUser = async ({ userToMock, mockedBy }: { userToMock: stri
   return mockedUser
 }
 
-export const getUserToska = async ({
+export const getUser = async ({
   username,
   name,
   email,

services/backend/src/util/importerClient.ts

@@ -3,18 +3,16 @@ import axios from 'axios'
 import { importerToken, importerUrl } from '../config'
 import logger from './logger'
 
-const toskaImporterClient = axios.create({
+const importerClient = axios.create({
   headers: { token: importerToken },
   baseURL: importerUrl,
   timeout: 10000,
 })
 
-const getToskaImporterClient = () => {
+export const getImporterClient = () => {
   if (!importerToken) {
     logger.error("Importer token not set, can't return client!")
     return null
   }
-  return toskaImporterClient
+  return importerClient
 }
-
-export const getImporterClient = getToskaImporterClient

services/frontend/Dockerfile

@@ -22,9 +22,6 @@ ENV REACT_APP_SENTRY_RELEASE=$SENTRY_RELEASE
 ARG SENTRY_DSN=''
 ENV REACT_APP_SENTRY_DSN=$SENTRY_DSN
 
-ARG SERVICE_PROVIDER='toska'
-ENV REACT_APP_SERVICE_PROVIDER=$SERVICE_PROVIDER
-
 ARG LANGUAGE_CENTER_VIEW_ENABLED
 ENV REACT_APP_LANGUAGE_CENTER_VIEW_ENABLED=$LANGUAGE_CENTER_VIEW_ENABLED