Skip to content

Commit 4ffd177

Browse files
committed
[NAE-1678] User impersonation
- changes based on PR comments
1 parent 2c054b7 commit 4ffd177

File tree

8 files changed

+14
-9
lines changed

8 files changed

+14
-9
lines changed

projects/netgrif-components-core/src/assets/i18n/de.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,9 +466,9 @@
466466
},
467467
"impersonation": {
468468
"user": {
469-
"successfullyRepresented": "Benutzer erfolgreich vertreten",
470-
"currentlyAlreadyRepresented": "Benutzer ist bereits aktuell vertreten",
471-
"currentlyLogged": "Benutzer ist derzeit angemeldet"
469+
"successfullyRepresented": "Benutzer wird jetzt vertreten",
470+
"currentlyAlreadyRepresented": "Für den Benutzer existiert bereits eine Vertretung",
471+
"currentlyLogged": "Benutzer ist bereits angemeldet"
472472
},
473473
"action": {
474474
"failed": "Aktion ist fehlgeschlagen",

projects/netgrif-components-core/src/lib/authentication/public-api.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ export * from './authentication.factory';
1212

1313
/* SERVICES */
1414
export * from './anonymous/anonymous.service';
15+
export * from './services/anonymous-authentication-interceptor'
16+
export * from './services/authentication-interceptor'
1517

1618
/* COMPONENTS */
1719
export * from './components/abstract-authentication-overlay';

projects/netgrif-components-core/src/lib/impersonation/services/impersonation-user-resource.service.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ export class ImpersonationUserResourceService extends UserResourceService {
1515

1616
protected _IMPERSONATION_SERVER_URL: string;
1717

18-
constructor(protected provider: ResourceProvider, protected _configService: ConfigurationService) {
19-
super(provider, _configService);
18+
constructor(provider: ResourceProvider, configService: ConfigurationService) {
19+
super(provider, configService);
2020
this._IMPERSONATION_SERVER_URL = this.getResourceAddress('impersonation');
2121
}
2222

2323
public search(body: {fulltext: string}, params?: Params): Observable<Page<UserResource>> {
24-
return this.provider.post$('/impersonate/search', this._IMPERSONATION_SERVER_URL, {query: body.fulltext}, params)
24+
return this._resourceProvider.post$('/impersonate/search', this._IMPERSONATION_SERVER_URL, {query: body.fulltext}, params)
2525
.pipe(map((r) => this.getResourcePage<UserResource>(r, 'users')));
2626
}
2727
}

projects/netgrif-components-core/src/lib/side-menu/content-components/user-impersonate/abstract-user-impersonate.component.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {SideMenuControl} from '../../models/side-menu-control';
22
import {Component, Inject} from '@angular/core';
33
import {NAE_SIDE_MENU_CONTROL} from '../../side-menu-injection-token';
4-
import {LoggerService} from '../../../logger/services/logger.service';
54
import {CaseViewService} from '../../../view/case-view/service/case-view-service';
65
import {Case} from '../../../resources/interface/case';
76
import {AbstractCaseViewComponent} from '../../../view/case-view/abstract-case-view';
@@ -17,7 +16,6 @@ export abstract class AbstractUserImpersonateComponent extends AbstractCaseViewC
1716
protected _injectedData: UserImpersonateInjectionData;
1817

1918
protected constructor(@Inject(NAE_SIDE_MENU_CONTROL) protected _sideMenuControl: SideMenuControl,
20-
protected _log: LoggerService,
2119
caseViewService: CaseViewService) {
2220
super(caseViewService);
2321
if (this._sideMenuControl.data) {

projects/netgrif-components/src/lib/side-menu/content-components/load-filter/load-filter.component.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// TODO TEST 30.9.2022
12
// import {ComponentFixture, TestBed} from '@angular/core/testing';
23
// import {LoadFilterComponent} from './load-filter.component';
34
// import {

projects/netgrif-components/src/lib/side-menu/content-components/side-menu-content-component.module.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ import {
2525
} from './admin-impersonate/side-menu-admin-impersonate-component.module';
2626
import {AdminImpersonateComponent} from './admin-impersonate/admin-impersonate.component';
2727
import {UserImpersonateComponent} from './user-impersonate/user-impersonate.component';
28+
import {SideMenuUserImpersonateComponentModule} from './user-impersonate/side-menu-user-impersonate-component.module';
2829

2930

3031
@NgModule({
3132
imports: [
3233
CommonModule,
3334
SideMenuUserAssignComponentModule,
3435
SideMenuAdminImpersonateComponentModule,
36+
SideMenuUserImpersonateComponentModule,
3537
SideMenuNewCaseComponentModule,
3638
SideMenuImportNetComponentModule,
3739
SideMenuFilterSelectorComponentModule,
@@ -42,6 +44,7 @@ import {UserImpersonateComponent} from './user-impersonate/user-impersonate.comp
4244
exports: [
4345
SideMenuUserAssignComponentModule,
4446
SideMenuAdminImpersonateComponentModule,
47+
SideMenuUserImpersonateComponentModule,
4548
SideMenuNewCaseComponentModule,
4649
SideMenuImportNetComponentModule,
4750
SideMenuFilterSelectorComponentModule,

projects/netgrif-components/src/lib/side-menu/content-components/user-impersonate/user-impersonate.component.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// TODO TEST 30.9.2022
12
// import {ComponentFixture, TestBed} from '@angular/core/testing';
23
//
34
// import {UserImpersonateComponent} from './user-impersonate.component';

projects/netgrif-components/src/lib/side-menu/content-components/user-impersonate/user-impersonate.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export class UserImpersonateComponent extends AbstractUserImpersonateComponent i
5757
constructor(@Inject(NAE_SIDE_MENU_CONTROL) sideMenuControl: SideMenuControl,
5858
log: LoggerService,
5959
caseViewService: CaseViewService) {
60-
super(sideMenuControl, log, caseViewService);
60+
super(sideMenuControl, caseViewService);
6161
}
6262

6363
ngAfterViewInit(): void {

0 commit comments

Comments
 (0)