fix: avoid flow lock when updated by api key

activepieces · May 16, 2024 · 9b3f7ba · 9b3f7ba
1 parent b64e579
commit 9b3f7ba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/packages/server/api/src/app/flows/flow-version/flow-version.service.ts b/packages/server/api/src/app/flows/flow-version/flow-version.service.ts
@@ -31,7 +31,8 @@ import {
     LoopOnItemsActionSettingsWithValidation,
     PieceActionSettings,
     PieceTriggerSettings,
-    ProjectId, SeekPage, TriggerType, UserId } from '@activepieces/shared'
+    ProjectId, SeekPage, TriggerType, UserId,
+} from '@activepieces/shared'
 
 const branchSettingsValidator = TypeCompiler.Compile(
     BranchActionSettingsWithValidation,
@@ -138,8 +139,9 @@ export const flowVersionService = {
         }
 
         mutatedFlowVersion.updated = dayjs().toISOString()
-        mutatedFlowVersion.updatedBy = userId
-
+        if (userId) {
+            mutatedFlowVersion.updatedBy = userId
+        }
         return flowVersionRepo(entityManager).save(mutatedFlowVersion)
     },
 
@@ -641,7 +643,7 @@ type GetFlowVersionOrThrowParams = {
 type NewFlowVersion = Omit<FlowVersion, 'created' | 'updated'>
 
 type ApplyOperationParams = {
-    userId: UserId
+    userId: UserId | null
     projectId: ProjectId
     flowVersion: FlowVersion
     userOperation: FlowOperationRequest

diff --git a/packages/server/api/src/app/flows/flow/flow.controller.ts b/packages/server/api/src/app/flows/flow/flow.controller.ts
@@ -64,7 +64,7 @@ export const flowController: FastifyPluginAsyncTypebox = async (app) => {
 
         const updatedFlow = await flowService.update({
             id: request.params.id,
-            userId,
+            userId: request.principal.type === PrincipalType.SERVICE ? null : userId,
             projectId: request.principal.projectId,
             operation: request.body,
         })

diff --git a/packages/server/api/src/app/flows/flow/flow.service.ts b/packages/server/api/src/app/flows/flow/flow.service.ts
@@ -490,7 +490,7 @@ type CountParams = {
 
 type UpdateParams = {
     id: FlowId
-    userId: UserId
+    userId: UserId | null
     projectId: ProjectId
     operation: FlowOperationRequest
     lock?: boolean
@@ -505,7 +505,7 @@ type UpdateStatusParams = {
 
 type UpdatePublishedVersionIdParams = {
     id: FlowId
-    userId: UserId
+    userId: UserId | null
     projectId: ProjectId
 }
 
@@ -518,7 +518,7 @@ type NewFlow = Omit<Flow, 'created' | 'updated'>
 
 type LockFlowVersionIfNotLockedParams = {
     flowVersion: FlowVersion
-    userId: UserId
+    userId: UserId | null
     projectId: ProjectId
     entityManager: EntityManager
 }