@asgardeo/auth-spa 0.2.21 → 0.2.22

package/src/worker/worker-core.ts

@@ -18,6 +18,7 @@
 
 import {
     AsgardeoAuthClient,
+    AsgardeoAuthException,
     AuthClientConfig,
     AuthorizationURLParams,
     BasicUserInfo,
@@ -31,7 +32,6 @@ import {
     TokenResponse
 } from "@asgardeo/auth-js";
 import { CUSTOM_GRANT_CONFIG } from "../constants";
-import { AsgardeoSPAException } from "../exception";
 import { SPAHelper } from "../helpers";
 import { HttpClient, HttpClientInstance } from "../http-client";
 import {
@@ -63,7 +63,7 @@ export const WebWorkerCore = async (
         if (requestConfig.attachToken) {
             request.headers = {
                 ...request.headers,
-                Authorization: `Bearer ${await _authenticationClient.getAccessToken()}`
+                Authorization: `Bearer ${ await _authenticationClient.getAccessToken() }`
             };
         }
     };
@@ -84,13 +84,13 @@ export const WebWorkerCore = async (
 
     const httpRequest = async (requestConfig: HttpRequestConfig): Promise<HttpResponse> => {
         let matches = false;
-        const config = await _dataLayer.getConfigData();
+        const serverOrigin = (config as any).baseUrl || (config as any).serverOrigin;
 
         for (const baseUrl of [
             ...((await _dataLayer.getConfigData())?.resourceServerURLs ?? []),
-            config?.serverOrigin
+            serverOrigin
         ]) {
-            if (requestConfig?.url?.startsWith(baseUrl)) {
+            if (baseUrl && requestConfig?.url?.startsWith(baseUrl)) {
                 matches = true;
 
                 break;
@@ -103,45 +103,43 @@ export const WebWorkerCore = async (
                 .then((response: HttpResponse) => {
                     return Promise.resolve(response);
                 })
-                .catch((error: HttpError) => {
+                .catch(async (error: HttpError) => {
                     if (error?.response?.status === 401 || !error?.response) {
-                        return refreshAccessToken()
-                            .then(() => {
-                                return _httpClient
-                                    .request(requestConfig)
-                                    .then((response) => {
-                                        return Promise.resolve(response);
-                                    })
-                                    .catch((error) => {
-                                        return Promise.reject(error);
-                                    });
-                            })
-                            .catch((refreshError) => {
-                                return Promise.reject(
-                                    new AsgardeoSPAException(
-                                        "WORKER_CORE-HR-ES01",
-                                        "worker-core",
-                                        "httpRequest",
-                                        "",
-                                        "",
-                                        refreshError
-                                    )
-                                );
-                            });
+                        let refreshAccessTokenResponse: BasicUserInfo;
+                        try {
+                            refreshAccessTokenResponse = await refreshAccessToken();
+                        } catch (refreshError: any) {
+                            throw new AsgardeoAuthException(
+                                "SPA-WORKER_CORE-HR-SE01",
+                                refreshError?.name ?? "Refresh token request failed.",
+                                refreshError?.message ??
+                                "An error occurred while trying to refresh the " +
+                                "access token following a 401 response from the server."
+                            );
+                        }
+
+                        if (refreshAccessTokenResponse) {
+                            return _httpClient
+                                .request(requestConfig)
+                                .then((response) => {
+                                    return Promise.resolve(response);
+                                })
+                                .catch((error) => {
+                                    return Promise.reject(error);
+                                });
+                        }
                     }
 
                     return Promise.reject(error);
                 });
         } else {
             return Promise.reject(
-                new AsgardeoSPAException(
-                    "WORKER_CORE-HR-IV02",
-                    "worker-core",
-                    "httpRequest",
+                new AsgardeoAuthException(
+                    "SPA-WORKER_CORE-HR-IV02",
                     "Request to the provided endpoint is prohibited.",
                     "Requests can only be sent to resource servers specified by the `resourceServerURLs`" +
-                        " attribute while initializing the SDK. The specified endpoint in this request " +
-                        "cannot be found among the `resourceServerURLs`"
+                    " attribute while initializing the SDK. The specified endpoint in this request " +
+                    "cannot be found among the `resourceServerURLs`"
                 )
             );
         }
@@ -149,16 +147,17 @@ export const WebWorkerCore = async (
 
     const httpRequestAll = async (requestConfigs: HttpRequestConfig[]): Promise<HttpResponse[] | undefined> => {
         let matches = true;
-        const config = await _dataLayer.getConfigData();
+
+        const serverOrigin = (config as any).baseUrl || (config as any).serverOrigin;
 
         for (const requestConfig of requestConfigs) {
             let urlMatches = false;
 
             for (const baseUrl of [
                 ...((await _dataLayer.getConfigData())?.resourceServerURLs ?? []),
-                config?.serverOrigin
+                serverOrigin
             ]) {
-                if (requestConfig.url?.startsWith(baseUrl)) {
+                if (baseUrl && requestConfig.url?.startsWith(baseUrl)) {
                     urlMatches = true;
 
                     break;
@@ -186,35 +185,34 @@ export const WebWorkerCore = async (
                     .then((responses: HttpResponse[]) => {
                         return Promise.resolve(responses);
                     })
-                    .catch((error: HttpError) => {
+                    .catch(async (error: HttpError) => {
                         if (error?.response?.status === 401) {
-                            return _authenticationClient
-                                .refreshAccessToken()
-                                .then(() => {
-                                    return (
-                                        _httpClient.all &&
-                                        _httpClient
-                                            .all(requests)
-                                            .then((response) => {
-                                                return Promise.resolve(response);
-                                            })
-                                            .catch((error) => {
-                                                return Promise.reject(error);
-                                            })
-                                    );
-                                })
-                                .catch((refreshError) => {
-                                    return Promise.reject(
-                                        new AsgardeoSPAException(
-                                            "WORKER_CORE-HRA-ES01",
-                                            "worker-core",
-                                            "httpRequestAll",
-                                            "",
-                                            "",
-                                            refreshError
-                                        )
-                                    );
-                                });
+                            let refreshAccessTokenResponse: BasicUserInfo;
+                            try {
+                                refreshAccessTokenResponse = await refreshAccessToken();
+                            } catch (refreshError: any) {
+                                throw new AsgardeoAuthException(
+                                    "SPA-WORKER_CORE-HRA-SE01",
+                                    refreshError?.name ?? "Refresh token request failed.",
+                                    refreshError?.message ??
+                                    "An error occurred while trying to refresh the " +
+                                    "access token following a 401 response from the server."
+                                );
+                            }
+
+                            if (refreshAccessTokenResponse) {
+                                return (
+                                    _httpClient.all &&
+                                    _httpClient
+                                        .all(requests)
+                                        .then((response) => {
+                                            return Promise.resolve(response);
+                                        })
+                                        .catch((error) => {
+                                            return Promise.reject(error);
+                                        })
+                                );
+                            }
                         }
 
                         return Promise.reject(error);
@@ -222,14 +220,12 @@ export const WebWorkerCore = async (
             );
         } else {
             return Promise.reject(
-                new AsgardeoSPAException(
-                    "WORKER_CORE-HRA-IV02",
-                    "worker-core",
-                    "httpRequest",
+                new AsgardeoAuthException(
+                    "SPA-WORKER_CORE-HRA-IV02",
                     "Request to the provided endpoint is prohibited.",
                     "Requests can only be sent to resource servers specified by the `resourceServerURLs`" +
-                        " attribute while initializing the SDK. The specified endpoint in this request " +
-                        "cannot be found among the `resourceServerURLs`"
+                    " attribute while initializing the SDK. The specified endpoint in this request " +
+                    "cannot be found among the `resourceServerURLs`"
                 )
             );
         }
@@ -289,10 +285,8 @@ export const WebWorkerCore = async (
         }
 
         return Promise.reject(
-            new AsgardeoSPAException(
-                "WORKER_CORE-RAT1-NF01",
-                "worker-core",
-                "requestAccessToken",
+            new AsgardeoAuthException(
+                "SPA-WORKER_CORE-RAT1-NF01",
                 "No authorization code.",
                 "No authorization code was found."
             )
@@ -312,23 +306,23 @@ export const WebWorkerCore = async (
     const requestCustomGrant = async (config: CustomGrantConfig): Promise<BasicUserInfo | FetchResponse> => {
         let useDefaultEndpoint = true;
         let matches = false;
-        const clientConfig = await _dataLayer.getConfigData();
+        const serverOrigin = (config as any).baseUrl || (config as any).serverOrigin;
 
         // If the config does not contains a token endpoint, default token endpoint will be used.
         if (config?.tokenEndpoint) {
             useDefaultEndpoint = false;
             for (const baseUrl of [
                 ...((await _dataLayer.getConfigData())?.resourceServerURLs ?? []),
-                clientConfig?.serverOrigin
+                serverOrigin
             ]) {
-                if (config.tokenEndpoint?.startsWith(baseUrl)) {
+                if (baseUrl && config.tokenEndpoint?.startsWith(baseUrl)) {
                     matches = true;
                     break;
                 }
             }
         }
 
-        if(config.shouldReplayAfterRefresh) {
+        if (config.shouldReplayAfterRefresh) {
             _dataLayer.setTemporaryDataParameter(CUSTOM_GRANT_CONFIG, JSON.stringify(config));
         }
         if (useDefaultEndpoint || matches) {
@@ -348,14 +342,12 @@ export const WebWorkerCore = async (
                 });
         } else {
             return Promise.reject(
-                new AsgardeoSPAException(
-                    "WORKER_CORE-RCG-IV01",
-                    "worker-core",
-                    "requestCustomGrant",
+                new AsgardeoAuthException(
+                    "SPA-WORKER_CORE-RCG-IV01",
                     "Request to the provided endpoint is prohibited.",
                     "Requests can only be sent to resource servers specified by the `resourceServerURLs`" +
-                        " attribute while initializing the SDK. The specified token endpoint in this request " +
-                        "cannot be found among the `resourceServerURLs`"
+                    " attribute while initializing the SDK. The specified token endpoint in this request " +
+                    "cannot be found among the `resourceServerURLs`"
                 )
             );
         }
@@ -427,11 +419,11 @@ export const WebWorkerCore = async (
     };
 
     const getCustomGrantConfigData = async (): Promise<AuthClientConfig<CustomGrantConfig> | null> => {
-        const configString =  await _dataLayer.getTemporaryDataParameter(CUSTOM_GRANT_CONFIG);
-        if(configString) {
+        const configString = await _dataLayer.getTemporaryDataParameter(CUSTOM_GRANT_CONFIG);
+        if (configString) {
             return JSON.parse(configString as string);
         } else {
-            return null
+            return null;
         }
     };
 

package/dist/src/exception/exception.d.ts

@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) 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.
- */
-export declare class AsgardeoSPAException extends Error {
-    name: string;
-    code: string;
-    file: string;
-    method: string;
-    description: string;
-    error: AsgardeoSPAException | undefined;
-    constructor(code: string, file: string, method: string, message: string, description: string, error?: AsgardeoSPAException | undefined);
-}
-//# sourceMappingURL=exception.d.ts.map

package/dist/src/exception/exception.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"exception.d.ts","sourceRoot":"","sources":["../../../src/exception/exception.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,qBAAa,oBAAqB,SAAQ,KAAK;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,oBAAoB,GAAG,SAAS,CAAC;gBAG3C,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,oBAAoB,GAAG,SAAS;CAW/C"}

package/dist/src/exception/exception.js

@@ -1,30 +0,0 @@
-/**
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) 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.
- */
-export class AsgardeoSPAException extends Error {
-    constructor(code, file, method, message, description, error) {
-        super(message !== null && message !== void 0 ? message : error === null || error === void 0 ? void 0 : error.message);
-        this.name = this.constructor.name;
-        this.code = code;
-        this.file = file;
-        this.method = method;
-        this.error = error;
-        this.description = description;
-        Object.setPrototypeOf(this, new.target.prototype);
-    }
-}
-//# sourceMappingURL=exception.js.map

package/dist/src/exception/exception.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"exception.js","sourceRoot":"","sources":["../../../src/exception/exception.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IAQ3C,YACI,IAAY,EACZ,IAAY,EACZ,MAAc,EACd,OAAe,EACf,WAAmB,EACnB,KAAwC;QAExC,KAAK,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACtD,CAAC;CACJ"}

package/dist/src/exception/index.d.ts

@@ -1,19 +0,0 @@
-/**
-* Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) 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.
-*/
-export * from "./exception";
-//# sourceMappingURL=index.d.ts.map

package/dist/src/exception/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exception/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;EAgBE;AAEF,cAAc,aAAa,CAAC"}

package/dist/src/exception/index.js

@@ -1,19 +0,0 @@
-/**
-* Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) 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.
-*/
-export * from "./exception";
-//# sourceMappingURL=index.js.map

package/dist/src/exception/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/exception/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;EAgBE;AAEF,cAAc,aAAa,CAAC"}

package/src/exception/exception.ts

@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) 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.
- */
-
-export class AsgardeoSPAException extends Error {
-    public name: string;
-    public code: string;
-    public file: string;
-    public method: string;
-    public description: string;
-    public error: AsgardeoSPAException | undefined;
-
-    public constructor(
-        code: string,
-        file: string,
-        method: string,
-        message: string,
-        description: string,
-        error?: AsgardeoSPAException | undefined
-    ) {
-        super(message ?? error?.message);
-        this.name = this.constructor.name;
-        this.code = code;
-        this.file = file;
-        this.method = method;
-        this.error = error;
-        this.description = description;
-        Object.setPrototypeOf(this, new.target.prototype);
-    }
-}

package/src/exception/index.ts

@@ -1,19 +0,0 @@
-/**
-* Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) 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.
-*/
-
-export * from "./exception";