fix: improve flow when logging in and there are disabled domains in play

gettakaro · Oct 28, 2024 · acaee9c · acaee9c
1 parent f1940b9
commit acaee9c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/app-api/src/controllers/UserController.ts b/packages/app-api/src/controllers/UserController.ts
@@ -151,7 +151,7 @@ export class UserController {
   }
 
   @Get('/me')
-  @UseBefore(AuthService.getAuthMiddleware([]))
+  @UseBefore(AuthService.getAuthMiddleware([], false))
   @ResponseSchema(MeOutoutDTOAPI)
   @OpenAPI({
     summary: 'Get the current logged in user',

diff --git a/packages/app-api/src/service/AuthService.ts b/packages/app-api/src/service/AuthService.ts
@@ -13,7 +13,7 @@ import { Routes, RESTGetAPICurrentUserGuildsResult } from 'discord-api-types/v10
 import oauth from 'passport-oauth2';
 import { DiscordService } from './DiscordService.js';
 import { domainStateMiddleware } from '../middlewares/domainStateMiddleware.js';
-import { DomainService } from './DomainService.js';
+import { DOMAIN_STATES, DomainService } from './DomainService.js';
 
 interface DiscordUserInfo {
   id: string;
@@ -193,7 +193,8 @@ export class AuthService extends DomainScoped {
             log.warn(`No domain found for identity ${identity.id}`);
             throw new errors.UnauthorizedError();
           }
-          domainId = domains[0].id;
+          // Find the first active domain
+          domainId = domains.find((d) => d.state === DOMAIN_STATES.ACTIVE)?.id;
 
           // Set the domain cookie
           if (req.res?.cookie)