feat: more patchy patch

backend/src/ee/services/github-org-sync/github-org-sync-service.ts

@@ -372,14 +372,12 @@ export const githubOrgSyncServiceFactory = ({
             tx
           );
           const memberships = await membershipGroupDAL.insertMany(
-            newGroups.map(
-              (el) => ({
-                actorGroupId: el.id,
-                scope: AccessScope.Organization,
-                scopeOrgId: orgId
-              }),
-              tx
-            )
+            newGroups.map((el) => ({
+              actorGroupId: el.id,
+              scope: AccessScope.Organization,
+              scopeOrgId: orgId
+            })),
+            tx
           );
 
           await membershipRoleDAL.insertMany(
@@ -717,14 +715,12 @@ export const githubOrgSyncServiceFactory = ({
         );
 
         const memberships = await membershipGroupDAL.insertMany(
-          newGroups.map(
-            (el) => ({
-              actorGroupId: el.id,
-              scope: AccessScope.Organization,
-              scopeOrgId: orgPermission.orgId
-            }),
-            tx
-          )
+          newGroups.map((el) => ({
+            actorGroupId: el.id,
+            scope: AccessScope.Organization,
+            scopeOrgId: orgPermission.orgId
+          })),
+          tx
         );
 
         await membershipRoleDAL.insertMany(

backend/src/ee/services/ldap-config/ldap-config-service.ts

@@ -467,7 +467,7 @@ export const ldapConfigServiceFactory = ({
 
         const [orgMembership] = await orgDAL.findMembership(
           {
-            [`${TableName.Membership}.actorUserId` as "actorUserId"]: userAlias.userId,
+            [`${TableName.Membership}.actorUserId` as "actorUserId"]: newUserAlias.userId,
             [`${TableName.Membership}.scopeOrgId` as "scopeOrgId"]: orgId,
             [`${TableName.Membership}.scope` as "scope"]: AccessScope.Organization
           },

backend/src/ee/services/permission/org-permission.ts

@@ -229,7 +229,9 @@ export const OrgPermissionSchema = z.discriminatedUnion("subject", [
   }),
   z.object({
     subject: z.literal(OrgPermissionSubjects.Billing).describe("The entity this permission pertains to."),
-    action: CASL_ACTION_SCHEMA_NATIVE_ENUM(OrgPermissionActions).describe("Describe what action an entity can take.")
+    action: CASL_ACTION_SCHEMA_NATIVE_ENUM(OrgPermissionBillingActions).describe(
+      "Describe what action an entity can take."
+    )
   }),
   z.object({
     subject: z.literal(OrgPermissionSubjects.Identity).describe("The entity this permission pertains to."),