feat: added impersonated token

Author: teogl

projects/craftsjs-app/src/app/@redux/account/models/impersonate-input.model.ts

@@ -0,0 +1,4 @@
+export class ImpersonateInput {
+    tenantImpersonationId?: string;
+    userId?: string;
+}

projects/craftsjs-app/src/app/@redux/account/models/impersonate-output.model.ts

@@ -0,0 +1,4 @@
+export class ImpersonateOutput {
+    impersonationToken: string;
+    tenancyName: string;
+}

projects/craftsjs-app/src/app/@redux/account/services/account.service.ts

@@ -0,0 +1,24 @@
+import { Injectable, Injector } from '@angular/core';
+import { ImpersonateInput } from '../models/impersonate-input.model';
+import { ImpersonateOutput } from '../models/impersonate-output.model';
+import { ServiceApiBase } from '../../shared/services/service-base';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class AccountService extends ServiceApiBase {
+
+  constructor(
+    injector: Injector
+  ) {
+    super(injector, 'api/auth/account');
+  }
+
+  impersonate(impersonateInput: ImpersonateInput) {
+    return this.post<ImpersonateInput, ImpersonateOutput>('impersonate', impersonateInput);
+  }
+
+  backToImpersonator() {
+    return this.post<ImpersonateOutput>('back-to-impersonator');
+  }
+}

projects/craftsjs-app/src/app/@redux/permission/models/permission-store.model.ts

@@ -1,7 +1,8 @@
+import { EntityState } from '@ngrx/entity';
 import { PermissionDto } from './permission-dto.model';
 
