@abp/ng.core 4.4.0 → 4.4.4

package/esm2015/lib/utils/auth-utils.js

@@ -2,16 +2,13 @@ import { Router } from '@angular/router';
 import { OAuthStorage } from 'angular-oauth2-oidc';
 import { pipe } from 'rxjs';
 import { switchMap, tap } from 'rxjs/operators';
-import { AbpApplicationConfigurationService } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service';
 import { ConfigStateService } from '../services/config-state.service';
 const cookieKey = 'rememberMe';
 const storageKey = 'passwordFlow';
 export function pipeToLogin(params, injector) {
     const configState = injector.get(ConfigStateService);
-    const appConfigService = injector.get(AbpApplicationConfigurationService);
     const router = injector.get(Router);
-    return pipe(switchMap(() => appConfigService.get()), tap(res => {
-        configState.setState(res);
+    return pipe(switchMap(() => configState.refreshAppState()), tap(() => {
         setRememberMe(params.rememberMe);
         if (params.redirectUrl)
             router.navigate([params.redirectUrl]);
@@ -42,4 +39,4 @@ export function removeRememberMe() {
     localStorage.removeItem(storageKey);
     document.cookie = cookieKey + '= ; path=/; expires = Thu, 01 Jan 1970 00:00:00 GMT';
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC11dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc3JjL2xpYi91dGlscy9hdXRoLXV0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QyxPQUFPLEVBQUUsWUFBWSxFQUFpQixNQUFNLHFCQUFxQixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDNUIsT0FBTyxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVoRCxPQUFPLEVBQUUsa0NBQWtDLEVBQUUsTUFBTSxxR0FBcUcsQ0FBQztBQUN6SixPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUV0RSxNQUFNLFNBQVMsR0FBRyxZQUFZLENBQUM7QUFDL0IsTUFBTSxVQUFVLEdBQUcsY0FBYyxDQUFDO0FBRWxDLE1BQU0sVUFBVSxXQUFXLENBQ3pCLE1BQXVELEVBQ3ZELFFBQWtCO0lBRWxCLE1BQU0sV0FBVyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUNyRCxNQUFNLGdCQUFnQixHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsa0NBQWtDLENBQUMsQ0FBQztJQUMxRSxNQUFNLE1BQU0sR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRXBDLE9BQU8sSUFBSSxDQUNULFNBQVMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxFQUN2QyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUU7UUFDUixXQUFXLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzFCLGFBQWEsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDakMsSUFBSSxNQUFNLENBQUMsV0FBVztZQUFFLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQztJQUNoRSxDQUFDLENBQUMsQ0FDSCxDQUFDO0FBQ0osQ0FBQztBQUVELE1BQU0sVUFBVSx5QkFBeUIsQ0FBQyxRQUFrQixFQUFFLFFBQXVCO0lBQ25GLE1BQU0sRUFBRSxZQUFZLEVBQUUsYUFBYSxFQUFFLEtBQUssRUFBRSxhQUFhLEVBQUUsVUFBVSxFQUFFLEdBQUcsUUFBUSxDQUFDO0lBQ25GLE1BQU0sT0FBTyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUM7SUFFM0MsT0FBTyxDQUFDLE9BQU8sQ0FBQyxjQUFjLEVBQUUsWUFBWSxDQUFDLENBQUM7SUFDOUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxlQUFlLEVBQUUsYUFBYSxDQUFDLENBQUM7SUFDaEQsT0FBTyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsRUFBRSxFQUFFLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUM7SUFFM0QsSUFBSSxhQUFhLEVBQUU7UUFDakIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO0tBQzdFO0lBRUQsSUFBSSxVQUFVLEVBQUU7UUFDZCxNQUFNLHFCQUFxQixHQUFHLFVBQVUsR0FBRyxJQUFJLENBQUM7UUFDaEQsTUFBTSxHQUFHLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUN2QixNQUFNLFNBQVMsR0FBRyxHQUFHLENBQUMsT0FBTyxFQUFFLEdBQUcscUJBQXFCLENBQUM7UUFDeEQsT0FBTyxDQUFDLE9BQU8sQ0FBQyxZQUFZLEVBQUUsRUFBRSxHQUFHLFNBQVMsQ0FBQyxDQUFDO0tBQy9DO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhLENBQUMsUUFBaUI7SUFDN0MsZ0JBQWdCLEVBQUUsQ0FBQztJQUNuQixZQUFZLENBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUN6QyxRQUFRLENBQUMsTUFBTSxHQUFHLEdBQUcsU0FBUyxnQkFDNUIsUUFBUSxDQUFDLENBQUMsQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFDLENBQUMsRUFDekQsRUFBRSxDQUFDO0FBQ0wsQ0FBQztBQUVELE1BQU0sVUFBVSxnQkFBZ0I7SUFDOUIsWUFBWSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUNwQyxRQUFRLENBQUMsTUFBTSxHQUFHLFNBQVMsR0FBRyxxREFBcUQsQ0FBQztBQUN0RixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0b3IgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IFJvdXRlciB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBPQXV0aFN0b3JhZ2UsIFRva2VuUmVzcG9uc2UgfSBmcm9tICdhbmd1bGFyLW9hdXRoMi1vaWRjJztcbmltcG9ydCB7IHBpcGUgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IHN3aXRjaE1hcCwgdGFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgTG9naW5QYXJhbXMgfSBmcm9tICcuLi9tb2RlbHMvYXV0aCc7XG5pbXBvcnQgeyBBYnBBcHBsaWNhdGlvbkNvbmZpZ3VyYXRpb25TZXJ2aWNlIH0gZnJvbSAnLi4vcHJveHkvdm9sby9hYnAvYXNwLW5ldC1jb3JlL212Yy9hcHBsaWNhdGlvbi1jb25maWd1cmF0aW9ucy9hYnAtYXBwbGljYXRpb24tY29uZmlndXJhdGlvbi5zZXJ2aWNlJztcbmltcG9ydCB7IENvbmZpZ1N0YXRlU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2NvbmZpZy1zdGF0ZS5zZXJ2aWNlJztcblxuY29uc3QgY29va2llS2V5ID0gJ3JlbWVtYmVyTWUnO1xuY29uc3Qgc3RvcmFnZUtleSA9ICdwYXNzd29yZEZsb3cnO1xuXG5leHBvcnQgZnVuY3Rpb24gcGlwZVRvTG9naW4oXG4gIHBhcmFtczogUGljazxMb2dpblBhcmFtcywgJ3JlZGlyZWN0VXJsJyB8ICdyZW1lbWJlck1lJz4sXG4gIGluamVjdG9yOiBJbmplY3Rvcixcbikge1xuICBjb25zdCBjb25maWdTdGF0ZSA9IGluamVjdG9yLmdldChDb25maWdTdGF0ZVNlcnZpY2UpO1xuICBjb25zdCBhcHBDb25maWdTZXJ2aWNlID0gaW5qZWN0b3IuZ2V0KEFicEFwcGxpY2F0aW9uQ29uZmlndXJhdGlvblNlcnZpY2UpO1xuICBjb25zdCByb3V0ZXIgPSBpbmplY3Rvci5nZXQoUm91dGVyKTtcblxuICByZXR1cm4gcGlwZShcbiAgICBzd2l0Y2hNYXAoKCkgPT4gYXBwQ29uZmlnU2VydmljZS5nZXQoKSksXG4gICAgdGFwKHJlcyA9PiB7XG4gICAgICBjb25maWdTdGF0ZS5zZXRTdGF0ZShyZXMpO1xuICAgICAgc2V0UmVtZW1iZXJNZShwYXJhbXMucmVtZW1iZXJNZSk7XG4gICAgICBpZiAocGFyYW1zLnJlZGlyZWN0VXJsKSByb3V0ZXIubmF2aWdhdGUoW3BhcmFtcy5yZWRpcmVjdFVybF0pO1xuICAgIH0pLFxuICApO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gc2V0VG9rZW5SZXNwb25zZVRvU3RvcmFnZShpbmplY3RvcjogSW5qZWN0b3IsIHRva2VuUmVzOiBUb2tlblJlc3BvbnNlKSB7XG4gIGNvbnN0IHsgYWNjZXNzX3Rva2VuLCByZWZyZXNoX3Rva2VuLCBzY29wZTogZ3JhbnRlZFNjb3BlcywgZXhwaXJlc19pbiB9ID0gdG9rZW5SZXM7XG4gIGNvbnN0IHN0b3JhZ2UgPSBpbmplY3Rvci5nZXQoT0F1dGhTdG9yYWdlKTtcblxuICBzdG9yYWdlLnNldEl0ZW0oJ2FjY2Vzc190b2tlbicsIGFjY2Vzc190b2tlbik7XG4gIHN0b3JhZ2Uuc2V0SXRlbSgncmVmcmVzaF90b2tlbicsIHJlZnJlc2hfdG9rZW4pO1xuICBzdG9yYWdlLnNldEl0ZW0oJ2FjY2Vzc190b2tlbl9zdG9yZWRfYXQnLCAnJyArIERhdGUubm93KCkpO1xuXG4gIGlmIChncmFudGVkU2NvcGVzKSB7XG4gICAgc3RvcmFnZS5zZXRJdGVtKCdncmFudGVkX3Njb3BlcycsIEpTT04uc3RyaW5naWZ5KGdyYW50ZWRTY29wZXMuc3BsaXQoJyAnKSkpO1xuICB9XG5cbiAgaWYgKGV4cGlyZXNfaW4pIHtcbiAgICBjb25zdCBleHBpcmVzSW5NaWxsaVNlY29uZHMgPSBleHBpcmVzX2luICogMTAwMDtcbiAgICBjb25zdCBub3cgPSBuZXcgRGF0ZSgpO1xuICAgIGNvbnN0IGV4cGlyZXNBdCA9IG5vdy5nZXRUaW1lKCkgKyBleHBpcmVzSW5NaWxsaVNlY29uZHM7XG4gICAgc3RvcmFnZS5zZXRJdGVtKCdleHBpcmVzX2F0JywgJycgKyBleHBpcmVzQXQpO1xuICB9XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBzZXRSZW1lbWJlck1lKHJlbWVtYmVyOiBib29sZWFuKSB7XG4gIHJlbW92ZVJlbWVtYmVyTWUoKTtcbiAgbG9jYWxTdG9yYWdlLnNldEl0ZW0oc3RvcmFnZUtleSwgJ3RydWUnKTtcbiAgZG9jdW1lbnQuY29va2llID0gYCR7Y29va2llS2V5fT10cnVlOyBwYXRoPS8ke1xuICAgIHJlbWVtYmVyID8gJyA7ZXhwaXJlcz1GcmksIDMxIERlYyA5OTk5IDIzOjU5OjU5IEdNVCcgOiAnJ1xuICB9YDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHJlbW92ZVJlbWVtYmVyTWUoKSB7XG4gIGxvY2FsU3RvcmFnZS5yZW1vdmVJdGVtKHN0b3JhZ2VLZXkpO1xuICBkb2N1bWVudC5jb29raWUgPSBjb29raWVLZXkgKyAnPSA7IHBhdGg9LzsgZXhwaXJlcyA9IFRodSwgMDEgSmFuIDE5NzAgMDA6MDA6MDAgR01UJztcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC11dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc3JjL2xpYi91dGlscy9hdXRoLXV0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QyxPQUFPLEVBQUUsWUFBWSxFQUFpQixNQUFNLHFCQUFxQixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDNUIsT0FBTyxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVoRCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUV0RSxNQUFNLFNBQVMsR0FBRyxZQUFZLENBQUM7QUFDL0IsTUFBTSxVQUFVLEdBQUcsY0FBYyxDQUFDO0FBRWxDLE1BQU0sVUFBVSxXQUFXLENBQ3pCLE1BQXVELEVBQ3ZELFFBQWtCO0lBRWxCLE1BQU0sV0FBVyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUNyRCxNQUFNLE1BQU0sR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRXBDLE9BQU8sSUFBSSxDQUNULFNBQVMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxXQUFXLENBQUMsZUFBZSxFQUFFLENBQUMsRUFDOUMsR0FBRyxDQUFDLEdBQUcsRUFBRTtRQUNQLGFBQWEsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDakMsSUFBSSxNQUFNLENBQUMsV0FBVztZQUFFLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQztJQUNoRSxDQUFDLENBQUMsQ0FDSCxDQUFDO0FBQ0osQ0FBQztBQUVELE1BQU0sVUFBVSx5QkFBeUIsQ0FBQyxRQUFrQixFQUFFLFFBQXVCO0lBQ25GLE1BQU0sRUFBRSxZQUFZLEVBQUUsYUFBYSxFQUFFLEtBQUssRUFBRSxhQUFhLEVBQUUsVUFBVSxFQUFFLEdBQUcsUUFBUSxDQUFDO0lBQ25GLE1BQU0sT0FBTyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUM7SUFFM0MsT0FBTyxDQUFDLE9BQU8sQ0FBQyxjQUFjLEVBQUUsWUFBWSxDQUFDLENBQUM7SUFDOUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxlQUFlLEVBQUUsYUFBYSxDQUFDLENBQUM7SUFDaEQsT0FBTyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsRUFBRSxFQUFFLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUM7SUFFM0QsSUFBSSxhQUFhLEVBQUU7UUFDakIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO0tBQzdFO0lBRUQsSUFBSSxVQUFVLEVBQUU7UUFDZCxNQUFNLHFCQUFxQixHQUFHLFVBQVUsR0FBRyxJQUFJLENBQUM7UUFDaEQsTUFBTSxHQUFHLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUN2QixNQUFNLFNBQVMsR0FBRyxHQUFHLENBQUMsT0FBTyxFQUFFLEdBQUcscUJBQXFCLENBQUM7UUFDeEQsT0FBTyxDQUFDLE9BQU8sQ0FBQyxZQUFZLEVBQUUsRUFBRSxHQUFHLFNBQVMsQ0FBQyxDQUFDO0tBQy9DO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhLENBQUMsUUFBaUI7SUFDN0MsZ0JBQWdCLEVBQUUsQ0FBQztJQUNuQixZQUFZLENBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUN6QyxRQUFRLENBQUMsTUFBTSxHQUFHLEdBQUcsU0FBUyxnQkFDNUIsUUFBUSxDQUFDLENBQUMsQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFDLENBQUMsRUFDekQsRUFBRSxDQUFDO0FBQ0wsQ0FBQztBQUVELE1BQU0sVUFBVSxnQkFBZ0I7SUFDOUIsWUFBWSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUNwQyxRQUFRLENBQUMsTUFBTSxHQUFHLFNBQVMsR0FBRyxxREFBcUQsQ0FBQztBQUN0RixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0b3IgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IFJvdXRlciB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBPQXV0aFN0b3JhZ2UsIFRva2VuUmVzcG9uc2UgfSBmcm9tICdhbmd1bGFyLW9hdXRoMi1vaWRjJztcbmltcG9ydCB7IHBpcGUgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IHN3aXRjaE1hcCwgdGFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgTG9naW5QYXJhbXMgfSBmcm9tICcuLi9tb2RlbHMvYXV0aCc7XG5pbXBvcnQgeyBDb25maWdTdGF0ZVNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9jb25maWctc3RhdGUuc2VydmljZSc7XG5cbmNvbnN0IGNvb2tpZUtleSA9ICdyZW1lbWJlck1lJztcbmNvbnN0IHN0b3JhZ2VLZXkgPSAncGFzc3dvcmRGbG93JztcblxuZXhwb3J0IGZ1bmN0aW9uIHBpcGVUb0xvZ2luKFxuICBwYXJhbXM6IFBpY2s8TG9naW5QYXJhbXMsICdyZWRpcmVjdFVybCcgfCAncmVtZW1iZXJNZSc+LFxuICBpbmplY3RvcjogSW5qZWN0b3IsXG4pIHtcbiAgY29uc3QgY29uZmlnU3RhdGUgPSBpbmplY3Rvci5nZXQoQ29uZmlnU3RhdGVTZXJ2aWNlKTtcbiAgY29uc3Qgcm91dGVyID0gaW5qZWN0b3IuZ2V0KFJvdXRlcik7XG5cbiAgcmV0dXJuIHBpcGUoXG4gICAgc3dpdGNoTWFwKCgpID0+IGNvbmZpZ1N0YXRlLnJlZnJlc2hBcHBTdGF0ZSgpKSxcbiAgICB0YXAoKCkgPT4ge1xuICAgICAgc2V0UmVtZW1iZXJNZShwYXJhbXMucmVtZW1iZXJNZSk7XG4gICAgICBpZiAocGFyYW1zLnJlZGlyZWN0VXJsKSByb3V0ZXIubmF2aWdhdGUoW3BhcmFtcy5yZWRpcmVjdFVybF0pO1xuICAgIH0pLFxuICApO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gc2V0VG9rZW5SZXNwb25zZVRvU3RvcmFnZShpbmplY3RvcjogSW5qZWN0b3IsIHRva2VuUmVzOiBUb2tlblJlc3BvbnNlKSB7XG4gIGNvbnN0IHsgYWNjZXNzX3Rva2VuLCByZWZyZXNoX3Rva2VuLCBzY29wZTogZ3JhbnRlZFNjb3BlcywgZXhwaXJlc19pbiB9ID0gdG9rZW5SZXM7XG4gIGNvbnN0IHN0b3JhZ2UgPSBpbmplY3Rvci5nZXQoT0F1dGhTdG9yYWdlKTtcblxuICBzdG9yYWdlLnNldEl0ZW0oJ2FjY2Vzc190b2tlbicsIGFjY2Vzc190b2tlbik7XG4gIHN0b3JhZ2Uuc2V0SXRlbSgncmVmcmVzaF90b2tlbicsIHJlZnJlc2hfdG9rZW4pO1xuICBzdG9yYWdlLnNldEl0ZW0oJ2FjY2Vzc190b2tlbl9zdG9yZWRfYXQnLCAnJyArIERhdGUubm93KCkpO1xuXG4gIGlmIChncmFudGVkU2NvcGVzKSB7XG4gICAgc3RvcmFnZS5zZXRJdGVtKCdncmFudGVkX3Njb3BlcycsIEpTT04uc3RyaW5naWZ5KGdyYW50ZWRTY29wZXMuc3BsaXQoJyAnKSkpO1xuICB9XG5cbiAgaWYgKGV4cGlyZXNfaW4pIHtcbiAgICBjb25zdCBleHBpcmVzSW5NaWxsaVNlY29uZHMgPSBleHBpcmVzX2luICogMTAwMDtcbiAgICBjb25zdCBub3cgPSBuZXcgRGF0ZSgpO1xuICAgIGNvbnN0IGV4cGlyZXNBdCA9IG5vdy5nZXRUaW1lKCkgKyBleHBpcmVzSW5NaWxsaVNlY29uZHM7XG4gICAgc3RvcmFnZS5zZXRJdGVtKCdleHBpcmVzX2F0JywgJycgKyBleHBpcmVzQXQpO1xuICB9XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBzZXRSZW1lbWJlck1lKHJlbWVtYmVyOiBib29sZWFuKSB7XG4gIHJlbW92ZVJlbWVtYmVyTWUoKTtcbiAgbG9jYWxTdG9yYWdlLnNldEl0ZW0oc3RvcmFnZUtleSwgJ3RydWUnKTtcbiAgZG9jdW1lbnQuY29va2llID0gYCR7Y29va2llS2V5fT10cnVlOyBwYXRoPS8ke1xuICAgIHJlbWVtYmVyID8gJyA7ZXhwaXJlcz1GcmksIDMxIERlYyA5OTk5IDIzOjU5OjU5IEdNVCcgOiAnJ1xuICB9YDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHJlbW92ZVJlbWVtYmVyTWUoKSB7XG4gIGxvY2FsU3RvcmFnZS5yZW1vdmVJdGVtKHN0b3JhZ2VLZXkpO1xuICBkb2N1bWVudC5jb29raWUgPSBjb29raWVLZXkgKyAnPSA7IHBhdGg9LzsgZXhwaXJlcyA9IFRodSwgMDEgSmFuIDE5NzAgMDA6MDA6MDAgR01UJztcbn1cbiJdfQ==

package/esm2015/lib/utils/initial-utils.js

@@ -3,7 +3,6 @@ import { registerLocaleData } from '@angular/common';
 import { OAuthService } from 'angular-oauth2-oidc';
 import { tap, catchError } from 'rxjs/operators';
 import { throwError } from 'rxjs';
-import { AbpApplicationConfigurationService } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service';
 import { AuthService } from '../services/auth.service';
 import { ConfigStateService } from '../services/config-state.service';
 import { EnvironmentService } from '../services/environment.service';
@@ -17,7 +16,6 @@ export function getInitialData(injector) {
     const fn = () => __awaiter(this, void 0, void 0, function* () {
         const environmentService = injector.get(EnvironmentService);
         const configState = injector.get(ConfigStateService);
-        const appConfigService = injector.get(AbpApplicationConfigurationService);
         const options = injector.get(CORE_OPTIONS);
         environmentService.setState(options.environment);
         yield getRemoteEnv(injector, options.environment);
@@ -25,9 +23,9 @@ export function getInitialData(injector) {
         yield injector.get(AuthService).init();
         if (options.skipGetAppConfiguration)
             return;
-        return appConfigService
-            .get()
-            .pipe(tap(res => configState.setState(res)), tap(() => checkAccessToken(injector)), tap(() => {
+        return configState
+            .refreshAppState()
+            .pipe(tap(() => checkAccessToken(injector)), tap(() => {
             const currentTenant = configState.getOne('currentTenant');
             injector.get(SessionStateService).setTenant(currentTenant);
         }), catchError(error => {
@@ -63,4 +61,4 @@ export function localeInitializer(injector) {
     };
     return fn;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"initial-utils.js","sourceRoot":"","sources":["../../../../../packages/core/src/lib/utils/initial-utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { registerLocaleData } from '@angular/common';\nimport { Injector } from '@angular/core';\nimport { OAuthService } from 'angular-oauth2-oidc';\nimport { tap, catchError } from 'rxjs/operators';\nimport { throwError } from 'rxjs';\nimport { ABP } from '../models/common';\nimport { Environment } from '../models/environment';\nimport { AbpApplicationConfigurationService } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service';\nimport { CurrentTenantDto } from '../proxy/volo/abp/asp-net-core/mvc/multi-tenancy/models';\nimport { AuthService } from '../services/auth.service';\nimport { ConfigStateService } from '../services/config-state.service';\nimport { EnvironmentService } from '../services/environment.service';\nimport { SessionStateService } from '../services/session-state.service';\nimport { clearOAuthStorage } from '../strategies/auth-flow.strategy';\nimport { CORE_OPTIONS } from '../tokens/options.token';\nimport { APP_INIT_ERROR_HANDLERS } from '../tokens/app-config.token';\nimport { getRemoteEnv } from './environment-utils';\nimport { parseTenantFromUrl } from './multi-tenancy-utils';\n\nexport function getInitialData(injector: Injector) {\n  const fn = async () => {\n    const environmentService = injector.get(EnvironmentService);\n    const configState = injector.get(ConfigStateService);\n    const appConfigService = injector.get(AbpApplicationConfigurationService);\n    const options = injector.get(CORE_OPTIONS) as ABP.Root;\n\n    environmentService.setState(options.environment as Environment);\n    await getRemoteEnv(injector, options.environment);\n    await parseTenantFromUrl(injector);\n    await injector.get(AuthService).init();\n\n    if (options.skipGetAppConfiguration) return;\n\n    return appConfigService\n      .get()\n      .pipe(\n        tap(res => configState.setState(res)),\n        tap(() => checkAccessToken(injector)),\n        tap(() => {\n          const currentTenant = configState.getOne('currentTenant') as CurrentTenantDto;\n          injector.get(SessionStateService).setTenant(currentTenant);\n        }),\n        catchError(error => {\n          const appInitErrorHandlers = injector.get(APP_INIT_ERROR_HANDLERS, null);\n          if (appInitErrorHandlers && appInitErrorHandlers.length) {\n            appInitErrorHandlers.forEach(func => func(error));\n          }\n\n          return throwError(error);\n        }),\n      )\n      .toPromise();\n  };\n\n  return fn;\n}\n\nexport function checkAccessToken(injector: Injector) {\n  const configState = injector.get(ConfigStateService);\n  const oAuth = injector.get(OAuthService);\n  if (oAuth.hasValidAccessToken() && !configState.getDeep('currentUser.id')) {\n    clearOAuthStorage();\n  }\n}\n\nexport function localeInitializer(injector: Injector) {\n  const fn = () => {\n    const sessionState = injector.get(SessionStateService);\n    const { registerLocaleFn }: ABP.Root = injector.get(CORE_OPTIONS);\n\n    const lang = sessionState.getLanguage() || 'en';\n\n    return new Promise((resolve, reject) => {\n      registerLocaleFn(lang).then(module => {\n        if (module?.default) registerLocaleData(module.default);\n\n        return resolve('resolved');\n      }, reject);\n    });\n  };\n\n  return fn;\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5pdGlhbC11dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc3JjL2xpYi91dGlscy9pbml0aWFsLXV0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUVyRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbkQsT0FBTyxFQUFFLEdBQUcsRUFBRSxVQUFVLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNqRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBSWxDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUN0RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNyRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUN4RSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUNyRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDdkQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDckUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25ELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTNELE1BQU0sVUFBVSxjQUFjLENBQUMsUUFBa0I7SUFDL0MsTUFBTSxFQUFFLEdBQUcsR0FBUyxFQUFFO1FBQ3BCLE1BQU0sa0JBQWtCLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1FBQzVELE1BQU0sV0FBVyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsa0JB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dGVudCI6WyJpbXBvcnQgeyByZWdpc3RlckxvY2FsZURhdGEgfSBmcm9tICdAYW5ndWxhci9jb21tb24nO1xuaW1wb3J0IHsgSW5qZWN0b3IgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE9BdXRoU2VydmljZSB9IGZyb20gJ2FuZ3VsYXItb2F1dGgyLW9pZGMnO1xuaW1wb3J0IHsgdGFwLCBjYXRjaEVycm9yIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgdGhyb3dFcnJvciB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgQUJQIH0gZnJvbSAnLi4vbW9kZWxzL2NvbW1vbic7XG5pbXBvcnQgeyBFbnZpcm9ubWVudCB9IGZyb20gJy4uL21vZGVscy9lbnZpcm9ubWVudCc7XG5pbXBvcnQgeyBDdXJyZW50VGVuYW50RHRvIH0gZnJvbSAnLi4vcHJveHkvdm9sby9hYnAvYXNwLW5ldC1jb3JlL212Yy9tdWx0aS10ZW5hbmN5L21vZGVscyc7XG5pbXBvcnQgeyBBdXRoU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2F1dGguc2VydmljZSc7XG5pbXBvcnQgeyBDb25maWdTdGF0ZVNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9jb25maWctc3RhdGUuc2VydmljZSc7XG5pbXBvcnQgeyBFbnZpcm9ubWVudFNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9lbnZpcm9ubWVudC5zZXJ2aWNlJztcbmltcG9ydCB7IFNlc3Npb25TdGF0ZVNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9zZXNzaW9uLXN0YXRlLnNlcnZpY2UnO1xuaW1wb3J0IHsgY2xlYXJPQXV0aFN0b3JhZ2UgfSBmcm9tICcuLi9zdHJhdGVnaWVzL2F1dGgtZmxvdy5zdHJhdGVneSc7XG5pbXBvcnQgeyBDT1JFX09QVElPTlMgfSBmcm9tICcuLi90b2tlbnMvb3B0aW9ucy50b2tlbic7XG5pbXBvcnQgeyBBUFBfSU5JVF9FUlJPUl9IQU5ETEVSUyB9IGZyb20gJy4uL3Rva2Vucy9hcHAtY29uZmlnLnRva2VuJztcbmltcG9ydCB7IGdldFJlbW90ZUVudiB9IGZyb20gJy4vZW52aXJvbm1lbnQtdXRpbHMnO1xuaW1wb3J0IHsgcGFyc2VUZW5hbnRGcm9tVXJsIH0gZnJvbSAnLi9tdWx0aS10ZW5hbmN5LXV0aWxzJztcblxuZXhwb3J0IGZ1bmN0aW9uIGdldEluaXRpYWxEYXRhKGluamVjdG9yOiBJbmplY3Rvcikge1xuICBjb25zdCBmbiA9IGFzeW5jICgpID0+IHtcbiAgICBjb25zdCBlbnZpcm9ubWVudFNlcnZpY2UgPSBpbmplY3Rvci5nZXQoRW52aXJvbm1lbnRTZXJ2aWNlKTtcbiAgICBjb25zdCBjb25maWdTdGF0ZSA9IGluamVjdG9yLmdldChDb25maWdTdGF0ZVNlcnZpY2UpO1xuICAgIGNvbnN0IG9wdGlvbnMgPSBpbmplY3Rvci5nZXQoQ09SRV9PUFRJT05TKSBhcyBBQlAuUm9vdDtcblxuICAgIGVudmlyb25tZW50U2VydmljZS5zZXRTdGF0ZShvcHRpb25zLmVudmlyb25tZW50IGFzIEVudmlyb25tZW50KTtcbiAgICBhd2FpdCBnZXRSZW1vdGVFbnYoaW5qZWN0b3IsIG9wdGlvbnMuZW52aXJvbm1lbnQpO1xuICAgIGF3YWl0IHBhcnNlVGVuYW50RnJvbVVybChpbmplY3Rvcik7XG4gICAgYXdhaXQgaW5qZWN0b3IuZ2V0KEF1dGhTZXJ2aWNlKS5pbml0KCk7XG5cbiAgICBpZiAob3B0aW9ucy5za2lwR2V0QXBwQ29uZmlndXJhdGlvbikgcmV0dXJuO1xuXG4gICAgcmV0dXJuIGNvbmZpZ1N0YXRlXG4gICAgICAucmVmcmVzaEFwcFN0YXRlKClcbiAgICAgIC5waXBlKFxuICAgICAgICB0YXAoKCkgPT4gY2hlY2tBY2Nlc3NUb2tlbihpbmplY3RvcikpLFxuICAgICAgICB0YXAoKCkgPT4ge1xuICAgICAgICAgIGNvbnN0IGN1cnJlbnRUZW5hbnQgPSBjb25maWdTdGF0ZS5nZXRPbmUoJ2N1cnJlbnRUZW5hbnQnKSBhcyBDdXJyZW50VGVuYW50RHRvO1xuICAgICAgICAgIGluamVjdG9yLmdldChTZXNzaW9uU3RhdGVTZXJ2aWNlKS5zZXRUZW5hbnQoY3VycmVudFRlbmFudCk7XG4gICAgICAgIH0pLFxuICAgICAgICBjYXRjaEVycm9yKGVycm9yID0+IHtcbiAgICAgICAgICBjb25zdCBhcHBJbml0RXJyb3JIYW5kbGVycyA9IGluamVjdG9yLmdldChBUFBfSU5JVF9FUlJPUl9IQU5ETEVSUywgbnVsbCk7XG4gICAgICAgICAgaWYgKGFwcEluaXRFcnJvckhhbmRsZXJzICYmIGFwcEluaXRFcnJvckhhbmRsZXJzLmxlbmd0aCkge1xuICAgICAgICAgICAgYXBwSW5pdEVycm9ySGFuZGxlcnMuZm9yRWFjaChmdW5jID0+IGZ1bmMoZXJyb3IpKTtcbiAgICAgICAgICB9XG5cbiAgICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihlcnJvcik7XG4gICAgICAgIH0pLFxuICAgICAgKVxuICAgICAgLnRvUHJvbWlzZSgpO1xuICB9O1xuXG4gIHJldHVybiBmbjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNoZWNrQWNjZXNzVG9rZW4oaW5qZWN0b3I6IEluamVjdG9yKSB7XG4gIGNvbnN0IGNvbmZpZ1N0YXRlID0gaW5qZWN0b3IuZ2V0KENvbmZpZ1N0YXRlU2VydmljZSk7XG4gIGNvbnN0IG9BdXRoID0gaW5qZWN0b3IuZ2V0KE9BdXRoU2VydmljZSk7XG4gIGlmIChvQXV0aC5oYXNWYWxpZEFjY2Vzc1Rva2VuKCkgJiYgIWNvbmZpZ1N0YXRlLmdldERlZXAoJ2N1cnJlbnRVc2VyLmlkJykpIHtcbiAgICBjbGVhck9BdXRoU3RvcmFnZSgpO1xuICB9XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBsb2NhbGVJbml0aWFsaXplcihpbmplY3RvcjogSW5qZWN0b3IpIHtcbiAgY29uc3QgZm4gPSAoKSA9PiB7XG4gICAgY29uc3Qgc2Vzc2lvblN0YXRlID0gaW5qZWN0b3IuZ2V0KFNlc3Npb25TdGF0ZVNlcnZpY2UpO1xuICAgIGNvbnN0IHsgcmVnaXN0ZXJMb2NhbGVGbiB9OiBBQlAuUm9vdCA9IGluamVjdG9yLmdldChDT1JFX09QVElPTlMpO1xuXG4gICAgY29uc3QgbGFuZyA9IHNlc3Npb25TdGF0ZS5nZXRMYW5ndWFnZSgpIHx8ICdlbic7XG5cbiAgICByZXR1cm4gbmV3IFByb21pc2UoKHJlc29sdmUsIHJlamVjdCkgPT4ge1xuICAgICAgcmVnaXN0ZXJMb2NhbGVGbihsYW5nKS50aGVuKG1vZHVsZSA9PiB7XG4gICAgICAgIGlmIChtb2R1bGU/LmRlZmF1bHQpIHJlZ2lzdGVyTG9jYWxlRGF0YShtb2R1bGUuZGVmYXVsdCk7XG5cbiAgICAgICAgcmV0dXJuIHJlc29sdmUoJ3Jlc29sdmVkJyk7XG4gICAgICB9LCByZWplY3QpO1xuICAgIH0pO1xuICB9O1xuXG4gIHJldHVybiBmbjtcbn1cbiJdfQ==

package/esm2015/lib/utils/multi-tenancy-utils.js

@@ -37,9 +37,14 @@ export function parseTenantFromUrl(injector) {
         const setEnvironmentWithDomainTenant = (tenant) => {
             hideTenantBox();
             setDomainTenant(tenant);
-            replaceTenantNameWithinEnvironment(injector, tenant.name);
         };
         if (tenancyName) {
+            /**
+             * We have to replace tenant name within the urls from environment,
+             * because the code below will make a http request to find information about the domain tenant.
+             * Before this request takes place, we need to replace placeholders aka "{0}".
+             */
+            replaceTenantNameWithinEnvironment(injector, tenancyName);
             return multiTenancyService
                 .setTenantByName(tenancyName)
                 .pipe(tap(setEnvironmentWithDomainTenant))
@@ -75,4 +80,4 @@ function replaceTenantNameWithinEnvironment(injector, tenancyName, placeholder =
     });
     return environmentService.setState(environment);
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"multi-tenancy-utils.js","sourceRoot":"","sources":["../../../../../packages/core/src/lib/utils/multi-tenancy-utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injector } from '@angular/core';\nimport clone from 'just-clone';\n\nimport { tap } from 'rxjs/operators';\nimport { Environment } from '../models/environment';\n\nimport { FindTenantResultDto } from '../proxy/volo/abp/asp-net-core/mvc/multi-tenancy/models';\nimport { EnvironmentService } from '../services/environment.service';\nimport { MultiTenancyService } from '../services/multi-tenancy.service';\nimport { createTokenParser } from './string-utils';\n\nconst tenancyPlaceholder = '{0}';\n\nfunction getCurrentTenancyName(appBaseUrl: string): string {\n  if (appBaseUrl.charAt(appBaseUrl.length - 1) !== '/') appBaseUrl += '/';\n\n  const parseTokens = createTokenParser(appBaseUrl);\n  const token = tenancyPlaceholder.replace(/[}{]/g, '');\n  return parseTokens(window.location.href)[token]?.[0];\n}\n\nfunction getCurrentTenancyNameFromUrl(tenantKey: string) {\n  const urlParams = new URLSearchParams(window.location.search);\n  return urlParams.get(tenantKey);\n}\n\nexport async function parseTenantFromUrl(injector: Injector) {\n  const environmentService = injector.get(EnvironmentService);\n  const multiTenancyService = injector.get(MultiTenancyService);\n\n  const baseUrl = environmentService.getEnvironment()?.application?.baseUrl || '';\n  const tenancyName = getCurrentTenancyName(baseUrl);\n\n  const hideTenantBox = () => {\n    multiTenancyService.isTenantBoxVisible = false;\n  };\n\n  const setDomainTenant = (tenant: FindTenantResultDto) => {\n    multiTenancyService.domainTenant = {\n      id: tenant.tenantId,\n      name: tenant.name,\n      isAvailable: true,\n    };\n  };\n\n  const setEnvironmentWithDomainTenant = (tenant: FindTenantResultDto) => {\n    hideTenantBox();\n    setDomainTenant(tenant);\n    replaceTenantNameWithinEnvironment(injector, tenant.name);\n  };\n\n  if (tenancyName) {\n    return multiTenancyService\n      .setTenantByName(tenancyName)\n      .pipe(tap(setEnvironmentWithDomainTenant))\n      .toPromise();\n  } else {\n    /**\n     * If there is no tenant, we still have to clean up {0}. from baseUrl to avoid incorrect http requests.\n     */\n    replaceTenantNameWithinEnvironment(injector, '', tenancyPlaceholder + '.');\n\n    const tenantIdFromQueryParams = getCurrentTenancyNameFromUrl(multiTenancyService.tenantKey);\n    if (tenantIdFromQueryParams) {\n      return multiTenancyService.setTenantById(tenantIdFromQueryParams).toPromise();\n    }\n  }\n\n  return Promise.resolve();\n}\n\nfunction replaceTenantNameWithinEnvironment(\n  injector: Injector,\n  tenancyName: string,\n  placeholder = tenancyPlaceholder,\n) {\n  const environmentService = injector.get(EnvironmentService);\n\n  const environment = clone(environmentService.getEnvironment()) as Environment;\n\n  if (environment.application.baseUrl) {\n    environment.application.baseUrl = environment.application.baseUrl.replace(\n      placeholder,\n      tenancyName,\n    );\n  }\n\n  if (environment.oAuthConfig.redirectUri) {\n    environment.oAuthConfig.redirectUri = environment.oAuthConfig.redirectUri.replace(\n      placeholder,\n      tenancyName,\n    );\n  }\n\n  environment.oAuthConfig.issuer = environment.oAuthConfig.issuer.replace(placeholder, tenancyName);\n\n  Object.keys(environment.apis).forEach(api => {\n    Object.keys(environment.apis[api]).forEach(key => {\n      environment.apis[api][key] = environment.apis[api][key].replace(placeholder, tenancyName);\n    });\n  });\n\n  return environmentService.setState(environment);\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"multi-tenancy-utils.js","sourceRoot":"","sources":["../../../../../packages/core/src/lib/utils/multi-tenancy-utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injector } from '@angular/core';\nimport clone from 'just-clone';\n\nimport { tap } from 'rxjs/operators';\nimport { Environment } from '../models/environment';\n\nimport { FindTenantResultDto } from '../proxy/volo/abp/asp-net-core/mvc/multi-tenancy/models';\nimport { EnvironmentService } from '../services/environment.service';\nimport { MultiTenancyService } from '../services/multi-tenancy.service';\nimport { createTokenParser } from './string-utils';\n\nconst tenancyPlaceholder = '{0}';\n\nfunction getCurrentTenancyName(appBaseUrl: string): string {\n  if (appBaseUrl.charAt(appBaseUrl.length - 1) !== '/') appBaseUrl += '/';\n\n  const parseTokens = createTokenParser(appBaseUrl);\n  const token = tenancyPlaceholder.replace(/[}{]/g, '');\n  return parseTokens(window.location.href)[token]?.[0];\n}\n\nfunction getCurrentTenancyNameFromUrl(tenantKey: string) {\n  const urlParams = new URLSearchParams(window.location.search);\n  return urlParams.get(tenantKey);\n}\n\nexport async function parseTenantFromUrl(injector: Injector) {\n  const environmentService = injector.get(EnvironmentService);\n  const multiTenancyService = injector.get(MultiTenancyService);\n\n  const baseUrl = environmentService.getEnvironment()?.application?.baseUrl || '';\n  const tenancyName = getCurrentTenancyName(baseUrl);\n\n  const hideTenantBox = () => {\n    multiTenancyService.isTenantBoxVisible = false;\n  };\n\n  const setDomainTenant = (tenant: FindTenantResultDto) => {\n    multiTenancyService.domainTenant = {\n      id: tenant.tenantId,\n      name: tenant.name,\n      isAvailable: true,\n    };\n  };\n\n  const setEnvironmentWithDomainTenant = (tenant: FindTenantResultDto) => {\n    hideTenantBox();\n    setDomainTenant(tenant);\n  };\n\n  if (tenancyName) {\n    /**\n     * We have to replace tenant name within the urls from environment,\n     * because the code below will make a http request to find information about the domain tenant.\n     * Before this request takes place, we need to replace placeholders aka \"{0}\".\n     */\n    replaceTenantNameWithinEnvironment(injector, tenancyName);\n    return multiTenancyService\n      .setTenantByName(tenancyName)\n      .pipe(tap(setEnvironmentWithDomainTenant))\n      .toPromise();\n  } else {\n    /**\n     * If there is no tenant, we still have to clean up {0}. from baseUrl to avoid incorrect http requests.\n     */\n    replaceTenantNameWithinEnvironment(injector, '', tenancyPlaceholder + '.');\n\n    const tenantIdFromQueryParams = getCurrentTenancyNameFromUrl(multiTenancyService.tenantKey);\n    if (tenantIdFromQueryParams) {\n      return multiTenancyService.setTenantById(tenantIdFromQueryParams).toPromise();\n    }\n  }\n\n  return Promise.resolve();\n}\n\nfunction replaceTenantNameWithinEnvironment(\n  injector: Injector,\n  tenancyName: string,\n  placeholder = tenancyPlaceholder,\n) {\n  const environmentService = injector.get(EnvironmentService);\n\n  const environment = clone(environmentService.getEnvironment()) as Environment;\n\n  if (environment.application.baseUrl) {\n    environment.application.baseUrl = environment.application.baseUrl.replace(\n      placeholder,\n      tenancyName,\n    );\n  }\n\n  if (environment.oAuthConfig.redirectUri) {\n    environment.oAuthConfig.redirectUri = environment.oAuthConfig.redirectUri.replace(\n      placeholder,\n      tenancyName,\n    );\n  }\n\n  environment.oAuthConfig.issuer = environment.oAuthConfig.issuer.replace(placeholder, tenancyName);\n\n  Object.keys(environment.apis).forEach(api => {\n    Object.keys(environment.apis[api]).forEach(key => {\n      environment.apis[api][key] = environment.apis[api][key].replace(placeholder, tenancyName);\n    });\n  });\n\n  return environmentService.setState(environment);\n}\n"]}

package/fesm2015/abp-ng.core.js

@@ -4,14 +4,14 @@ import * as i1 from '@angular/router';
 import { PRIMARY_OUTLET, Router, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, ActivatedRoute, RouterModule } from '@angular/router';
 import { registerLocaleData, CommonModule } from '@angular/common';
 import { BehaviorSubject, Subject, throwError, from, Subscription, fromEvent, of, timer, pipe, Observable, concat, ReplaySubject } from 'rxjs';
-import { map, distinctUntilChanged, filter, catchError, tap, take, switchMap, mapTo, debounceTime, takeUntil, finalize, retryWhen, delay, shareReplay } from 'rxjs/operators';
+import { map, distinctUntilChanged, filter, catchError, switchMap, take, mapTo, debounceTime, takeUntil, tap, finalize, retryWhen, delay, shareReplay } from 'rxjs/operators';
 import { __rest, __awaiter, __decorate } from 'tslib';
+import snq from 'snq';
+import compare from 'just-compare';
 import * as i2 from '@angular/common/http';
 import { HttpClient, HttpHeaders, HttpClientModule, HttpClientXsrfModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import * as i4 from '@ngxs/store';
 import { Store, Action, Selector, State, NgxsModule, createSelector } from '@ngxs/store';
-import compare from 'just-compare';
-import snq from 'snq';
 import { FormGroupDirective, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
 import * as i1$1 from 'angular-oauth2-oidc';
 import { OAuthService, OAuthStorage, OAuthErrorEvent, OAuthInfoEvent, OAuthModule } from 'angular-oauth2-oidc';
@@ -140,6 +140,76 @@ function coreOptionsFactory(_a) {
     return Object.assign({}, options);
 }
 
+// This will not be necessary when only Angukar 9.1+ is supported
+function getLocaleDirection(locale) {
+    return /^(ar(-[A-Z]{2})?|ckb(-IR)?|fa(-AF)?|he|ks|lrc(-IQ)?|mzn|pa-Arab|ps(-PK)?|sd|ug|ur(-IN)?|uz-Arab|yi)$/.test(locale)
+        ? 'rtl'
+        : 'ltr';
+}
+function createLocalizer(localization) {
+    return (resourceName, key, defaultValue) => {
+        if (resourceName === '_')
+            return key;
+        const resource = snq(() => localization.values[resourceName]);
+        if (!resource)
+            return defaultValue;
+        return resource[key] || defaultValue;
+    };
+}
+function createLocalizerWithFallback(localization) {
+    const findLocalization = createLocalizationFinder(localization);
+    return (resourceNames, keys, defaultValue) => {
+        const { localized } = findLocalization(resourceNames, keys);
+        return localized || defaultValue;
+    };
+}
+function createLocalizationPipeKeyGenerator(localization) {
+    const findLocalization = createLocalizationFinder(localization);
+    return (resourceNames, keys, defaultKey) => {
+        const { resourceName, key } = findLocalization(resourceNames, keys);
+        return !resourceName ? defaultKey : resourceName === '_' ? key : `${resourceName}::${key}`;
+    };
+}
+function createLocalizationFinder(localization) {
+    const localize = createLocalizer(localization);
+    return (resourceNames, keys) => {
+        resourceNames = resourceNames.concat(localization.defaultResourceName).filter(Boolean);
+        const resourceCount = resourceNames.length;
+        const keyCount = keys.length;
+        for (let i = 0; i < resourceCount; i++) {
+            const resourceName = resourceNames[i];
+            for (let j = 0; j < keyCount; j++) {
+                const key = keys[j];
+                const localized = localize(resourceName, key, null);
+                if (localized)
+                    return { resourceName, key, localized };
+            }
+        }
+        return { resourceName: undefined, key: undefined, localized: undefined };
+    };
+}
+
+function createTokenParser(format) {
+    return (str) => {
+        const tokens = [];
+        const regex = format.replace(/\./g, '\\.').replace(/\{\s?([0-9a-zA-Z]+)\s?\}/g, (_, token) => {
+            tokens.push(token);
+            return '(.+)';
+        });
+        const matches = (str.match(regex) || []).slice(1);
+        return matches.reduce((acc, v, i) => {
+            const key = tokens[i];
+            acc[key] = [...(acc[key] || []), v].filter(Boolean);
+            return acc;
+        }, {});
+    };
+}
+function interpolate(text, params) {
+    return text
+        .replace(/(['"]?\{\s*(\d+)\s*\}['"]?)/g, (_, match, digit) => { var _a; return (_a = params[digit]) !== null && _a !== void 0 ? _a : match; })
+        .replace(/\s+/g, ' ');
+}
+
 function noop() {
     // tslint:disable-next-line: only-arrow-functions
     const fn = function () { };
@@ -338,89 +408,31 @@ AbpApplicationConfigurationService.ctorParameters = () => [
     { type: RestService }
 ];
 
-// This will not be necessary when only Angukar 9.1+ is supported
-function getLocaleDirection(locale) {
-    return /^(ar(-[A-Z]{2})?|ckb(-IR)?|fa(-AF)?|he|ks|lrc(-IQ)?|mzn|pa-Arab|ps(-PK)?|sd|ug|ur(-IN)?|uz-Arab|yi)$/.test(locale)
-        ? 'rtl'
-        : 'ltr';
-}
-function createLocalizer(localization) {
-    return (resourceName, key, defaultValue) => {
-        if (resourceName === '_')
-            return key;
-        const resource = snq(() => localization.values[resourceName]);
-        if (!resource)
-            return defaultValue;
-        return resource[key] || defaultValue;
-    };
-}
-function createLocalizerWithFallback(localization) {
-    const findLocalization = createLocalizationFinder(localization);
-    return (resourceNames, keys, defaultValue) => {
-        const { localized } = findLocalization(resourceNames, keys);
-        return localized || defaultValue;
-    };
-}
-function createLocalizationPipeKeyGenerator(localization) {
-    const findLocalization = createLocalizationFinder(localization);
-    return (resourceNames, keys, defaultKey) => {
-        const { resourceName, key } = findLocalization(resourceNames, keys);
-        return !resourceName ? defaultKey : resourceName === '_' ? key : `${resourceName}::${key}`;
-    };
-}
-function createLocalizationFinder(localization) {
-    const localize = createLocalizer(localization);
-    return (resourceNames, keys) => {
-        resourceNames = resourceNames.concat(localization.defaultResourceName).filter(Boolean);
-        const resourceCount = resourceNames.length;
-        const keyCount = keys.length;
-        for (let i = 0; i < resourceCount; i++) {
-            const resourceName = resourceNames[i];
-            for (let j = 0; j < keyCount; j++) {
-                const key = keys[j];
-                const localized = localize(resourceName, key, null);
-                if (localized)
-                    return { resourceName, key, localized };
-            }
-        }
-        return { resourceName: undefined, key: undefined, localized: undefined };
-    };
-}
-
-function createTokenParser(format) {
-    return (str) => {
-        const tokens = [];
-        const regex = format.replace(/\./g, '\\.').replace(/\{\s?([0-9a-zA-Z]+)\s?\}/g, (_, token) => {
-            tokens.push(token);
-            return '(.+)';
-        });
-        const matches = (str.match(regex) || []).slice(1);
-        return matches.reduce((acc, v, i) => {
-            const key = tokens[i];
-            acc[key] = [...(acc[key] || []), v].filter(Boolean);
-            return acc;
-        }, {});
-    };
-}
-function interpolate(text, params) {
-    return text
-        .replace(/(['"]?\{\s*(\d+)\s*\}['"]?)/g, (_, match, digit) => { var _a; return (_a = params[digit]) !== null && _a !== void 0 ? _a : match; })
-        .replace(/\s+/g, ' ');
-}
-
 class ConfigStateService {
     constructor(abpConfigService) {
         this.abpConfigService = abpConfigService;
         this.store = new InternalStore({});
+        this.updateSubject = new Subject();
+        this.initUpdateStream();
     }
     get createOnUpdateStream() {
         return this.store.sliceUpdate;
     }
+    initUpdateStream() {
+        this.updateSubject
+            .pipe(switchMap(() => this.abpConfigService.get()))
+            .subscribe(res => this.setState(res));
+    }
+    /**
+     * @deprecated do not use this method directly, instead call refreshAppState
+     * This method will be private in v5.0
+     */
     setState(state) {
         this.store.set(state);
     }
     refreshAppState() {
-        return this.abpConfigService.get().pipe(tap(res => this.setState(res)));
+        this.updateSubject.next();
+        return this.createOnUpdateStream(state => state).pipe(take(1));
     }
     getOne$(key) {
         return this.store.sliceState(state => state[key]);
@@ -598,11 +610,10 @@ SessionStateService.ctorParameters = () => [
 ];
 
 class LocalizationService {
-    constructor(sessionState, injector, otherInstance, configState, appConfigService) {
+    constructor(sessionState, injector, otherInstance, configState) {
         this.sessionState = sessionState;
         this.injector = injector;
         this.configState = configState;
-        this.appConfigService = appConfigService;
         this.latestLang = this.sessionState.getLanguage();
         this._languageChange$ = new Subject();
         if (otherInstance)
@@ -621,10 +632,7 @@ class LocalizationService {
     listenToSetLanguage() {
         this.sessionState
             .onLanguageChange$()
-            .pipe(filter(lang => this.configState.getDeep('localization.currentCulture.cultureName') !== lang), switchMap(lang => this.appConfigService
-            .get()
-            .pipe(tap(res => this.configState.setState(res)))
-            .pipe(mapTo(lang))), switchMap(lang => from(this.registerLocale(lang).then(() => lang))))
+            .pipe(filter(lang => this.configState.getDeep('localization.currentCulture.cultureName') !== lang), switchMap(lang => this.configState.refreshAppState().pipe(mapTo(lang))), switchMap(lang => from(this.registerLocale(lang).then(() => lang))))
             .subscribe(lang => this._languageChange$.next(lang));
     }
     registerLocale(locale) {
@@ -674,7 +682,7 @@ class LocalizationService {
         return createLocalizerWithFallback(localization)(resourceNames, keys, defaultValue);
     }
 }
-LocalizationService.ɵprov = i0.ɵɵdefineInjectable({ factory: function LocalizationService_Factory() { return new LocalizationService(i0.ɵɵinject(SessionStateService), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(LocalizationService, 12), i0.ɵɵinject(ConfigStateService), i0.ɵɵinject(AbpApplicationConfigurationService)); }, token: LocalizationService, providedIn: "root" });
+LocalizationService.ɵprov = i0.ɵɵdefineInjectable({ factory: function LocalizationService_Factory() { return new LocalizationService(i0.ɵɵinject(SessionStateService), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(LocalizationService, 12), i0.ɵɵinject(ConfigStateService)); }, token: LocalizationService, providedIn: "root" });
 LocalizationService.decorators = [
     { type: Injectable, args: [{ providedIn: 'root' },] }
 ];
@@ -682,8 +690,7 @@ LocalizationService.ctorParameters = () => [
     { type: SessionStateService },
     { type: Injector },
     { type: LocalizationService, decorators: [{ type: Optional }, { type: SkipSelf }] },
-    { type: ConfigStateService },
-    { type: AbpApplicationConfigurationService }
+    { type: ConfigStateService }
 ];
 function getLocalization(state, key, ...interpolateParams) {
     if (!key)
@@ -1149,7 +1156,6 @@ class DynamicLayoutComponent {
         this.route = injector.get(ActivatedRoute);
         this.router = injector.get(Router);
         this.routes = injector.get(RoutesService);
-        this.getLayout();
         this.checkLayoutOnNavigationEnd();
         this.listenToLanguageChange();
     }
@@ -2498,10 +2504,8 @@ const cookieKey = 'rememberMe';
 const storageKey = 'passwordFlow';
 function pipeToLogin(params, injector) {
     const configState = injector.get(ConfigStateService);
-    const appConfigService = injector.get(AbpApplicationConfigurationService);
     const router = injector.get(Router);
-    return pipe(switchMap(() => appConfigService.get()), tap(res => {
-        configState.setState(res);
+    return pipe(switchMap(() => configState.refreshAppState()), tap(() => {
         setRememberMe(params.rememberMe);
         if (params.redirectUrl)
             router.navigate([params.redirectUrl]);
@@ -2542,7 +2546,6 @@ class AuthFlowStrategy {
         this.environment = injector.get(EnvironmentService);
         this.configState = injector.get(ConfigStateService);
         this.oAuthService = injector.get(OAuthService);
-        this.appConfigService = injector.get(AbpApplicationConfigurationService);
         this.sessionState = injector.get(SessionStateService);
         this.oAuthConfig = this.environment.getEnvironment().oAuthConfig;
         this.tenantKey = injector.get(TENANT_KEY);
@@ -2554,6 +2557,9 @@ class AuthFlowStrategy {
             if (shouldClear)
                 clearOAuthStorage(oAuthStorage);
             this.oAuthService.configure(this.oAuthConfig);
+            this.oAuthService.events
+                .pipe(filter(event => event.type === 'token_refresh_error'))
+                .subscribe(() => this.navigateToLogin());
             return this.oAuthService
                 .loadDiscoveryDocument()
                 .then(() => {
@@ -2570,10 +2576,8 @@ class AuthFlowStrategy {
     }
     listenToOauthErrors() {
         this.oAuthService.events
-            .pipe(filter(event => event instanceof OAuthErrorEvent), tap(() => clearOAuthStorage()), switchMap(() => this.appConfigService.get()))
-            .subscribe(res => {
-            this.configState.setState(res);
-        });
+            .pipe(filter(event => event instanceof OAuthErrorEvent), tap(() => clearOAuthStorage()), switchMap(() => this.configState.refreshAppState()))
+            .subscribe();
     }
 }
 class AuthCodeFlowStrategy extends AuthFlowStrategy {
@@ -2630,9 +2634,7 @@ class AuthPasswordFlowStrategy extends AuthFlowStrategy {
             else {
                 this.oAuthService.logOut();
                 removeRememberMe();
-                this.appConfigService.get().subscribe(res => {
-                    this.configState.setState(res);
-                });
+                this.configState.refreshAppState().subscribe();
             }
         });
     }
@@ -2660,8 +2662,7 @@ class AuthPasswordFlowStrategy extends AuthFlowStrategy {
     }
     pipeToLogin(params) {
         const router = this.injector.get(Router);
-        return pipe(switchMap(() => this.appConfigService.get()), tap(res => {
-            this.configState.setState(res);
+        return pipe(switchMap(() => this.configState.refreshAppState()), tap(() => {
             setRememberMe(params.rememberMe);
             if (params.redirectUrl)
                 router.navigate([params.redirectUrl]);
@@ -2669,8 +2670,7 @@ class AuthPasswordFlowStrategy extends AuthFlowStrategy {
     }
     logout(queryParams) {
         const router = this.injector.get(Router);
-        return from(this.oAuthService.revokeTokenAndLogout(queryParams)).pipe(switchMap(() => this.appConfigService.get()), tap(res => {
-            this.configState.setState(res);
+        return from(this.oAuthService.revokeTokenAndLogout(queryParams)).pipe(switchMap(() => this.configState.refreshAppState()), tap(() => {
             router.navigateByUrl('/');
             removeRememberMe();
         }));
@@ -2917,9 +2917,14 @@ function parseTenantFromUrl(injector) {
         const setEnvironmentWithDomainTenant = (tenant) => {
             hideTenantBox();
             setDomainTenant(tenant);
-            replaceTenantNameWithinEnvironment(injector, tenant.name);
         };
         if (tenancyName) {
+            /**
+             * We have to replace tenant name within the urls from environment,
+             * because the code below will make a http request to find information about the domain tenant.
+             * Before this request takes place, we need to replace placeholders aka "{0}".
+             */
+            replaceTenantNameWithinEnvironment(injector, tenancyName);
             return multiTenancyService
                 .setTenantByName(tenancyName)
                 .pipe(tap(setEnvironmentWithDomainTenant))
@@ -2960,7 +2965,6 @@ function getInitialData(injector) {
     const fn = () => __awaiter(this, void 0, void 0, function* () {
         const environmentService = injector.get(EnvironmentService);
         const configState = injector.get(ConfigStateService);
-        const appConfigService = injector.get(AbpApplicationConfigurationService);
         const options = injector.get(CORE_OPTIONS);
         environmentService.setState(options.environment);
         yield getRemoteEnv(injector, options.environment);
@@ -2968,9 +2972,9 @@ function getInitialData(injector) {
         yield injector.get(AuthService).init();
         if (options.skipGetAppConfiguration)
             return;
-        return appConfigService
-            .get()
-            .pipe(tap(res => configState.setState(res)), tap(() => checkAccessToken(injector)), tap(() => {
+        return configState
+            .refreshAppState()
+            .pipe(tap(() => checkAccessToken(injector)), tap(() => {
             const currentTenant = configState.getOne('currentTenant');
             injector.get(SessionStateService).setTenant(currentTenant);
         }), catchError(error => {
@@ -3799,10 +3803,8 @@ var ConfigState_1;
  * @deprecated Use ConfigStateService instead. To be deleted in v5.0.
  */
 let ConfigState = ConfigState_1 = class ConfigState {
-    constructor(http, store, sessionState, environmentService, configState) {
-        this.http = http;
+    constructor(store, environmentService, configState) {
         this.store = store;
-        this.sessionState = sessionState;
         this.environmentService = environmentService;
         this.configState = configState;
         this.syncConfigState();
@@ -3968,9 +3970,7 @@ let ConfigState = ConfigState_1 = class ConfigState {
     addData({ patchState, dispatch }) {
         const apiName = 'default';
         const api = this.store.selectSnapshot(ConfigState_1.getApiUrl(apiName));
-        return this.http
-            .get(`${api}/api/abp/application-configuration`)
-            .pipe(tap(configuration => this.configState.setState(configuration)), catchError((err) => {
+        return this.configState.refreshAppState().pipe(catchError((err) => {
             dispatch(new RestOccurError(err));
             return throwError(err);
         }));
@@ -3986,9 +3986,7 @@ ConfigState.decorators = [
     { type: Injectable }
 ];
 ConfigState.ctorParameters = () => [
-    { type: HttpClient },
     { type: Store },
-    { type: SessionStateService },
     { type: EnvironmentService },
     { type: ConfigStateService }
 ];