From c60840e97978362897079723d2086190faea2b0e Mon Sep 17 00:00:00 2001 From: Sheen Capadngan Date: Wed, 26 Mar 2025 03:35:37 +0800 Subject: [PATCH] misc: reordered ua checks for crossplane --- .../services/identity-ua/identity-ua-service.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/backend/src/services/identity-ua/identity-ua-service.ts b/backend/src/services/identity-ua/identity-ua-service.ts index fdb7acd52..1efa1ff37 100644 --- a/backend/src/services/identity-ua/identity-ua-service.ts +++ b/backend/src/services/identity-ua/identity-ua-service.ts @@ -251,14 +251,17 @@ export const identityUaServiceFactory = ({ const identityMembershipOrg = await identityOrgMembershipDAL.findOne({ identityId }); if (!identityMembershipOrg) throw new NotFoundError({ message: `Failed to find identity with ID ${identityId}` }); + const uaIdentityAuth = await identityUaDAL.findOne({ identityId }); + if (!uaIdentityAuth) { + throw new NotFoundError({ message: `Failed to find universal auth for identity with ID ${identityId}` }); + } + if (!identityMembershipOrg.identity.authMethods.includes(IdentityAuthMethod.UNIVERSAL_AUTH)) { throw new BadRequestError({ message: "The identity does not have universal auth" }); } - const uaIdentityAuth = await identityUaDAL.findOne({ identityId }); - if ( (accessTokenMaxTTL || uaIdentityAuth.accessTokenMaxTTL) > 0 && (accessTokenTTL || uaIdentityAuth.accessTokenMaxTTL) > (accessTokenMaxTTL || uaIdentityAuth.accessTokenMaxTTL) @@ -327,14 +330,17 @@ export const identityUaServiceFactory = ({ const identityMembershipOrg = await identityOrgMembershipDAL.findOne({ identityId }); if (!identityMembershipOrg) throw new NotFoundError({ message: `Failed to find identity with ID ${identityId}` }); + const uaIdentityAuth = await identityUaDAL.findOne({ identityId }); + if (!uaIdentityAuth) { + throw new NotFoundError({ message: `Failed to find universal auth for identity with ID ${identityId}` }); + } + if (!identityMembershipOrg.identity.authMethods.includes(IdentityAuthMethod.UNIVERSAL_AUTH)) { throw new BadRequestError({ message: "The identity does not have universal auth" }); } - const uaIdentityAuth = await identityUaDAL.findOne({ identityId }); - const { permission } = await permissionService.getOrgPermission( actor, actorId,