-export class PermissionStoreModel {
+export interface PermissionStoreModel extends EntityState<PermissionDto> {
     loading: boolean;
-    permissions: PermissionDto[];
+    total: number;
 }
 

projects/craftsjs-app/src/app/@redux/permission/selectors/permission.selector.ts

@@ -1,12 +1,13 @@
 
 import { createSelector } from '@ngrx/store';
 import { PermissionStoreModel } from '../models/permission-store.model';
+import { selectAll } from '../stores/permission.store';
 
 export const selectPermissionState = state => <PermissionStoreModel>state.permissions.store;
 
 export const selectAllPermissions = createSelector(
     selectPermissionState,
-    store => store.permissions
+    selectAll
 );
 
 export const selectPermissionsLoading = createSelector(

projects/craftsjs-app/src/app/@redux/permission/stores/permission.store.ts

@@ -1,12 +1,17 @@
+import { createEntityAdapter, EntityAdapter } from '@ngrx/entity';
+import { Store, Action } from '@craftsjs/ngrx-action';
 import { PermissionStoreModel } from '../models/permission-store.model';
 import * as PermissionActions from '../actions/permission.actions';
-import { Store, Action } from '@craftsjs/ngrx-action';
+import { PermissionDto } from '../models/permission-dto.model';
 
+export const adapter: EntityAdapter<PermissionDto> = createEntityAdapter<PermissionDto>();
 
-@Store<PermissionStoreModel>({
+const initialState = adapter.getInitialState({
     loading: false,
-    permissions: []
-})
+    total: 0
+});
+
+@Store<PermissionStoreModel>(initialState)
 export class PermissionStore {
 
     @Action(PermissionActions.loadPermissions)
@@ -16,7 +21,15 @@ export class PermissionStore {
 
     @Action(PermissionActions.permissionsLoaded)
     permissionsLoaded(state: PermissionStoreModel, { payload: { permissions } }) {
-        return { ...state, permissions, loading: false };
+        return adapter.upsertMany<PermissionStoreModel>(permissions, {
+            ...state,
+            loading: false,
+            total: permissions.length
+        });
     }
 
 }
+
+export const {
+    selectAll
+} = adapter.getSelectors();

projects/craftsjs-app/src/app/admin/role/component/role-form/role-form.component.ts

@@ -44,7 +44,6 @@ export class RoleFormComponent extends FormBase implements OnInit {
   }
 
   private _initFinalStep() {
-    console.log(this.roleDto.permissions);
     this.formFinalStep = this._fb.group({
       permissions: [this.roleDto.permissions]
     });

projects/craftsjs-app/src/app/admin/tenant/components/tenant-list/tenant-list.component.html

@@ -18,7 +18,7 @@
               <button *ngIf="'Page.Tenants.Delete' | isGranted" mat-icon-button (click)="deleteTenant(tenant)">
                 <mat-icon suffix>delete</mat-icon>
               </button>
-              <button *ngIf="'Page.Tenants.Impersonation' | isGranted" mat-icon-button (click)="openModalImpersonation(tenant.id)"
+              <button mat-icon-button (click)="openModalImpersonation(tenant.id)"
                 [matTooltip]="'tenant.impersonation' | translateAsync" matTooltipPosition="above">
                 <mat-icon suffix>supervisor_account</mat-icon>
               </button>

projects/craftsjs-app/src/app/admin/tenant/components/tenant-list/user-list-impersonation/user-list-impersonation.component.ts

@@ -4,6 +4,9 @@ import { UserDto } from '@redux/user/models/user-dto.model';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { Store } from '@ngrx/store';
 import * as UserActions from '@redux/user/actions/user.actions';
+import { AuthService } from '@craftsjs/boilerplate';
+import { takeUntil } from 'rxjs/operators';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-user-list-impersonation',
@@ -22,7 +25,9 @@ export class UserListImpersonationComponent implements OnDestroy {
   constructor(
     private _dialogRef: MatDialogRef<UserListImpersonationComponent>,
     private _store: Store,
-    @Inject(MAT_DIALOG_DATA) public tenantId: number
+    @Inject(MAT_DIALOG_DATA) public tenantId: string,
+    private _authService: AuthService,
+    private _router: Router
   ) { }
 
   close() {
@@ -31,25 +36,14 @@ export class UserListImpersonationComponent implements OnDestroy {
 
   impersonation(user: UserDto) {
     console.log(user);
-    // this.saveSubject.next(true);
-    // this._accountService.impersonate({ UserId: user.id, tenantId: this.tenantId }).pipe(
-    //   takeUntil(this.unsubscribeAll),
-    //   switchMap((result) => {
-    //     this._authService.setTenantCookie(this.tenantId);
-    //     return this._authService.impersonatedAuthenticate(result.impersonationToken).pipe(
-    //       switchMap(() => {
-    //         return this._sessionService.init().pipe(
-    //           tap(() => {
-    //             this.saveSubject.next(false);
-    //             this.close();
-    //             this._router.navigate(['admin/profile']);
-    //           })
-    //         );
-    //       })
-    //     );
-    //   }
-    //   )
-    // ).subscribe();
+    this.saveSubject.next(true);
+    this._authService.impersonatedAuthenticate({ userId: user.id, tenantImpersonationId: this.tenantId }).pipe(
+      takeUntil(this.unsubscribeAll)
+    ).subscribe(() => {
+      this.saveSubject.next(false);
+      this.close();
+      this._router.navigate(['admin/profile']);
+    });
   }
 
   ngOnDestroy(): void {

projects/craftsjs-app/src/app/admin/user/components/user-list/user-list.component.ts

@@ -1,4 +1,4 @@
-import { Component, ChangeDetectionStrategy, Input, ContentChild, TemplateRef } from '@angular/core';
+import { Component, ChangeDetectionStrategy, Input, ContentChild, TemplateRef, OnInit } from '@angular/core';
 import { UserDataSourceService } from '../../services/user-data-source.service';
 import { GetUserDto } from '@redux/user/models/get-user-dto.model';
 import { Store } from '@ngrx/store';
@@ -17,7 +17,7 @@ import { ListComponentBase } from '../../../../shared/list/list-component-base';
     UserActionService
   ]
 })
-export class UserListComponent extends ListComponentBase<GetUserDto> {
+export class UserListComponent extends ListComponentBase<GetUserDto> implements OnInit {
 
   @ContentChild(TemplateRef, { static: true }) templateRef: TemplateRef<any>;
 
@@ -36,7 +36,19 @@ export class UserListComponent extends ListComponentBase<GetUserDto> {
     this.displayedColumns = userDataSourceService.displayedColumns;
   }
 
+  ngOnInit() {
+    if(this.tenantId !== undefined) {
+      const filter = Object.assign({}, this.filter.getValue(), {tenantId: this.tenantId});
+      this.filter.next({ ...filter });
+    }
+    super.ngOnInit()
+  }
+
   search(filter: GetUserDto) {
+    if(this.tenantId !== undefined) {
+      const filter = Object.assign({}, this.filter.getValue(), {tenantId: this.tenantId});
+      this.filter.next({ ...filter });
+    }
     this.filter.next({ ...filter });
     this._store.dispatch(UserActions.userClearStore());
   }