diff --git a/feature-libs/organization/administration/components/user/details/user-details.component.ts b/feature-libs/organization/administration/components/user/details/user-details.component.ts index db3fd7b3dc5..2e1de7db41c 100644 --- a/feature-libs/organization/administration/components/user/details/user-details.component.ts +++ b/feature-libs/organization/administration/components/user/details/user-details.component.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Injector } from '@angular/core'; import { B2BUser, B2BUserRole, B2BUserRight } from '@spartacus/core'; import { Observable, Subscription } from 'rxjs'; import { startWith, switchMap } from 'rxjs/operators'; @@ -43,8 +43,13 @@ export class UserDetailsComponent { constructor( protected itemService: ItemService, - protected b2bUserService: B2BUserService - ) {} + protected b2bUserService: B2BUserService, + protected injector: Injector + ) { + console.log({ + UserDetailsComponent: this, + }); + } hasRight(model: B2BUser): boolean { return (model.roles ?? []).some((role: string) => diff --git a/feature-libs/organization/administration/core/guards/user.guard.ts b/feature-libs/organization/administration/core/guards/user.guard.ts index ac5a0d7ba03..3719495f759 100644 --- a/feature-libs/organization/administration/core/guards/user.guard.ts +++ b/feature-libs/organization/administration/core/guards/user.guard.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Injectable } from '@angular/core'; +import { Injectable, Injector } from '@angular/core'; import { Router, UrlTree } from '@angular/router'; import { GlobalMessageService, @@ -13,14 +13,23 @@ import { } from '@spartacus/core'; import { B2BUserService } from '../services'; +let UserGuard_count = 0; + @Injectable() export class UserGuard { + UserGuard_count = ++UserGuard_count; + constructor( protected globalMessageService: GlobalMessageService, protected b2bUserService: B2BUserService, protected semanticPathService: SemanticPathService, - protected router: Router - ) {} + protected router: Router, + protected injector: Injector + ) { + console.log({ + UserGuard: this, + }); + } canActivate(): boolean | UrlTree { const isUpdatingUserAllowed = this.b2bUserService.isUpdatingUserAllowed(); diff --git a/feature-libs/organization/administration/core/services/b2b-user.service.ts b/feature-libs/organization/administration/core/services/b2b-user.service.ts index c6551298d34..2e062ecd593 100644 --- a/feature-libs/organization/administration/core/services/b2b-user.service.ts +++ b/feature-libs/organization/administration/core/services/b2b-user.service.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Injectable } from '@angular/core'; +import { Injectable, Injector } from '@angular/core'; import { Store } from '@ngrx/store'; import { B2BUser, @@ -32,12 +32,21 @@ import { } from '../store/selectors/b2b-user.selector'; import { getItemStatus } from '../utils/get-item-status'; +let B2BUserService_count = 0; + @Injectable({ providedIn: 'root' }) export class B2BUserService { + B2BUserService_count = ++B2BUserService_count; + constructor( protected store: Store, - protected userIdService: UserIdService - ) {} + protected userIdService: UserIdService, + protected injector: Injector + ) { + console.log({ + B2BUserService: this, + }); + } load(orgCustomerId: string) { this.userIdService.takeUserId(true).subscribe({ diff --git a/integration-libs/cdc/organization/administration/cdc-b2b-user.service.ts b/integration-libs/cdc/organization/administration/cdc-b2b-user.service.ts index 91c9a949319..2f476ff3625 100644 --- a/integration-libs/cdc/organization/administration/cdc-b2b-user.service.ts +++ b/integration-libs/cdc/organization/administration/cdc-b2b-user.service.ts @@ -4,12 +4,33 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Injectable } from '@angular/core'; -import { B2BUserService } from '@spartacus/organization/administration/core'; +import { Injectable, Injector } from '@angular/core'; +import { Store } from '@ngrx/store'; +import { UserIdService } from '@spartacus/core'; +import { + B2BUserService, + StateWithOrganization, +} from '@spartacus/organization/administration/core'; + +let CDC_B2BUserService_count = 0; + @Injectable({ providedIn: 'root', }) export class CdcB2BUserService extends B2BUserService { + CDC_B2BUserService_count = ++CDC_B2BUserService_count; + + constructor( + protected store: Store, + protected userIdService: UserIdService, + protected injector: Injector + ) { + super(store, userIdService, injector); + console.log({ + CdcB2BUserService: this, + }); + } + isUpdatingUserAllowed(): boolean { return false; }