diff --git a/packages/server/modules/automate/graph/resolvers/automate.ts b/packages/server/modules/automate/graph/resolvers/automate.ts index d6ab062e7..426cf0cbc 100644 --- a/packages/server/modules/automate/graph/resolvers/automate.ts +++ b/packages/server/modules/automate/graph/resolvers/automate.ts @@ -43,8 +43,8 @@ import { import { convertFunctionReleaseToGraphQLReturn, convertFunctionToGraphQLReturn, - createFunctionFromTemplate, - updateFunction + createFunctionFromTemplateFactory, + updateFunctionFactory } from '@/modules/automate/services/functionManagement' import { Resolvers, @@ -441,7 +441,7 @@ export = (FF_AUTOMATE_MODULE_ENABLED }, AutomateMutations: { async createFunction(_parent, args, ctx) { - const create = createFunctionFromTemplate({ + const create = createFunctionFromTemplateFactory({ createExecutionEngineFn: createFunction, getUser, createStoredAuthCode: createStoredAuthCodeFactory({ @@ -453,7 +453,7 @@ export = (FF_AUTOMATE_MODULE_ENABLED .graphqlReturn }, async updateFunction(_parent, args, ctx) { - const update = updateFunction({ + const update = updateFunctionFactory({ updateFunction: execEngineUpdateFunction, getFunction, createStoredAuthCode: createStoredAuthCodeFactory({ diff --git a/packages/server/modules/automate/rest/authGithubApp.ts b/packages/server/modules/automate/rest/authGithubApp.ts index 01a08e0b7..d7545c9d1 100644 --- a/packages/server/modules/automate/rest/authGithubApp.ts +++ b/packages/server/modules/automate/rest/authGithubApp.ts @@ -1,7 +1,7 @@ import { createStoredAuthCodeFactory } from '@/modules/automate/services/authCode' import { - handleAutomateFunctionCreatorAuthCallback, - startAutomateFunctionCreatorAuth + handleAutomateFunctionCreatorAuthCallbackFactory, + startAutomateFunctionCreatorAuthFactory } from '@/modules/automate/services/functionManagement' import { getGenericRedis } from '@/modules/core' import { corsMiddleware } from '@/modules/core/configs/cors' @@ -19,7 +19,7 @@ export default (app: Application) => { validateScope({ requiredScope: Scopes.AutomateFunctions.Write }) ]), async (req, res) => { - const startAuth = startAutomateFunctionCreatorAuth({ + const startAuth = startAutomateFunctionCreatorAuthFactory({ createStoredAuthCode: createStoredAuthCodeFactory({ redis: getGenericRedis() }) @@ -36,7 +36,7 @@ export default (app: Application) => { validateScope({ requiredScope: Scopes.AutomateFunctions.Write }) ]), async (req, res) => { - const handleCallback = handleAutomateFunctionCreatorAuthCallback() + const handleCallback = handleAutomateFunctionCreatorAuthCallbackFactory() await handleCallback({ req, res }) } ) diff --git a/packages/server/modules/automate/services/functionManagement.ts b/packages/server/modules/automate/services/functionManagement.ts index 45e973772..00800a8ce 100644 --- a/packages/server/modules/automate/services/functionManagement.ts +++ b/packages/server/modules/automate/services/functionManagement.ts @@ -122,7 +122,7 @@ export type CreateFunctionDeps = { getUser: typeof getUser } -export const createFunctionFromTemplate = +export const createFunctionFromTemplateFactory = (deps: CreateFunctionDeps) => async (params: { input: CreateAutomateFunctionInput; userId: string }) => { const { input, userId } = params @@ -187,7 +187,7 @@ export type UpdateFunctionDeps = { createStoredAuthCode: CreateStoredAuthCode } -export const updateFunction = +export const updateFunctionFactory = (deps: UpdateFunctionDeps) => async (params: { input: UpdateAutomateFunctionInput; userId: string }) => { const { updateFunction, createStoredAuthCode } = deps @@ -233,7 +233,7 @@ export type StartAutomateFunctionCreatorAuthDeps = { createStoredAuthCode: CreateStoredAuthCode } -export const startAutomateFunctionCreatorAuth = +export const startAutomateFunctionCreatorAuthFactory = (deps: StartAutomateFunctionCreatorAuthDeps) => async (params: { req: Request; res: Response }) => { const { createStoredAuthCode } = deps @@ -260,7 +260,7 @@ export const startAutomateFunctionCreatorAuth = return res.redirect(redirectUrl.toString()) } -export const handleAutomateFunctionCreatorAuthCallback = +export const handleAutomateFunctionCreatorAuthCallbackFactory = () => async (params: { req: Request; res: Response }) => { const { req, res } = params const {