Merge pull request #9395 from abpframework/feat/l41

Create account core package

npm/ng-packs/angular.json

@@ -541,6 +541,44 @@
           }
         }
       }
+    },
+    "account-core": {
+      "projectType": "library",
+      "root": "packages/account-core",
+      "sourceRoot": "packages/account-core/src",
+      "prefix": "lib",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:ng-packagr",
+          "options": {
+            "tsConfig": "packages/account-core/tsconfig.lib.json",
+            "project": "packages/account-core/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "packages/account-core/tsconfig.lib.prod.json"
+            }
+          }
+        },
+        "test": {
+          "builder": "@angular-builders/jest:run",
+          "options": {
+            "tsConfig": "tsconfig.json",
+            "coverage": true,
+            "passWithNoTests": true
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "packages/account-core/tsconfig.lib.json",
+              "packages/account-core/tsconfig.spec.json"
+            ],
+            "exclude": ["**/node_modules/**"]
+          }
+        }
+      }
     }
   },
   "cli": {

npm/ng-packs/packages/account-core/README.md

@@ -0,0 +1,3 @@
+# @abp/ng.account.core
+
+Visit the [ABP documentation](https://docs.abp.io)

npm/ng-packs/packages/account-core/jest.config.js

@@ -0,0 +1,6 @@
+const jestConfig = require('../../jest.config');
+
+module.exports = {
+  ...jestConfig,
+  name: 'account-core',
+};

npm/ng-packs/packages/account-core/ng-package.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../dist/account-core",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}

npm/ng-packs/packages/account-core/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "@abp/ng.account.core",
+  "version": "0.0.1",
+  "homepage": "https://abp.io",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/abpframework/abp.git"
+  },
+  "peerDependencies": {
+    "@angular/common": ">=11.1.2",
+    "@angular/core": ">=11.1.2",
+    "@abp/ng.core": "~4.3.3",
+    "@abp/ng.theme.shared": "~4.3.3"
+  },
+  "dependencies": {
+    "tslib": "^2.0.0"
+  }
+}

