add back role migration

Patch Vercel integration for custom preview branches

backend/src/integrations/sync.ts

@@ -950,7 +950,11 @@ const syncSecretsVercel = async ({
       ? {
           teamId: integrationAuth.teamId
         }
-      : {})
+      : {}),
+    ...(integration?.path
+      ? {
+        gitBranch: integration?.path
+      } : {})
   };
 
   const vercelSecrets: VercelSecret[] = (
@@ -969,7 +973,7 @@ const syncSecretsVercel = async ({
 
     if (
       integration.targetEnvironment === "preview" &&
-      integration.path &&
+      secret.gitBranch &&
       integration.path !== secret.gitBranch
     ) {
       // case: secret on preview environment does not have same target git branch
@@ -978,7 +982,7 @@ const syncSecretsVercel = async ({
 
     return true;
   });
-
+  
   const res: { [key: string]: VercelSecret } = {};
 
   for await (const vercelSecret of vercelSecrets) {

backend/src/utils/setup/backfillData.ts

@@ -819,3 +819,18 @@ export const backfillPermission = async () => {
     console.info("Could not acquire lock for script [backfillPermission], skipping");
   }
 };
+
+export const migrateRoleFromOwnerToAdmin = async () => {
+  await MembershipOrg.updateMany(
+    {
+      role: OWNER
+    },
+    {
+      $set: {
+        role: ADMIN
+      }
+    }
+  );
+
+  console.info("Backfill: Finished converting owner role to member");
+}

backend/src/utils/setup/index.ts

@@ -18,7 +18,8 @@ import {
   backfillServiceToken,
   backfillServiceTokenMultiScope,
   backfillTrustedIps,
-  backfillUserAuthMethods
+  backfillUserAuthMethods,
+  migrateRoleFromOwnerToAdmin
 } from "./backfillData";
 import {
   reencryptBotOrgKeys,
@@ -85,6 +86,7 @@ export const setup = async () => {
   await backfillTrustedIps();
   await backfillUserAuthMethods();
   // await backfillPermission();
+  await migrateRoleFromOwnerToAdmin()
 
   // re-encrypt any data previously encrypted under server hex 128-bit ENCRYPTION_KEY
   // to base64 256-bit ROOT_ENCRYPTION_KEY