@arv-bedrock/auth-sso 0.1.9 → 0.1.11

package/dist/cjs/auth.js

@@ -25,26 +25,25 @@ class Auth {
                 this.doLogin();
             }
         });
-        this.userType = "officer";
-        this.authHost = "";
-        this.clientId = "";
-        this.clientSecret = "";
-        this.frontendHost = "";
-        this.defaultCallback = "";
+        this.userType = 'officer';
+        this.authHost = '';
+        this.clientId = '';
+        this.clientSecret = '';
+        this.defaultCallback = '';
         this.user = { userId: '', email: '' };
         this.queryString = '';
         this.clientInit = { logoutUrl: '', portalHomeUrl: '', isPortal: false };
     }
     isCitizen() {
-        return this.userType === "citizen";
+        return this.userType === 'citizen';
     }
     getCode() {
         const params = new URLSearchParams(window.location.search);
-        return params.get(constant_1.CODE) || "";
+        return params.get(constant_1.CODE) || '';
     }
     getRedirectUri() {
         const params = new URLSearchParams(window.location.search);
-        return params.get(constant_1.REDIRECT_URI) || "";
+        return params.get(constant_1.REDIRECT_URI) || '';
     }
     setUser(profile) {
         this.user.userId = profile.user_id;
@@ -54,10 +53,8 @@ class Auth {
         const params = new URLSearchParams(window.location.search);
         params.delete(key);
         const { pathname } = window.location;
-        const replaceURL = params.toString()
-            ? `${pathname}?${params.toString()}`
-            : pathname;
-        window.history.replaceState({}, "", replaceURL);
+        const replaceURL = params.toString() ? `${pathname}?${params.toString()}` : pathname;
+        window.history.replaceState({}, '', replaceURL);
     }
     doLogin(redirectUrl = this.defaultCallback) {
         let url = new URL(redirectUrl, window.location.origin).toString();
@@ -65,7 +62,7 @@ class Auth {
             url = url.slice(0, url.length - 1);
         }
         const callbackURL = encodeURIComponent(url);
-        let target = `${this.authHost}/auth/${constant_1.OFFICER}/login?redirectUri=${callbackURL}&client_id=${this.clientId}`;
+        let target = `${this.authHost}/auth/login?redirectUri=${callbackURL}&client_id=${this.clientId}`;
         if (this.isCitizen()) {
             target = `${this.authHost}/auth/${constant_1.CITIZEN}/login?redirectUri=${callbackURL}&client_id=${this.clientId}`;
         }
@@ -77,7 +74,7 @@ class Auth {
             url = url.slice(0, url.length - 1);
         }
         const callbackURL = encodeURIComponent(url);
-        let location = `${this.authHost}/auth/${constant_1.OFFICER}/register?redirectUri=${callbackURL}&client_id=${this.clientId}`;
+        let location = `${this.authHost}/auth/create-account?redirectUri=${callbackURL}&client_id=${this.clientId}`;
         if (this.isCitizen()) {
             location = `${this.authHost}/auth/${constant_1.CITIZEN}/main-register?redirectUri=${callbackURL}&client_id=${this.clientId}`;
         }
@@ -97,8 +94,8 @@ class Auth {
             this.clientId = options.clientId;
             this.clientSecret = options.clientSecret;
             this.queryString = this.createQueryParam({
-                'client_id': this.clientId,
-                'user_type': this.userType
+                client_id: this.clientId,
+                user_type: this.userType,
             });
             const res = yield this.getClientInit();
             if (res.code != '200') {
@@ -110,14 +107,32 @@ class Auth {
     setCookie(code) {
         return __awaiter(this, void 0, void 0, function* () {
             const codeParam = `${constant_1.CODE}=${code}`;
-            const response = yield (0, _fetch_1.default)(`${this.authHost}/api/v1/oauth/cookies?${this.queryString}&${codeParam}`, {
-                method: "POST",
-                body: JSON.stringify({ code })
+            yield (0, _fetch_1.default)(`${this.authHost}/api/v1/oauth/cookies?${this.queryString}&${codeParam}`, {
+                method: 'POST',
+                body: JSON.stringify({ code }),
             });
             this.removeUrlParam(constant_1.CODE);
-            return response;
+            const shouldDoLoginMethod = this.getParam(constant_1.LOGIN_METHOD_REQUEST) == 'true';
+            if (shouldDoLoginMethod) {
+                yield this.doLoginMethodReqeust();
+            }
+        });
+    }
+    doLoginMethodReqeust() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const result = yield (0, _fetch_1.default)(`${this.authHost}/api/v1/oauth/loginMethodRequest?${this.queryString}`);
+                window.location.replace(result.data.redirectUri);
+            }
+            catch (err) {
+                console.log(err);
+                throw err;
+            }
         });
     }
+    getParam(key) {
+        return new URLSearchParams(window.location.search).get(key);
+    }
     getClientInfo() {
         return __awaiter(this, void 0, void 0, function* () {
             const result = yield (0, _fetch_1.default)(`${this.authHost}/api/v1/oauth/clientInfo?${this.queryString}`);
@@ -134,15 +149,15 @@ class Auth {
     clearCookie() {
         return __awaiter(this, void 0, void 0, function* () {
             yield (0, _fetch_1.default)(`${this.authHost}/api/v1/oauth/cookies?${this.queryString}`, {
-                method: "DELETE"
+                method: 'DELETE',
             });
         });
     }
     getProfile() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const secretParam = `${constant_1.CLIENT_SECRET}=${this.clientSecret}`;
-                const result = yield (0, _fetch_1.default)(`${this.authHost}/api/v1/oauth/profile_sso?${this.queryString}&${secretParam}`);
+                const secretParam = `&${constant_1.CLIENT_SECRET}=${this.clientSecret}`;
+                const result = yield (0, _fetch_1.default)(`${this.authHost}/api/v1/oauth/profile_sso?${this.queryString}${secretParam}`);
                 const profile = result.data;
                 this.setUser(profile);
                 return profile;
@@ -159,9 +174,8 @@ class Auth {
         window.location.replace(`${this.clientInit.portalHomeUrl}?client_id=${this.clientId}&user_type=${this.userType}`);
     }
     verifyToken() {
-        const secretParam = `${constant_1.CLIENT_SECRET}=${this.clientSecret}`;
-        return (0, _fetch_1.default)(`${this.authHost}/api/v1/oauth/verifyToken?${this.queryString}&${secretParam}`, {
-            method: "POST"
+        return (0, _fetch_1.default)(`${this.authHost}/api/v1/oauth/verifyToken?${this.queryString}`, {
+            method: 'POST',
         });
     }
 }

package/dist/cjs/constant.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OFFICER = exports.REDIRECT_URI = exports.CODE = exports.CLIENT_SECRET = exports.CITIZEN = void 0;
+exports.REDIRECT_URI = exports.OFFICER = exports.LOGIN_METHOD_REQUEST = exports.CODE = exports.CLIENT_SECRET = exports.CITIZEN = void 0;
 const CITIZEN = "citizen";
 exports.CITIZEN = CITIZEN;
 const OFFICER = "officer";
 exports.OFFICER = OFFICER;
 const CLIENT_SECRET = "client_secret";
 exports.CLIENT_SECRET = CLIENT_SECRET;
-const CODE = 'code';
+const CODE = "code";
 exports.CODE = CODE;
-const REDIRECT_URI = 'redirectUri';
+const REDIRECT_URI = "redirectUri";
 exports.REDIRECT_URI = REDIRECT_URI;
+const LOGIN_METHOD_REQUEST = "loginMethod";
+exports.LOGIN_METHOD_REQUEST = LOGIN_METHOD_REQUEST;

package/dist/cjs/index.js

@@ -15,7 +15,10 @@ const initBedrockAuth = ({ authUri, clientId, clientSecret, callback, userType,
         .then(() => {
         callback();
     })
-        .catch((error) => console.log(error));
+        .catch((error) => {
+        callback(error);
+        console.log(error);
+    });
 };
 exports.initBedrockAuth = initBedrockAuth;
 const doLogin = (redirectUrl) => auth_1.default.doLogin(redirectUrl);

package/dist/cjs/types/auth.d.ts

@@ -1,4 +1,4 @@
-export type UserType = "citizen" | "officer";
+export type UserType = 'citizen' | 'officer';
 interface Options {
     authHost: string;
     clientId: string;
@@ -28,10 +28,12 @@ export interface ClientInit {
     portalHomeUrl: string;
     isPortal: boolean;
 }
+export interface LoginMethodRequest {
+    redirectUri: string;
+}
 declare class Auth {
     private userType;
     private authHost;
-    private frontendHost;
     private defaultCallback;
     private clientId;
     private clientSecret;
@@ -49,7 +51,9 @@ declare class Auth {
     doRegister(redirectUrl?: string): void;
     private createQueryParam;
     init(options: Options): Promise<void>;
-    setCookie(code: string): Promise<ResponseData<[]>>;
+    setCookie(code: string): Promise<void>;
+    private doLoginMethodReqeust;
+    private getParam;
     getClientInfo(): Promise<ResponseData<ClientInfo>>;
     private getClientInit;
     clearCookie(): Promise<void>;

package/dist/cjs/types/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../auth.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;AAM7C,UAAU,OAAO;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAQD,cAAM,IAAI;IACR,OAAO,CAAC,QAAQ,CAAW;IAE3B,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,eAAe,CAAS;IAEhC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,IAAI,CAAQ;IACpB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAa;;IAc/B,SAAS;IAIF,OAAO;IAKP,cAAc;IAKrB,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,cAAc;IAUf,OAAO,CAAC,WAAW,GAAE,MAA6B;IAalD,QAAQ,sBAOb;IAEK,UAAU,CAAC,WAAW,GAAE,MAA6B;IAc5D,OAAO,CAAC,gBAAgB;IAQX,IAAI,CAAC,OAAO,EAAE,OAAO;IAkBrB,SAAS,CAAC,IAAI,EAAE,MAAM;IAYtB,aAAa;YAKZ,aAAa;IAMd,WAAW;IAOX,UAAU;IAYhB,QAAQ;IASR,WAAW;CAQnB;AAED,QAAA,MAAM,WAAW,MAAa,CAAC;AAE/B,eAAe,WAAW,CAAC"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../auth.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAA;AAM5C,UAAU,OAAO;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,CAAC,CAAA;IACP,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAOD,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,cAAM,IAAI;IACR,OAAO,CAAC,QAAQ,CAAU;IAE1B,OAAO,CAAC,QAAQ,CAAQ;IAExB,OAAO,CAAC,eAAe,CAAQ;IAE/B,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,YAAY,CAAQ;IAE5B,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,UAAU,CAAY;;IAa9B,SAAS;IAIF,OAAO;IAKP,cAAc;IAKrB,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,cAAc;IAQf,OAAO,CAAC,WAAW,GAAE,MAA6B;IAalD,QAAQ,sBAOd;IAEM,UAAU,CAAC,WAAW,GAAE,MAA6B;IAc5D,OAAO,CAAC,gBAAgB;IAQX,IAAI,CAAC,OAAO,EAAE,OAAO;IAiBrB,SAAS,CAAC,IAAI,EAAE,MAAM;YAcrB,oBAAoB;IAalC,OAAO,CAAC,QAAQ;IAIH,aAAa;YAOZ,aAAa;IAQd,WAAW;IAMX,UAAU;IAchB,QAAQ;IASR,WAAW;CAQnB;AAED,QAAA,MAAM,WAAW,MAAa,CAAA;AAE9B,eAAe,WAAW,CAAA"}

package/dist/cjs/types/constant.d.ts

@@ -3,5 +3,6 @@ declare const OFFICER = "officer";
 declare const CLIENT_SECRET = "client_secret";
 declare const CODE = "code";
 declare const REDIRECT_URI = "redirectUri";
-export { CITIZEN, CLIENT_SECRET, CODE, REDIRECT_URI, OFFICER };
+declare const LOGIN_METHOD_REQUEST = "loginMethod";
+export { CITIZEN, CLIENT_SECRET, CODE, LOGIN_METHOD_REQUEST, OFFICER, REDIRECT_URI, };
 //# sourceMappingURL=constant.d.ts.map

package/dist/cjs/types/constant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../constant.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,OAAO,YAAY,CAAC;AAC1B,QAAA,MAAM,OAAO,YAAY,CAAC;AAC1B,QAAA,MAAM,aAAa,kBAAkB,CAAC;AACtC,QAAA,MAAM,IAAI,SAAS,CAAC;AACpB,QAAA,MAAM,YAAY,gBAAgB,CAAC;AAEnC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,CAAA"}
+{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../constant.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,OAAO,YAAY,CAAC;AAC1B,QAAA,MAAM,OAAO,YAAY,CAAC;AAC1B,QAAA,MAAM,aAAa,kBAAkB,CAAC;AACtC,QAAA,MAAM,IAAI,SAAS,CAAC;AACpB,QAAA,MAAM,YAAY,gBAAgB,CAAC;AACnC,QAAA,MAAM,oBAAoB,gBAAgB,CAAC;AAE3C,OAAO,EACL,OAAO,EACP,aAAa,EACb,IAAI,EACJ,oBAAoB,EACpB,OAAO,EACP,YAAY,GACb,CAAC"}

package/dist/cjs/types/index.d.ts

@@ -4,13 +4,13 @@ export type AuthProps = {
     authUri: string;
     clientId: string;
     clientSecret: string;
-    callback: () => void;
+    callback: (error?: any) => void;
 };
 export declare const initBedrockAuth: ({ authUri, clientId, clientSecret, callback, userType, }: AuthProps) => void;
 export declare const doLogin: (redirectUrl?: string) => void;
 export declare const doLogout: () => Promise<void>;
 export declare const doRegister: (redirectUrl?: string) => void;
-export declare const setCookie: (code: string) => Promise<import("./auth").ResponseData<[]>>;
+export declare const setCookie: (code: string) => Promise<void>;
 export declare const getProfile: () => Promise<import("./auth").AuthServiceResponse | undefined>;
 export declare const clearCookie: () => Promise<void>;
 export declare const getCode: () => string;

package/dist/cjs/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../index.ts"],"names":[],"mappings":"AAAA,OAAW,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAEtC,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,eAAe,6DAMzB,SAAS,SAWX,CAAC;AAEF,eAAO,MAAM,OAAO,iBAAkB,MAAM,SAA4B,CAAC;AAEzE,eAAO,MAAM,QAAQ,qBAAsB,CAAC;AAE5C,eAAO,MAAM,UAAU,iBAAkB,MAAM,SAA+B,CAAC;AAE/E,eAAO,MAAM,SAAS,SAAU,MAAM,+CAAuB,CAAC;AAE9D,eAAO,MAAM,UAAU,iEAAwB,CAAC;AAEhD,eAAO,MAAM,WAAW,qBAAyB,CAAC;AAElD,eAAO,MAAM,OAAO,cAAqB,CAAC;AAE1C,eAAO,MAAM,QAAQ,iCAAsB,CAAC;AAE5C,eAAO,MAAM,cAAc,cAA4B,CAAC;AAExD,eAAO,MAAM,WAAW,kDAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../index.ts"],"names":[],"mappings":"AAAA,OAAW,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAEtC,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,eAAe,6DAMzB,SAAS,SAcX,CAAC;AAEF,eAAO,MAAM,OAAO,iBAAkB,MAAM,SAA4B,CAAC;AAEzE,eAAO,MAAM,QAAQ,qBAAsB,CAAC;AAE5C,eAAO,MAAM,UAAU,iBAAkB,MAAM,SAA+B,CAAC;AAE/E,eAAO,MAAM,SAAS,SAAU,MAAM,kBAAuB,CAAC;AAE9D,eAAO,MAAM,UAAU,iEAAwB,CAAC;AAEhD,eAAO,MAAM,WAAW,qBAAyB,CAAC;AAElD,eAAO,MAAM,OAAO,cAAqB,CAAC;AAE1C,eAAO,MAAM,QAAQ,iCAAsB,CAAC;AAE5C,eAAO,MAAM,cAAc,cAA4B,CAAC;AAExD,eAAO,MAAM,WAAW,kDAAyB,CAAC"}

package/dist/esm/auth.js

@@ -1,9 +1,8 @@
-import customFetch from "./_fetch";
-import { CITIZEN, CLIENT_SECRET, CODE, REDIRECT_URI, OFFICER } from './constant';
+import customFetch from './_fetch';
+import { CITIZEN, CLIENT_SECRET, CODE, LOGIN_METHOD_REQUEST, REDIRECT_URI } from './constant';
 class Auth {
     userType;
     authHost;
-    frontendHost;
     defaultCallback;
     clientId;
     clientSecret;
@@ -11,26 +10,25 @@ class Auth {
     queryString;
     clientInit;
     constructor() {
-        this.userType = "officer";
-        this.authHost = "";
-        this.clientId = "";
-        this.clientSecret = "";
-        this.frontendHost = "";
-        this.defaultCallback = "";
+        this.userType = 'officer';
+        this.authHost = '';
+        this.clientId = '';
+        this.clientSecret = '';
+        this.defaultCallback = '';
         this.user = { userId: '', email: '' };
         this.queryString = '';
         this.clientInit = { logoutUrl: '', portalHomeUrl: '', isPortal: false };
     }
     isCitizen() {
-        return this.userType === "citizen";
+        return this.userType === 'citizen';
     }
     getCode() {
         const params = new URLSearchParams(window.location.search);
-        return params.get(CODE) || "";
+        return params.get(CODE) || '';
     }
     getRedirectUri() {
         const params = new URLSearchParams(window.location.search);
-        return params.get(REDIRECT_URI) || "";
+        return params.get(REDIRECT_URI) || '';
     }
     setUser(profile) {
         this.user.userId = profile.user_id;
@@ -40,10 +38,8 @@ class Auth {
         const params = new URLSearchParams(window.location.search);
         params.delete(key);
         const { pathname } = window.location;
-        const replaceURL = params.toString()
-            ? `${pathname}?${params.toString()}`
-            : pathname;
-        window.history.replaceState({}, "", replaceURL);
+        const replaceURL = params.toString() ? `${pathname}?${params.toString()}` : pathname;
+        window.history.replaceState({}, '', replaceURL);
     }
     doLogin(redirectUrl = this.defaultCallback) {
         let url = new URL(redirectUrl, window.location.origin).toString();
@@ -51,7 +47,7 @@ class Auth {
             url = url.slice(0, url.length - 1);
         }
         const callbackURL = encodeURIComponent(url);
-        let target = `${this.authHost}/auth/${OFFICER}/login?redirectUri=${callbackURL}&client_id=${this.clientId}`;
+        let target = `${this.authHost}/auth/login?redirectUri=${callbackURL}&client_id=${this.clientId}`;
         if (this.isCitizen()) {
             target = `${this.authHost}/auth/${CITIZEN}/login?redirectUri=${callbackURL}&client_id=${this.clientId}`;
         }
@@ -72,7 +68,7 @@ class Auth {
             url = url.slice(0, url.length - 1);
         }
         const callbackURL = encodeURIComponent(url);
-        let location = `${this.authHost}/auth/${OFFICER}/register?redirectUri=${callbackURL}&client_id=${this.clientId}`;
+        let location = `${this.authHost}/auth/create-account?redirectUri=${callbackURL}&client_id=${this.clientId}`;
         if (this.isCitizen()) {
             location = `${this.authHost}/auth/${CITIZEN}/main-register?redirectUri=${callbackURL}&client_id=${this.clientId}`;
         }
@@ -91,8 +87,8 @@ class Auth {
         this.clientId = options.clientId;
         this.clientSecret = options.clientSecret;
         this.queryString = this.createQueryParam({
-            'client_id': this.clientId,
-            'user_type': this.userType
+            client_id: this.clientId,
+            user_type: this.userType,
         });
         const res = await this.getClientInit();
         if (res.code != '200') {
@@ -102,12 +98,28 @@ class Auth {
     }
     async setCookie(code) {
         const codeParam = `${CODE}=${code}`;
-        const response = await customFetch(`${this.authHost}/api/v1/oauth/cookies?${this.queryString}&${codeParam}`, {
-            method: "POST",
-            body: JSON.stringify({ code })
+        await customFetch(`${this.authHost}/api/v1/oauth/cookies?${this.queryString}&${codeParam}`, {
+            method: 'POST',
+            body: JSON.stringify({ code }),
         });
         this.removeUrlParam(CODE);
-        return response;
+        const shouldDoLoginMethod = this.getParam(LOGIN_METHOD_REQUEST) == 'true';
+        if (shouldDoLoginMethod) {
+            await this.doLoginMethodReqeust();
+        }
+    }
+    async doLoginMethodReqeust() {
+        try {
+            const result = await customFetch(`${this.authHost}/api/v1/oauth/loginMethodRequest?${this.queryString}`);
+            window.location.replace(result.data.redirectUri);
+        }
+        catch (err) {
+            console.log(err);
+            throw err;
+        }
+    }
+    getParam(key) {
+        return new URLSearchParams(window.location.search).get(key);
     }
     async getClientInfo() {
         const result = await customFetch(`${this.authHost}/api/v1/oauth/clientInfo?${this.queryString}`);
@@ -120,13 +132,13 @@ class Auth {
     }
     async clearCookie() {
         await customFetch(`${this.authHost}/api/v1/oauth/cookies?${this.queryString}`, {
-            method: "DELETE"
+            method: 'DELETE',
         });
     }
     async getProfile() {
         try {
-            const secretParam = `${CLIENT_SECRET}=${this.clientSecret}`;
-            const result = await customFetch(`${this.authHost}/api/v1/oauth/profile_sso?${this.queryString}&${secretParam}`);
+            const secretParam = `&${CLIENT_SECRET}=${this.clientSecret}`;
+            const result = await customFetch(`${this.authHost}/api/v1/oauth/profile_sso?${this.queryString}${secretParam}`);
             const profile = result.data;
             this.setUser(profile);
             return profile;
@@ -142,9 +154,8 @@ class Auth {
         window.location.replace(`${this.clientInit.portalHomeUrl}?client_id=${this.clientId}&user_type=${this.userType}`);
     }
     verifyToken() {
-        const secretParam = `${CLIENT_SECRET}=${this.clientSecret}`;
-        return customFetch(`${this.authHost}/api/v1/oauth/verifyToken?${this.queryString}&${secretParam}`, {
-            method: "POST"
+        return customFetch(`${this.authHost}/api/v1/oauth/verifyToken?${this.queryString}`, {
+            method: 'POST',
         });
     }
 }

package/dist/esm/constant.js

@@ -1,6 +1,7 @@
 const CITIZEN = "citizen";
 const OFFICER = "officer";
 const CLIENT_SECRET = "client_secret";
-const CODE = 'code';
-const REDIRECT_URI = 'redirectUri';
-export { CITIZEN, CLIENT_SECRET, CODE, REDIRECT_URI, OFFICER };
+const CODE = "code";
+const REDIRECT_URI = "redirectUri";
+const LOGIN_METHOD_REQUEST = "loginMethod";
+export { CITIZEN, CLIENT_SECRET, CODE, LOGIN_METHOD_REQUEST, OFFICER, REDIRECT_URI, };

package/dist/esm/index.mjs

@@ -9,7 +9,10 @@ export const initBedrockAuth = ({ authUri, clientId, clientSecret, callback, use
         .then(() => {
         callback();
     })
-        .catch((error) => console.log(error));
+        .catch((error) => {
+        callback(error);
+        console.log(error);
+    });
 };
 export const doLogin = (redirectUrl) => BR.doLogin(redirectUrl);
 export const doLogout = () => BR.doLogout();

package/dist/esm/types/auth.d.ts

@@ -1,4 +1,4 @@
-export type UserType = "citizen" | "officer";
+export type UserType = 'citizen' | 'officer';
 interface Options {
     authHost: string;
     clientId: string;
@@ -28,10 +28,12 @@ export interface ClientInit {
     portalHomeUrl: string;
     isPortal: boolean;
 }
+export interface LoginMethodRequest {
+    redirectUri: string;
+}
 declare class Auth {
     private userType;
     private authHost;
-    private frontendHost;
     private defaultCallback;
     private clientId;
     private clientSecret;
@@ -49,7 +51,9 @@ declare class Auth {
     doRegister(redirectUrl?: string): void;
     private createQueryParam;
     init(options: Options): Promise<void>;
-    setCookie(code: string): Promise<ResponseData<[]>>;
+    setCookie(code: string): Promise<void>;
+    private doLoginMethodReqeust;
+    private getParam;
     getClientInfo(): Promise<ResponseData<ClientInfo>>;
     private getClientInit;
     clearCookie(): Promise<void>;

package/dist/esm/types/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../auth.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;AAM7C,UAAU,OAAO;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAQD,cAAM,IAAI;IACR,OAAO,CAAC,QAAQ,CAAW;IAE3B,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,eAAe,CAAS;IAEhC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,IAAI,CAAQ;IACpB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAa;;IAc/B,SAAS;IAIF,OAAO;IAKP,cAAc;IAKrB,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,cAAc;IAUf,OAAO,CAAC,WAAW,GAAE,MAA6B;IAalD,QAAQ,sBAOb;IAEK,UAAU,CAAC,WAAW,GAAE,MAA6B;IAc5D,OAAO,CAAC,gBAAgB;IAQX,IAAI,CAAC,OAAO,EAAE,OAAO;IAkBrB,SAAS,CAAC,IAAI,EAAE,MAAM;IAYtB,aAAa;YAKZ,aAAa;IAMd,WAAW;IAOX,UAAU;IAYhB,QAAQ;IASR,WAAW;CAQnB;AAED,QAAA,MAAM,WAAW,MAAa,CAAC;AAE/B,eAAe,WAAW,CAAC"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../auth.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAA;AAM5C,UAAU,OAAO;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,CAAC,CAAA;IACP,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAOD,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,cAAM,IAAI;IACR,OAAO,CAAC,QAAQ,CAAU;IAE1B,OAAO,CAAC,QAAQ,CAAQ;IAExB,OAAO,CAAC,eAAe,CAAQ;IAE/B,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,YAAY,CAAQ;IAE5B,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,UAAU,CAAY;;IAa9B,SAAS;IAIF,OAAO;IAKP,cAAc;IAKrB,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,cAAc;IAQf,OAAO,CAAC,WAAW,GAAE,MAA6B;IAalD,QAAQ,sBAOd;IAEM,UAAU,CAAC,WAAW,GAAE,MAA6B;IAc5D,OAAO,CAAC,gBAAgB;IAQX,IAAI,CAAC,OAAO,EAAE,OAAO;IAiBrB,SAAS,CAAC,IAAI,EAAE,MAAM;YAcrB,oBAAoB;IAalC,OAAO,CAAC,QAAQ;IAIH,aAAa;YAOZ,aAAa;IAQd,WAAW;IAMX,UAAU;IAchB,QAAQ;IASR,WAAW;CAQnB;AAED,QAAA,MAAM,WAAW,MAAa,CAAA;AAE9B,eAAe,WAAW,CAAA"}

package/dist/esm/types/constant.d.ts

@@ -3,5 +3,6 @@ declare const OFFICER = "officer";
 declare const CLIENT_SECRET = "client_secret";
 declare const CODE = "code";
 declare const REDIRECT_URI = "redirectUri";
-export { CITIZEN, CLIENT_SECRET, CODE, REDIRECT_URI, OFFICER };
+declare const LOGIN_METHOD_REQUEST = "loginMethod";
+export { CITIZEN, CLIENT_SECRET, CODE, LOGIN_METHOD_REQUEST, OFFICER, REDIRECT_URI, };
 //# sourceMappingURL=constant.d.ts.map

package/dist/esm/types/constant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../constant.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,OAAO,YAAY,CAAC;AAC1B,QAAA,MAAM,OAAO,YAAY,CAAC;AAC1B,QAAA,MAAM,aAAa,kBAAkB,CAAC;AACtC,QAAA,MAAM,IAAI,SAAS,CAAC;AACpB,QAAA,MAAM,YAAY,gBAAgB,CAAC;AAEnC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,CAAA"}
+{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../constant.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,OAAO,YAAY,CAAC;AAC1B,QAAA,MAAM,OAAO,YAAY,CAAC;AAC1B,QAAA,MAAM,aAAa,kBAAkB,CAAC;AACtC,QAAA,MAAM,IAAI,SAAS,CAAC;AACpB,QAAA,MAAM,YAAY,gBAAgB,CAAC;AACnC,QAAA,MAAM,oBAAoB,gBAAgB,CAAC;AAE3C,OAAO,EACL,OAAO,EACP,aAAa,EACb,IAAI,EACJ,oBAAoB,EACpB,OAAO,EACP,YAAY,GACb,CAAC"}

package/dist/esm/types/index.d.ts

@@ -4,13 +4,13 @@ export type AuthProps = {
     authUri: string;
     clientId: string;
     clientSecret: string;
-    callback: () => void;
+    callback: (error?: any) => void;
 };
 export declare const initBedrockAuth: ({ authUri, clientId, clientSecret, callback, userType, }: AuthProps) => void;
 export declare const doLogin: (redirectUrl?: string) => void;
 export declare const doLogout: () => Promise<void>;
 export declare const doRegister: (redirectUrl?: string) => void;
-export declare const setCookie: (code: string) => Promise<import("./auth").ResponseData<[]>>;
+export declare const setCookie: (code: string) => Promise<void>;
 export declare const getProfile: () => Promise<import("./auth").AuthServiceResponse | undefined>;
 export declare const clearCookie: () => Promise<void>;
 export declare const getCode: () => string;

package/dist/esm/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../index.ts"],"names":[],"mappings":"AAAA,OAAW,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAEtC,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,eAAe,6DAMzB,SAAS,SAWX,CAAC;AAEF,eAAO,MAAM,OAAO,iBAAkB,MAAM,SAA4B,CAAC;AAEzE,eAAO,MAAM,QAAQ,qBAAsB,CAAC;AAE5C,eAAO,MAAM,UAAU,iBAAkB,MAAM,SAA+B,CAAC;AAE/E,eAAO,MAAM,SAAS,SAAU,MAAM,+CAAuB,CAAC;AAE9D,eAAO,MAAM,UAAU,iEAAwB,CAAC;AAEhD,eAAO,MAAM,WAAW,qBAAyB,CAAC;AAElD,eAAO,MAAM,OAAO,cAAqB,CAAC;AAE1C,eAAO,MAAM,QAAQ,iCAAsB,CAAC;AAE5C,eAAO,MAAM,cAAc,cAA4B,CAAC;AAExD,eAAO,MAAM,WAAW,kDAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../index.ts"],"names":[],"mappings":"AAAA,OAAW,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAEtC,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,eAAe,6DAMzB,SAAS,SAcX,CAAC;AAEF,eAAO,MAAM,OAAO,iBAAkB,MAAM,SAA4B,CAAC;AAEzE,eAAO,MAAM,QAAQ,qBAAsB,CAAC;AAE5C,eAAO,MAAM,UAAU,iBAAkB,MAAM,SAA+B,CAAC;AAE/E,eAAO,MAAM,SAAS,SAAU,MAAM,kBAAuB,CAAC;AAE9D,eAAO,MAAM,UAAU,iEAAwB,CAAC;AAEhD,eAAO,MAAM,WAAW,qBAAyB,CAAC;AAElD,eAAO,MAAM,OAAO,cAAqB,CAAC;AAE1C,eAAO,MAAM,QAAQ,iCAAsB,CAAC;AAE5C,eAAO,MAAM,cAAc,cAA4B,CAAC;AAExD,eAAO,MAAM,WAAW,kDAAyB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arv-bedrock/auth-sso",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "main": "./dist/cjs/index.js",
   "types": "./dist/cjs/types/index.d.ts",
   "scripts": {