fix: refresh without a status

activepieces · Jul 19, 2023 · f653cc9 · f653cc9
1 parent 459b781
commit f653cc9
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.0'
 services:
   activepieces:
-    image: activepieces/activepieces:0.5.0
+    image: activepieces/activepieces:0.5.1
     container_name: activepieces
     restart: unless-stopped
     ## Enable the following line if you already use AP_EXECUTION_MODE with SANDBOXED or old activepieces, checking the breaking change documentation for more info.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "activepieces",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "scripts": {
     "prepare": "husky install",
     "docker": "docker compose -f docker-compose.dev.yml up",

diff --git a/packages/backend/src/app/app-connection/app-connection.entity.ts b/packages/backend/src/app/app-connection/app-connection.entity.ts
@@ -3,7 +3,7 @@ import { EntitySchema } from 'typeorm'
 import { ApIdSchema, BaseColumnSchemaPart } from '../helper/base-entity'
 import { EncryptedObject } from '../helper/encryption'
 
-export type AppConnectionSchema = Omit<AppConnection, 'value'> & { project: Project, value: EncryptedObject }
+export type AppConnectionSchema = Omit<AppConnection, 'value' | 'status'> & { project: Project, value: EncryptedObject }
 
 export const AppConnectionEntity = new EntitySchema<AppConnectionSchema>({
     name: 'app_connection',

diff --git a/packages/backend/src/app/app-connection/app-connection.service.ts b/packages/backend/src/app/app-connection/app-connection.service.ts
@@ -76,7 +76,6 @@ export const appConnectionService = {
             name: request.name,
             projectId,
         })
-
         return decryptConnection(updatedConnection)
     },
 
@@ -236,30 +235,35 @@ function decryptConnection(
         case AppConnectionType.BASIC_AUTH:
             connection = {
                 ...encryptedConnection,
+                status: AppConnectionStatus.ACTIVE,
                 value,
             }
             break
         case AppConnectionType.CLOUD_OAUTH2:
             connection = {
                 ...encryptedConnection,
+                status: AppConnectionStatus.ACTIVE,
                 value,
             }
             break
         case AppConnectionType.CUSTOM_AUTH:
             connection = {
                 ...encryptedConnection,
+                status: AppConnectionStatus.ACTIVE,
                 value,
             }
             break
         case AppConnectionType.OAUTH2:
             connection = {
                 ...encryptedConnection,
+                status: AppConnectionStatus.ACTIVE,
                 value,
             }
             break
         case AppConnectionType.SECRET_TEXT:
             connection = {
                 ...encryptedConnection,
+                status: AppConnectionStatus.ACTIVE,
                 value,
             }
             break
@@ -335,7 +339,10 @@ async function lockAndRefreshConnection({
         }
         const refreshedAppConnection = await refresh(appConnection)
         await appConnectionRepo.update(refreshedAppConnection.id, {
-            ...refreshedAppConnection,
+            id: refreshedAppConnection.id,
+            name: refreshedAppConnection.name,
+            appName: refreshedAppConnection.appName,
+            projectId: refreshedAppConnection.projectId,
             value: encryptObject(refreshedAppConnection.value),
         })
         refreshedAppConnection.status = getStatus(refreshedAppConnection)

diff --git a/packages/backend/src/app/workers/flow-worker/flow-worker.ts b/packages/backend/src/app/workers/flow-worker/flow-worker.ts
@@ -229,7 +229,7 @@ async function downloadFiles(
     logger.info(`[${flowVersion.id}] Acquiring flow lock to build codes`)
     const flowLock = await acquireLock({
         key: flowVersion.id,
-        timeout: 60000,
+        timeout: 180000,
     })
     try {
         const buildPath = sandbox.getSandboxFolderPath()