diff --git a/apps/http-backend/src/index.ts b/apps/http-backend/src/index.ts index 13e5fe7..1a6ab49 100644 --- a/apps/http-backend/src/index.ts +++ b/apps/http-backend/src/index.ts @@ -34,7 +34,7 @@ app.use(cookieParser()); app.use("/user" , userRouter) app.use('/node', sheetRouter) -app.use('/auth/google', googleAuth) +app.use('/oauth/google', googleAuth) app.use('/execute', execRouter) const PORT= 3002 diff --git a/apps/http-backend/src/routes/google_callback.ts b/apps/http-backend/src/routes/google_callback.ts index 70cae62..7b31781 100644 --- a/apps/http-backend/src/routes/google_callback.ts +++ b/apps/http-backend/src/routes/google_callback.ts @@ -132,7 +132,7 @@ googleAuth.get( // Redirect to workflow page if workflowId is provided, otherwise to general workflow page const redirectUrl = workflowId ? `http://localhost:3000/workflows/${workflowId}` - : "http://localhost:3000/workflow"; + : "http://localhost:3000/workflows"; console.log(' Redirecting to:', redirectUrl); return res.redirect(redirectUrl); } catch (err: any) { diff --git a/apps/http-backend/src/routes/userRoutes/userRoutes.ts b/apps/http-backend/src/routes/userRoutes/userRoutes.ts index 8c9c781..f0220ef 100644 --- a/apps/http-backend/src/routes/userRoutes/userRoutes.ts +++ b/apps/http-backend/src/routes/userRoutes/userRoutes.ts @@ -574,13 +574,13 @@ router.put( message: "Invalid input", }); } - const { credentialId, ...restConfig } = dataSafe.data.Config; + // const { credentialId, ...restConfig } = dataSafe.data.Config; const updateNode = await prismaClient.node.update({ where: { id: dataSafe.data.NodeId }, data: { position: dataSafe.data.position, - config: restConfig, - CredentialsID: credentialId + config: dataSafe.data.Config , + CredentialsID: dataSafe.data.Config?.credentialId || null }, }); diff --git a/apps/http-backend/tsconfig.tsbuildinfo b/apps/http-backend/tsconfig.tsbuildinfo index cd93c21..ea011f3 100644 --- a/apps/http-backend/tsconfig.tsbuildinfo +++ b/apps/http-backend/tsconfig.tsbuildinfo @@ -1 +1 @@ -{"root":["./src/index.ts","./src/routes/google_callback.ts","./src/routes/nodes.routes.ts","./src/routes/userroutes/usermiddleware.ts","./src/routes/userroutes/userroutes.ts","./src/scheduler/token-scheduler.ts","./src/services/token-refresh.service.ts"],"version":"5.7.3"} \ No newline at end of file +{"root":["./src/index.ts","./src/routes/google_callback.ts","./src/routes/sheet.routes.ts","./src/routes/userRoutes/executionRoutes.ts","./src/routes/userRoutes/userMiddleware.ts","./src/routes/userRoutes/userRoutes.ts","./src/scheduler/token-scheduler.ts","./src/services/token-refresh.service.ts"],"version":"5.7.3"} \ No newline at end of file diff --git a/apps/worker/tsconfig.tsbuildinfo b/apps/worker/tsconfig.tsbuildinfo index dd1e64e..cf4ce0f 100644 --- a/apps/worker/tsconfig.tsbuildinfo +++ b/apps/worker/tsconfig.tsbuildinfo @@ -1 +1 @@ -{"root":["./src/index.ts","./src/types.ts","./src/engine/executor.ts","./src/engine/registory.ts","./src/tests/create-execution.ts","./src/tests/setup-test.ts","./src/tests/test.ts","./src/tests/update-node.ts"],"version":"5.7.3"} \ No newline at end of file +{"root":["./src/index.ts","./src/engine/executor.ts"],"version":"5.7.3"} \ No newline at end of file diff --git a/packages/common/tsconfig.tsbuildinfo b/packages/common/tsconfig.tsbuildinfo index 44940f3..7ec0579 100644 --- a/packages/common/tsconfig.tsbuildinfo +++ b/packages/common/tsconfig.tsbuildinfo @@ -1 +1 @@ -{"root":["./src/index.ts"],"version":"5.7.3"} \ No newline at end of file +{"root":["./src/index.ts","./src/interpolation.ts"],"version":"5.7.3"} \ No newline at end of file diff --git a/packages/nodes/tsconfig.tsbuildinfo b/packages/nodes/tsconfig.tsbuildinfo index 716ded6..50662c6 100644 --- a/packages/nodes/tsconfig.tsbuildinfo +++ b/packages/nodes/tsconfig.tsbuildinfo @@ -1 +1 @@ -{"root":["./src/index.ts","./src/common/google-oauth-service.ts","./src/gmail/gmail.executor.ts","./src/gmail/gmail.node.ts","./src/gmail/gmail.service.ts","./src/google-sheets/google-sheets.executor.ts","./src/google-sheets/google-sheets.node.ts","./src/google-sheets/google-sheets.service.ts","./src/google-sheets/test.ts","./src/registry/node-registry.ts"],"version":"5.7.3"} \ No newline at end of file +{"root":["./src/index.ts","./src/common/google-oauth-service.ts","./src/gmail/gmail.executor.ts","./src/gmail/gmail.node.ts","./src/gmail/gmail.service.ts","./src/google-sheets/google-sheets.executor.ts","./src/google-sheets/google-sheets.node.ts","./src/google-sheets/google-sheets.service.ts","./src/google-sheets/test.ts","./src/registry/Execution.config.types.ts","./src/registry/execution.registory.ts","./src/registry/node-registry.ts"],"version":"5.7.3"} \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 51efa89..e964403 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -232,6 +232,9 @@ importers: specifier: ^2.2.4 version: 2.2.4 devDependencies: + '@repo/common': + specifier: workspace:* + version: link:../../packages/common '@repo/db': specifier: workspace:* version: link:../../packages/db