@kolektor/nucleus-identity 0.0.9-pre.5707 → 0.0.10-pre.6137

package/fesm2020/kolektor-nucleus-identity.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { Injectable, NgModule } from '@angular/core';
 import * as i1$1 from '@angular/common/http';
 import { HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
-import { from, throwError } from 'rxjs';
+import { lastValueFrom, from, throwError } from 'rxjs';
 import { AppAuthError, AuthorizationNotifier, TokenResponse, Requestor, AuthorizationServiceConfiguration, JQueryRequestor, nowInSeconds, BaseTokenRequestHandler, BasicQueryStringUtils, TokenRequest, GRANT_TYPE_AUTHORIZATION_CODE, GRANT_TYPE_REFRESH_TOKEN, LocalStorageBackend, RedirectRequestHandler, AuthorizationRequest } from '@openid/appauth';
 import { App } from '@capacitor/app';
 import { Browser } from '@capacitor/browser';
@@ -144,9 +144,9 @@ class LocationService {
         }
     }
 }
-LocationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: LocationService, deps: [{ token: i1.NucleusAppService }], target: i0.ɵɵFactoryTarget.Injectable });
-LocationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: LocationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: LocationService, decorators: [{
+LocationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: LocationService, deps: [{ token: i1.NucleusAppService }], target: i0.ɵɵFactoryTarget.Injectable });
+LocationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: LocationService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: LocationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -218,8 +218,16 @@ class SecretsStore {
     constructor(clientId) {
         this._tokens = {};
         this._identities = {};
-        this._tokenStorageKeyPrefix = `Nucleus.Identity.${clientId}`; // do not change this or login fith existing refresh tokens will fail
-        this._servicePrincipalKey = `Nucleus.Identity.${clientId}.SvcP`;
+        // this specify which identity id is used by default, when If id is not specified in getToken or getIdentity
+        this._defaultIdentityId = null;
+        this._defaultIdentityIdStorageKey = null;
+        this._tokenStorageKeyPrefix = `Nucleus.Identity.${clientId}`; // do not change this or login with existing tokens will fail
+        this._servicePrincipalKey = `${this._tokenStorageKeyPrefix}.SvcP`;
+        this._defaultIdentityIdStorageKey = `${this._tokenStorageKeyPrefix}.IdId`;
+        this._defaultIdentityId = localStorage.getItem(this._defaultIdentityIdStorageKey);
+    }
+    get defaultIdentityId() {
+        return this._defaultIdentityId;
     }
     removeServicePrincipal() {
         this._servicePrincipal = null;
@@ -242,6 +250,15 @@ class SecretsStore {
         const key = this.getTokenKey(id);
         return this._identities[key];
     }
+    setDefaultIdentityId(id) {
+        this._defaultIdentityId = id;
+        if (this._defaultIdentityId) {
+            localStorage.setItem(this._defaultIdentityIdStorageKey, this._defaultIdentityId);
+        }
+        else {
+            localStorage.removeItem(this._defaultIdentityIdStorageKey);
+        }
+    }
     async getToken(id = null) {
         const key = this.getTokenKey(id);
         // if token is not there or it is invalid we check storage again before returning
@@ -286,6 +303,9 @@ class SecretsStore {
         }
     }
     getTokenKey(id = null) {
+        if (!id) {
+            id = this._defaultIdentityId;
+        }
         return id ? `${this._tokenStorageKeyPrefix}.${id}` : this._tokenStorageKeyPrefix;
     }
     clear(key) {
@@ -334,9 +354,9 @@ class AngularRequestor extends Requestor {
         });
     }
 }
