@c8y/ngx-components 1018.0.247 → 1018.0.249

package/fesm2020/c8y-ngx-components-auth-configuration.mjs

@@ -12,7 +12,7 @@ import * as i4 from 'ngx-bootstrap/popover';
 import { PopoverModule } from 'ngx-bootstrap/popover';
 import { map, catchError, tap, switchMap, shareReplay, publishReplay, refCount, take, mapTo, mergeAll, toArray } from 'rxjs/operators';
 import { forkJoin, from, of, BehaviorSubject, defer, throwError, Subject, EMPTY, merge } from 'rxjs';
-import { isString, omit, defaults, omitBy, isEmpty, cloneDeep, isFinite, pickBy, identity, map as map$1, pick, findKey, has, get, reduce, pull, defaultsDeep, at, head, reject, isUndefined, assign, set } from 'lodash-es';
+import { isString, omit, defaults, omitBy, isEmpty, cloneDeep, isFinite, pickBy, identity, map as map$1, pick, findKey, has, get, reduce, pull, defaultsDeep, at, head, reject, isUndefined } from 'lodash-es';
 import * as i2$1 from '@ngx-translate/core';
 import { TooltipModule } from 'ngx-bootstrap/tooltip';
 import { __decorate, __metadata } from 'tslib';
@@ -1856,12 +1856,7 @@ class AadConfigurationMapper {
         this.defaults = {
             visibleOnLoginPage: true
         };
-        this.constants = {
-            providerName: 'Azure AD',
-            type: 'oauth2',
-            grantType: 'AUTHORIZATION_CODE'
-        };
-        this.urlPattern = /^(.+)\/((.+?)\/oauth2\/authorize)$/;
+        this.urlPattern = /^(.+)\/((.+?)\/oauth2\/(authorize|token))$/;
     }
     mapFrom(templateModel) {
         const baseUrl = `${templateModel.aadAddress}/${templateModel.tenant}/oauth2`;
@@ -1949,17 +1944,14 @@ class AadConfigurationMapper {
     mapTo(ssoConfiguration) {
         const applicationsId = at(ssoConfiguration, ['audience', 'clientId']);
         this.setupDefaults(ssoConfiguration);
-        this.setupConstants(ssoConfiguration);
-        this.setupAadAddressAndTenant(ssoConfiguration);
-        this.setupClientSecret(ssoConfiguration);
         this.setupUserIdConfig(ssoConfiguration);
         this.setupSignatureVerificationConfig(ssoConfiguration);
         const aadConfiguration = {
-            aadAddress: this.getAadAddressFromUrl(ssoConfiguration.authorizationRequest.url),
-            tenant: this.getTenantFromUrl(ssoConfiguration.authorizationRequest.url),
+            aadAddress: this.getAadAddress(ssoConfiguration),
+            tenant: this.getTenant(ssoConfiguration),
             applicationId: this.getFirstDefined(applicationsId),
             redirectToPlatform: ssoConfiguration.redirectToPlatform,
-            clientSecret: ssoConfiguration.authorizationRequest.requestParams.client_id,
+            clientSecret: this.getClientSecret(ssoConfiguration),
             issuer: ssoConfiguration.issuer,
             buttonName: ssoConfiguration.buttonName,
             visibleOnLoginPage: ssoConfiguration.visibleOnLoginPage,
@@ -1979,19 +1971,22 @@ class AadConfigurationMapper {
     setupDefaults(ssoConfiguration) {
         defaults(ssoConfiguration, this.defaults);
     }
-    setupConstants(ssoConfiguration) {
-        assign(ssoConfiguration, this.constants);
+    getAadAddress(ssoConfiguration) {
+        const urls = this.getUrlsFromRequests(ssoConfiguration);
+        const aadAddresses = map$1(urls, url => this.getAadAddressFromUrl(url));
+        return this.getFirstDefined(aadAddresses);
     }
-    setupAadAddressAndTenant(ssoConfiguration) {
-        const urls = at(ssoConfiguration, [
+    getTenant(ssoConfiguration) {
+        const urls = this.getUrlsFromRequests(ssoConfiguration);
+        const tenants = map$1(urls, url => this.getTenantFromUrl(url));
+        return this.getFirstDefined(tenants);
+    }
+    getUrlsFromRequests(ssoConfiguration) {
+        return at(ssoConfiguration, [
             'authorizationRequest.url',
             'tokenRequest.url',
             'refreshRequest.url'
         ]);
-        const aadAddresses = map$1(urls, url => this.getAadAddressFromUrl(url));
-        set(ssoConfiguration, 'aadAddress', this.getFirstDefined(aadAddresses));
-        const tenants = map$1(urls, url => this.getTenantFromUrl(url));
-        set(ssoConfiguration, 'tenant', this.getFirstDefined(tenants));
     }
     getAadAddressFromUrl(url) {
         const [, aadAddress] = (url || '').match(this.urlPattern) || [];
@@ -2001,18 +1996,17 @@ class AadConfigurationMapper {
         const [, , , tenant] = (url || '').match(this.urlPattern) || [];
         return tenant;
     }
-    setupClientSecret(ssoConfiguration) {
+    getClientSecret(ssoConfiguration) {
         const bodies = at(ssoConfiguration, ['tokenRequest.body', 'refreshRequest.body']);
         const clientSecrets = map$1(bodies, body => this.getClientSecretFromBody(body));
-        set(ssoConfiguration, 'clientSecret', this.getFirstDefined(clientSecrets));
+        return this.getFirstDefined(clientSecrets);
     }
     getClientSecretFromBody(body) {
         const [, clientSecret] = (body || '').match(/client_secret=([^&]+)/) || [];
-        return decodeURIComponent(clientSecret);
+        return clientSecret ? decodeURIComponent(clientSecret) : undefined;
     }
     setupUserIdConfig(ssoConfiguration) {
         defaultsDeep(ssoConfiguration, { userIdConfig: { jwtField: 'upn' } });
-        set(ssoConfiguration, 'userIdConfig.useConstantValue', false);
     }
     setupSignatureVerificationConfig(ssoConfiguration) {
         defaultsDeep(ssoConfiguration, { signatureVerificationConfig: { aad: {} } });