@sunbird-cb/utils 1.0.16 → 1.0.17

package/bundles/sunbird-cb-utils.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/material/dialog'), require('@angular/material/snack-bar'), require('rxjs'), require('@angular/cdk/layout'), require('rxjs/operators'), require('@angular/common'), require('@angular/material'), require('ngx-image-cropper'), require('@angular/common/http'), require('keycloak-angular'), require('@angular/cdk/platform'), require('@angular/router'), require('moment'), require('lodash'), require('@angular/platform-browser')) :
-    typeof define === 'function' && define.amd ? define('@sunbird-cb/utils', ['exports', '@angular/core', '@angular/material/dialog', '@angular/material/snack-bar', 'rxjs', '@angular/cdk/layout', 'rxjs/operators', '@angular/common', '@angular/material', 'ngx-image-cropper', '@angular/common/http', 'keycloak-angular', '@angular/cdk/platform', '@angular/router', 'moment', 'lodash', '@angular/platform-browser'], factory) :
-    (global = global || self, factory((global['sunbird-cb'] = global['sunbird-cb'] || {}, global['sunbird-cb'].utils = {}), global.ng.core, global.ng.material.dialog, global.ng.material['snack-bar'], global.rxjs, global.ng.cdk.layout, global.rxjs.operators, global.ng.common, global.ng.material, global.ngxImageCropper, global.ng.common.http, global['keycloak-angular'], global.ng.cdk.platform, global.ng.router, global.moment, global._, global.ng.platformBrowser));
-}(this, (function (exports, core, dialog, snackBar, rxjs, layout, operators, common, material, ngxImageCropper, http, keycloakAngular, platform, router, _moment, lodash, platformBrowser) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/material/dialog'), require('@angular/material/snack-bar'), require('rxjs'), require('@angular/cdk/layout'), require('rxjs/operators'), require('@angular/common'), require('@angular/material'), require('ngx-image-cropper'), require('keycloak-angular'), require('@angular/common/http'), require('@angular/cdk/platform'), require('@angular/router'), require('moment'), require('lodash'), require('@angular/platform-browser')) :
+    typeof define === 'function' && define.amd ? define('@sunbird-cb/utils', ['exports', '@angular/core', '@angular/material/dialog', '@angular/material/snack-bar', 'rxjs', '@angular/cdk/layout', 'rxjs/operators', '@angular/common', '@angular/material', 'ngx-image-cropper', 'keycloak-angular', '@angular/common/http', '@angular/cdk/platform', '@angular/router', 'moment', 'lodash', '@angular/platform-browser'], factory) :
+    (global = global || self, factory((global['sunbird-cb'] = global['sunbird-cb'] || {}, global['sunbird-cb'].utils = {}), global.ng.core, global.ng.material.dialog, global.ng.material['snack-bar'], global.rxjs, global.ng.cdk.layout, global.rxjs.operators, global.ng.common, global.ng.material, global.ngxImageCropper, global['keycloak-angular'], global.ng.common.http, global.ng.cdk.platform, global.ng.router, global.moment, global._, global.ng.platformBrowser));
+}(this, (function (exports, core, dialog, snackBar, rxjs, layout, operators, common, material, ngxImageCropper, keycloakAngular, http, platform, router, _moment, lodash, platformBrowser) { 'use strict';
 
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -2014,9 +2014,8 @@
     var storage$1 = localStorage;
     var storageKey$1 = 'kc';
     var AuthKeycloakService = (function () {
-        function AuthKeycloakService(http, configSvc, keycloakSvc, msAuthSvc) {
+        function AuthKeycloakService(configSvc, keycloakSvc, msAuthSvc) {
             var _this = this;
-            this.http = http;
             this.configSvc = configSvc;
             this.keycloakSvc = keycloakSvc;
             this.msAuthSvc = msAuthSvc;
@@ -2159,7 +2158,7 @@
             if (_redirectUrl === void 0) { _redirectUrl = this.defaultRedirectUrl; }
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
-                    window.location.href = _redirectUrl + "apis/reset";
+                    window.location.href = _redirectUrl + "public/logout";
                     return [2];
                 });
             });
@@ -2167,24 +2166,23 @@
         AuthKeycloakService.prototype.force_logout = function () {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            if (storage$1.getItem('telemetrySessionId')) {
-                                storage$1.removeItem('telemetrySessionId');
-                            }
-                            try {
-                                sessionStorage.clear();
-                                localStorage.clear();
-                            }
-                            catch (_b) {
-                            }
-                            storage$1.removeItem(storageKey$1);
-                            window.location.href = '/public/logout';
-                            return [4, this.http.get('/apis/reset').toPromise()];
-                        case 1:
-                            _a.sent();
-                            return [2];
+                    if (storage$1.getItem('telemetrySessionId')) {
+                        storage$1.removeItem('telemetrySessionId');
+                    }
+                    storage$1.removeItem(storageKey$1);
+                    if (localStorage.getItem('login') === 'true') {
+                        try {
+                            sessionStorage.clear();
+                            localStorage.clear();
+                        }
+                        catch (_b) {
+                        }
+                        window.location.href = this.defaultRedirectUrl + "apis/reset";
                     }
+                    else {
+                        window.location.href = this.defaultRedirectUrl + "public/logout";
+                    }
+                    return [2];
                 });
             });
         };
@@ -2296,17 +2294,15 @@
                     },] }
         ];
         AuthKeycloakService.ctorParameters = function () { return [
-            { type: http.HttpClient },
             { type: ConfigurationsService },
             { type: keycloakAngular.KeycloakService },
             { type: AuthMicrosoftService }
         ]; };
-        /** @nocollapse */ AuthKeycloakService.ngInjectableDef = core.ɵɵdefineInjectable({ factory: function AuthKeycloakService_Factory() { return new AuthKeycloakService(core.ɵɵinject(http.HttpClient), core.ɵɵinject(ConfigurationsService), core.ɵɵinject(keycloakAngular.KeycloakService), core.ɵɵinject(AuthMicrosoftService)); }, token: AuthKeycloakService, providedIn: "root" });
+        /** @nocollapse */ AuthKeycloakService.ngInjectableDef = core.ɵɵdefineInjectable({ factory: function AuthKeycloakService_Factory() { return new AuthKeycloakService(core.ɵɵinject(ConfigurationsService), core.ɵɵinject(keycloakAngular.KeycloakService), core.ɵɵinject(AuthMicrosoftService)); }, token: AuthKeycloakService, providedIn: "root" });
         return AuthKeycloakService;
     }());
     if (false) {
         AuthKeycloakService.prototype.loginChangeSubject;
-        AuthKeycloakService.prototype.http;
         AuthKeycloakService.prototype.configSvc;
         AuthKeycloakService.prototype.keycloakSvc;
         AuthKeycloakService.prototype.msAuthSvc;