-AngularRequestor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: AngularRequestor, deps: [{ token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-AngularRequestor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: AngularRequestor, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: AngularRequestor, decorators: [{
+AngularRequestor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: AngularRequestor, deps: [{ token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+AngularRequestor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: AngularRequestor, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: AngularRequestor, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -437,9 +457,9 @@ class OidcConfigurationService {
         }
     }
 }
-OidcConfigurationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: OidcConfigurationService, deps: [{ token: AngularRequestor }, { token: NucleusIdentityConfig }, { token: i1.NucleusAppService }], target: i0.ɵɵFactoryTarget.Injectable });
-OidcConfigurationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: OidcConfigurationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: OidcConfigurationService, decorators: [{
+OidcConfigurationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: OidcConfigurationService, deps: [{ token: AngularRequestor }, { token: NucleusIdentityConfig }, { token: i1.NucleusAppService }], target: i0.ɵɵFactoryTarget.Injectable });
+OidcConfigurationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: OidcConfigurationService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: OidcConfigurationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -594,9 +614,9 @@ class TokenClient {
         }
     }
 }
-TokenClient.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: TokenClient, deps: [{ token: AngularRequestor }, { token: OidcConfigurationService }], target: i0.ɵɵFactoryTarget.Injectable });
-TokenClient.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: TokenClient, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: TokenClient, decorators: [{
+TokenClient.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: TokenClient, deps: [{ token: AngularRequestor }, { token: OidcConfigurationService }], target: i0.ɵɵFactoryTarget.Injectable });
+TokenClient.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: TokenClient, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: TokenClient, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -647,6 +667,9 @@ class NucleusIdentityService {
     get isServicePrincipalAuthenticated() {
         return this.servicePrincipalIdentity != null;
     }
+    get isIdentityServicePrincipal() {
+        return this._store.defaultIdentityId === this._servicePrincipalTokenId;
+    }
     async init(startLogin = false) {
         if (this._initStarted || this._initialized) {
             console.warn('Nucleus.Identity: Auth initialization was already started. Don\'t call init() multiple times!');
@@ -664,6 +687,7 @@ class NucleusIdentityService {
             const request = this._authorizationNotifier.request;
             const response = this._authorizationNotifier.response;
             const res = await this.tokenClient.getByAuthorizationCode(request.redirectUri, response.code, request.internal['code_verifier']);
+            this._store.setDefaultIdentityId(null);
             await this._store.setToken(res);
         }
         else {
@@ -679,6 +703,7 @@ class NucleusIdentityService {
         const assertionToken = await this.getServicePrincipalAccessToken();
         const scope = this.prepareScope(true, this.config?.requestedScopes);
         const res = await this.tokenClient.getBySecret(provider, secret, assertionToken, scope);
+        this._store.setDefaultIdentityId(null);
         await this._store.setToken(res);
     }
     async login() {
@@ -747,30 +772,34 @@ class NucleusIdentityService {
         }
     }
     async loginServicePrincipal() {
-        await this.loginServicePrincipalInternal();
-    }
-    /*
-    public async loginAsServicePrincipal() {
-      let token = await this._store.getToken(this._servicePrincipalTokenId);
-      if (!token) {
-        await this.loginServicePrincipal();
-      }
-      token = await this._store.getToken(this._servicePrincipalTokenId);
-       // TODO: we have to distinguished that token is service principal so refresh token stuff is handled correctly.
-       // We have to implement universal getAccessToken function that can handle all cases
-      await this._store.setToken(token);
-    }
-    */
+        const sp = await this._store.getServicePrincipal();
+        if (sp) {
+            const scope = this.prepareScope(false, this.config.servicePrincipalRequestedScopes);
+            const res = await this.tokenClient.getByClientCredentials(sp.id, sp.secret, scope);
+            await this._store.setToken(res, this._servicePrincipalTokenId);
+            return res;
+        }
+        else {
+            throw Error('Service principal is not registered!');
+        }
+    }
+    async loginAsServicePrincipal() {
+        const token = await this._store.getToken(this._servicePrincipalTokenId);
+        if (!token) {
+            await this.loginServicePrincipal();
+        }
+        this._store.setDefaultIdentityId(this._servicePrincipalTokenId);
+    }
     async getOtp(type, expiresIn = -1) {
         let url = this.config.getServerUrl(`/otp/create?type=${type}`);
         if (expiresIn > 0) {
             url += `&expiresIn=${expiresIn}`;
         }
-        return this.http.get(url).toPromise();
+        return lastValueFrom(this.http.get(url));
     }
     async getOtpStatus(id) {
         const url = this.config.getServerUrl(`/otp/status/${id}`);
-        return this.http.get(url).toPromise();
+        return lastValueFrom(this.http.get(url));
     }
     getOtpUrl(redirectUrl, password) {
         const encoded = encodeURIComponent(redirectUrl);
@@ -841,22 +870,10 @@ class NucleusIdentityService {
             extras: params,
         }, this._crypto, true);
     }
-    async loginServicePrincipalInternal() {
-        const sp = await this._store.getServicePrincipal();
-        if (sp) {
-            const scope = this.prepareScope(false, this.config.servicePrincipalRequestedScopes);
-            const res = await this.tokenClient.getByClientCredentials(sp.id, sp.secret, scope);
-            await this._store.setToken(res, this._servicePrincipalTokenId);
-            return res;
-        }
-        else {
-            throw Error('Service principal is not registered!');
-        }
-    }
     async getServicePrincipalAccessTokenInternal() {
         let token = await this._store.getToken(this._servicePrincipalTokenId);
         if (!token?.isValid()) {
-            token = await this.loginServicePrincipalInternal();
+            token = await this.loginServicePrincipal();
         }
         return token?.accessToken;
     }
@@ -933,9 +950,9 @@ class NucleusIdentityService {
         });
     }
 }
