Merge branch 'chore/platform-billing' of github.com:calcom/cal.com in…

…to chore/platform-billing
calcom · Apr 30, 2024 · edfe409 · edfe409
2 parents 330d82e + 7d9dbca
commit edfe409
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/packages/app-store/_utils/oauth/OAuthManager.ts b/packages/app-store/_utils/oauth/OAuthManager.ts
@@ -174,7 +174,6 @@ export class OAuthManager {
      */
     isTokenExpired?: IsTokenExpired;
   }) {
-    ensureValidResourceOwner(resourceOwner);
     this.resourceOwner = resourceOwner;
     this.currentTokenObject = currentTokenObject;
     this.appSlug = appSlug;
@@ -191,6 +190,13 @@ export class OAuthManager {
       credentialSyncVariables.CREDENTIAL_SYNC_SECRET_HEADER_NAME &&
       credentialSyncVariables.CREDENTIAL_SYNC_SECRET
     );
+
+    if (this.useCredentialSync) {
+      // Though it should be validated without credential sync as well but it seems like we have some credentials without userId in production
+      // So, we are not validating it for now
+      ensureValidResourceOwner(resourceOwner);
+    }
+
     this.autoCheckTokenExpiryOnRequest = autoCheckTokenExpiryOnRequest;
     this.updateTokenObject = updateTokenObject;
   }