Merge pull request #1672 from peetck/main

make signoutCallback return signout response if request_type is so:r
authts · Sep 20, 2024 · e04c828 · e04c828
2 parents df9dbfc + 861d603
commit e04c828
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
@@ -1042,7 +1042,7 @@ export class UserManager {
     protected _signinStart(args: CreateSigninRequestArgs, handle: IWindow): Promise<NavigateResponse>;
     // (undocumented)
     protected _signout(args: CreateSignoutRequestArgs, handle: IWindow): Promise<SignoutResponse>;
-    signoutCallback(url?: string, keepOpen?: boolean): Promise<void>;
+    signoutCallback(url?: string, keepOpen?: boolean): Promise<SignoutResponse | undefined>;
     // (undocumented)
     protected _signoutEnd(url: string): Promise<SignoutResponse>;
     signoutPopup(args?: SignoutPopupArgs): Promise<void>;

diff --git a/src/UserManager.ts b/src/UserManager.ts
@@ -418,16 +418,15 @@ export class UserManager {
      *
      * @throws `Error` If request_type is unknown or signout cannot be processed.
      */
-    public async signoutCallback(url = window.location.href, keepOpen = false): Promise<void> {
+    public async signoutCallback(url = window.location.href, keepOpen = false): Promise<SignoutResponse | undefined> {
         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;
@@ -437,6 +436,7 @@ export class UserManager {
             default:
                 throw new Error("invalid response_type in state");
         }
+        return undefined;
     }
 
     /**