@cleavelandprice/ngx-lib 3.7.2 → 3.7.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/authentication/model/authentication-request.d.ts +2 -0
- package/authentication/model/service-config.d.ts +2 -1
- package/authentication/object/model/service-config.d.ts +1 -1
- package/authentication/object/services/authentication.service.d.ts +1 -1
- package/authentication/token/gui/components/login/login.component.d.ts +2 -1
- package/authentication/token/gui/components/login-form/login-form.component.d.ts +1 -0
- package/authentication/token/gui/model/login-form-data.d.ts +1 -0
- package/authentication/token/gui/model/service-config.d.ts +1 -1
- package/authentication/token/model/service-config.d.ts +1 -1
- package/authentication/token/services/authentication.service.d.ts +1 -1
- package/esm2020/authentication/model/authentication-request.mjs +1 -1
- package/esm2020/authentication/model/service-config.mjs +3 -2
- package/esm2020/authentication/object/model/service-config.mjs +3 -3
- package/esm2020/authentication/object/services/authentication.service.mjs +7 -5
- package/esm2020/authentication/token/gui/components/login/login.component.mjs +8 -3
- package/esm2020/authentication/token/gui/components/login-form/login-form.component.mjs +6 -4
- package/esm2020/authentication/token/gui/model/login-form-data.mjs +1 -1
- package/esm2020/authentication/token/gui/model/service-config.mjs +3 -3
- package/esm2020/authentication/token/model/service-config.mjs +3 -3
- package/esm2020/authentication/token/services/authentication.service.mjs +7 -5
- package/fesm2015/cleavelandprice-ngx-lib-authentication-object.mjs +8 -6
- package/fesm2015/cleavelandprice-ngx-lib-authentication-object.mjs.map +1 -1
- package/fesm2015/cleavelandprice-ngx-lib-authentication-token-gui.mjs +15 -8
- package/fesm2015/cleavelandprice-ngx-lib-authentication-token-gui.mjs.map +1 -1
- package/fesm2015/cleavelandprice-ngx-lib-authentication-token.mjs +8 -6
- package/fesm2015/cleavelandprice-ngx-lib-authentication-token.mjs.map +1 -1
- package/fesm2015/cleavelandprice-ngx-lib-authentication.mjs +2 -1
- package/fesm2015/cleavelandprice-ngx-lib-authentication.mjs.map +1 -1
- package/fesm2015/cleavelandprice-ngx-lib-dialog.mjs +1 -0
- package/fesm2020/cleavelandprice-ngx-lib-authentication-object.mjs +8 -6
- package/fesm2020/cleavelandprice-ngx-lib-authentication-object.mjs.map +1 -1
- package/fesm2020/cleavelandprice-ngx-lib-authentication-token-gui.mjs +14 -7
- package/fesm2020/cleavelandprice-ngx-lib-authentication-token-gui.mjs.map +1 -1
- package/fesm2020/cleavelandprice-ngx-lib-authentication-token.mjs +8 -6
- package/fesm2020/cleavelandprice-ngx-lib-authentication-token.mjs.map +1 -1
- package/fesm2020/cleavelandprice-ngx-lib-authentication.mjs +2 -1
- package/fesm2020/cleavelandprice-ngx-lib-authentication.mjs.map +1 -1
- package/fesm2020/cleavelandprice-ngx-lib-dialog.mjs +1 -0
- package/package.json +1 -1
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { ServiceConfig as NgxLibServiceConfig } from '@cleavelandprice/ngx-lib';
|
|
2
2
|
export declare class ServiceConfig extends NgxLibServiceConfig {
|
|
3
|
+
appName: string | undefined;
|
|
3
4
|
tokenName: string;
|
|
4
5
|
authenticateEndpoint: string;
|
|
5
|
-
constructor(useSsl_or_customApiUrl
|
|
6
|
+
constructor(useSsl_or_customApiUrl: string | boolean | undefined, appName: string | undefined, tokenName?: string, // The name used as the Key of the item saved in the browser's LocalStorage
|
|
6
7
|
authenticateEndpoint?: string);
|
|
7
8
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { ServiceConfig as BaseServiceConfig } from '@cleavelandprice/ngx-lib/authentication';
|
|
2
2
|
export declare class ServiceConfig extends BaseServiceConfig {
|
|
3
|
-
constructor(useSsl_or_customApiUrl?: boolean | string, tokenName?: string, authenticateEndpoint?: string);
|
|
3
|
+
constructor(useSsl_or_customApiUrl?: boolean | string, appName?: string | undefined, tokenName?: string, authenticateEndpoint?: string);
|
|
4
4
|
}
|
|
@@ -16,7 +16,7 @@ export declare class AuthenticationService implements AbstractAuthenticationServ
|
|
|
16
16
|
get useSessionStorage(): boolean;
|
|
17
17
|
get storage(): Storage;
|
|
18
18
|
constructor(config: ServiceConfig, http: HttpClient);
|
|
19
|
-
login(username: string, password: string, adminGroup?: string): void;
|
|
19
|
+
login(username: string, password: string, adminGroup?: string, additionalInfo?: string): void;
|
|
20
20
|
logout(): void;
|
|
21
21
|
validateUser(token: User): void;
|
|
22
22
|
checkForExistingToken(): void;
|
|
@@ -5,9 +5,10 @@ export declare class LoginComponent {
|
|
|
5
5
|
private dialog;
|
|
6
6
|
authenticationService: AuthenticationService;
|
|
7
7
|
adminGroup: string;
|
|
8
|
+
additionalInfo: string;
|
|
8
9
|
constructor(dialog: MatDialog, authenticationService: AuthenticationService);
|
|
9
10
|
login(): void;
|
|
10
11
|
confirmLogout(): void;
|
|
11
12
|
static ɵfac: i0.ɵɵFactoryDeclaration<LoginComponent, never>;
|
|
12
|
-
static ɵcmp: i0.ɵɵComponentDeclaration<LoginComponent, "cp-login", never, { "adminGroup": "adminGroup"; }, {}, never, never, false, never>;
|
|
13
|
+
static ɵcmp: i0.ɵɵComponentDeclaration<LoginComponent, "cp-login", never, { "adminGroup": "adminGroup"; "additionalInfo": "additionalInfo"; }, {}, never, never, false, never>;
|
|
13
14
|
}
|
|
@@ -15,6 +15,7 @@ export declare class LoginFormComponent implements OnInit, OnDestroy {
|
|
|
15
15
|
username: FormControl<null>;
|
|
16
16
|
password: FormControl<null>;
|
|
17
17
|
adminGroup: FormControl<any>;
|
|
18
|
+
additionalInfo: FormControl<any>;
|
|
18
19
|
}>;
|
|
19
20
|
constructor(data: LoginFormData, dialogRef: MatDialogRef<LoginFormComponent>, authenticationService: AuthenticationService);
|
|
20
21
|
ngOnInit(): void;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ServiceConfig as BaseServiceConfig } from '@cleavelandprice/ngx-lib/authentication/token';
|
|
2
2
|
export declare class ServiceConfig extends BaseServiceConfig {
|
|
3
3
|
showRememberMeOption: boolean;
|
|
4
|
-
constructor(useSsl_or_customApiUrl?: boolean | string, showRememberMeOption?: boolean, tokenName?: string, authenticateEndpoint?: string);
|
|
4
|
+
constructor(useSsl_or_customApiUrl?: boolean | string, showRememberMeOption?: boolean, appName?: string | undefined, tokenName?: string, authenticateEndpoint?: string);
|
|
5
5
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ServiceConfig as BaseServiceConfig } from '@cleavelandprice/ngx-lib/authentication';
|
|
2
2
|
export declare class ServiceConfig extends BaseServiceConfig {
|
|
3
3
|
deferTokenValidation: boolean;
|
|
4
|
-
constructor(useSsl_or_customApiUrl?: boolean | string, tokenName?: string, authenticateEndpoint?: string);
|
|
4
|
+
constructor(useSsl_or_customApiUrl?: boolean | string, appName?: string | undefined, tokenName?: string, authenticateEndpoint?: string);
|
|
5
5
|
}
|
|
@@ -15,7 +15,7 @@ export declare class AuthenticationService implements AbstractAuthenticationServ
|
|
|
15
15
|
get useSessionStorage(): boolean;
|
|
16
16
|
get storage(): Storage;
|
|
17
17
|
constructor(config: ServiceConfig, http: HttpClient);
|
|
18
|
-
login(username: string, password: string, adminGroup?: string): void;
|
|
18
|
+
login(username: string, password: string, adminGroup?: string, additionalInfo?: string): void;
|
|
19
19
|
logout(): void;
|
|
20
20
|
validateUser(token: string): void;
|
|
21
21
|
checkForExistingToken(): void;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aGVudGljYXRpb24tcmVxdWVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2NsZWF2ZWxhbmRwcmljZS9uZ3gtbGliL2F1dGhlbnRpY2F0aW9uL3NyYy9tb2RlbC9hdXRoZW50aWNhdGlvbi1yZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgaW50ZXJmYWNlIEF1dGhlbnRpY2F0aW9uUmVxdWVzdCB7XHJcbiAgICB1c2VybmFtZTogc3RyaW5nO1xyXG4gICAgcGFzc3dvcmQ6IHN0cmluZztcclxuICAgIGFkbWluR3JvdXA/
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aGVudGljYXRpb24tcmVxdWVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2NsZWF2ZWxhbmRwcmljZS9uZ3gtbGliL2F1dGhlbnRpY2F0aW9uL3NyYy9tb2RlbC9hdXRoZW50aWNhdGlvbi1yZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgaW50ZXJmYWNlIEF1dGhlbnRpY2F0aW9uUmVxdWVzdCB7XHJcbiAgICB1c2VybmFtZTogc3RyaW5nO1xyXG4gICAgcGFzc3dvcmQ6IHN0cmluZztcclxuICAgIGFkbWluR3JvdXA/OiBzdHJpbmc7XHJcbiAgICBpbmNsdWRlVGh1bWJuYWlsPzogYm9vbGVhbjtcclxuICAgIGFwcE5hbWU/OiBzdHJpbmc7XHJcbiAgICBhZGRpdGlvbmFsSW5mbz86IHN0cmluZztcclxufVxyXG4iXX0=
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { ServiceConfig as NgxLibServiceConfig } from '@cleavelandprice/ngx-lib';
|
|
2
2
|
export class ServiceConfig extends NgxLibServiceConfig {
|
|
3
3
|
// See the comment in the library's main service-config.ts file for an explanation
|
|
4
|
-
constructor(useSsl_or_customApiUrl = false, tokenName = 'token', // The name used as the Key of the item saved in the browser's LocalStorage
|
|
4
|
+
constructor(useSsl_or_customApiUrl = false, appName, tokenName = 'token', // The name used as the Key of the item saved in the browser's LocalStorage
|
|
5
5
|
authenticateEndpoint = '/authenticate/token') {
|
|
6
6
|
super(useSsl_or_customApiUrl);
|
|
7
|
+
this.appName = appName;
|
|
7
8
|
this.tokenName = tokenName;
|
|
8
9
|
this.authenticateEndpoint = authenticateEndpoint;
|
|
9
10
|
}
|
|
10
11
|
}
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS1jb25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9jbGVhdmVsYW5kcHJpY2Uvbmd4LWxpYi9hdXRoZW50aWNhdGlvbi9zcmMvbW9kZWwvc2VydmljZS1jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsSUFBSSxtQkFBbUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRWhGLE1BQU0sT0FBTyxhQUFjLFNBQVEsbUJBQW1CO0lBQ2xELGtGQUFrRjtJQUNsRixZQUFZLHlCQUEyQyxLQUFLLEVBQ2pELE9BQTJCLEVBQzNCLFlBQVksT0FBTyxFQUFFLDJFQUEyRTtJQUNoRyx1QkFBdUIscUJBQXFCO1FBRW5ELEtBQUssQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO1FBSnZCLFlBQU8sR0FBUCxPQUFPLENBQW9CO1FBQzNCLGNBQVMsR0FBVCxTQUFTLENBQVU7UUFDbkIseUJBQW9CLEdBQXBCLG9CQUFvQixDQUF3QjtJQUd2RCxDQUFDO0NBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBTZXJ2aWNlQ29uZmlnIGFzIE5neExpYlNlcnZpY2VDb25maWcgfSBmcm9tICdAY2xlYXZlbGFuZHByaWNlL25neC1saWInO1xyXG5cclxuZXhwb3J0IGNsYXNzIFNlcnZpY2VDb25maWcgZXh0ZW5kcyBOZ3hMaWJTZXJ2aWNlQ29uZmlnIHtcclxuICAgIC8vIFNlZSB0aGUgY29tbWVudCBpbiB0aGUgbGlicmFyeSdzIG1haW4gc2VydmljZS1jb25maWcudHMgZmlsZSBmb3IgYW4gZXhwbGFuYXRpb25cclxuICAgIGNvbnN0cnVjdG9yKHVzZVNzbF9vcl9jdXN0b21BcGlVcmw6IGJvb2xlYW4gfCBzdHJpbmcgPSBmYWxzZSxcclxuICAgICAgICBwdWJsaWMgYXBwTmFtZTogc3RyaW5nIHwgdW5kZWZpbmVkLFxyXG4gICAgICAgIHB1YmxpYyB0b2tlbk5hbWUgPSAndG9rZW4nLCAvLyBUaGUgbmFtZSB1c2VkIGFzIHRoZSBLZXkgb2YgdGhlIGl0ZW0gc2F2ZWQgaW4gdGhlIGJyb3dzZXIncyBMb2NhbFN0b3JhZ2VcclxuICAgICAgICBwdWJsaWMgYXV0aGVudGljYXRlRW5kcG9pbnQgPSAnL2F1dGhlbnRpY2F0ZS90b2tlbidcclxuICAgICAgICApIHtcclxuICAgICAgICBzdXBlcih1c2VTc2xfb3JfY3VzdG9tQXBpVXJsKTtcclxuICAgIH1cclxufSJdfQ==
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
import { ServiceConfig as BaseServiceConfig } from '@cleavelandprice/ngx-lib/authentication';
|
|
3
3
|
export class ServiceConfig extends BaseServiceConfig {
|
|
4
4
|
// See the comment in the library's main service-config.ts file for an explanation
|
|
5
|
-
constructor(useSsl_or_customApiUrl = false, tokenName = 'user', authenticateEndpoint = '/authenticate') {
|
|
6
|
-
super(useSsl_or_customApiUrl, tokenName, authenticateEndpoint);
|
|
5
|
+
constructor(useSsl_or_customApiUrl = false, appName = undefined, tokenName = 'user', authenticateEndpoint = '/authenticate') {
|
|
6
|
+
super(useSsl_or_customApiUrl, appName, tokenName, authenticateEndpoint);
|
|
7
7
|
}
|
|
8
8
|
}
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS1jb25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9jbGVhdmVsYW5kcHJpY2Uvbmd4LWxpYi9hdXRoZW50aWNhdGlvbi9vYmplY3Qvc3JjL21vZGVsL3NlcnZpY2UtY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGtGQUFrRjtBQUNsRixPQUFPLEVBQUUsYUFBYSxJQUFJLGlCQUFpQixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFFN0YsTUFBTSxPQUFPLGFBQWMsU0FBUSxpQkFBaUI7SUFFaEQsa0ZBQWtGO0lBQ2xGLFlBQVkseUJBQTJDLEtBQUssRUFDeEQsVUFBOEIsU0FBUyxFQUN2QyxTQUFTLEdBQUcsTUFBTSxFQUNsQixvQkFBb0IsR0FBRyxlQUFlO1FBRXRDLEtBQUssQ0FBQyxzQkFBc0IsRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLG9CQUFvQixDQUFDLENBQUM7SUFDNUUsQ0FBQztDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiLy9pbXBvcnQgeyBTZXJ2aWNlQ29uZmlnIGFzIE5neExpYlNlcnZpY2VDb25maWcgfSBmcm9tICdAY2xlYXZlbGFuZHByaWNlL25neC1saWInO1xyXG5pbXBvcnQgeyBTZXJ2aWNlQ29uZmlnIGFzIEJhc2VTZXJ2aWNlQ29uZmlnIH0gZnJvbSAnQGNsZWF2ZWxhbmRwcmljZS9uZ3gtbGliL2F1dGhlbnRpY2F0aW9uJztcclxuXHJcbmV4cG9ydCBjbGFzcyBTZXJ2aWNlQ29uZmlnIGV4dGVuZHMgQmFzZVNlcnZpY2VDb25maWcge1xyXG4gICAgXHJcbiAgICAvLyBTZWUgdGhlIGNvbW1lbnQgaW4gdGhlIGxpYnJhcnkncyBtYWluIHNlcnZpY2UtY29uZmlnLnRzIGZpbGUgZm9yIGFuIGV4cGxhbmF0aW9uXHJcbiAgICBjb25zdHJ1Y3Rvcih1c2VTc2xfb3JfY3VzdG9tQXBpVXJsOiBib29sZWFuIHwgc3RyaW5nID0gZmFsc2UsXHJcbiAgICAgICAgYXBwTmFtZTogc3RyaW5nIHwgdW5kZWZpbmVkID0gdW5kZWZpbmVkLFxyXG4gICAgICAgIHRva2VuTmFtZSA9ICd1c2VyJyxcclxuICAgICAgICBhdXRoZW50aWNhdGVFbmRwb2ludCA9ICcvYXV0aGVudGljYXRlJ1xyXG4gICAgICAgICkge1xyXG4gICAgICAgIHN1cGVyKHVzZVNzbF9vcl9jdXN0b21BcGlVcmwsIGFwcE5hbWUsIHRva2VuTmFtZSwgYXV0aGVudGljYXRlRW5kcG9pbnQpO1xyXG4gICAgfVxyXG59Il19
|
|
@@ -31,11 +31,13 @@ export class AuthenticationService {
|
|
|
31
31
|
//#endregion
|
|
32
32
|
//#region Utilities
|
|
33
33
|
//Authenticate the user and store the token in Local Storage
|
|
34
|
-
login(username, password, adminGroup) {
|
|
34
|
+
login(username, password, adminGroup, additionalInfo) {
|
|
35
35
|
const request = {
|
|
36
|
-
username
|
|
37
|
-
password
|
|
38
|
-
adminGroup
|
|
36
|
+
username,
|
|
37
|
+
password,
|
|
38
|
+
adminGroup,
|
|
39
|
+
additionalInfo,
|
|
40
|
+
appName: this.config.appName
|
|
39
41
|
};
|
|
40
42
|
this.authenticating = true;
|
|
41
43
|
this.authenticatingChanged.emit(this.authenticating);
|
|
@@ -103,4 +105,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.4", ngImpor
|
|
|
103
105
|
}], authenticationError: [{
|
|
104
106
|
type: Output
|
|
105
107
|
}] } });
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../../../../../../projects/cleavelandprice/ngx-lib/authentication/object/src/services/authentication.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { EventEmitter, Injectable, Optional, Output } from '@angular/core';\r\nimport { HttpClient } from '@angular/common/http';\r\n\r\nimport { User } from '@cleavelandprice/ngx-lib/active-directory';\r\n\r\nimport {\r\n  AbstractAuthenticationService,\r\n  AuthenticatedUser,\r\n  AuthenticationRequest\r\n} from '@cleavelandprice/ngx-lib/authentication';\r\n\r\nimport { ServiceConfig } from '../model/service-config';\r\n\r\n@Injectable({\r\n  providedIn: 'root'\r\n})\r\nexport class AuthenticationService implements AbstractAuthenticationService {\r\n  //#region Fields\r\n  @Output() authenticatedChanged = new EventEmitter<boolean>();\r\n  @Output() authenticatingChanged = new EventEmitter<boolean>();\r\n  @Output() authenticationError = new EventEmitter();\r\n  authenticating = false; // Flag set to true while the service is attempting to authenticate the user\r\n  authenticated = false; // Flag set to true when the user is successfully authenticated\r\n  authenticatedUser: AuthenticatedUser | undefined; // Object representing the authenticated user\r\n  //#endregion\r\n\r\n  //#region Properties\r\n  get useSessionStorage(): boolean {\r\n    return !!localStorage.getItem('storeTokenInSession');\r\n  }\r\n\r\n  get storage(): Storage {\r\n    return this.useSessionStorage ?\r\n      sessionStorage:\r\n      localStorage;\r\n  }\r\n  //#endregion\r\n\r\n  //#region Lifecycle\r\n    constructor(@Optional() private config: ServiceConfig,\r\n              private http: HttpClient) {\r\n\r\n                this.config = this.config ?? new ServiceConfig();\r\n                \r\n                this.checkForExistingToken();\r\n  }\r\n  //#endregion\r\n\r\n  //#region Utilities\r\n  //Authenticate the user and store the token in Local Storage\r\n  login(username: string, password: string, adminGroup?: string, additionalInfo?: string): void {\r\n    const request: AuthenticationRequest = {\r\n      username,\r\n      password,\r\n      adminGroup,\r\n      additionalInfo,\r\n      appName: this.config.appName\r\n    };\r\n\r\n    this.authenticating = true;\r\n    this.authenticatingChanged.emit(this.authenticating);\r\n\r\n    this.http.post(`${this.config.apiUrl}${this.config.authenticateEndpoint}`, request)\r\n      .subscribe({\r\n        next: (user) => {\r\n          if (user) {\r\n            this.validateUser(user as User);\r\n          } else {\r\n            this.logout();\r\n          }\r\n        },\r\n        error: (err) => {\r\n          this.authenticating = false;\r\n          this.authenticatingChanged.emit(this.authenticating);\r\n          this.authenticationError.emit(err);\r\n        }\r\n      });\r\n  }\r\n \r\n  //Logout the user and delete the token from Local Storage\r\n  logout(): void {\r\n    if (this.storage.getItem(this.config.tokenName)) {\r\n      this.storage.removeItem(this.config.tokenName);\r\n    }\r\n\r\n    this.authenticatedUser = undefined;\r\n    this.authenticated = false;\r\n    this.authenticatedChanged.emit(false);\r\n  }\r\n \r\n  validateUser(token: User): void {\r\n    this.authenticatedUser = {\r\n      admin: false, // This type of authentication has no concept of Admin\r\n      displayName: token.displayName,\r\n      accountName: token.sAMAccountName,\r\n      distinguishedName: token.distinguishedName,\r\n      employeeNumber: token.employeeNumber,\r\n      memberOf: token.memberOf.join(',')\r\n    };\r\n\r\n    this.storage.setItem(this.config.tokenName, JSON.stringify(token));\r\n    \r\n    this.authenticated = true;\r\n    this.authenticatedChanged.emit(this.authenticated);\r\n\r\n    this.authenticating = false;\r\n    this.authenticatingChanged.emit(this.authenticating);\r\n  }\r\n\r\n  checkForExistingToken(): void {\r\n    const token = this.storage.getItem(this.config.tokenName);\r\n    if (token) {\r\n      this.validateUser(JSON.parse(token) as User);\r\n    }\r\n  }\r\n  //#endregion\r\n}\r\n "]}
|
|
@@ -13,7 +13,10 @@ export class LoginComponent {
|
|
|
13
13
|
}
|
|
14
14
|
login() {
|
|
15
15
|
this.dialog.open(LoginFormComponent, {
|
|
16
|
-
data: {
|
|
16
|
+
data: {
|
|
17
|
+
adminGroup: this.adminGroup,
|
|
18
|
+
additionalInfo: this.additionalInfo
|
|
19
|
+
}
|
|
17
20
|
});
|
|
18
21
|
}
|
|
19
22
|
confirmLogout() {
|
|
@@ -29,11 +32,13 @@ export class LoginComponent {
|
|
|
29
32
|
}
|
|
30
33
|
}
|
|
31
34
|
LoginComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: LoginComponent, deps: [{ token: i1.MatDialog }, { token: i2.AuthenticationService }], target: i0.ɵɵFactoryTarget.Component });
|
|
32
|
-
LoginComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.0.4", type: LoginComponent, selector: "cp-login", inputs: { adminGroup: "adminGroup" }, ngImport: i0, template: "<div id=\"user-id\">\r\n <!-- Logged out -->\r\n <mat-icon *ngIf=\"!authenticationService.authenticated\"\r\n fontIcon=\"account_circle\"\r\n matTooltip=\"Login\"\r\n (click)=\"login()\">\r\n </mat-icon>\r\n\r\n <!-- Logged in -->\r\n <ng-container *ngIf=\"authenticationService.authenticated\">\r\n <!-- With photo -->\r\n <img *ngIf=\"authenticationService.authenticatedUser?.photoUrl\"\r\n id=\"authenticated-user-image\"\r\n [src]=\"authenticationService.authenticatedUser?.photoUrl\"\r\n matTooltip=\"Logout\"\r\n (click)=\"confirmLogout()\" />\r\n \r\n <!-- Without photo -->\r\n <mat-icon *ngIf=\"!authenticationService.authenticatedUser?.photoUrl\"\r\n fontIcon=\"account_circle\"\r\n matTooltip=\"Logout\"\r\n (click)=\"confirmLogout()\">\r\n </mat-icon>\r\n \r\n <!-- Name -->\r\n <div id=\"user-name\">\r\n {{ authenticationService.authenticatedUser?.displayName }}\r\n </div>\r\n </ng-container>\r\n</div>", styles: ["#user-id{display:flex;height:2em;padding:.3em;font-family:Verdana,Geneva,Tahoma,sans-serif}mat-icon{font-size:2em!important;height:2em!important;width:2em!important}img{border-radius:100%;width:2em;height:2em}#user-id>div{display:flex;align-items:center;height:100%;margin-left:.75em;font-size:1.15em}\n", ".material-icons{font-family:Material Icons;font-weight:400;font-style:normal;font-size:24px;display:inline-block;line-height:1;text-transform:none;letter-spacing:normal;word-wrap:normal;white-space:nowrap;direction:ltr;-webkit-font-smoothing:antialiased;text-rendering:optimizeLegibility;-moz-osx-font-smoothing:grayscale;font-feature-settings:\"liga\"}\n"], dependencies: [{ kind: "directive", type: i3.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: i4.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }] });
|
|
35
|
+
LoginComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.0.4", type: LoginComponent, selector: "cp-login", inputs: { adminGroup: "adminGroup", additionalInfo: "additionalInfo" }, ngImport: i0, template: "<div id=\"user-id\">\r\n <!-- Logged out -->\r\n <mat-icon *ngIf=\"!authenticationService.authenticated\"\r\n fontIcon=\"account_circle\"\r\n matTooltip=\"Login\"\r\n (click)=\"login()\">\r\n </mat-icon>\r\n\r\n <!-- Logged in -->\r\n <ng-container *ngIf=\"authenticationService.authenticated\">\r\n <!-- With photo -->\r\n <img *ngIf=\"authenticationService.authenticatedUser?.photoUrl\"\r\n id=\"authenticated-user-image\"\r\n [src]=\"authenticationService.authenticatedUser?.photoUrl\"\r\n matTooltip=\"Logout\"\r\n (click)=\"confirmLogout()\" />\r\n \r\n <!-- Without photo -->\r\n <mat-icon *ngIf=\"!authenticationService.authenticatedUser?.photoUrl\"\r\n fontIcon=\"account_circle\"\r\n matTooltip=\"Logout\"\r\n (click)=\"confirmLogout()\">\r\n </mat-icon>\r\n \r\n <!-- Name -->\r\n <div id=\"user-name\">\r\n {{ authenticationService.authenticatedUser?.displayName }}\r\n </div>\r\n </ng-container>\r\n</div>", styles: ["#user-id{display:flex;height:2em;padding:.3em;font-family:Verdana,Geneva,Tahoma,sans-serif}mat-icon{font-size:2em!important;height:2em!important;width:2em!important}img{border-radius:100%;width:2em;height:2em}#user-id>div{display:flex;align-items:center;height:100%;margin-left:.75em;font-size:1.15em}\n", ".material-icons{font-family:Material Icons;font-weight:400;font-style:normal;font-size:24px;display:inline-block;line-height:1;text-transform:none;letter-spacing:normal;word-wrap:normal;white-space:nowrap;direction:ltr;-webkit-font-smoothing:antialiased;text-rendering:optimizeLegibility;-moz-osx-font-smoothing:grayscale;font-feature-settings:\"liga\"}\n"], dependencies: [{ kind: "directive", type: i3.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: i4.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }] });
|
|
33
36
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: LoginComponent, decorators: [{
|
|
34
37
|
type: Component,
|
|
35
38
|
args: [{ selector: 'cp-login', template: "<div id=\"user-id\">\r\n <!-- Logged out -->\r\n <mat-icon *ngIf=\"!authenticationService.authenticated\"\r\n fontIcon=\"account_circle\"\r\n matTooltip=\"Login\"\r\n (click)=\"login()\">\r\n </mat-icon>\r\n\r\n <!-- Logged in -->\r\n <ng-container *ngIf=\"authenticationService.authenticated\">\r\n <!-- With photo -->\r\n <img *ngIf=\"authenticationService.authenticatedUser?.photoUrl\"\r\n id=\"authenticated-user-image\"\r\n [src]=\"authenticationService.authenticatedUser?.photoUrl\"\r\n matTooltip=\"Logout\"\r\n (click)=\"confirmLogout()\" />\r\n \r\n <!-- Without photo -->\r\n <mat-icon *ngIf=\"!authenticationService.authenticatedUser?.photoUrl\"\r\n fontIcon=\"account_circle\"\r\n matTooltip=\"Logout\"\r\n (click)=\"confirmLogout()\">\r\n </mat-icon>\r\n \r\n <!-- Name -->\r\n <div id=\"user-name\">\r\n {{ authenticationService.authenticatedUser?.displayName }}\r\n </div>\r\n </ng-container>\r\n</div>", styles: ["#user-id{display:flex;height:2em;padding:.3em;font-family:Verdana,Geneva,Tahoma,sans-serif}mat-icon{font-size:2em!important;height:2em!important;width:2em!important}img{border-radius:100%;width:2em;height:2em}#user-id>div{display:flex;align-items:center;height:100%;margin-left:.75em;font-size:1.15em}\n", ".material-icons{font-family:Material Icons;font-weight:400;font-style:normal;font-size:24px;display:inline-block;line-height:1;text-transform:none;letter-spacing:normal;word-wrap:normal;white-space:nowrap;direction:ltr;-webkit-font-smoothing:antialiased;text-rendering:optimizeLegibility;-moz-osx-font-smoothing:grayscale;font-feature-settings:\"liga\"}\n"] }]
|
|
36
39
|
}], ctorParameters: function () { return [{ type: i1.MatDialog }, { type: i2.AuthenticationService }]; }, propDecorators: { adminGroup: [{
|
|
37
40
|
type: Input
|
|
41
|
+
}], additionalInfo: [{
|
|
42
|
+
type: Input
|
|
38
43
|
}] } });
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9naW4uY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY2xlYXZlbGFuZHByaWNlL25neC1saWIvYXV0aGVudGljYXRpb24vdG9rZW4vZ3VpL3NyYy9jb21wb25lbnRzL2xvZ2luL2xvZ2luLmNvbXBvbmVudC50cyIsIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2NsZWF2ZWxhbmRwcmljZS9uZ3gtbGliL2F1dGhlbnRpY2F0aW9uL3Rva2VuL2d1aS9zcmMvY29tcG9uZW50cy9sb2dpbi9sb2dpbi5jb21wb25lbnQuaHRtbCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLEtBQUssRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUVqRCxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUV4RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQzs7Ozs7O0FBV3hFLE1BQU0sT0FBTyxjQUFjO0lBSXpCLFlBQW9CLE1BQWlCLEVBQ2xCLHFCQUE0QztRQUQzQyxXQUFNLEdBQU4sTUFBTSxDQUFXO1FBQ2xCLDBCQUFxQixHQUFyQixxQkFBcUIsQ0FBdUI7SUFDL0QsQ0FBQztJQUVELEtBQUs7UUFDSCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxrQkFBa0IsRUFBRTtZQUNuQyxJQUFJLEVBQUU7Z0JBQ0osVUFBVSxFQUFFLElBQUksQ0FBQyxVQUFVO2dCQUMzQixjQUFjLEVBQUUsSUFBSSxDQUFDLGNBQWM7YUFDcEM7U0FDRixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsYUFBYTtRQUNYLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLHFCQUFxQixFQUFFO1lBQ3RDLElBQUksRUFBRSxFQUFFLE9BQU8sRUFBRSxrQ0FBa0MsRUFBRTtTQUN0RCxDQUFDO2FBQ0QsV0FBVyxFQUFFO2FBQ2IsU0FBUyxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQ2xCLElBQUksTUFBTSxFQUFFO2dCQUNWLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxNQUFNLEVBQUUsQ0FBQzthQUNyQztRQUNILENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQzs7MkdBM0JVLGNBQWM7K0ZBQWQsY0FBYyx3SENmM0Isb2xDQTZCTTsyRkRkTyxjQUFjO2tCQVIxQixTQUFTOytCQUNFLFVBQVU7b0lBUVgsVUFBVTtzQkFBbEIsS0FBSztnQkFDRyxjQUFjO3NCQUF0QixLQUFLIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29tcG9uZW50LCBJbnB1dCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBNYXREaWFsb2cgfSBmcm9tICdAYW5ndWxhci9tYXRlcmlhbC9kaWFsb2cnO1xyXG5pbXBvcnQgeyBDb25maXJtYXRpb25Db21wb25lbnQgfSBmcm9tICdAY2xlYXZlbGFuZHByaWNlL25neC1saWIvZGlhbG9nJztcclxuXHJcbmltcG9ydCB7IExvZ2luRm9ybUNvbXBvbmVudCB9IGZyb20gJy4uL2xvZ2luLWZvcm0vbG9naW4tZm9ybS5jb21wb25lbnQnO1xyXG5pbXBvcnQgeyBBdXRoZW50aWNhdGlvblNlcnZpY2UgfSBmcm9tICcuLi8uLi9zZXJ2aWNlcy9hdXRoZW50aWNhdGlvbi5zZXJ2aWNlJztcclxuXHJcbkBDb21wb25lbnQoe1xyXG4gIHNlbGVjdG9yOiAnY3AtbG9naW4nLFxyXG4gIHRlbXBsYXRlVXJsOiAnLi9sb2dpbi5jb21wb25lbnQuaHRtbCcsXHJcbiAgc3R5bGVVcmxzOiBbXHJcbiAgICAnLi9sb2dpbi5jb21wb25lbnQuY3NzJyxcclxuICAgICcuLi8uLi8uLi8uLi8uLi8uLi9zdHlsZXMvbWF0LWljb24uY3NzJ1xyXG4gIF1cclxufSlcclxuZXhwb3J0IGNsYXNzIExvZ2luQ29tcG9uZW50IHtcclxuICBASW5wdXQoKSBhZG1pbkdyb3VwITogc3RyaW5nO1xyXG4gIEBJbnB1dCgpIGFkZGl0aW9uYWxJbmZvITogc3RyaW5nO1xyXG5cclxuICBjb25zdHJ1Y3Rvcihwcml2YXRlIGRpYWxvZzogTWF0RGlhbG9nLFxyXG4gICAgICAgICAgICAgIHB1YmxpYyBhdXRoZW50aWNhdGlvblNlcnZpY2U6IEF1dGhlbnRpY2F0aW9uU2VydmljZSkge1xyXG4gIH1cclxuXHJcbiAgbG9naW4oKTogdm9pZCB7XHJcbiAgICB0aGlzLmRpYWxvZy5vcGVuKExvZ2luRm9ybUNvbXBvbmVudCwge1xyXG4gICAgICBkYXRhOiB7XHJcbiAgICAgICAgYWRtaW5Hcm91cDogdGhpcy5hZG1pbkdyb3VwLFxyXG4gICAgICAgIGFkZGl0aW9uYWxJbmZvOiB0aGlzLmFkZGl0aW9uYWxJbmZvXHJcbiAgICAgIH1cclxuICAgIH0pO1xyXG4gIH1cclxuXHJcbiAgY29uZmlybUxvZ291dCgpOiB2b2lkIHtcclxuICAgIHRoaXMuZGlhbG9nLm9wZW4oQ29uZmlybWF0aW9uQ29tcG9uZW50LCB7XHJcbiAgICAgIGRhdGE6IHsgbWVzc2FnZTogYEFyZSB5b3Ugc3VyZSB5b3Ugd2FudCB0byBsb2dvdXQ/YCB9XHJcbiAgICB9KVxyXG4gICAgLmFmdGVyQ2xvc2VkKClcclxuICAgIC5zdWJzY3JpYmUocmVzdWx0ID0+IHtcclxuICAgICAgaWYgKHJlc3VsdCkge1xyXG4gICAgICAgIHRoaXMuYXV0aGVudGljYXRpb25TZXJ2aWNlLmxvZ291dCgpO1xyXG4gICAgICB9XHJcbiAgICB9KTtcclxuICB9XHJcbn1cclxuIiwiPGRpdiBpZD1cInVzZXItaWRcIj5cclxuICAgIDwhLS0gTG9nZ2VkIG91dCAtLT5cclxuICAgIDxtYXQtaWNvbiAqbmdJZj1cIiFhdXRoZW50aWNhdGlvblNlcnZpY2UuYXV0aGVudGljYXRlZFwiXHJcbiAgICAgICAgZm9udEljb249XCJhY2NvdW50X2NpcmNsZVwiXHJcbiAgICAgICAgbWF0VG9vbHRpcD1cIkxvZ2luXCJcclxuICAgICAgICAoY2xpY2spPVwibG9naW4oKVwiPlxyXG4gICAgPC9tYXQtaWNvbj5cclxuXHJcbiAgICA8IS0tIExvZ2dlZCBpbiAtLT5cclxuICAgIDxuZy1jb250YWluZXIgKm5nSWY9XCJhdXRoZW50aWNhdGlvblNlcnZpY2UuYXV0aGVudGljYXRlZFwiPlxyXG4gICAgICAgIDwhLS0gV2l0aCBwaG90byAtLT5cclxuICAgICAgICA8aW1nICpuZ0lmPVwiYXV0aGVudGljYXRpb25TZXJ2aWNlLmF1dGhlbnRpY2F0ZWRVc2VyPy5waG90b1VybFwiXHJcbiAgICAgICAgICAgIGlkPVwiYXV0aGVudGljYXRlZC11c2VyLWltYWdlXCJcclxuICAgICAgICAgICAgW3NyY109XCJhdXRoZW50aWNhdGlvblNlcnZpY2UuYXV0aGVudGljYXRlZFVzZXI/LnBob3RvVXJsXCJcclxuICAgICAgICAgICAgbWF0VG9vbHRpcD1cIkxvZ291dFwiXHJcbiAgICAgICAgICAgIChjbGljayk9XCJjb25maXJtTG9nb3V0KClcIiAvPlxyXG4gICAgXHJcbiAgICAgICAgPCEtLSBXaXRob3V0IHBob3RvIC0tPlxyXG4gICAgICAgIDxtYXQtaWNvbiAqbmdJZj1cIiFhdXRoZW50aWNhdGlvblNlcnZpY2UuYXV0aGVudGljYXRlZFVzZXI/LnBob3RvVXJsXCJcclxuICAgICAgICAgICAgZm9udEljb249XCJhY2NvdW50X2NpcmNsZVwiXHJcbiAgICAgICAgICAgIG1hdFRvb2x0aXA9XCJMb2dvdXRcIlxyXG4gICAgICAgICAgICAoY2xpY2spPVwiY29uZmlybUxvZ291dCgpXCI+XHJcbiAgICAgICAgPC9tYXQtaWNvbj5cclxuICAgIFxyXG4gICAgICAgIDwhLS0gTmFtZSAtLT5cclxuICAgICAgICA8ZGl2IGlkPVwidXNlci1uYW1lXCI+XHJcbiAgICAgICAgICAgIHt7IGF1dGhlbnRpY2F0aW9uU2VydmljZS5hdXRoZW50aWNhdGVkVXNlcj8uZGlzcGxheU5hbWUgfX1cclxuICAgICAgICA8L2Rpdj5cclxuICAgIDwvbmctY29udGFpbmVyPlxyXG48L2Rpdj4iXX0=
|
|
@@ -19,9 +19,11 @@ export class LoginFormComponent {
|
|
|
19
19
|
this.form = new FormGroup({
|
|
20
20
|
username: new FormControl(null, [Validators.required]),
|
|
21
21
|
password: new FormControl(null, [Validators.required]),
|
|
22
|
-
adminGroup: new FormControl()
|
|
22
|
+
adminGroup: new FormControl(),
|
|
23
|
+
additionalInfo: new FormControl()
|
|
23
24
|
});
|
|
24
25
|
this.form.get('adminGroup')?.setValue(data.adminGroup);
|
|
26
|
+
this.form.get('additionalInfo')?.setValue(data.additionalInfo);
|
|
25
27
|
}
|
|
26
28
|
ngOnInit() {
|
|
27
29
|
this.authenticatedChangedSubscription = this.authenticationService.authenticatedChanged
|
|
@@ -35,8 +37,8 @@ export class LoginFormComponent {
|
|
|
35
37
|
}
|
|
36
38
|
authenticate() {
|
|
37
39
|
this.errorMessage = undefined;
|
|
38
|
-
const { username, password, adminGroup } = this.form.value;
|
|
39
|
-
this.authenticationService.login(username, password, adminGroup);
|
|
40
|
+
const { username, password, adminGroup, additionalInfo } = this.form.value;
|
|
41
|
+
this.authenticationService.login(username, password, adminGroup, additionalInfo);
|
|
40
42
|
}
|
|
41
43
|
authChangedHandler(authenticated) {
|
|
42
44
|
if (authenticated) {
|
|
@@ -68,4 +70,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.4", ngImpor
|
|
|
68
70
|
type: Inject,
|
|
69
71
|
args: [MAT_DIALOG_DATA]
|
|
70
72
|
}] }, { type: i1.MatDialogRef }, { type: i2.AuthenticationService }]; } });
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"login-form.component.js","sourceRoot":"","sources":["../../../../../../../../../projects/cleavelandprice/ngx-lib/authentication/token/gui/src/components/login-form/login-form.component.ts","../../../../../../../../../projects/cleavelandprice/ngx-lib/authentication/token/gui/src/components/login-form/login-form.component.html"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAqB,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAgB,eAAe,EAAE,MAAM,0BAA0B,CAAC;;;;;;;;;;;;AAazE,MAAM,OAAO,kBAAkB;IAY7B,YAAqC,IAAmB,EACrC,SAA2C,EAC3C,qBAA4C;QAD5C,cAAS,GAAT,SAAS,CAAkC;QAC3C,0BAAqB,GAArB,qBAAqB,CAAuB;QAT/D,SAAI,GAAG,IAAI,SAAS,CAAC;YACnB,QAAQ,EAAE,IAAI,WAAW,CAAC,IAAI,EAAE,CAAE,UAAU,CAAC,QAAQ,CAAE,CAAC;YACxD,QAAQ,EAAE,IAAI,WAAW,CAAC,IAAI,EAAE,CAAE,UAAU,CAAC,QAAQ,CAAE,CAAC;YACxD,UAAU,EAAE,IAAI,WAAW,EAAE;YAC7B,cAAc,EAAE,IAAI,WAAW,EAAE;SAClC,CAAC,CAAC;QAMW,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC7E,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,gCAAgC,GAAG,IAAI,CAAC,qBAAqB,CAAC,oBAAoB;aACpF,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEjD,IAAI,CAAC,+BAA+B,GAAG,IAAI,CAAC,qBAAqB,CAAC,mBAAmB;aAClF,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,WAAW;QACT,IAAI,CAAC,+BAA+B,CAAC,WAAW,EAAE,CAAC;QACnD,IAAI,CAAC,gCAAgC,CAAC,WAAW,EAAE,CAAC;IACtD,CAAC;IAED,YAAY;QACV,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;QAC9B,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAC3E,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,QAAS,EAAE,QAAS,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;IACrF,CAAC;IAEO,kBAAkB,CAAC,aAAsB;QAC/C,IAAI,aAAa,EAAE;YACjB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;SACxB;IACH,CAAC;IAEO,YAAY,CAAC,GAAQ;QAC3B,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,YAAY,GAAG,GAAG,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,UAAU,EAAE,CAAC;IACvD,CAAC;IAED,sBAAsB,CAAC,OAAgB;QACrC,MAAM,OAAO,GAAG,qBAAqB,CAAC;QAEtC,IAAI,OAAO,EAAE;YACX,IAAI,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBACjC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;aAClC;SACF;aAAM;YACL,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;SACvC;IACH,CAAC;;+GA5DU,kBAAkB,kBAYT,eAAe;mGAZxB,kBAAkB,oDCf/B,owDAwCqB;2FDzBR,kBAAkB;kBAP9B,SAAS;;;0BAmBK,MAAM;2BAAC,eAAe","sourcesContent":["import { Component, Inject, OnInit, OnDestroy } from '@angular/core';\r\nimport { FormGroup, Validators, FormControl } from '@angular/forms';\r\nimport { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';\r\nimport { Subscription } from 'rxjs';\r\n\r\nimport { LoginFormData } from '../../model/login-form-data';\r\nimport { AuthenticationService } from '../../services/authentication.service';\r\n\r\n@Component({\r\n  templateUrl: './login-form.component.html',\r\n  styleUrls: [\r\n    './login-form.component.css',\r\n    '../../../../../../styles/mat-icon.css'\r\n  ]\r\n})\r\nexport class LoginFormComponent implements OnInit, OnDestroy {\r\n  errorMessage: string | undefined;\r\n  authenticatedChangedSubscription!: Subscription;\r\n  authenticationErrorSubscription!: Subscription;\r\n\r\n  form = new FormGroup({\r\n    username: new FormControl(null, [ Validators.required ]),\r\n    password: new FormControl(null, [ Validators.required ]),\r\n    adminGroup: new FormControl(),\r\n    additionalInfo: new FormControl()\r\n  });\r\n\r\n  constructor(@Inject(MAT_DIALOG_DATA) data: LoginFormData,\r\n              public dialogRef: MatDialogRef<LoginFormComponent>,\r\n              public authenticationService: AuthenticationService) {\r\n\r\n                this.form.get('adminGroup')?.setValue(data.adminGroup);\r\n                this.form.get('additionalInfo')?.setValue(data.additionalInfo);\r\n  }\r\n\r\n  ngOnInit(): void {\r\n    this.authenticatedChangedSubscription = this.authenticationService.authenticatedChanged\r\n      .subscribe(this.authChangedHandler.bind(this));\r\n\r\n    this.authenticationErrorSubscription = this.authenticationService.authenticationError\r\n      .subscribe(this.errorHandler.bind(this));\r\n  }\r\n\r\n  ngOnDestroy(): void {\r\n    this.authenticationErrorSubscription.unsubscribe();\r\n    this.authenticatedChangedSubscription.unsubscribe();\r\n  }\r\n\r\n  authenticate() {\r\n    this.errorMessage = undefined;\r\n    const { username, password, adminGroup, additionalInfo } = this.form.value;\r\n    this.authenticationService.login(username!, password!, adminGroup, additionalInfo);\r\n  }\r\n\r\n  private authChangedHandler(authenticated: boolean): void {\r\n    if (authenticated) {\r\n      this.dialogRef.close();\r\n    }\r\n  }\r\n\r\n  private errorHandler(err: any): void {\r\n    console.log('Authentication error', err);\r\n    this.errorMessage = `${err.name}: ${err.statusText}`;\r\n  }\r\n\r\n  changeTokenStorageMode(checked: boolean): void {\r\n    const keyName = 'storeTokenInSession';\r\n\r\n    if (checked) {\r\n      if (localStorage.getItem(keyName)) {\r\n        localStorage.removeItem(keyName);\r\n      }\r\n    } else {\r\n      localStorage.setItem(keyName, 'true');\r\n    }\r\n  }\r\n}\r\n","<h2 mat-dialog-title>\r\n    <span *ngIf=\"!authenticationService.authenticating\">Login</span>\r\n    <span *ngIf=\"authenticationService.authenticating\">Authenticating...</span>\r\n</h2>\r\n\r\n<mat-dialog-content>\r\n    <div id=\"spinner\" *ngIf=\"authenticationService.authenticating\">\r\n        <mat-progress-spinner color=\"primary\" mode=\"indeterminate\"></mat-progress-spinner>\r\n    </div>\r\n\r\n    <form *ngIf=\"!authenticationService.authenticating\" [formGroup]=\"form\">\r\n        <mat-form-field>\r\n            <input matInput formControlName=\"username\" placeholder=\"Username\" (keyup.enter)=\"authenticate()\">\r\n        </mat-form-field>\r\n\r\n        <mat-form-field>\r\n            <input matInput formControlName=\"password\" type=\"password\" placeholder=\"Password\" (keyup.enter)=\"authenticate()\">\r\n        </mat-form-field>\r\n\r\n        <mat-slide-toggle *ngIf=\"authenticationService.config.showRememberMeOption\" [checked]=\"!authenticationService.useSessionStorage\" (change)=\"changeTokenStorageMode($event.checked)\">\r\n            Remember me next time\r\n        </mat-slide-toggle>\r\n    </form>\r\n\r\n    <div *ngIf=\"!authenticationService.authenticating && errorMessage\" id=\"error\">\r\n        {{ errorMessage }}\r\n    </div>\r\n</mat-dialog-content>\r\n\r\n<mat-dialog-actions *ngIf=\"!authenticationService.authenticating\">\r\n    <button mat-raised-button color=\"primary\" (click)=\"authenticate()\"\r\n        [disabled]=\"form.invalid\">\r\n        <mat-icon fontIcon=\"done\"></mat-icon>\r\n        <span>OK</span>\r\n    </button>\r\n\r\n    <button mat-raised-button (click)=\"dialogRef.close()\">\r\n        <mat-icon fontIcon=\"close\"></mat-icon>\r\n        <span>Cancel</span>\r\n    </button>\r\n</mat-dialog-actions>"]}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9naW4tZm9ybS1kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY2xlYXZlbGFuZHByaWNlL25neC1saWIvYXV0aGVudGljYXRpb24vdG9rZW4vZ3VpL3NyYy9tb2RlbC9sb2dpbi1mb3JtLWRhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBpbnRlcmZhY2UgTG9naW5Gb3JtRGF0YSB7XHJcbiAgICBhZG1pbkdyb3VwOiBzdHJpbmc7XHJcbiAgICBhZGRpdGlvbmFsSW5mbzogc3RyaW5nO1xyXG59XHJcbiJdfQ==
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
import { ServiceConfig as BaseServiceConfig } from '@cleavelandprice/ngx-lib/authentication/token';
|
|
3
3
|
export class ServiceConfig extends BaseServiceConfig {
|
|
4
4
|
// See the comment in the library's main service-config.ts file for an explanation
|
|
5
|
-
constructor(useSsl_or_customApiUrl = false, showRememberMeOption = true, tokenName = 'token', authenticateEndpoint = '/authenticate/token') {
|
|
6
|
-
super(useSsl_or_customApiUrl, tokenName, authenticateEndpoint);
|
|
5
|
+
constructor(useSsl_or_customApiUrl = false, showRememberMeOption = true, appName = undefined, tokenName = 'token', authenticateEndpoint = '/authenticate/token') {
|
|
6
|
+
super(useSsl_or_customApiUrl, appName, tokenName, authenticateEndpoint);
|
|
7
7
|
this.showRememberMeOption = showRememberMeOption;
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS1jb25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9jbGVhdmVsYW5kcHJpY2Uvbmd4LWxpYi9hdXRoZW50aWNhdGlvbi90b2tlbi9ndWkvc3JjL21vZGVsL3NlcnZpY2UtY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGtGQUFrRjtBQUNsRixPQUFPLEVBQUUsYUFBYSxJQUFJLGlCQUFpQixFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFFbkcsTUFBTSxPQUFPLGFBQWMsU0FBUSxpQkFBaUI7SUFDaEQsa0ZBQWtGO0lBQ2xGLFlBQVkseUJBQTJDLEtBQUssRUFDakQsdUJBQXVCLElBQUksRUFDbEMsVUFBOEIsU0FBUyxFQUN2QyxTQUFTLEdBQUcsT0FBTyxFQUNuQixvQkFBb0IsR0FBRyxxQkFBcUI7UUFFNUMsS0FBSyxDQUFDLHNCQUFzQixFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsb0JBQW9CLENBQUMsQ0FBQztRQUxqRSx5QkFBb0IsR0FBcEIsb0JBQW9CLENBQU87SUFNdEMsQ0FBQztDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiLy9pbXBvcnQgeyBTZXJ2aWNlQ29uZmlnIGFzIE5neExpYlNlcnZpY2VDb25maWcgfSBmcm9tICdAY2xlYXZlbGFuZHByaWNlL25neC1saWInO1xyXG5pbXBvcnQgeyBTZXJ2aWNlQ29uZmlnIGFzIEJhc2VTZXJ2aWNlQ29uZmlnIH0gZnJvbSAnQGNsZWF2ZWxhbmRwcmljZS9uZ3gtbGliL2F1dGhlbnRpY2F0aW9uL3Rva2VuJztcclxuXHJcbmV4cG9ydCBjbGFzcyBTZXJ2aWNlQ29uZmlnIGV4dGVuZHMgQmFzZVNlcnZpY2VDb25maWcge1xyXG4gICAgLy8gU2VlIHRoZSBjb21tZW50IGluIHRoZSBsaWJyYXJ5J3MgbWFpbiBzZXJ2aWNlLWNvbmZpZy50cyBmaWxlIGZvciBhbiBleHBsYW5hdGlvblxyXG4gICAgY29uc3RydWN0b3IodXNlU3NsX29yX2N1c3RvbUFwaVVybDogYm9vbGVhbiB8IHN0cmluZyA9IGZhbHNlLFxyXG4gICAgICAgIHB1YmxpYyBzaG93UmVtZW1iZXJNZU9wdGlvbiA9IHRydWUsXHJcbiAgICAgICAgYXBwTmFtZTogc3RyaW5nIHwgdW5kZWZpbmVkID0gdW5kZWZpbmVkLFxyXG4gICAgICAgIHRva2VuTmFtZSA9ICd0b2tlbicsXHJcbiAgICAgICAgYXV0aGVudGljYXRlRW5kcG9pbnQgPSAnL2F1dGhlbnRpY2F0ZS90b2tlbidcclxuICAgICAgICApIHtcclxuICAgICAgICBzdXBlcih1c2VTc2xfb3JfY3VzdG9tQXBpVXJsLCBhcHBOYW1lLCB0b2tlbk5hbWUsIGF1dGhlbnRpY2F0ZUVuZHBvaW50KTtcclxuICAgIH1cclxufSJdfQ==
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
import { ServiceConfig as BaseServiceConfig } from '@cleavelandprice/ngx-lib/authentication';
|
|
3
3
|
export class ServiceConfig extends BaseServiceConfig {
|
|
4
4
|
// See the comment in the library's main service-config.ts file for an explanation
|
|
5
|
-
constructor(useSsl_or_customApiUrl = false, tokenName = 'token', authenticateEndpoint = '/authenticate/token') {
|
|
6
|
-
super(useSsl_or_customApiUrl, tokenName, authenticateEndpoint);
|
|
5
|
+
constructor(useSsl_or_customApiUrl = false, appName = undefined, tokenName = 'token', authenticateEndpoint = '/authenticate/token') {
|
|
6
|
+
super(useSsl_or_customApiUrl, appName, tokenName, authenticateEndpoint);
|
|
7
7
|
this.deferTokenValidation = false;
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS1jb25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9jbGVhdmVsYW5kcHJpY2Uvbmd4LWxpYi9hdXRoZW50aWNhdGlvbi90b2tlbi9zcmMvbW9kZWwvc2VydmljZS1jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsa0ZBQWtGO0FBQ2xGLE9BQU8sRUFBRSxhQUFhLElBQUksaUJBQWlCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUU3RixNQUFNLE9BQU8sYUFBYyxTQUFRLGlCQUFpQjtJQUdoRCxrRkFBa0Y7SUFDbEYsWUFBWSx5QkFBMkMsS0FBSyxFQUN4RCxVQUE4QixTQUFTLEVBQ3ZDLFNBQVMsR0FBRyxPQUFPLEVBQ25CLG9CQUFvQixHQUFHLHFCQUFxQjtRQUU1QyxLQUFLLENBQUMsc0JBQXNCLEVBQUUsT0FBTyxFQUFFLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxDQUFDO1FBUjVFLHlCQUFvQixHQUFHLEtBQUssQ0FBQztJQVM3QixDQUFDO0NBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyIvL2ltcG9ydCB7IFNlcnZpY2VDb25maWcgYXMgTmd4TGliU2VydmljZUNvbmZpZyB9IGZyb20gJ0BjbGVhdmVsYW5kcHJpY2Uvbmd4LWxpYic7XHJcbmltcG9ydCB7IFNlcnZpY2VDb25maWcgYXMgQmFzZVNlcnZpY2VDb25maWcgfSBmcm9tICdAY2xlYXZlbGFuZHByaWNlL25neC1saWIvYXV0aGVudGljYXRpb24nO1xyXG5cclxuZXhwb3J0IGNsYXNzIFNlcnZpY2VDb25maWcgZXh0ZW5kcyBCYXNlU2VydmljZUNvbmZpZyB7XHJcbiAgICBkZWZlclRva2VuVmFsaWRhdGlvbiA9IGZhbHNlO1xyXG4gICAgXHJcbiAgICAvLyBTZWUgdGhlIGNvbW1lbnQgaW4gdGhlIGxpYnJhcnkncyBtYWluIHNlcnZpY2UtY29uZmlnLnRzIGZpbGUgZm9yIGFuIGV4cGxhbmF0aW9uXHJcbiAgICBjb25zdHJ1Y3Rvcih1c2VTc2xfb3JfY3VzdG9tQXBpVXJsOiBib29sZWFuIHwgc3RyaW5nID0gZmFsc2UsXHJcbiAgICAgICAgYXBwTmFtZTogc3RyaW5nIHwgdW5kZWZpbmVkID0gdW5kZWZpbmVkLFxyXG4gICAgICAgIHRva2VuTmFtZSA9ICd0b2tlbicsXHJcbiAgICAgICAgYXV0aGVudGljYXRlRW5kcG9pbnQgPSAnL2F1dGhlbnRpY2F0ZS90b2tlbidcclxuICAgICAgICApIHtcclxuICAgICAgICBzdXBlcih1c2VTc2xfb3JfY3VzdG9tQXBpVXJsLCBhcHBOYW1lLCB0b2tlbk5hbWUsIGF1dGhlbnRpY2F0ZUVuZHBvaW50KTtcclxuICAgIH1cclxufSJdfQ==
|
|
@@ -34,11 +34,13 @@ export class AuthenticationService {
|
|
|
34
34
|
//#endregion
|
|
35
35
|
//#region Utilities
|
|
36
36
|
//Authenticate the user and store the token in Local Storage
|
|
37
|
-
login(username, password, adminGroup) {
|
|
37
|
+
login(username, password, adminGroup, additionalInfo) {
|
|
38
38
|
const request = {
|
|
39
|
-
username
|
|
40
|
-
password
|
|
41
|
-
adminGroup
|
|
39
|
+
username,
|
|
40
|
+
password,
|
|
41
|
+
adminGroup,
|
|
42
|
+
additionalInfo,
|
|
43
|
+
appName: this.config.appName
|
|
42
44
|
};
|
|
43
45
|
this.authenticating = true;
|
|
44
46
|
this.authenticatingChanged.emit(this.authenticating);
|
|
@@ -114,4 +116,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.4", ngImpor
|
|
|
114
116
|
}], authenticationError: [{
|
|
115
117
|
type: Output
|
|
116
118
|
}] } });
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../../../../../../projects/cleavelandprice/ngx-lib/authentication/token/src/services/authentication.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { EventEmitter, Injectable, Optional, Output } from '@angular/core';\r\nimport { HttpClient } from '@angular/common/http';\r\nimport { JwtHelperService } from '@auth0/angular-jwt';\r\n\r\nimport {\r\n  AbstractAuthenticationService,\r\n  AuthenticatedUser,\r\n  AuthenticationRequest\r\n} from '@cleavelandprice/ngx-lib/authentication';\r\n\r\nimport { AuthenticationToken } from '../model/authentication-token';\r\nimport { ServiceConfig } from '../model/service-config';\r\n\r\n@Injectable({\r\n  providedIn: 'root'\r\n})\r\nexport class AuthenticationService implements AbstractAuthenticationService {\r\n  //#region Fields\r\n  @Output() authenticatedChanged = new EventEmitter<boolean>();\r\n  @Output() authenticatingChanged = new EventEmitter<boolean>();\r\n  @Output() authenticationError = new EventEmitter();\r\n  authenticating = false; // Flag set to true while the service is attempting to authenticate the user\r\n  authenticated = false; // Flag set to true when the user is successfully authenticated\r\n  authenticatedUser: AuthenticatedUser | undefined; // Object representing the authenticated user\r\n  //#endregion\r\n\r\n  //#region Properties\r\n  get useSessionStorage(): boolean {\r\n    return !!localStorage.getItem('storeTokenInSession');\r\n  }\r\n\r\n  get storage(): Storage {\r\n    return this.useSessionStorage ?\r\n      sessionStorage:\r\n      localStorage;\r\n  }\r\n  //#endregion\r\n\r\n  //#region Lifecycle\r\n  constructor(@Optional() protected config: ServiceConfig,\r\n            protected http: HttpClient) {\r\n\r\n              this.config = this.config ?? new ServiceConfig();\r\n\r\n              if (!this.config.deferTokenValidation) {\r\n                this.checkForExistingToken();\r\n              }\r\n  }\r\n  //#endregion\r\n\r\n  //#region Utilities\r\n  //Authenticate the user and store the token in Local Storage\r\n  login(username: string, password: string, adminGroup?: string): void {\r\n    const request: AuthenticationRequest = {\r\n      username: username,\r\n      password: password,\r\n      adminGroup: adminGroup\r\n    };\r\n\r\n    this.authenticating = true;\r\n    this.authenticatingChanged.emit(this.authenticating);\r\n\r\n    // Sending a 'raw' POST request so that we can tell HttpClient that we are expecting text instead of Json\r\n    // Otherwise, it would throw an error trying to decode Json from the response\r\n    this.http.request('POST', `${this.config.apiUrl}${this.config.authenticateEndpoint}`, { body: request, responseType: 'text' })\r\n      .subscribe({\r\n        next: (token) => {\r\n          if (token) {\r\n            this.validateUser(token);\r\n          } else {\r\n            this.logout();\r\n          }\r\n        },\r\n        error: (err) => {\r\n          this.authenticating = false;\r\n          this.authenticatingChanged.emit(this.authenticating);\r\n          this.authenticationError.emit(err);\r\n        }\r\n      });\r\n  }\r\n \r\n  //Logout the user and delete the token from Local Storage\r\n  logout(): void {\r\n    if (this.storage.getItem(this.config.tokenName)) {\r\n      this.storage.removeItem(this.config.tokenName);\r\n    }\r\n\r\n    this.authenticatedUser = undefined;\r\n    this.authenticated = false;\r\n    this.authenticatedChanged.emit(false);\r\n  }\r\n \r\n  validateUser(token: string): void {\r\n    const jwtHelper = new JwtHelperService();\r\n    const decoded = jwtHelper.decodeToken(token) as AuthenticationToken;\r\n\r\n    if (jwtHelper.isTokenExpired(token)) {\r\n      this.logout();\r\n      return;\r\n    }\r\n\r\n    this.authenticatedUser = {\r\n      admin: decoded.role === 'Admin',\r\n      displayName: decoded.displayName,\r\n      accountName: decoded.winaccountname,\r\n      distinguishedName: decoded.distinguishedName,\r\n      employeeNumber: decoded.employeeNumber,\r\n      memberOf: decoded.memberOf\r\n    };\r\n\r\n    this.storage.setItem(this.config.tokenName, token);\r\n    \r\n    this.authenticated = true;\r\n    this.authenticatedChanged.emit(this.authenticated);\r\n\r\n    this.authenticating = false;\r\n    this.authenticatingChanged.emit(this.authenticating);\r\n  }\r\n\r\n  checkForExistingToken(): void {\r\n    const token = this.storage.getItem(this.config.tokenName);\r\n    if (token) {\r\n      this.validateUser(token);\r\n    }\r\n  }\r\n  //#endregion\r\n}"]}
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../../../../../../projects/cleavelandprice/ngx-lib/authentication/token/src/services/authentication.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { EventEmitter, Injectable, Optional, Output } from '@angular/core';\r\nimport { HttpClient } from '@angular/common/http';\r\nimport { JwtHelperService } from '@auth0/angular-jwt';\r\n\r\nimport {\r\n  AbstractAuthenticationService,\r\n  AuthenticatedUser,\r\n  AuthenticationRequest\r\n} from '@cleavelandprice/ngx-lib/authentication';\r\n\r\nimport { AuthenticationToken } from '../model/authentication-token';\r\nimport { ServiceConfig } from '../model/service-config';\r\n\r\n@Injectable({\r\n  providedIn: 'root'\r\n})\r\nexport class AuthenticationService implements AbstractAuthenticationService {\r\n  //#region Fields\r\n  @Output() authenticatedChanged = new EventEmitter<boolean>();\r\n  @Output() authenticatingChanged = new EventEmitter<boolean>();\r\n  @Output() authenticationError = new EventEmitter();\r\n  authenticating = false; // Flag set to true while the service is attempting to authenticate the user\r\n  authenticated = false; // Flag set to true when the user is successfully authenticated\r\n  authenticatedUser: AuthenticatedUser | undefined; // Object representing the authenticated user\r\n  //#endregion\r\n\r\n  //#region Properties\r\n  get useSessionStorage(): boolean {\r\n    return !!localStorage.getItem('storeTokenInSession');\r\n  }\r\n\r\n  get storage(): Storage {\r\n    return this.useSessionStorage ?\r\n      sessionStorage:\r\n      localStorage;\r\n  }\r\n  //#endregion\r\n\r\n  //#region Lifecycle\r\n  constructor(@Optional() protected config: ServiceConfig,\r\n            protected http: HttpClient) {\r\n\r\n              this.config = this.config ?? new ServiceConfig();\r\n\r\n              if (!this.config.deferTokenValidation) {\r\n                this.checkForExistingToken();\r\n              }\r\n  }\r\n  //#endregion\r\n\r\n  //#region Utilities\r\n  //Authenticate the user and store the token in Local Storage\r\n  login(username: string, password: string, adminGroup?: string, additionalInfo?: string): void {\r\n    const request: AuthenticationRequest = {\r\n      username,\r\n      password,\r\n      adminGroup,\r\n      additionalInfo,\r\n      appName: this.config.appName\r\n    };\r\n\r\n    this.authenticating = true;\r\n    this.authenticatingChanged.emit(this.authenticating);\r\n\r\n    // Sending a 'raw' POST request so that we can tell HttpClient that we are expecting text instead of Json\r\n    // Otherwise, it would throw an error trying to decode Json from the response\r\n    this.http.request('POST', `${this.config.apiUrl}${this.config.authenticateEndpoint}`, { body: request, responseType: 'text' })\r\n      .subscribe({\r\n        next: (token) => {\r\n          if (token) {\r\n            this.validateUser(token);\r\n          } else {\r\n            this.logout();\r\n          }\r\n        },\r\n        error: (err) => {\r\n          this.authenticating = false;\r\n          this.authenticatingChanged.emit(this.authenticating);\r\n          this.authenticationError.emit(err);\r\n        }\r\n      });\r\n  }\r\n \r\n  //Logout the user and delete the token from Local Storage\r\n  logout(): void {\r\n    if (this.storage.getItem(this.config.tokenName)) {\r\n      this.storage.removeItem(this.config.tokenName);\r\n    }\r\n\r\n    this.authenticatedUser = undefined;\r\n    this.authenticated = false;\r\n    this.authenticatedChanged.emit(false);\r\n  }\r\n \r\n  validateUser(token: string): void {\r\n    const jwtHelper = new JwtHelperService();\r\n    const decoded = jwtHelper.decodeToken(token) as AuthenticationToken;\r\n\r\n    if (jwtHelper.isTokenExpired(token)) {\r\n      this.logout();\r\n      return;\r\n    }\r\n\r\n    this.authenticatedUser = {\r\n      admin: decoded.role === 'Admin',\r\n      displayName: decoded.displayName,\r\n      accountName: decoded.winaccountname,\r\n      distinguishedName: decoded.distinguishedName,\r\n      employeeNumber: decoded.employeeNumber,\r\n      memberOf: decoded.memberOf\r\n    };\r\n\r\n    this.storage.setItem(this.config.tokenName, token);\r\n    \r\n    this.authenticated = true;\r\n    this.authenticatedChanged.emit(this.authenticated);\r\n\r\n    this.authenticating = false;\r\n    this.authenticatingChanged.emit(this.authenticating);\r\n  }\r\n\r\n  checkForExistingToken(): void {\r\n    const token = this.storage.getItem(this.config.tokenName);\r\n    if (token) {\r\n      this.validateUser(token);\r\n    }\r\n  }\r\n  //#endregion\r\n}"]}
|
|
@@ -7,8 +7,8 @@ import { CommonModule } from '@angular/common';
|
|
|
7
7
|
//import { ServiceConfig as NgxLibServiceConfig } from '@cleavelandprice/ngx-lib';
|
|
8
8
|
class ServiceConfig extends ServiceConfig$1 {
|
|
9
9
|
// See the comment in the library's main service-config.ts file for an explanation
|
|
10
|
-
constructor(useSsl_or_customApiUrl = false, tokenName = 'user', authenticateEndpoint = '/authenticate') {
|
|
11
|
-
super(useSsl_or_customApiUrl, tokenName, authenticateEndpoint);
|
|
10
|
+
constructor(useSsl_or_customApiUrl = false, appName = undefined, tokenName = 'user', authenticateEndpoint = '/authenticate') {
|
|
11
|
+
super(useSsl_or_customApiUrl, appName, tokenName, authenticateEndpoint);
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
|
|
@@ -41,11 +41,13 @@ class AuthenticationService {
|
|
|
41
41
|
//#endregion
|
|
42
42
|
//#region Utilities
|
|
43
43
|
//Authenticate the user and store the token in Local Storage
|
|
44
|
-
login(username, password, adminGroup) {
|
|
44
|
+
login(username, password, adminGroup, additionalInfo) {
|
|
45
45
|
const request = {
|
|
46
|
-
username
|
|
47
|
-
password
|
|
48
|
-
adminGroup
|
|
46
|
+
username,
|
|
47
|
+
password,
|
|
48
|
+
adminGroup,
|
|
49
|
+
additionalInfo,
|
|
50
|
+
appName: this.config.appName
|
|
49
51
|
};
|
|
50
52
|
this.authenticating = true;
|
|
51
53
|
this.authenticatingChanged.emit(this.authenticating);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleavelandprice-ngx-lib-authentication-object.mjs","sources":["../../../../projects/cleavelandprice/ngx-lib/authentication/object/src/model/service-config.ts","../../../../projects/cleavelandprice/ngx-lib/authentication/object/src/services/authentication.service.ts","../../../../projects/cleavelandprice/ngx-lib/authentication/object/src/object.module.ts","../../../../projects/cleavelandprice/ngx-lib/authentication/object/src/cleavelandprice-ngx-lib-authentication-object.ts"],"sourcesContent":["//import { ServiceConfig as NgxLibServiceConfig } from '@cleavelandprice/ngx-lib';\r\nimport { ServiceConfig as BaseServiceConfig } from '@cleavelandprice/ngx-lib/authentication';\r\n\r\nexport class ServiceConfig extends BaseServiceConfig {\r\n \r\n // See the comment in the library's main service-config.ts file for an explanation\r\n constructor(useSsl_or_customApiUrl: boolean | string = false,\r\n tokenName = 'user',\r\n authenticateEndpoint = '/authenticate'\r\n ) {\r\n super(useSsl_or_customApiUrl, tokenName, authenticateEndpoint);\r\n }\r\n}","import { EventEmitter, Injectable, Optional, Output } from '@angular/core';\r\nimport { HttpClient } from '@angular/common/http';\r\n\r\nimport { User } from '@cleavelandprice/ngx-lib/active-directory';\r\n\r\nimport {\r\n AbstractAuthenticationService,\r\n AuthenticatedUser,\r\n AuthenticationRequest\r\n} from '@cleavelandprice/ngx-lib/authentication';\r\n\r\nimport { ServiceConfig } from '../model/service-config';\r\n\r\n@Injectable({\r\n providedIn: 'root'\r\n})\r\nexport class AuthenticationService implements AbstractAuthenticationService {\r\n //#region Fields\r\n @Output() authenticatedChanged = new EventEmitter<boolean>();\r\n @Output() authenticatingChanged = new EventEmitter<boolean>();\r\n @Output() authenticationError = new EventEmitter();\r\n authenticating = false; // Flag set to true while the service is attempting to authenticate the user\r\n authenticated = false; // Flag set to true when the user is successfully authenticated\r\n authenticatedUser: AuthenticatedUser | undefined; // Object representing the authenticated user\r\n //#endregion\r\n\r\n //#region Properties\r\n get useSessionStorage(): boolean {\r\n return !!localStorage.getItem('storeTokenInSession');\r\n }\r\n\r\n get storage(): Storage {\r\n return this.useSessionStorage ?\r\n sessionStorage:\r\n localStorage;\r\n }\r\n //#endregion\r\n\r\n //#region Lifecycle\r\n constructor(@Optional() private config: ServiceConfig,\r\n private http: HttpClient) {\r\n\r\n this.config = this.config ?? new ServiceConfig();\r\n \r\n this.checkForExistingToken();\r\n }\r\n //#endregion\r\n\r\n //#region Utilities\r\n //Authenticate the user and store the token in Local Storage\r\n login(username: string, password: string, adminGroup?: string): void {\r\n const request: AuthenticationRequest = {\r\n username: username,\r\n password: password,\r\n adminGroup: adminGroup\r\n };\r\n\r\n this.authenticating = true;\r\n this.authenticatingChanged.emit(this.authenticating);\r\n\r\n this.http.post(`${this.config.apiUrl}${this.config.authenticateEndpoint}`, request)\r\n .subscribe({\r\n next: (user) => {\r\n if (user) {\r\n this.validateUser(user as User);\r\n } else {\r\n this.logout();\r\n }\r\n },\r\n error: (err) => {\r\n this.authenticating = false;\r\n this.authenticatingChanged.emit(this.authenticating);\r\n this.authenticationError.emit(err);\r\n }\r\n });\r\n }\r\n \r\n //Logout the user and delete the token from Local Storage\r\n logout(): void {\r\n if (this.storage.getItem(this.config.tokenName)) {\r\n this.storage.removeItem(this.config.tokenName);\r\n }\r\n\r\n this.authenticatedUser = undefined;\r\n this.authenticated = false;\r\n this.authenticatedChanged.emit(false);\r\n }\r\n \r\n validateUser(token: User): void {\r\n this.authenticatedUser = {\r\n admin: false, // This type of authentication has no concept of Admin\r\n displayName: token.displayName,\r\n accountName: token.sAMAccountName,\r\n distinguishedName: token.distinguishedName,\r\n employeeNumber: token.employeeNumber,\r\n memberOf: token.memberOf.join(',')\r\n };\r\n\r\n this.storage.setItem(this.config.tokenName, JSON.stringify(token));\r\n \r\n this.authenticated = true;\r\n this.authenticatedChanged.emit(this.authenticated);\r\n\r\n this.authenticating = false;\r\n this.authenticatingChanged.emit(this.authenticating);\r\n }\r\n\r\n checkForExistingToken(): void {\r\n const token = this.storage.getItem(this.config.tokenName);\r\n if (token) {\r\n this.validateUser(JSON.parse(token) as User);\r\n }\r\n }\r\n //#endregion\r\n}\r\n ","import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\n\r\nimport { ServiceConfig } from './model/service-config';\r\n\r\nimport { AuthenticationService } from './services/authentication.service';\r\n\r\n@NgModule({\r\n declarations: [],\r\n imports: [\r\n CommonModule\r\n ],\r\n exports: []\r\n})\r\nexport class ObjectModule {\r\n static forRoot(config: ServiceConfig): ModuleWithProviders<ObjectModule> {\r\n return {\r\n ngModule: ObjectModule,\r\n providers: [\r\n AuthenticationService,\r\n { provide: ServiceConfig, useValue: config }\r\n ]\r\n };\r\n }\r\n\r\n constructor(@Optional() @SkipSelf() parentModule: ObjectModule) {\r\n if (parentModule) {\r\n throw new Error(\r\n 'ObjectModule is already loaded. Import it in the AppModule only');\r\n }\r\n }\r\n}","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public_api';\n"],"names":["BaseServiceConfig","i1.ServiceConfig"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cleavelandprice-ngx-lib-authentication-object.mjs","sources":["../../../../projects/cleavelandprice/ngx-lib/authentication/object/src/model/service-config.ts","../../../../projects/cleavelandprice/ngx-lib/authentication/object/src/services/authentication.service.ts","../../../../projects/cleavelandprice/ngx-lib/authentication/object/src/object.module.ts","../../../../projects/cleavelandprice/ngx-lib/authentication/object/src/cleavelandprice-ngx-lib-authentication-object.ts"],"sourcesContent":["//import { ServiceConfig as NgxLibServiceConfig } from '@cleavelandprice/ngx-lib';\r\nimport { ServiceConfig as BaseServiceConfig } from '@cleavelandprice/ngx-lib/authentication';\r\n\r\nexport class ServiceConfig extends BaseServiceConfig {\r\n \r\n // See the comment in the library's main service-config.ts file for an explanation\r\n constructor(useSsl_or_customApiUrl: boolean | string = false,\r\n appName: string | undefined = undefined,\r\n tokenName = 'user',\r\n authenticateEndpoint = '/authenticate'\r\n ) {\r\n super(useSsl_or_customApiUrl, appName, tokenName, authenticateEndpoint);\r\n }\r\n}","import { EventEmitter, Injectable, Optional, Output } from '@angular/core';\r\nimport { HttpClient } from '@angular/common/http';\r\n\r\nimport { User } from '@cleavelandprice/ngx-lib/active-directory';\r\n\r\nimport {\r\n AbstractAuthenticationService,\r\n AuthenticatedUser,\r\n AuthenticationRequest\r\n} from '@cleavelandprice/ngx-lib/authentication';\r\n\r\nimport { ServiceConfig } from '../model/service-config';\r\n\r\n@Injectable({\r\n providedIn: 'root'\r\n})\r\nexport class AuthenticationService implements AbstractAuthenticationService {\r\n //#region Fields\r\n @Output() authenticatedChanged = new EventEmitter<boolean>();\r\n @Output() authenticatingChanged = new EventEmitter<boolean>();\r\n @Output() authenticationError = new EventEmitter();\r\n authenticating = false; // Flag set to true while the service is attempting to authenticate the user\r\n authenticated = false; // Flag set to true when the user is successfully authenticated\r\n authenticatedUser: AuthenticatedUser | undefined; // Object representing the authenticated user\r\n //#endregion\r\n\r\n //#region Properties\r\n get useSessionStorage(): boolean {\r\n return !!localStorage.getItem('storeTokenInSession');\r\n }\r\n\r\n get storage(): Storage {\r\n return this.useSessionStorage ?\r\n sessionStorage:\r\n localStorage;\r\n }\r\n //#endregion\r\n\r\n //#region Lifecycle\r\n constructor(@Optional() private config: ServiceConfig,\r\n private http: HttpClient) {\r\n\r\n this.config = this.config ?? new ServiceConfig();\r\n \r\n this.checkForExistingToken();\r\n }\r\n //#endregion\r\n\r\n //#region Utilities\r\n //Authenticate the user and store the token in Local Storage\r\n login(username: string, password: string, adminGroup?: string, additionalInfo?: string): void {\r\n const request: AuthenticationRequest = {\r\n username,\r\n password,\r\n adminGroup,\r\n additionalInfo,\r\n appName: this.config.appName\r\n };\r\n\r\n this.authenticating = true;\r\n this.authenticatingChanged.emit(this.authenticating);\r\n\r\n this.http.post(`${this.config.apiUrl}${this.config.authenticateEndpoint}`, request)\r\n .subscribe({\r\n next: (user) => {\r\n if (user) {\r\n this.validateUser(user as User);\r\n } else {\r\n this.logout();\r\n }\r\n },\r\n error: (err) => {\r\n this.authenticating = false;\r\n this.authenticatingChanged.emit(this.authenticating);\r\n this.authenticationError.emit(err);\r\n }\r\n });\r\n }\r\n \r\n //Logout the user and delete the token from Local Storage\r\n logout(): void {\r\n if (this.storage.getItem(this.config.tokenName)) {\r\n this.storage.removeItem(this.config.tokenName);\r\n }\r\n\r\n this.authenticatedUser = undefined;\r\n this.authenticated = false;\r\n this.authenticatedChanged.emit(false);\r\n }\r\n \r\n validateUser(token: User): void {\r\n this.authenticatedUser = {\r\n admin: false, // This type of authentication has no concept of Admin\r\n displayName: token.displayName,\r\n accountName: token.sAMAccountName,\r\n distinguishedName: token.distinguishedName,\r\n employeeNumber: token.employeeNumber,\r\n memberOf: token.memberOf.join(',')\r\n };\r\n\r\n this.storage.setItem(this.config.tokenName, JSON.stringify(token));\r\n \r\n this.authenticated = true;\r\n this.authenticatedChanged.emit(this.authenticated);\r\n\r\n this.authenticating = false;\r\n this.authenticatingChanged.emit(this.authenticating);\r\n }\r\n\r\n checkForExistingToken(): void {\r\n const token = this.storage.getItem(this.config.tokenName);\r\n if (token) {\r\n this.validateUser(JSON.parse(token) as User);\r\n }\r\n }\r\n //#endregion\r\n}\r\n ","import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\n\r\nimport { ServiceConfig } from './model/service-config';\r\n\r\nimport { AuthenticationService } from './services/authentication.service';\r\n\r\n@NgModule({\r\n declarations: [],\r\n imports: [\r\n CommonModule\r\n ],\r\n exports: []\r\n})\r\nexport class ObjectModule {\r\n static forRoot(config: ServiceConfig): ModuleWithProviders<ObjectModule> {\r\n return {\r\n ngModule: ObjectModule,\r\n providers: [\r\n AuthenticationService,\r\n { provide: ServiceConfig, useValue: config }\r\n ]\r\n };\r\n }\r\n\r\n constructor(@Optional() @SkipSelf() parentModule: ObjectModule) {\r\n if (parentModule) {\r\n throw new Error(\r\n 'ObjectModule is already loaded. Import it in the AppModule only');\r\n }\r\n }\r\n}","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public_api';\n"],"names":["BaseServiceConfig","i1.ServiceConfig"],"mappings":"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"}
|