npm/ng-packs/packages/account-core/src/lib/auth-wrapper.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { AuthWrapperService } from './auth-wrapper.service';
+
+describe('AuthWrapperService', () => {
+  let service: AuthWrapperService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(AuthWrapperService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.ts → npm/ng-packs/packages/account-core/src/lib/auth-wrapper.service.ts

@@ -1,17 +1,11 @@
-import { ConfigStateService, MultiTenancyService, SubscriptionService } from '@abp/ng.core';
+import { Injectable, Injector } from '@angular/core';
-import { Component, Injector } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { eAccountComponents } from '../../enums/components';
 import { ActivatedRoute } from '@angular/router';
+import { ConfigStateService, MultiTenancyService } from '@abp/ng.core';
 
-@Component({
+@Injectable()
-  selector: 'abp-auth-wrapper',
+export class AuthWrapperService {
-  templateUrl: './auth-wrapper.component.html',
-  exportAs: 'abpAuthWrapper',
-  providers: [SubscriptionService],
-})
-export class AuthWrapperComponent {
   isMultiTenancyEnabled$ = this.configState.getDeep$('multiTenancy.isEnabled');
 
   get enableLocalLogin$(): Observable<boolean> {
@@ -20,7 +14,7 @@ export class AuthWrapperComponent {
       .pipe(map(value => value?.toLowerCase() !== 'false'));
   }
 
-  tenantBoxKey = eAccountComponents.TenantBox;
+  tenantBoxKey = 'Account.TenantBoxComponent';
   route: ActivatedRoute;
 
   private _tenantBoxVisible = true;

npm/ng-packs/packages/account-core/src/lib/tenant-box.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { TenantBoxService } from './tenant-box.service';
+
+describe('TenantBoxService', () => {
+  let service: TenantBoxService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(TenantBoxService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

npm/ng-packs/packages/account/src/lib/components/tenant-box/tenant-box.component.ts → npm/ng-packs/packages/account-core/src/lib/tenant-box.service.ts

@@ -1,3 +1,5 @@
+import { Injectable } from '@angular/core';
+import { ToasterService } from '@abp/ng.theme.shared';
 import {
   AbpApplicationConfigurationService,
   AbpTenantService,
@@ -5,17 +7,10 @@ import {
   CurrentTenantDto,
   SessionStateService,
 } from '@abp/ng.core';
-import { ToasterService } from '@abp/ng.theme.shared';
-import { Component } from '@angular/core';
 import { finalize } from 'rxjs/operators';
-import { Account } from '../../models/account';
 
-@Component({
+@Injectable()
-  selector: 'abp-tenant-box',
+export class TenantBoxService {
-  templateUrl: './tenant-box.component.html',
-})
-export class TenantBoxComponent
-  implements Account.TenantBoxComponentInputs, Account.TenantBoxComponentOutputs {
   currentTenant$ = this.sessionState.getTenant$();
 
   name: string;

npm/ng-packs/packages/account-core/src/public-api.ts

@@ -0,0 +1,6 @@
+/*
+ * Public API Surface of account-core
+ */
+
+export * from './lib/auth-wrapper.service';
+export * from './lib/tenant-box.service';

npm/ng-packs/packages/account-core/src/test.ts

@@ -0,0 +1,26 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/zone';
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+declare const require: {
+  context(path: string, deep?: boolean, filter?: RegExp): {
+    keys(): string[];
+    <T>(id: string): T;
+  };
+};
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);

npm/ng-packs/packages/account-core/tsconfig.lib.json

@@ -0,0 +1,20 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "../../tsconfig.prod.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/lib",
+    "target": "es2015",
+    "declaration": true,
+    "inlineSources": true,
+    "types": [],
+    "lib": ["dom", "es2018"]
+  },
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true,
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true,
+    "enableResourceInlining": true
+  },
+  "exclude": ["src/test.ts", "**/*.spec.ts"]
+}

npm/ng-packs/packages/account-core/tsconfig.lib.prod.json

@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.lib.json",
+  "angularCompilerOptions": {
+    "enableIvy": false
+  }
+}

npm/ng-packs/packages/account-core/tsconfig.spec.json

@@ -0,0 +1,17 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/spec",
+    "types": [
+      "jasmine"
+    ]
+  },
+  "files": [
+    "src/test.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}

npm/ng-packs/packages/account-core/tslint.json

@@ -0,0 +1,17 @@
+{
+  "extends": "../../tslint.json",
+  "rules": {
+    "directive-selector": [
+      true,
+      "attribute",
+      "lib",
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      "lib",
+      "kebab-case"
+    ]
+  }
+}

npm/ng-packs/packages/account/config/src/enums/route-names.ts

@@ -3,4 +3,6 @@ export const enum eAccountRouteNames {
   Login = 'AbpAccount::Login',
   Register = 'AbpAccount::Register',
   ManageProfile = 'AbpAccount::MyAccount',
+  ForgotPassword = 'AbpAccount::ForgotPassword',
+  ResetPassword = 'AbpAccount::ResetPassword',
 }

npm/ng-packs/packages/account/config/src/providers/route.provider.ts

@@ -13,7 +13,7 @@ export function configureRoutes(routes: RoutesService) {
         path: undefined,
         name: eAccountRouteNames.Account,
         invisible: true,
-        layout: eLayoutType.application,
+        layout: eLayoutType.account,
         order: 1,
       },
       {
@@ -32,8 +32,21 @@ export function configureRoutes(routes: RoutesService) {
         path: '/account/manage',
         name: eAccountRouteNames.ManageProfile,
         parentName: eAccountRouteNames.Account,
+        layout: eLayoutType.application,
         order: 3,
       },
+      {
+        path: '/account/forgot-password',
+        parentName: eAccountRouteNames.Account,
+        name: eAccountRouteNames.ForgotPassword,
+        invisible: true,
+      },
+      {
+        path: '/account/reset-password',
+        parentName: eAccountRouteNames.Account,
+        name: eAccountRouteNames.ResetPassword,
+        invisible: true,
+      },
     ]);
   };
 }

npm/ng-packs/packages/account/src/lib/account-routing.module.ts

@@ -6,7 +6,6 @@ import {
 } from '@abp/ng.core';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthWrapperComponent } from './components/auth-wrapper/auth-wrapper.component';
 import { ForgotPasswordComponent } from './components/forgot-password/forgot-password.component';
 import { LoginComponent } from './components/login/login.component';
 import { ManageProfileComponent } from './components/manage-profile/manage-profile.component';
@@ -22,61 +21,49 @@ const routes: Routes = [
     component: DynamicLayoutComponent,
     children: [
       {
-        path: '',
+        path: 'login',
         component: ReplaceableRouteContainerComponent,
+        canActivate: [AuthenticationFlowGuard],
         data: {
           replaceableComponent: {
-            key: eAccountComponents.AuthWrapper,
+            key: eAccountComponents.Login,
-            defaultComponent: AuthWrapperComponent,
+            defaultComponent: LoginComponent,
-          } as ReplaceableComponents.RouteData<AuthWrapperComponent>,
+          } as ReplaceableComponents.RouteData<LoginComponent>,
+        },
+      },
+      {
+        path: 'register',
+        component: ReplaceableRouteContainerComponent,
+        canActivate: [AuthenticationFlowGuard],
+        data: {
+          replaceableComponent: {
+            key: eAccountComponents.Register,
+            defaultComponent: RegisterComponent,
+          } as ReplaceableComponents.RouteData<RegisterComponent>,
+        },
+      },
+      {
+        path: 'forgot-password',
+        component: ReplaceableRouteContainerComponent,
+        canActivate: [AuthenticationFlowGuard],
+        data: {
+          replaceableComponent: {
+            key: eAccountComponents.ForgotPassword,
+            defaultComponent: ForgotPasswordComponent,
+          } as ReplaceableComponents.RouteData<ForgotPasswordComponent>,
+        },
+      },
+      {
+        path: 'reset-password',
+        component: ReplaceableRouteContainerComponent,
+        canActivate: [],
+        data: {
+          tenantBoxVisible: false,
+          replaceableComponent: {
+            key: eAccountComponents.ResetPassword,
+            defaultComponent: ResetPasswordComponent,
+          } as ReplaceableComponents.RouteData<ResetPasswordComponent>,
         },
-        children: [
-          {
-            path: 'login',
-            component: ReplaceableRouteContainerComponent,
-            canActivate: [AuthenticationFlowGuard],
-            data: {
-              replaceableComponent: {
-                key: eAccountComponents.Login,
-                defaultComponent: LoginComponent,
-              } as ReplaceableComponents.RouteData<LoginComponent>,
-            },
-          },
-          {
-            path: 'register',
-            component: ReplaceableRouteContainerComponent,
-            canActivate: [AuthenticationFlowGuard],
-            data: {
-              replaceableComponent: {
-                key: eAccountComponents.Register,
-                defaultComponent: RegisterComponent,
-              } as ReplaceableComponents.RouteData<RegisterComponent>,
-            },
-          },
-          {
-            path: 'forgot-password',
-            component: ReplaceableRouteContainerComponent,
-            canActivate: [AuthenticationFlowGuard],
-            data: {
-              replaceableComponent: {
-                key: eAccountComponents.ForgotPassword,
-                defaultComponent: ForgotPasswordComponent,
-              } as ReplaceableComponents.RouteData<ForgotPasswordComponent>,
-            },
-          },
-          {
-            path: 'reset-password',
-            component: ReplaceableRouteContainerComponent,
-            canActivate: [AuthenticationFlowGuard],
-            data: {
-              tenantBoxVisible: false,
-              replaceableComponent: {
-                key: eAccountComponents.ResetPassword,
-                defaultComponent: ResetPasswordComponent,
-              } as ReplaceableComponents.RouteData<ResetPasswordComponent>,
-            },
-          },
-        ],
       },
       {
         path: 'manage',

npm/ng-packs/packages/account/src/lib/account.module.ts

@@ -4,13 +4,11 @@ import { ModuleWithProviders, NgModule, NgModuleFactory } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { NgxValidateCoreModule } from '@ngx-validate/core';
 import { AccountRoutingModule } from './account-routing.module';
-import { AuthWrapperComponent } from './components/auth-wrapper/auth-wrapper.component';
 import { ChangePasswordComponent } from './components/change-password/change-password.component';
 import { LoginComponent } from './components/login/login.component';
 import { ManageProfileComponent } from './components/manage-profile/manage-profile.component';
 import { PersonalSettingsComponent } from './components/personal-settings/personal-settings.component';
 import { RegisterComponent } from './components/register/register.component';
-import { TenantBoxComponent } from './components/tenant-box/tenant-box.component';
 import { AccountConfigOptions } from './models/config-options';
 import { ACCOUNT_CONFIG_OPTIONS } from './tokens/config-options.token';
 import { accountConfigOptionsFactory } from './utils/factory-utils';
@@ -19,10 +17,8 @@ import { ForgotPasswordComponent } from './components/forgot-password/forgot-pas
 import { ResetPasswordComponent } from './components/reset-password/reset-password.component';
 
 const declarations = [
-  AuthWrapperComponent,
   LoginComponent,
   RegisterComponent,
-  TenantBoxComponent,
   ChangePasswordComponent,
   ManageProfileComponent,
   PersonalSettingsComponent,

npm/ng-packs/packages/account/src/lib/components/index.ts

@@ -5,4 +5,3 @@ export * from './manage-profile/manage-profile.component';
 export * from './register/register.component';
 export * from './personal-settings/personal-settings.component';
 export * from './reset-password/reset-password.component';
-export * from './tenant-box/tenant-box.component';

npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.html

@@ -0,0 +1,62 @@
+<nav
+  class="navbar navbar-expand-lg navbar-dark bg-dark shadow-sm flex-column flex-md-row mb-4"
+  id="main-navbar"
+  style="min-height: 4rem"
+>
+  <div class="container">
+    <abp-logo *abpReplaceableTemplate="{ componentKey: service.logoComponentKey }"></abp-logo>
+    <button
+      class="navbar-toggler"
+      type="button"
+      [attr.aria-expanded]="!service.isCollapsed"
+      (click)="service.isCollapsed = !service.isCollapsed"
+    >
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <div
+      class="navbar-collapse"
+      [class.overflow-hidden]="service.smallScreen"
+      id="main-navbar-collapse"
+    >
+      <ng-container *ngTemplateOutlet="!service.smallScreen ? navigations : null"></ng-container>
+
+      <div
+        *ngIf="service.smallScreen"
+        [@collapseWithMargin]="service.isCollapsed ? 'collapsed' : 'expanded'"
+      >
+        <ng-container *ngTemplateOutlet="navigations"></ng-container>
+      </div>
+
+      <ng-template #navigations>
+        <abp-routes
+          *abpReplaceableTemplate="{
+            componentKey: service.routesComponentKey,
+            inputs: {
+              smallScreen: { value: service.smallScreen }
+            }
+          }"
+          class="mx-auto"
+          [smallScreen]="service.smallScreen"
+        ></abp-routes>
+
+        <abp-nav-items
+          *abpReplaceableTemplate="{
+            componentKey: service.navItemsComponentKey
+          }"
+        ></abp-nav-items>
+      </ng-template>
+    </div>
+  </div>
+</nav>
+
+<!-- [@slideFromBottom]="outlet.isActivated && outlet.activatedRoute?.routeConfig?.path" TODO: throws ExpressionChangedAfterItHasBeenCheck when animation is active. It should be fixed -->
+<div class="container">
+  <abp-page-alert-container></abp-page-alert-container>
+  <abp-auth-wrapper
+    *abpReplaceableTemplate="{
+      componentKey: authWrapperKey
+    }"
+  >
+    <router-outlet #outlet="outlet"></router-outlet>
+  </abp-auth-wrapper>
+</div>

npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts

@@ -1,14 +1,21 @@
-import { Component } from '@angular/core';
+import { AfterViewInit, Component } from '@angular/core';
-import { eLayoutType } from '@abp/ng.core';
+import { eLayoutType, SubscriptionService } from '@abp/ng.core';
+import { LayoutService } from '../../services/layout.service';
 
 @Component({
   selector: 'abp-layout-account',
-  template: `
+  templateUrl: './account-layout.component.html',
-    <router-outlet></router-outlet>
+  providers: [LayoutService, SubscriptionService],
-    <abp-confirmation></abp-confirmation>
-  `,
 })
-export class AccountLayoutComponent {
+export class AccountLayoutComponent implements AfterViewInit {
   // required for dynamic component
   static type = eLayoutType.account;
+
+  authWrapperKey = 'Account.AuthWrapperComponent';
+
+  constructor(public service: LayoutService) {}
+
+  ngAfterViewInit() {
+    this.service.subscribeWindowSize();
+  }
 }

npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.html → npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/auth-wrapper/auth-wrapper.component.html

@@ -1,16 +1,18 @@
 <div class="row">
   <div class="mx-auto col col-md-5">
-    <ng-container *ngIf="(isMultiTenancyEnabled$ | async) && isTenantBoxVisible">
+    <ng-container *ngIf="(service.isMultiTenancyEnabled$ | async) && service.isTenantBoxVisible">
-      <abp-tenant-box *abpReplaceableTemplate="{ componentKey: tenantBoxKey }"></abp-tenant-box>
+      <abp-tenant-box
+        *abpReplaceableTemplate="{ componentKey: service.tenantBoxKey }"
+      ></abp-tenant-box>
     </ng-container>
 
     <div class="abp-account-container">
       <div
-        *ngIf="enableLocalLogin$ | async; else disableLocalLoginTemplate"
+        *ngIf="service.enableLocalLogin$ | async; else disableLocalLoginTemplate"
         class="card mt-3 shadow-sm rounded"
       >
         <div class="card-body p-5">
-          <router-outlet></router-outlet>
+          <ng-content></ng-content>
         </div>
       </div>
     </div>

npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/auth-wrapper/auth-wrapper.component.spec.ts

@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AuthWrapperComponent } from './auth-wrapper.component';
+
+describe('AuthWrapperComponent', () => {
+  let component: AuthWrapperComponent;
+  let fixture: ComponentFixture<AuthWrapperComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ AuthWrapperComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AuthWrapperComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/auth-wrapper/auth-wrapper.component.ts

@@ -0,0 +1,13 @@
+import { Component, OnInit } from '@angular/core';
+import { AuthWrapperService } from '@abp/ng.account.core';
+
+@Component({
+  selector: 'abp-auth-wrapper',
+  templateUrl: './auth-wrapper.component.html',
+  providers: [AuthWrapperService],
+})
+export class AuthWrapperComponent implements OnInit {
+  constructor(public service: AuthWrapperService) {}
+
+  ngOnInit(): void {}
+}

npm/ng-packs/packages/account/src/lib/components/tenant-box/tenant-box.component.html → npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.html

@@ -1,4 +1,4 @@
-<ng-container *ngIf="(currentTenant$ | async) || {} as currentTenant">
+<ng-container *ngIf="(service.currentTenant$ | async) || {} as currentTenant">
   <div class="card shadow-sm rounded mb-3">
     <div class="card-body px-5">
       <div class="row">
@@ -16,7 +16,7 @@
             id="AbpTenantSwitchLink"
             href="javascript:void(0);"
             class="btn btn-sm mt-3 btn-outline-primary"
-            (click)="onSwitch()"
+            (click)="service.onSwitch()"
             >{{ 'AbpUiMultiTenancy::Switch' | abpLocalization }}</a
           >
         </div>
@@ -24,17 +24,17 @@
     </div>
   </div>
 
-  <abp-modal size="md" [(visible)]="isModalVisible" [busy]="modalBusy">
+  <abp-modal size="md" [(visible)]="service.isModalVisible" [busy]="service.modalBusy">
     <ng-template #abpHeader>
       <h5>Switch Tenant</h5>
     </ng-template>
     <ng-template #abpBody>
-      <form (ngSubmit)="save()">
+      <form (ngSubmit)="service.save()">
         <div class="mt-2">
           <div class="form-group">
             <label for="name">{{ 'AbpUiMultiTenancy::Name' | abpLocalization }}</label>
             <input
-              [(ngModel)]="name"
+              [(ngModel)]="service.name"
               type="text"
               id="name"
               name="tenant"
@@ -53,8 +53,8 @@
       <abp-button
         type="abp-button"
         iconClass="fa fa-check"
-        (click)="save()"
+        (click)="service.save()"
-        [disabled]="currentTenant?.name === name"
+        [disabled]="currentTenant?.name === service.name"
       >
         <span>{{ 'AbpTenantManagement::Save' | abpLocalization }}</span>
       </abp-button>

npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.spec.ts

@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TenantBoxComponent } from './tenant-box.component';
+
+describe('TenantBoxComponent', () => {
+  let component: TenantBoxComponent;
+  let fixture: ComponentFixture<TenantBoxComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ TenantBoxComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TenantBoxComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.ts

@@ -0,0 +1,13 @@
+import { Component, OnInit } from '@angular/core';
+import { TenantBoxService } from '@abp/ng.account.core';
+
+@Component({
+  selector: 'abp-tenant-box',
+  templateUrl: './tenant-box.component.html',
+  providers: [TenantBoxService],
+})
+export class TenantBoxComponent implements OnInit {
+  constructor(public service: TenantBoxService) {}
+
+  ngOnInit(): void {}
+}

npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html

@@ -4,37 +4,37 @@
   style="min-height: 4rem"
 >
   <div class="container">
-    <abp-logo *abpReplaceableTemplate="{ componentKey: logoComponentKey }"></abp-logo>
+    <abp-logo *abpReplaceableTemplate="{ componentKey: service.logoComponentKey }"></abp-logo>
     <button
       class="navbar-toggler"
       type="button"
-      [attr.aria-expanded]="!isCollapsed"
+      [attr.aria-expanded]="!service.isCollapsed"
-      (click)="isCollapsed = !isCollapsed"
+      (click)="service.isCollapsed = !service.isCollapsed"
     >
       <span class="navbar-toggler-icon"></span>
     </button>
-    <div class="navbar-collapse" [class.overflow-hidden]="smallScreen" id="main-navbar-collapse">
+    <div class="navbar-collapse" [class.overflow-hidden]="service.smallScreen" id="main-navbar-collapse">
-      <ng-container *ngTemplateOutlet="!smallScreen ? navigations : null"></ng-container>
+      <ng-container *ngTemplateOutlet="!service.smallScreen ? navigations : null"></ng-container>
 
-      <div *ngIf="smallScreen" [@collapseWithMargin]="isCollapsed ? 'collapsed' : 'expanded'">
+      <div *ngIf="service.smallScreen" [@collapseWithMargin]="service.isCollapsed ? 'collapsed' : 'expanded'">
         <ng-container *ngTemplateOutlet="navigations"></ng-container>
       </div>
 
       <ng-template #navigations>
         <abp-routes
           *abpReplaceableTemplate="{
-            componentKey: routesComponentKey,
+            componentKey: service.routesComponentKey,
             inputs: {
-              smallScreen: { value: smallScreen }
+              smallScreen: { value: service.smallScreen }
             }
           }"
           class="mx-auto"
-          [smallScreen]="smallScreen"
+          [smallScreen]="service.smallScreen"
         ></abp-routes>
 
         <abp-nav-items
           *abpReplaceableTemplate="{
-            componentKey: navItemsComponentKey
+            componentKey: service.navItemsComponentKey
           }"
         ></abp-nav-items>
       </ng-template>

npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts

@@ -1,54 +1,21 @@
 import { eLayoutType, SubscriptionService } from '@abp/ng.core';
 import { collapseWithMargin, slideFromBottom } from '@abp/ng.theme.shared';
-import { AfterViewInit, Component, OnDestroy } from '@angular/core';
+import { AfterViewInit, Component } from '@angular/core';
-import { fromEvent } from 'rxjs';
+import { LayoutService } from '../../services/layout.service';
-import { debounceTime } from 'rxjs/operators';
-import { eThemeBasicComponents } from '../../enums/components';
 
 @Component({
   selector: 'abp-layout-application',
   templateUrl: './application-layout.component.html',
   animations: [slideFromBottom, collapseWithMargin],
-  providers: [SubscriptionService],
+  providers: [LayoutService, SubscriptionService],
 })
-export class ApplicationLayoutComponent implements AfterViewInit, OnDestroy {
+export class ApplicationLayoutComponent implements AfterViewInit {
   // required for dynamic component
   static type = eLayoutType.application;
 
-  isCollapsed = true;
+  constructor(public service: LayoutService) {}
-
-  smallScreen: boolean; // do not set true or false
-
-  logoComponentKey = eThemeBasicComponents.Logo;
-
-  routesComponentKey = eThemeBasicComponents.Routes;
-
-  navItemsComponentKey = eThemeBasicComponents.NavItems;
-
-  constructor(private subscription: SubscriptionService) {}
-
-  private checkWindowWidth() {
-    setTimeout(() => {
-      if (window.innerWidth < 992) {
-        if (this.smallScreen === false) {
-          this.isCollapsed = false;
-          setTimeout(() => {
-            this.isCollapsed = true;
-          }, 100);
-        }
-        this.smallScreen = true;
-      } else {
-        this.smallScreen = false;
-      }
-    }, 0);
-  }
 
   ngAfterViewInit() {
-    this.checkWindowWidth();
+    this.service.subscribeWindowSize();
-
-    const resize$ = fromEvent(window, 'resize').pipe(debounceTime(150));
-    this.subscription.addOne(resize$, () => this.checkWindowWidth());
   }
-
-  ngOnDestroy() {}
 }

npm/ng-packs/packages/theme-basic/src/lib/components/index.ts

@@ -1,4 +1,6 @@
 export * from './account-layout/account-layout.component';
+export * from './account-layout/auth-wrapper/auth-wrapper.component';
+export * from './account-layout/tenant-box/tenant-box.component';
 export * from './application-layout/application-layout.component';
 export * from './empty-layout/empty-layout.component';
 export * from './logo/logo.component';

npm/ng-packs/packages/theme-basic/src/lib/services/layout.service.ts

@@ -0,0 +1,39 @@
+import { ChangeDetectorRef, Injectable } from '@angular/core';
+import { eThemeBasicComponents } from '../enums';
+import { SubscriptionService } from '@abp/ng.core';
+import { fromEvent } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+
+@Injectable()
+export class LayoutService {
+  isCollapsed = true;
+
+  smallScreen: boolean; // do not set true or false
+
+  logoComponentKey = eThemeBasicComponents.Logo;
+
+  routesComponentKey = eThemeBasicComponents.Routes;
+
+  navItemsComponentKey = eThemeBasicComponents.NavItems;
+
+  constructor(private subscription: SubscriptionService, private cdRef: ChangeDetectorRef) {}
+
+  private checkWindowWidth() {
+    const isSmallScreen = window.innerWidth < 992;
+    if (isSmallScreen && this.smallScreen === false) {
+      this.isCollapsed = false;
+      setTimeout(() => {
+        this.isCollapsed = true;
+      }, 100);
+    }
+    this.smallScreen = isSmallScreen;
+    this.cdRef.detectChanges();
+  }
+
+  subscribeWindowSize() {
+    this.checkWindowWidth();
+
+    const resize$ = fromEvent(window, 'resize').pipe(debounceTime(150));
+    this.subscription.addOne(resize$, () => this.checkWindowWidth());
+  }
+}

npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts

@@ -20,6 +20,8 @@ import { ValidationErrorComponent } from './components/validation-error/validati
 import { BASIC_THEME_NAV_ITEM_PROVIDERS } from './providers/nav-item.provider';
 import { BASIC_THEME_STYLES_PROVIDERS } from './providers/styles.provider';
 import { PageAlertContainerComponent } from './components/page-alert-container/page-alert-container.component';
+import { TenantBoxComponent } from './components/account-layout/tenant-box/tenant-box.component';
+import { AuthWrapperComponent } from './components/account-layout/auth-wrapper/auth-wrapper.component';
 
 export const LAYOUTS = [ApplicationLayoutComponent, AccountLayoutComponent, EmptyLayoutComponent];
 
@@ -33,6 +35,8 @@ export const LAYOUTS = [ApplicationLayoutComponent, AccountLayoutComponent, Empt
     CurrentUserComponent,
     LanguagesComponent,
     PageAlertContainerComponent,
+    TenantBoxComponent,
+    AuthWrapperComponent,
   ],
   exports: [
     ...LAYOUTS,

npm/ng-packs/scripts/build.ts

@@ -1,6 +1,5 @@
 import program from 'commander';
 import execa from 'execa';
-import fse from 'fs-extra';
 
 (async () => {
   program.option('-i, --noInstall', 'skip updating package.json and installation', false);
@@ -37,7 +36,7 @@ import fse from 'fs-extra';
         '--prod',
         '--no-watch',
         '--packages',
-        '@abp/ng.feature-management,@abp/ng.permission-management',
+        '@abp/ng.feature-management,@abp/ng.permission-management,@abp/ng.account.core',
       ],
       { stdout: 'inherit', cwd: '../' },
     );
@@ -52,7 +51,7 @@ import fse from 'fs-extra';
         '--no-watch',
         '--all-packages',
         '--excluded-packages',
-        '@abp/ng.schematics,@abp/ng.core,@abp/ng.theme.shared,@abp/ng.components,@abp/ng.feature-management,@abp/ng.permission-management',
+        '@abp/ng.schematics,@abp/ng.core,@abp/ng.theme.shared,@abp/ng.components,@abp/ng.feature-management,@abp/ng.permission-management,@abp/ng.account.core',
       ],
       { stdout: 'inherit', cwd: '../' },
     );

npm/ng-packs/tsconfig.json

@@ -26,6 +26,7 @@
       "@abp/ng.theme.basic": ["packages/theme-basic/src/public-api.ts"],
       "@abp/ng.account": ["packages/account/src/public-api.ts"],
       "@abp/ng.account/config": ["packages/account/config/src/public-api.ts"],
+      "@abp/ng.account.core": ["packages/account-core/src/public-api.ts"],
       "@abp/ng.identity": ["packages/identity/src/public-api.ts"],
       "@abp/ng.identity/config": ["packages/identity/config/src/public-api.ts"],
       "@abp/ng.tenant-management": ["packages/tenant-management/src/public-api.ts"],