@sunbird-cb/utils 1.0.16 → 1.0.17

package/fesm5/sunbird-cb-utils.js

@@ -8,8 +8,8 @@ import { map, debounceTime, distinctUntilChanged, throttleTime, filter, catchErr
 import { CommonModule } from '@angular/common';
 import { MatIconModule, MatButtonModule, MatDialogModule, MatToolbarModule, MatCardModule, MatTooltipModule, MatSliderModule, MatProgressSpinnerModule, MatDialogRef as MatDialogRef$1 } from '@angular/material';
 import { ImageCropperModule } from 'ngx-image-cropper';
-import { HttpClient } from '@angular/common/http';
 import { KeycloakEventType, KeycloakService } from 'keycloak-angular';
+import { HttpClient } from '@angular/common/http';
 import { Platform } from '@angular/cdk/platform';
 import { NavigationEnd, Router, ActivatedRoute } from '@angular/router';
 import * as _moment from 'moment';
@@ -1807,9 +1807,8 @@ if (false) {
 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;
@@ -1952,7 +1951,7 @@ var AuthKeycloakService = (function () {
         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];
             });
         });
@@ -1960,24 +1959,23 @@ var AuthKeycloakService = (function () {
     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];
             });
         });
     };
@@ -2089,17 +2087,15 @@ var AuthKeycloakService = (function () {
                 },] }
     ];
     AuthKeycloakService.ctorParameters = function () { return [
-        { type: HttpClient },
         { type: ConfigurationsService },
         { type: KeycloakService },
         { type: AuthMicrosoftService }
     ]; };
-    /** @nocollapse */ AuthKeycloakService.ngInjectableDef = ɵɵdefineInjectable({ factory: function AuthKeycloakService_Factory() { return new AuthKeycloakService(ɵɵinject(HttpClient), ɵɵinject(ConfigurationsService), ɵɵinject(KeycloakService), ɵɵinject(AuthMicrosoftService)); }, token: AuthKeycloakService, providedIn: "root" });
+    /** @nocollapse */ AuthKeycloakService.ngInjectableDef = ɵɵdefineInjectable({ factory: function AuthKeycloakService_Factory() { return new AuthKeycloakService(ɵɵinject(ConfigurationsService), ɵɵinject(KeycloakService), ɵɵ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;