fix: Fixes error on logout

UserOfficeProject · Mar 15, 2023 · ca1307b · ca1307b
1 parent 29b9150
commit ca1307b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/apps/user-office-backend/src/auth/OAuthAuthorization.ts b/apps/user-office-backend/src/auth/OAuthAuthorization.ts
@@ -58,7 +58,7 @@ export abstract class OAuthAuthorization extends UserAuthorization {
     }
   }
 
-  async logout(uosToken: AuthJwtPayload): Promise<void | Rejection> {
+  async logout(uosToken: AuthJwtPayload): Promise<string | Rejection> {
     const oidcSub = uosToken.user.oidcSub;
 
     if (!oidcSub) {
@@ -73,7 +73,7 @@ export abstract class OAuthAuthorization extends UserAuthorization {
 
       await OpenIdClient.logout(user.oauthAccessToken);
 
-      return;
+      return 'logged out';
     } catch (error) {
       return rejection('Error ocurred while logging out', {
         error: (error as Error)?.message,

diff --git a/apps/user-office-backend/src/auth/StfcUserAuthorization.ts b/apps/user-office-backend/src/auth/StfcUserAuthorization.ts
@@ -221,13 +221,13 @@ export class StfcUserAuthorization extends UserAuthorization {
     return dummyUser;
   }
 
-  async logout(uosToken: AuthJwtPayload): Promise<void | Rejection> {
+  async logout(uosToken: AuthJwtPayload): Promise<string | Rejection> {
     try {
       const token = uosToken.externalToken;
       if (token) {
         this.uowsTokenCache.remove(token);
 
-        await client.logout(token).catch(() => {
+        return await client.logout(token).catch(() => {
           logger.logWarn('Failed to log out user', { token });
 
           return rejection('Failed to log out user', { token });

diff --git a/apps/user-office-backend/src/auth/UserAuthorization.ts b/apps/user-office-backend/src/auth/UserAuthorization.ts
@@ -153,7 +153,7 @@ export abstract class UserAuthorization {
     redirectUri: string
   ): Promise<User | null>;
 
-  abstract logout(token: AuthJwtPayload): Promise<void | Rejection>;
+  abstract logout(token: AuthJwtPayload): Promise<string | Rejection>;
 
   abstract isExternalTokenValid(externalToken: string): Promise<boolean>;
 }
diff --git a/apps/user-office-backend/src/auth/mockups/UserAuthorization.ts b/apps/user-office-backend/src/auth/mockups/UserAuthorization.ts
@@ -21,8 +21,8 @@ export class UserAuthorizationMock extends UserAuthorization {
   async isInternalUser(userId: number, currentRole: Role): Promise<boolean> {
     return true;
   }
-  async logout(token: AuthJwtPayload): Promise<void> {
-    return;
+  async logout(token: AuthJwtPayload): Promise<string> {
+    return 'logged out';
   }
   async isExternalTokenValid(externalToken: string): Promise<boolean> {
     return true;

diff --git a/apps/user-office-backend/src/datasources/stfc/UOWSSoapInterface.ts b/apps/user-office-backend/src/datasources/stfc/UOWSSoapInterface.ts
@@ -1072,7 +1072,7 @@
                   }
 
                   const refinedResult = this.client['logoutAsync'](argsObj).then((result: any) => {
-                      return result[0];
+                      return "successfully logged out";
                   }).catch((result: any) => {
                       const response = result?.response;
                       const exceptionMessage = response?.data?.match("<faultstring>(.*)</faultstring>")[1];

diff --git a/apps/user-office-backend/src/mutations/UserMutations.ts b/apps/user-office-backend/src/mutations/UserMutations.ts
@@ -507,7 +507,7 @@ export default class UserMutations {
     }
   }
 
-  async logout(token: string): Promise<void | Rejection> {
+  async logout(token: string): Promise<string | Rejection> {
     try {
       const decodedToken = verifyToken<AuthJwtPayload>(token);
-Original file line number
+Diff line change
@@ Expand Up / @@ -507,7 +507,7 @@ export default class UserMutations { @@
         }
       }
-      async logout(token: string): Promise<void | Rejection> {
+      async logout(token: string): Promise<string | Rejection> {
         try {
           const decodedToken = verifyToken<AuthJwtPayload>(token);
@@ Expand Down @@