chore: merge main into release for new releases

Author: Marfuen

apps/api/src/trust-portal/trust-portal.service.ts

@@ -345,15 +345,22 @@ export class TrustPortalService {
       );
     }
 
-    if (!trustRecord[config.enabledField]) {
+    if (trustRecord[config.statusField] !== 'compliant') {
       throw new BadRequestException(
-        `Framework ${framework} is not enabled for this organization`,
+        `Framework ${framework} must be marked as compliant before uploading a certificate`,
       );
     }
 
-    if (trustRecord[config.statusField] !== 'compliant') {
-      throw new BadRequestException(
-        `Framework ${framework} must be marked as compliant before uploading a certificate`,
+    // Auto-enable the framework if it's not already enabled (for backward compatibility with old organizations)
+    if (!trustRecord[config.enabledField]) {
+      await db.trust.update({
+        where: { organizationId },
+        data: {
+          [config.enabledField]: true,
+        },
+      });
+      this.logger.log(
+        `Auto-enabled framework ${framework} for organization ${organizationId} during certificate upload`,
       );
     }
   }

bun.lock

@@ -307,7 +307,7 @@
         "@types/jszip": "^3.4.1",
         "@upstash/ratelimit": "^2.0.5",
         "archiver": "^7.0.1",
-        "better-auth": "^1.3.27",
+        "better-auth": "^1.4.5",
         "class-variance-authority": "^0.7.1",
         "geist": "^1.3.1",
         "jszip": "^3.10.1",