@asgardeo/auth-spa 0.2.15 → 0.2.19

package/src/clients/main-thread-client.ts

@@ -53,6 +53,7 @@ import {
     MainThreadClientInterface,
     Message
 } from "../models";
+import { SPACustomGrantConfig } from "../models/request-custom-grant";
 import { LocalStore, MemoryStore, SessionStore } from "../stores";
 import { SPAUtils } from "../utils";
 
@@ -86,6 +87,8 @@ export const MainThreadClient = async (
         (sessionState: string) => _dataLayer.setSessionDataParameter(SESSION_STATE, sessionState ?? "")
     );
 
+    let _getSignOutURLFromSessionStorage: boolean = false;
+
     const _httpClient: HttpClientInstance = HttpClient.getInstance();
     let _isHttpHandlerEnabled: boolean = true;
     let _httpErrorCallback: (error: HttpError) => void | Promise<void>;
@@ -455,10 +458,13 @@ export const MainThreadClient = async (
     };
 
     const signOut = async (): Promise<boolean> => {
-        if (await _authenticationClient.isAuthenticated()) {
+        if (await _authenticationClient.isAuthenticated() && !_getSignOutURLFromSessionStorage) {
             location.href = await _authenticationClient.signOut();
         } else {
             location.href = SPAUtils.getSignOutURL();
+            await _dataLayer.removeOIDCProviderMetaData();
+            await _dataLayer.removeTemporaryData();
+            await _dataLayer.removeSessionData();
         }
 
         _spaHelper.clearRefreshTokenTimeout();
@@ -468,7 +474,7 @@ export const MainThreadClient = async (
         return true;
     };
 
-    const requestCustomGrant = async (config: CustomGrantConfig): Promise<BasicUserInfo | HttpResponse> => {
+    const requestCustomGrant = async (config: SPACustomGrantConfig): Promise<BasicUserInfo | HttpResponse> => {
         let useDefaultEndpoint = true;
         let matches = false;
         const clientConfig = await _dataLayer.getConfigData();
@@ -493,6 +499,10 @@ export const MainThreadClient = async (
             return _authenticationClient
                 .requestCustomGrant(config)
                 .then(async (response: HttpResponse | TokenResponse) => {
+                    if (config.preventSignOutURLUpdate) {
+                        _getSignOutURLFromSessionStorage = true;
+                    }
+
                     if (config.returnsSession) {
                         _spaHelper.refreshAccessTokenAutomatically();
 
@@ -519,22 +529,19 @@ export const MainThreadClient = async (
         }
     };
 
-    const refreshAccessToken = (): Promise<BasicUserInfo> => {
-        return _authenticationClient
-            .refreshAccessToken()
-            .then(() => {
-                getCustomGrantConfigData().then((customGrantConfig) => {
-                    if(customGrantConfig) {
-                        requestCustomGrant(customGrantConfig)
-                    }
-                })
-                _spaHelper.refreshAccessTokenAutomatically();
+    const refreshAccessToken = async (): Promise<BasicUserInfo> => {
+        try {
+            await _authenticationClient.refreshAccessToken();
+            const customGrantConfig = await getCustomGrantConfigData();
+            if (customGrantConfig) {
+                await requestCustomGrant(customGrantConfig);
+            }
+            _spaHelper.refreshAccessTokenAutomatically();
 
-                return _authenticationClient.getBasicUserInfo();
-            })
-            .catch((error) => {
-                return Promise.reject(error);
-            });
+            return _authenticationClient.getBasicUserInfo();
+        } catch (error) {
+            return Promise.reject(error);
+        }
     };
 
     const revokeAccessToken = (): Promise<boolean> => {
@@ -564,9 +571,11 @@ export const MainThreadClient = async (
         return _authenticationClient
             .requestAccessToken(resolvedAuthorizationCode, resolvedSessionState)
             .then(async () => {
-                if (config.storage === Storage.BrowserMemory) {
+                // Disable this temporarily
+                /* if (config.storage === Storage.BrowserMemory) {
                     SPAUtils.setSignOutURL(await _authenticationClient.getSignOutURL());
-                }
+                } */
+                SPAUtils.setSignOutURL(await _authenticationClient.getSignOutURL());
 
                 _spaHelper.clearRefreshTokenTimeout();
                 _spaHelper.refreshAccessTokenAutomatically();

package/src/clients/web-worker-client.ts

@@ -76,6 +76,7 @@ import {
     WebWorkerClientConfig,
     WebWorkerClientInterface
 } from "../models";
+import { SPACustomGrantConfig } from "../models/request-custom-grant";
 import { SPAUtils } from "../utils";
 
 export const WebWorkerClient = (config: AuthClientConfig<WebWorkerClientConfig>): WebWorkerClientInterface => {
@@ -88,6 +89,7 @@ export const WebWorkerClient = (config: AuthClientConfig<WebWorkerClientConfig>)
      */
     const _requestTimeout: number = config?.requestTimeout ?? 60000;
     let _isHttpHandlerEnabled: boolean = true;
+    let _getSignOutURLFromSessionStorage: boolean = false;
 
     const _sessionManagementHelper = SessionManagementHelper(
         async () => {
@@ -154,7 +156,7 @@ export const WebWorkerClient = (config: AuthClientConfig<WebWorkerClientConfig>)
      * @returns {Promise<HttpResponse|boolean>} A promise that resolves with a boolean value or the request
      * response if the the `returnResponse` attribute in the `requestParams` object is set to `true`.
      */
-    const requestCustomGrant = (requestParams: CustomGrantConfig): Promise<HttpResponse | BasicUserInfo> => {
+    const requestCustomGrant = (requestParams: SPACustomGrantConfig): Promise<HttpResponse | BasicUserInfo> => {
         const message: Message<CustomGrantConfig> = {
             data: requestParams,
             type: REQUEST_CUSTOM_GRANT
@@ -162,6 +164,10 @@ export const WebWorkerClient = (config: AuthClientConfig<WebWorkerClientConfig>)
 
         return communicate<CustomGrantConfig, HttpResponse | BasicUserInfo>(message)
             .then((response) => {
+                if (requestParams.preventSignOutURLUpdate) {
+                    _getSignOutURLFromSessionStorage = true;
+                }
+
                 return Promise.resolve(response);
             })
             .catch((error) => {
@@ -596,7 +602,7 @@ export const WebWorkerClient = (config: AuthClientConfig<WebWorkerClientConfig>)
     const signOut = (): Promise<boolean> => {
         return isAuthenticated()
             .then(async (response: boolean) => {
-                if (response) {
+                if (response && !_getSignOutURLFromSessionStorage) {
                     const message: Message<null> = {
                         type: SIGN_OUT
                     };

package/src/models/request-custom-grant.ts

@@ -0,0 +1,26 @@
+/**
+* Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com) All Rights Reserved.
+*
+* WSO2 Inc. licenses this file to you under the Apache License,
+* Version 2.0 (the "License"); you may not use this file except
+* in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+import { CustomGrantConfig } from "@asgardeo/auth-js";
+
+/**
+ * SPA Custom Request Grant config model
+ */
+export interface SPACustomGrantConfig extends CustomGrantConfig {
+    preventSignOutURLUpdate?: boolean;
+}

package/src/worker/worker-core.ts

@@ -356,22 +356,19 @@ export const WebWorkerCore = async (
         }
     };
 
-    const refreshAccessToken = (): Promise<BasicUserInfo> => {
-        return _authenticationClient
-            .refreshAccessToken()
-            .then(() => {
-                getCustomGrantConfigData().then((customGrantConfig) => {
-                    if(customGrantConfig) {
-                        requestCustomGrant(customGrantConfig)
-                    }
-                });
-                _spaHelper.refreshAccessTokenAutomatically();
+    const refreshAccessToken = async (): Promise<BasicUserInfo> => {
+        try {
+            await _authenticationClient.refreshAccessToken();
+            const customGrantConfig = await getCustomGrantConfigData();
+            if (customGrantConfig) {
+                await requestCustomGrant(customGrantConfig);
+            }
+            _spaHelper.refreshAccessTokenAutomatically();
 
-                return _authenticationClient.getBasicUserInfo();
-            })
-            .catch((error) => {
-                return Promise.reject(error);
-            });
+            return _authenticationClient.getBasicUserInfo();
+        } catch (error) {
+            return Promise.reject(error);
+        }
     };
 
     const revokeAccessToken = (): Promise<boolean> => {