Merge pull request #1681 from dopry/fix/2.4.x-signoutCallback-does-no…

…t-return-state fix: return signout response from signoutCallback
authts · Oct 3, 2024 · d94be14 · d94be14
2 parents 5de05ea + b579396
commit d94be14
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/docs/oidc-client-ts.api.md b/docs/oidc-client-ts.api.md
@@ -967,7 +967,7 @@ export class UserManager {
     // (undocumented)
     protected _signout(args: CreateSignoutRequestArgs, handle: IWindow): Promise<SignoutResponse>;
     // (undocumented)
-    signoutCallback(url?: string, keepOpen?: boolean): Promise<void>;
+    signoutCallback(url?: string, keepOpen?: boolean): Promise<SignoutResponse | void>;
     // (undocumented)
     protected _signoutEnd(url: string): Promise<SignoutResponse>;
     signoutPopup(args?: SignoutPopupArgs): Promise<void>;

diff --git a/src/UserManager.ts b/src/UserManager.ts
@@ -332,16 +332,15 @@ export class UserManager {
         }
     }
 
-    public async signoutCallback(url = window.location.href, keepOpen = false): Promise<void> {
+    public async signoutCallback(url = window.location.href, keepOpen = false): Promise<SignoutResponse | void> {
         const { state } = await this._client.readSignoutResponseState(url);
         if (!state) {
-            return;
+            return undefined;
         }
 
         switch (state.request_type) {
             case "so:r":
-                await this.signoutRedirectCallback(url);
-                break;
+                return await this.signoutRedirectCallback(url);
             case "so:p":
                 await this.signoutPopupCallback(url, keepOpen);
                 break;
@@ -351,6 +350,7 @@ export class UserManager {
             default:
                 throw new Error("invalid response_type in state");
         }
+        return undefined;
     }
 
     /**