cidaas-javascript-sdk 3.0.5 → 3.1.1

package/src/main/web-auth/WebAuth.ts

@@ -1,6 +1,5 @@
 import { UserManager, UserManagerSettings } from "oidc-client-ts";
 import * as CryptoJS from 'crypto-js';
-import fingerprint from '@fingerprintjs/fingerprintjs';
 
 import { Authentication } from "../authentication";
 import { Helper, CustomException } from "./Helper";
@@ -35,13 +34,26 @@ import {
   AcceptResetPasswordEntity,
   LoginFormRequestAsyncEntity,
   PhysicalVerificationLoginRequest,
-  IChangePasswordEntity
+  IChangePasswordEntity,
+  ICidaasSDKSettings
 } from "./Entities"
 
 export class WebAuth {
 
-  constructor(settings: UserManagerSettings & { mode?: string, cidaas_version: number }) {
+  constructor(settings: ICidaasSDKSettings) {
     try {
+      if (!settings.response_type) {
+        settings.response_type = "code";
+      }
+      if (!settings.scope) {
+        settings.scope = "email openid profile mobile";
+      }
+      if (!settings.mode) {
+        settings.mode = 'redirect';
+      }
+      if (!settings.cidaas_version) {
+        settings.cidaas_version = 2;
+      }
       var usermanager = new UserManager(settings)
       window.webAuthSettings = settings;
       window.usermanager = usermanager;
@@ -50,9 +62,6 @@ export class WebAuth {
       window.usermanager.events.addSilentRenewError(function (error: any) {
         throw new CustomException("Error while renewing silent login", 500);
       });
-      if (!settings.mode) {
-        window.webAuthSettings.mode = 'redirect';
-      }
     } catch (ex) {
       console.log(ex);
     }
@@ -225,27 +234,20 @@ export class WebAuth {
    * @returns 
    */
   getLoginURL() {
-    var settings = window.webAuthSettings;
-    if (!settings.response_type) {
-      settings.response_type = "code";
-    }
-    if (!settings.scope) {
-      settings.scope = "email openid profile mobile";
-    }
-    var loginURL = "";
-    window.usermanager._client.createSigninRequest(settings).then((signInRequest: any) => {
-      loginURL = signInRequest.url;
-    }) 
-    var timeRemaining = 5000
-    while(timeRemaining > 0) {
-      if (loginURL) {
-        break;
+    let loginUrl: string;
+    let finish: boolean = false;
+    (async () => {
+      try {
+        loginUrl = await window.usermanager._client.getSignInRedirectUrl();
       }
-      setTimeout(() => {
-        timeRemaining -= 100
-      }, 100);
-    }
-    return loginURL;
+      catch (e) {
+        //TODO: define Error handling
+        console.log(e);
+      }
+      finish = true
+    })();
+    while (!finish) { } // A simple synchronous loop to wait async call is finish
+    return loginUrl;
   };
 
   /**
@@ -300,29 +302,8 @@ export class WebAuth {
    * @returns 
    */
   getMissingFields(options: { requestId: string; trackId: string; }) {
-    return new Promise((resolve, reject) => {
-      try {
-        var http = new XMLHttpRequest();
-        var _serviceURL = window.webAuthSettings.authority + "/public-srv/public/trackinfo/" + options.requestId + "/" + options.trackId;
-        http.onreadystatechange = function () {
-          if (http.readyState == 4) {
-            if (http.responseText) {
-              resolve(JSON.parse(http.responseText));
-            } else {
-              resolve(false);
-            }
-          }
-        };
-        http.open("GET", _serviceURL, true);
-        http.setRequestHeader("Content-type", "application/json");
-        if (window.localeSettings) {
-          http.setRequestHeader("accept-language", window.localeSettings);
-        }
-        http.send();
-      } catch (ex) {
-        reject(ex);
-      }
-    });
+    const _serviceURL = window.webAuthSettings.authority + "/public-srv/public/trackinfo/" + options.requestId + "/" + options.trackId;
+    return Helper.createPostPromise(undefined, _serviceURL,false, "GET");
   };
 
   /**
@@ -330,29 +311,8 @@ export class WebAuth {
    * @returns 
    */
   getTenantInfo() {
-    return new Promise((resolve, reject) => {
-      try {
-        var http = new XMLHttpRequest();
-        var _serviceURL = window.webAuthSettings.authority + "/public-srv/tenantinfo/basic";
-        http.onreadystatechange = function () {
-          if (http.readyState == 4) {
-            if (http.responseText) {
-              resolve(JSON.parse(http.responseText));
-            } else {
-              resolve(false);
-            }
-          }
-        };
-        http.open("GET", _serviceURL, true);
-        http.setRequestHeader("Content-type", "application/json");
-        if (window.localeSettings) {
-          http.setRequestHeader("accept-language", window.localeSettings);
-        }
-        http.send();
-      } catch (ex) {
-        reject(ex);
-      }
-    });
+    const _serviceURL = window.webAuthSettings.authority + "/public-srv/tenantinfo/basic";
+    return Helper.createPostPromise(undefined, _serviceURL,false, "GET");
   };
 
   /**
@@ -373,29 +333,8 @@ export class WebAuth {
    * @returns 
    */
   getClientInfo(options: { requestId: string }) {
-    return new Promise((resolve, reject) => {
-      try {
-        var http = new XMLHttpRequest();
-        var _serviceURL = window.webAuthSettings.authority + "/public-srv/public/" + options.requestId;
-        http.onreadystatechange = function () {
-          if (http.readyState == 4) {
-            if (http.responseText) {
-              resolve(JSON.parse(http.responseText));
-            } else {
-              resolve(false);
-            }
-          }
-        };
-        http.open("GET", _serviceURL, true);
-        http.setRequestHeader("Content-type", "application/json");
-        if (window.localeSettings) {
-          http.setRequestHeader("accept-language", window.localeSettings);
-        }
-        http.send();
-      } catch (ex) {
-        reject(ex);
-      }
-    });
+    const _serviceURL = window.webAuthSettings.authority + "/public-srv/public/" + options.requestId;
+    return Helper.createPostPromise(undefined, _serviceURL,false, "GET");
   };
 
   /**
@@ -404,33 +343,12 @@ export class WebAuth {
    * @returns 
    */
   getDevicesInfo(options: any) {
-    return new Promise((resolve, reject) => {
-      try {
-        var http = new XMLHttpRequest();
-        var _serviceURL = window.webAuthSettings.authority + "/device-srv/devices";
-        options.userAgent = window.navigator.userAgent
-        http.onreadystatechange = function () {
-          if (http.readyState == 4) {
-            if (http.responseText) {
-              resolve(JSON.parse(http.responseText));
-            } else {
-              resolve(false);
-            }
-          }
-        };
-        http.open("GET", _serviceURL, true);
-        http.setRequestHeader("Content-type", "application/json");
-        if (window.localeSettings) {
-          http.setRequestHeader("accept-language", window.localeSettings);
-        }
-        if (window.navigator.userAgent) {
-          http.send(JSON.stringify(options));
-        }
-        http.send();
-      } catch (ex) {
-        reject(ex);
-      }
-    });
+    options.userAgent = window.navigator.userAgent;
+    const _serviceURL = window.webAuthSettings.authority + "/device-srv/devices";
+    if (window.navigator.userAgent) {
+      return Helper.createPostPromise(options, _serviceURL,false, "GET");
+    }
+    return Helper.createPostPromise(undefined, _serviceURL,false, "GET");
   };
 
   /**
@@ -439,33 +357,12 @@ export class WebAuth {
    * @returns 
    */
   deleteDevice(options: { device_id: string; userAgent?: string }) {
-    return new Promise((resolve, reject) => {
-      try {
-        var http = new XMLHttpRequest();
-        var _serviceURL = window.webAuthSettings.authority + "/device-srv/device/" + options.device_id;
-        options.userAgent = window.navigator.userAgent
-        http.onreadystatechange = function () {
-          if (http.readyState == 4) {
-            if (http.responseText) {
-              resolve(JSON.parse(http.responseText));
-            } else {
-              resolve(false);
-            }
-          }
-        };
-        http.open("DELETE", _serviceURL, true);
-        http.setRequestHeader("Content-type", "application/json");
-        if (window.localeSettings) {
-          http.setRequestHeader("accept-language", window.localeSettings);
-        }
-        if (window.navigator.userAgent) {
-          http.send(JSON.stringify(options));
-        }
-        http.send();
-      } catch (ex) {
-        reject(ex);
-      }
-    });
+    const _serviceURL = window.webAuthSettings.authority + "/device-srv/device/" + options.device_id;
+    options.userAgent = window.navigator.userAgent;
+    if (window.navigator.userAgent) {
+      return Helper.createPostPromise(options, _serviceURL,false, "DELETE");
+    }
+    return Helper.createPostPromise(undefined, _serviceURL,false, "DELETE");
   };
 
   /**
@@ -510,30 +407,8 @@ export class WebAuth {
  * @returns 
  */
   getUnreviewedDevices(access_token: string, sub: string) {
-    return new Promise((resolve, reject) => {
-      try {
-        var http = new XMLHttpRequest();
-        var _serviceURL = window.webAuthSettings.authority + "/reports-srv/device/unreviewlist/" + sub;
-        http.onreadystatechange = function () {
-          if (http.readyState == 4) {
-            if (http.responseText) {
-              resolve(JSON.parse(http.responseText));
-            } else {
-              resolve(false);
-            }
-          }
-        };
-        http.open("GET", _serviceURL, true);
-        http.setRequestHeader("Content-type", "application/json");
-        http.setRequestHeader("Authorization", `Bearer ${access_token}`);
-        if (window.localeSettings) {
-          http.setRequestHeader("accept-language", window.localeSettings);
-        }
-        http.send();
-      } catch (ex) {
-        throw new CustomException(ex, 417);
-      }
-    });
+    let _serviceURL = window.webAuthSettings.authority + "/reports-srv/device/unreviewlist/" + sub;
+    return Helper.createPostPromise(undefined, _serviceURL,false, "GET", access_token);
   };
 
   /**
@@ -543,30 +418,8 @@ export class WebAuth {
    * @returns 
    */
   getReviewedDevices(access_token: string, sub: string) {
-    return new Promise(function (resolve, reject) {
-      try {
-        var http = new XMLHttpRequest();
-        var _serviceURL = window.webAuthSettings.authority + "/reports-srv/device/reviewlist/" + sub;
-        http.onreadystatechange = function () {
-          if (http.readyState == 4) {
-            if (http.responseText) {
-              resolve(JSON.parse(http.responseText));
-            } else {
-              resolve(false);
-            }
-          }
-        };
-        http.open("GET", _serviceURL, true);
-        http.setRequestHeader("Content-type", "application/json");
-        http.setRequestHeader("Authorization", `Bearer ${access_token}`);
-        if (window.localeSettings) {
-          http.setRequestHeader("accept-language", window.localeSettings);
-        }
-        http.send();
-      } catch (ex) {
-        throw new CustomException(ex, 417);
-      }
-    });
+    let _serviceURL = window.webAuthSettings.authority + "/reports-srv/device/reviewlist/" + sub;
+    return Helper.createPostPromise(undefined, _serviceURL,false, "GET", access_token);
   };
 
   /**
@@ -576,30 +429,8 @@ export class WebAuth {
    * @returns 
    */
   reviewDevice(options: UpdateReviewDeviceEntity, access_token: string) {
-    return new Promise((resolve, reject) => {
-      try {
-        var http = new XMLHttpRequest();
-        var _serviceURL = window.webAuthSettings.authority + "/reports-srv/device/updatereview";
-        http.onreadystatechange = function () {
-          if (http.readyState == 4) {
-            if (http.responseText) {
-              resolve(JSON.parse(http.responseText));
-            } else {
-              resolve(false);
-            }
-          }
-        };
-        http.open("PUT", _serviceURL, true);
-        http.setRequestHeader("Content-type", "application/json");
-        http.setRequestHeader("Authorization", `Bearer ${access_token}`);
-        if (window.localeSettings) {
-          http.setRequestHeader("accept-language", window.localeSettings);
-        }
-        http.send(JSON.stringify(options));
-      } catch (ex) {
-        throw new CustomException(ex, 417);
-      }
-    });
+    let _serviceURL = window.webAuthSettings.authority + "/reports-srv/device/updatereview";
+    return Helper.createPostPromise(options, _serviceURL,false, "PUT", access_token);
   };
 
   /**
@@ -610,13 +441,9 @@ export class WebAuth {
     return new Promise((resolve, reject) => {
       try {
         var value = ('; ' + document.cookie).split(`; cidaas_dr=`).pop().split(';')[0];
-        var fpPromise = fingerprint.load();
-        var options = { fingerprint: "", userAgent: "" };
+        var options = { userAgent: "" };
         if (!value) {
           (async () => {
-            var fp = await fpPromise;
-            var result = await fp.get();
-            options.fingerprint = result.visitorId
             options.userAgent = window.navigator.userAgent
             var http = new XMLHttpRequest();
             var _serviceURL = window.webAuthSettings.authority + "/device-srv/deviceinfo";
@@ -983,7 +810,7 @@ export class WebAuth {
    */
   getUserActivities(options: UserActivityEntity, access_token: string) {
     var _serviceURL = window.webAuthSettings.authority + "/useractivity-srv/latestactivity";
-    return Helper.createPostPromise(options, _serviceURL, false, access_token);
+    return Helper.createPostPromise(options, _serviceURL, false,"POST", access_token);
   };
 
   /**
@@ -1042,7 +869,7 @@ export class WebAuth {
    */
   updateProfileImage(options: { image_key: string; }, access_token: string) {
     var _serviceURL = window.webAuthSettings.authority + "/image-srv/profile/upload";
-    return Helper.createPostPromise(options, _serviceURL, false, access_token);
+    return Helper.createPostPromise(options, _serviceURL, false,"POST", access_token);
   };
 
   /**
@@ -1660,7 +1487,7 @@ export class WebAuth {
   /**
    * @deprecated
    * authenticate ivr - v1
-   * @param options 
+   * @param options
    */
   authenticateIVR(options: any) {
     var verificationType = "IVR";
@@ -1669,21 +1496,21 @@ export class WebAuth {
 
   /**
    * @deprecated
-   * authenticate backupcode - v1
-   * @param options 
+   * authenticate totp - v1
+   * @param options
    */
-  authenticateBackupcode(options: any) {
-    var verificationType = "BACKUPCODE";
+  authenticateTOTP(options: any) {
+    var verificationType = "TOTP";
     this.authenticateMfaV1(options, verificationType);
   };
 
   /**
    * @deprecated
-   * authenticate totp - v1
-   * @param options 
+   * authenticate backupcode - v1
+   * @param options
    */
-  authenticateTOTP(options: any) {
-    var verificationType = "TOTP";
+  authenticateBackupcode(options: any) {
+    var verificationType = "BACKUPCODE";
     this.authenticateMfaV1(options, verificationType);
   };
 }

package/types/main/authentication/index.d.ts

@@ -1,55 +0,0 @@
-import { UserManager, UserManagerSettings } from "oidc-client-ts";
-export declare class Authentication {
-    webAuthSettings: UserManagerSettings;
-    userManager: UserManager;
-    constructor(webAuthSettings: UserManagerSettings, userManager: UserManager);
-    /**
-     * redirect sign in
-     * @param view_type
-     */
-    redirectSignIn(view_type: string): void;
-    /**
-     * redirect sign in callback
-     * @returns
-     */
-    redirectSignInCallback(): Promise<unknown>;
-    /**
-     * redirect sign out
-     * @returns
-     */
-    redirectSignOut(): Promise<unknown>;
-    /**
-     * redirect sign out callback
-     * @returns
-     */
-    redirectSignOutCallback(): Promise<unknown>;
-    /**
-     * pop up sign in
-     */
-    popupSignIn(): void;
-    /**
-     * pop up sign in callback
-     */
-    popupSignInCallback(): void;
-    /**
-     * pop up sign out
-     */
-    popupSignOut(): void;
-    /**
-     * silent sign in
-     */
-    silentSignIn(): void;
-    /**
-     * silent sign in callback
-     */
-    silentSignInCallback(): void;
-    /**
-     * silent sign in callback v2
-     * @returns
-     */
-    silentSignInCallbackV2(): Promise<unknown>;
-    /**
-     * silent sign out callback
-     */
-    popupSignOutCallback(): void;
-}