-NucleusIdentityService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: NucleusIdentityService, deps: [{ token: i1.NucleusAppService }, { token: LocationService }, { token: i1$1.HttpClient }, { token: OidcConfigurationService }, { token: TokenClient }], target: i0.ɵɵFactoryTarget.Injectable });
-NucleusIdentityService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: NucleusIdentityService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: NucleusIdentityService, decorators: [{
+NucleusIdentityService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: NucleusIdentityService, deps: [{ token: i1.NucleusAppService }, { token: LocationService }, { token: i1$1.HttpClient }, { token: OidcConfigurationService }, { token: TokenClient }], target: i0.ɵɵFactoryTarget.Injectable });
+NucleusIdentityService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: NucleusIdentityService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: NucleusIdentityService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -988,9 +1005,9 @@ class NucleusTokenInterceptor {
         }));
     }
 }
-NucleusTokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: NucleusTokenInterceptor, deps: [{ token: NucleusIdentityService }, { token: NucleusIdentityConfig }], target: i0.ɵɵFactoryTarget.Injectable });
-NucleusTokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: NucleusTokenInterceptor, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: NucleusTokenInterceptor, decorators: [{
+NucleusTokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: NucleusTokenInterceptor, deps: [{ token: NucleusIdentityService }, { token: NucleusIdentityConfig }], target: i0.ɵɵFactoryTarget.Injectable });
+NucleusTokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: NucleusTokenInterceptor, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: NucleusTokenInterceptor, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1008,10 +1025,10 @@ class NucleusIdentityModule {
         };
     }
 }
-NucleusIdentityModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: NucleusIdentityModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-NucleusIdentityModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: NucleusIdentityModule });
-NucleusIdentityModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: NucleusIdentityModule, imports: [[]] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.2", ngImport: i0, type: NucleusIdentityModule, decorators: [{
+NucleusIdentityModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: NucleusIdentityModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+NucleusIdentityModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.0.6", ngImport: i0, type: NucleusIdentityModule });
+NucleusIdentityModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: NucleusIdentityModule });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: NucleusIdentityModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [],
@@ -1040,3 +1057,4 @@ var OtpType;
  */
 
 export { DeviceCode, Identity, NucleusIdentityConfig, NucleusIdentityModule, NucleusIdentityService, OtpResponse, OtpStatus, OtpType, ServicePrincipalRegistrationStatus };
+//# sourceMappingURL=kolektor-nucleus-identity.mjs.map