@abp/ng.account 6.0.0 → 6.0.1
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/esm2020/lib/account.module.mjs +6 -1
- package/esm2020/lib/components/personal-settings/personal-settings.component.mjs +45 -10
- package/esm2020/lib/models/config-options.mjs +1 -1
- package/esm2020/lib/tokens/index.mjs +2 -1
- package/esm2020/lib/tokens/re-login-confirmation.token.mjs +3 -0
- package/fesm2015/abp-ng.account.mjs +145 -103
- package/fesm2015/abp-ng.account.mjs.map +1 -1
- package/fesm2020/abp-ng.account.mjs +140 -101
- package/fesm2020/abp-ng.account.mjs.map +1 -1
- package/lib/components/personal-settings/personal-settings.component.d.ts +11 -2
- package/lib/models/config-options.d.ts +1 -0
- package/lib/tokens/index.d.ts +1 -0
- package/lib/tokens/re-login-confirmation.token.d.ts +2 -0
- package/lib/utils/factory-utils.d.ts +1 -0
- package/package.json +4 -4
|
@@ -14,6 +14,7 @@ import { accountConfigOptionsFactory } from './utils/factory-utils';
|
|
|
14
14
|
import { AuthenticationFlowGuard } from './guards/authentication-flow.guard';
|
|
15
15
|
import { ForgotPasswordComponent } from './components/forgot-password/forgot-password.component';
|
|
16
16
|
import { ResetPasswordComponent } from './components/reset-password/reset-password.component';
|
|
17
|
+
import { RE_LOGIN_CONFIRMATION_TOKEN } from './tokens';
|
|
17
18
|
import { UiExtensionsModule } from '@abp/ng.theme.shared/extensions';
|
|
18
19
|
import { ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS } from './tokens/extensions.token';
|
|
19
20
|
import { AccountExtensionsGuard } from './guards/extensions.guard';
|
|
@@ -41,6 +42,10 @@ export class AccountModule {
|
|
|
41
42
|
useFactory: accountConfigOptionsFactory,
|
|
42
43
|
deps: [ACCOUNT_CONFIG_OPTIONS],
|
|
43
44
|
},
|
|
45
|
+
{
|
|
46
|
+
provide: RE_LOGIN_CONFIRMATION_TOKEN,
|
|
47
|
+
useValue: options.isPersonalSettingsChangedConfirmationActive ?? true,
|
|
48
|
+
},
|
|
44
49
|
{
|
|
45
50
|
provide: ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS,
|
|
46
51
|
useValue: options.editFormPropContributors,
|
|
@@ -95,4 +100,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.1", ngImpor
|
|
|
95
100
|
exports: [...declarations],
|
|
96
101
|
}]
|
|
97
102
|
}] });
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
103
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudC5tb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9hY2NvdW50L3NyYy9saWIvYWNjb3VudC5tb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUM3RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN6RCxPQUFPLEVBQXVCLFFBQVEsRUFBbUIsTUFBTSxlQUFlLENBQUM7QUFDL0UsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDL0QsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDM0QsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDaEUsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sd0RBQXdELENBQUM7QUFDakcsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBQ3BFLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHNEQUFzRCxDQUFDO0FBQzlGLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLDREQUE0RCxDQUFDO0FBQ3ZHLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDBDQUEwQyxDQUFDO0FBRTdFLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ3ZFLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBQzdFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHdEQUF3RCxDQUFDO0FBQ2pHLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHNEQUFzRCxDQUFDO0FBQzlGLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUN2RCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNyRSxPQUFPLEVBQUUsbUNBQW1DLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNoRixPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNuRSxPQUFPLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSxxRUFBcUUsQ0FBQzs7QUFFdkgsTUFBTSxZQUFZLEdBQUc7SUFDbkIsY0FBYztJQUNkLGlCQUFpQjtJQUNqQix1QkFBdUI7SUFDdkIsc0JBQXNCO0lBQ3RCLHlCQUF5QjtJQUN6Qix1QkFBdUI7SUFDdkIsc0JBQXNCO0lBQ3RCLGdDQUFnQztDQUNqQyxDQUFDO0FBY0YsTUFBTSxPQUFPLGFBQWE7SUFDeEIsTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLEVBQTBCO1FBQ2xELE9BQU87WUFDTCxRQUFRLEVBQUUsYUFBYTtZQUN2QixTQUFTLEVBQUU7Z0JBQ1QsdUJBQXVCO2dCQUN2QixFQUFFLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFO2dCQUN0RDtvQkFDRSxPQUFPLEVBQUUsaUJBQWlCO29CQUMxQixVQUFVLEVBQUUsMkJBQTJCO29CQUN2QyxJQUFJLEVBQUUsQ0FBQyxzQkFBc0IsQ0FBQztpQkFDL0I7Z0JBQ0Q7b0JBQ0UsT0FBTyxFQUFFLDJCQUEyQjtvQkFDcEMsUUFBUSxFQUFFLE9BQU8sQ0FBQywyQ0FBMkMsSUFBSSxJQUFJO2lCQUN0RTtnQkFDRDtvQkFDRSxPQUFPLEVBQUUsbUNBQW1DO29CQUM1QyxRQUFRLEVBQUUsT0FBTyxDQUFDLHdCQUF3QjtpQkFDM0M7Z0JBQ0Qsc0JBQXNCO2FBQ3ZCO1NBQ0YsQ0FBQztJQUNKLENBQUM7SUFFRCxNQUFNLENBQUMsT0FBTyxDQUFDLFVBQVUsRUFBMEI7UUFDakQsT0FBTyxJQUFJLGlCQUFpQixDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztJQUNoRSxDQUFDOzswR0EzQlUsYUFBYTsyR0FBYixhQUFhLGlCQXRCeEIsY0FBYztRQUNkLGlCQUFpQjtRQUNqQix1QkFBdUI7UUFDdkIsc0JBQXNCO1FBQ3RCLHlCQUF5QjtRQUN6Qix1QkFBdUI7UUFDdkIsc0JBQXNCO1FBQ3RCLGdDQUFnQyxhQU05QixVQUFVO1FBQ1Ysb0JBQW9CO1FBQ3BCLGlCQUFpQjtRQUNqQixpQkFBaUI7UUFDakIscUJBQXFCO1FBQ3JCLGtCQUFrQixhQWxCcEIsY0FBYztRQUNkLGlCQUFpQjtRQUNqQix1QkFBdUI7UUFDdkIsc0JBQXNCO1FBQ3RCLHlCQUF5QjtRQUN6Qix1QkFBdUI7UUFDdkIsc0JBQXNCO1FBQ3RCLGdDQUFnQzsyR0FlckIsYUFBYSxZQVR0QixVQUFVO1FBQ1Ysb0JBQW9CO1FBQ3BCLGlCQUFpQjtRQUNqQixpQkFBaUI7UUFDakIscUJBQXFCO1FBQ3JCLGtCQUFrQjsyRkFJVCxhQUFhO2tCQVp6QixRQUFRO21CQUFDO29CQUNSLFlBQVksRUFBRSxDQUFDLEdBQUcsWUFBWSxDQUFDO29CQUMvQixPQUFPLEVBQUU7d0JBQ1AsVUFBVTt3QkFDVixvQkFBb0I7d0JBQ3BCLGlCQUFpQjt3QkFDakIsaUJBQWlCO3dCQUNqQixxQkFBcUI7d0JBQ3JCLGtCQUFrQjtxQkFDbkI7b0JBQ0QsT0FBTyxFQUFFLENBQUMsR0FBRyxZQUFZLENBQUM7aUJBQzNCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29yZU1vZHVsZSwgTGF6eU1vZHVsZUZhY3RvcnkgfSBmcm9tICdAYWJwL25nLmNvcmUnO1xyXG5pbXBvcnQgeyBUaGVtZVNoYXJlZE1vZHVsZSB9IGZyb20gJ0BhYnAvbmcudGhlbWUuc2hhcmVkJztcclxuaW1wb3J0IHsgTW9kdWxlV2l0aFByb3ZpZGVycywgTmdNb2R1bGUsIE5nTW9kdWxlRmFjdG9yeSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBOZ2JEcm9wZG93bk1vZHVsZSB9IGZyb20gJ0BuZy1ib290c3RyYXAvbmctYm9vdHN0cmFwJztcclxuaW1wb3J0IHsgTmd4VmFsaWRhdGVDb3JlTW9kdWxlIH0gZnJvbSAnQG5neC12YWxpZGF0ZS9jb3JlJztcclxuaW1wb3J0IHsgQWNjb3VudFJvdXRpbmdNb2R1bGUgfSBmcm9tICcuL2FjY291bnQtcm91dGluZy5tb2R1bGUnO1xyXG5pbXBvcnQgeyBDaGFuZ2VQYXNzd29yZENvbXBvbmVudCB9IGZyb20gJy4vY29tcG9uZW50cy9jaGFuZ2UtcGFzc3dvcmQvY2hhbmdlLXBhc3N3b3JkLmNvbXBvbmVudCc7XHJcbmltcG9ydCB7IExvZ2luQ29tcG9uZW50IH0gZnJvbSAnLi9jb21wb25lbnRzL2xvZ2luL2xvZ2luLmNvbXBvbmVudCc7XHJcbmltcG9ydCB7IE1hbmFnZVByb2ZpbGVDb21wb25lbnQgfSBmcm9tICcuL2NvbXBvbmVudHMvbWFuYWdlLXByb2ZpbGUvbWFuYWdlLXByb2ZpbGUuY29tcG9uZW50JztcclxuaW1wb3J0IHsgUGVyc29uYWxTZXR0aW5nc0NvbXBvbmVudCB9IGZyb20gJy4vY29tcG9uZW50cy9wZXJzb25hbC1zZXR0aW5ncy9wZXJzb25hbC1zZXR0aW5ncy5jb21wb25lbnQnO1xyXG5pbXBvcnQgeyBSZWdpc3RlckNvbXBvbmVudCB9IGZyb20gJy4vY29tcG9uZW50cy9yZWdpc3Rlci9yZWdpc3Rlci5jb21wb25lbnQnO1xyXG5pbXBvcnQgeyBBY2NvdW50Q29uZmlnT3B0aW9ucyB9IGZyb20gJy4vbW9kZWxzL2NvbmZpZy1vcHRpb25zJztcclxuaW1wb3J0IHsgQUNDT1VOVF9DT05GSUdfT1BUSU9OUyB9IGZyb20gJy4vdG9rZW5zL2NvbmZpZy1vcHRpb25zLnRva2VuJztcclxuaW1wb3J0IHsgYWNjb3VudENvbmZpZ09wdGlvbnNGYWN0b3J5IH0gZnJvbSAnLi91dGlscy9mYWN0b3J5LXV0aWxzJztcclxuaW1wb3J0IHsgQXV0aGVudGljYXRpb25GbG93R3VhcmQgfSBmcm9tICcuL2d1YXJkcy9hdXRoZW50aWNhdGlvbi1mbG93Lmd1YXJkJztcclxuaW1wb3J0IHsgRm9yZ290UGFzc3dvcmRDb21wb25lbnQgfSBmcm9tICcuL2NvbXBvbmVudHMvZm9yZ290LXBhc3N3b3JkL2ZvcmdvdC1wYXNzd29yZC5jb21wb25lbnQnO1xyXG5pbXBvcnQgeyBSZXNldFBhc3N3b3JkQ29tcG9uZW50IH0gZnJvbSAnLi9jb21wb25lbnRzL3Jlc2V0LXBhc3N3b3JkL3Jlc2V0LXBhc3N3b3JkLmNvbXBvbmVudCc7XHJcbmltcG9ydCB7IFJFX0xPR0lOX0NPTkZJUk1BVElPTl9UT0tFTiB9IGZyb20gJy4vdG9rZW5zJztcclxuaW1wb3J0IHsgVWlFeHRlbnNpb25zTW9kdWxlIH0gZnJvbSAnQGFicC9uZy50aGVtZS5zaGFyZWQvZXh0ZW5zaW9ucyc7XHJcbmltcG9ydCB7IEFDQ09VTlRfRURJVF9GT1JNX1BST1BfQ09OVFJJQlVUT1JTIH0gZnJvbSAnLi90b2tlbnMvZXh0ZW5zaW9ucy50b2tlbic7XHJcbmltcG9ydCB7IEFjY291bnRFeHRlbnNpb25zR3VhcmQgfSBmcm9tICcuL2d1YXJkcy9leHRlbnNpb25zLmd1YXJkJztcclxuaW1wb3J0IHsgUGVyc29uYWxTZXR0aW5nc0hhbGZSb3dDb21wb25lbnQgfSBmcm9tICcuL2NvbXBvbmVudHMvcGVyc29uYWwtc2V0dGluZ3MvcGVyc29uYWwtc2V0dGluZ3MtaGFsZi1yb3cuY29tcG9uZW50JztcclxuXHJcbmNvbnN0IGRlY2xhcmF0aW9ucyA9IFtcclxuICBMb2dpbkNvbXBvbmVudCxcclxuICBSZWdpc3RlckNvbXBvbmVudCxcclxuICBDaGFuZ2VQYXNzd29yZENvbXBvbmVudCxcclxuICBNYW5hZ2VQcm9maWxlQ29tcG9uZW50LFxyXG4gIFBlcnNvbmFsU2V0dGluZ3NDb21wb25lbnQsXHJcbiAgRm9yZ290UGFzc3dvcmRDb21wb25lbnQsXHJcbiAgUmVzZXRQYXNzd29yZENvbXBvbmVudCxcclxuICBQZXJzb25hbFNldHRpbmdzSGFsZlJvd0NvbXBvbmVudCxcclxuXTtcclxuXHJcbkBOZ01vZHVsZSh7XHJcbiAgZGVjbGFyYXRpb25zOiBbLi4uZGVjbGFyYXRpb25zXSxcclxuICBpbXBvcnRzOiBbXHJcbiAgICBDb3JlTW9kdWxlLFxyXG4gICAgQWNjb3VudFJvdXRpbmdNb2R1bGUsXHJcbiAgICBUaGVtZVNoYXJlZE1vZHVsZSxcclxuICAgIE5nYkRyb3Bkb3duTW9kdWxlLFxyXG4gICAgTmd4VmFsaWRhdGVDb3JlTW9kdWxlLFxyXG4gICAgVWlFeHRlbnNpb25zTW9kdWxlLFxyXG4gIF0sXHJcbiAgZXhwb3J0czogWy4uLmRlY2xhcmF0aW9uc10sXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBBY2NvdW50TW9kdWxlIHtcclxuICBzdGF0aWMgZm9yQ2hpbGQob3B0aW9ucyA9IHt9IGFzIEFjY291bnRDb25maWdPcHRpb25zKTogTW9kdWxlV2l0aFByb3ZpZGVyczxBY2NvdW50TW9kdWxlPiB7XHJcbiAgICByZXR1cm4ge1xyXG4gICAgICBuZ01vZHVsZTogQWNjb3VudE1vZHVsZSxcclxuICAgICAgcHJvdmlkZXJzOiBbXHJcbiAgICAgICAgQXV0aGVudGljYXRpb25GbG93R3VhcmQsXHJcbiAgICAgICAgeyBwcm92aWRlOiBBQ0NPVU5UX0NPTkZJR19PUFRJT05TLCB1c2VWYWx1ZTogb3B0aW9ucyB9LFxyXG4gICAgICAgIHtcclxuICAgICAgICAgIHByb3ZpZGU6ICdBQ0NPVU5UX09QVElPTlMnLFxyXG4gICAgICAgICAgdXNlRmFjdG9yeTogYWNjb3VudENvbmZpZ09wdGlvbnNGYWN0b3J5LFxyXG4gICAgICAgICAgZGVwczogW0FDQ09VTlRfQ09ORklHX09QVElPTlNdLFxyXG4gICAgICAgIH0sXHJcbiAgICAgICAge1xyXG4gICAgICAgICAgcHJvdmlkZTogUkVfTE9HSU5fQ09ORklSTUFUSU9OX1RPS0VOLFxyXG4gICAgICAgICAgdXNlVmFsdWU6IG9wdGlvbnMuaXNQZXJzb25hbFNldHRpbmdzQ2hhbmdlZENvbmZpcm1hdGlvbkFjdGl2ZSA/PyB0cnVlLFxyXG4gICAgICAgIH0sXHJcbiAgICAgICAge1xyXG4gICAgICAgICAgcHJvdmlkZTogQUNDT1VOVF9FRElUX0ZPUk1fUFJPUF9DT05UUklCVVRPUlMsXHJcbiAgICAgICAgICB1c2VWYWx1ZTogb3B0aW9ucy5lZGl0Rm9ybVByb3BDb250cmlidXRvcnMsXHJcbiAgICAgICAgfSxcclxuICAgICAgICBBY2NvdW50RXh0ZW5zaW9uc0d1YXJkLFxyXG4gICAgICBdLFxyXG4gICAgfTtcclxuICB9XHJcblxyXG4gIHN0YXRpYyBmb3JMYXp5KG9wdGlvbnMgPSB7fSBhcyBBY2NvdW50Q29uZmlnT3B0aW9ucyk6IE5nTW9kdWxlRmFjdG9yeTxBY2NvdW50TW9kdWxlPiB7XHJcbiAgICByZXR1cm4gbmV3IExhenlNb2R1bGVGYWN0b3J5KEFjY291bnRNb2R1bGUuZm9yQ2hpbGQob3B0aW9ucykpO1xyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -1,26 +1,34 @@
|
|
|
1
1
|
import { ProfileService } from '@abp/ng.account.core/proxy';
|
|
2
|
-
import { ToasterService } from '@abp/ng.theme.shared';
|
|
3
|
-
import { Component, Injector } from '@angular/core';
|
|
2
|
+
import { Confirmation, ConfirmationService, ToasterService } from '@abp/ng.theme.shared';
|
|
3
|
+
import { Component, Inject, Injector } from '@angular/core';
|
|
4
4
|
import { UntypedFormBuilder } from '@angular/forms';
|
|
5
|
-
import { finalize } from 'rxjs/operators';
|
|
5
|
+
import { finalize, filter } from 'rxjs/operators';
|
|
6
6
|
import { ManageProfileStateService } from '../../services/manage-profile.state.service';
|
|
7
|
+
import { AuthService } from '@abp/ng.core';
|
|
8
|
+
import { RE_LOGIN_CONFIRMATION_TOKEN } from '../../tokens';
|
|
7
9
|
import { EXTENSIONS_IDENTIFIER, FormPropData, generateFormFromProps, } from '@abp/ng.theme.shared/extensions';
|
|
8
10
|
import * as i0 from "@angular/core";
|
|
9
11
|
import * as i1 from "@angular/forms";
|
|
10
12
|
import * as i2 from "@abp/ng.theme.shared";
|
|
11
13
|
import * as i3 from "@abp/ng.account.core/proxy";
|
|
12
14
|
import * as i4 from "../../services/manage-profile.state.service";
|
|
13
|
-
import * as i5 from "@
|
|
14
|
-
import * as i6 from "@
|
|
15
|
+
import * as i5 from "@abp/ng.core";
|
|
16
|
+
import * as i6 from "@angular/common";
|
|
15
17
|
import * as i7 from "@ngx-validate/core";
|
|
16
18
|
import * as i8 from "@abp/ng.theme.shared/extensions";
|
|
17
19
|
export class PersonalSettingsComponent {
|
|
18
|
-
constructor(fb, toasterService, profileService, manageProfileState, injector) {
|
|
20
|
+
constructor(fb, toasterService, profileService, manageProfileState, authService, confirmationService, isPersonalSettingsChangedConfirmationActive, injector) {
|
|
19
21
|
this.fb = fb;
|
|
20
22
|
this.toasterService = toasterService;
|
|
21
23
|
this.profileService = profileService;
|
|
22
24
|
this.manageProfileState = manageProfileState;
|
|
25
|
+
this.authService = authService;
|
|
26
|
+
this.confirmationService = confirmationService;
|
|
27
|
+
this.isPersonalSettingsChangedConfirmationActive = isPersonalSettingsChangedConfirmationActive;
|
|
23
28
|
this.injector = injector;
|
|
29
|
+
this.logoutConfirmation = () => {
|
|
30
|
+
this.authService.logout().subscribe();
|
|
31
|
+
};
|
|
24
32
|
}
|
|
25
33
|
buildForm() {
|
|
26
34
|
this.selected = this.manageProfileState.getProfile();
|
|
@@ -36,6 +44,7 @@ export class PersonalSettingsComponent {
|
|
|
36
44
|
submit() {
|
|
37
45
|
if (this.form.invalid)
|
|
38
46
|
return;
|
|
47
|
+
const isLogOutConfirmMessageVisible = this.isLogoutConfirmMessageActive();
|
|
39
48
|
this.inProgress = true;
|
|
40
49
|
this.profileService
|
|
41
50
|
.update(this.form.value)
|
|
@@ -43,16 +52,39 @@ export class PersonalSettingsComponent {
|
|
|
43
52
|
.subscribe(profile => {
|
|
44
53
|
this.manageProfileState.setProfile(profile);
|
|
45
54
|
this.toasterService.success('AbpAccount::PersonalSettingsSaved', 'Success', { life: 5000 });
|
|
55
|
+
if (isLogOutConfirmMessageVisible) {
|
|
56
|
+
this.showLogoutConfirmMessage();
|
|
57
|
+
}
|
|
46
58
|
});
|
|
47
59
|
}
|
|
60
|
+
isDataSame(oldValue, newValue) {
|
|
61
|
+
return Object.entries(oldValue).some(([key, value]) => {
|
|
62
|
+
if (key in newValue) {
|
|
63
|
+
return value !== newValue[key];
|
|
64
|
+
}
|
|
65
|
+
return false;
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
isLogoutConfirmMessageActive() {
|
|
69
|
+
if (!this.isPersonalSettingsChangedConfirmationActive) {
|
|
70
|
+
return false;
|
|
71
|
+
}
|
|
72
|
+
return this.isDataSame(this.profile, this.form.value);
|
|
73
|
+
}
|
|
74
|
+
showLogoutConfirmMessage() {
|
|
75
|
+
this.confirmationService
|
|
76
|
+
.info('AbpAccount::PersonalSettingsChangedConfirmationModalDescription', 'AbpAccount::PersonalSettingsChangedConfirmationModalTitle')
|
|
77
|
+
.pipe(filter(status => status === Confirmation.Status.confirm))
|
|
78
|
+
.subscribe(this.logoutConfirmation);
|
|
79
|
+
}
|
|
48
80
|
}
|
|
49
|
-
PersonalSettingsComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.1", ngImport: i0, type: PersonalSettingsComponent, deps: [{ token: i1.UntypedFormBuilder }, { token: i2.ToasterService }, { token: i3.ProfileService }, { token: i4.ManageProfileStateService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Component });
|
|
81
|
+
PersonalSettingsComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.1", ngImport: i0, type: PersonalSettingsComponent, deps: [{ token: i1.UntypedFormBuilder }, { token: i2.ToasterService }, { token: i3.ProfileService }, { token: i4.ManageProfileStateService }, { token: i5.AuthService }, { token: i2.ConfirmationService }, { token: RE_LOGIN_CONFIRMATION_TOKEN }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Component });
|
|
50
82
|
PersonalSettingsComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.1", type: PersonalSettingsComponent, selector: "abp-personal-settings-form", providers: [
|
|
51
83
|
{
|
|
52
84
|
provide: EXTENSIONS_IDENTIFIER,
|
|
53
85
|
useValue: "Account.PersonalSettingsComponent" /* eAccountComponents.PersonalSettings */,
|
|
54
86
|
},
|
|
55
|
-
], exportAs: ["abpPersonalSettingsForm"], ngImport: i0, template: "<form [formGroup]=\"form\" *ngIf=\"form\" (ngSubmit)=\"submit()\" validateOnSubmit>\r\n <abp-extensible-form [selectedRecord]=\"selected\"></abp-extensible-form>\r\n\r\n <abp-button\r\n buttonType=\"submit\"\r\n iconClass=\"fa fa-check\"\r\n buttonClass=\"btn btn-primary color-white\"\r\n [loading]=\"inProgress\"\r\n >\r\n {{ 'AbpIdentity::Save' | abpLocalization }}</abp-button\r\n >\r\n</form>\r\n", dependencies: [{ kind: "directive", type:
|
|
87
|
+
], exportAs: ["abpPersonalSettingsForm"], ngImport: i0, template: "<form [formGroup]=\"form\" *ngIf=\"form\" (ngSubmit)=\"submit()\" validateOnSubmit>\r\n <abp-extensible-form [selectedRecord]=\"selected\"></abp-extensible-form>\r\n\r\n <abp-button\r\n buttonType=\"submit\"\r\n iconClass=\"fa fa-check\"\r\n buttonClass=\"btn btn-primary color-white\"\r\n [loading]=\"inProgress\"\r\n >\r\n {{ 'AbpIdentity::Save' | abpLocalization }}</abp-button\r\n >\r\n</form>\r\n", dependencies: [{ kind: "directive", type: i6.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i1.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i1.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i5.FormSubmitDirective, selector: "form[ngSubmit][formGroup]", inputs: ["debounce", "notValidateOnSubmit", "markAsDirtyWhenSubmit"], outputs: ["ngSubmit"] }, { kind: "component", type: i2.ButtonComponent, selector: "abp-button", inputs: ["buttonId", "buttonClass", "buttonType", "formName", "iconClass", "loading", "disabled", "attributes"], outputs: ["click", "focus", "blur", "abpClick", "abpFocus", "abpBlur"] }, { kind: "directive", type: i7.ValidationGroupDirective, selector: "[formGroup],[formGroupName]", exportAs: ["validationGroup"] }, { kind: "component", type: i8.ExtensibleFormComponent, selector: "abp-extensible-form", inputs: ["selectedRecord"], exportAs: ["abpExtensibleForm"] }, { kind: "pipe", type: i5.LocalizationPipe, name: "abpLocalization" }] });
|
|
56
88
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.1", ngImport: i0, type: PersonalSettingsComponent, decorators: [{
|
|
57
89
|
type: Component,
|
|
58
90
|
args: [{ selector: 'abp-personal-settings-form', exportAs: 'abpPersonalSettingsForm', providers: [
|
|
@@ -61,5 +93,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.1", ngImpor
|
|
|
61
93
|
useValue: "Account.PersonalSettingsComponent" /* eAccountComponents.PersonalSettings */,
|
|
62
94
|
},
|
|
63
95
|
], template: "<form [formGroup]=\"form\" *ngIf=\"form\" (ngSubmit)=\"submit()\" validateOnSubmit>\r\n <abp-extensible-form [selectedRecord]=\"selected\"></abp-extensible-form>\r\n\r\n <abp-button\r\n buttonType=\"submit\"\r\n iconClass=\"fa fa-check\"\r\n buttonClass=\"btn btn-primary color-white\"\r\n [loading]=\"inProgress\"\r\n >\r\n {{ 'AbpIdentity::Save' | abpLocalization }}</abp-button\r\n >\r\n</form>\r\n" }]
|
|
64
|
-
}], ctorParameters: function () { return [{ type: i1.UntypedFormBuilder }, { type: i2.ToasterService }, { type: i3.ProfileService }, { type: i4.ManageProfileStateService }, { type:
|
|
65
|
-
|
|
96
|
+
}], ctorParameters: function () { return [{ type: i1.UntypedFormBuilder }, { type: i2.ToasterService }, { type: i3.ProfileService }, { type: i4.ManageProfileStateService }, { type: i5.AuthService }, { type: i2.ConfirmationService }, { type: undefined, decorators: [{
|
|
97
|
+
type: Inject,
|
|
98
|
+
args: [RE_LOGIN_CONFIRMATION_TOKEN]
|
|
99
|
+
}] }, { type: i0.Injector }]; } });
|
|
100
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"personal-settings.component.js","sourceRoot":"","sources":["../../../../../../../packages/account/src/lib/components/personal-settings/personal-settings.component.ts","../../../../../../../packages/account/src/lib/components/personal-settings/personal-settings.component.html"],"names":[],"mappings":"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","sourcesContent":["import { ProfileDto, ProfileService } from '@abp/ng.account.core/proxy';\r\nimport { Confirmation, ConfirmationService, ToasterService } from '@abp/ng.theme.shared';\r\nimport { Component, Inject, Injector, OnInit } from '@angular/core';\r\nimport { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';\r\nimport { finalize, filter } from 'rxjs/operators';\r\nimport { Account } from '../../models/account';\r\nimport { ManageProfileStateService } from '../../services/manage-profile.state.service';\r\nimport { AuthService } from '@abp/ng.core';\r\nimport { RE_LOGIN_CONFIRMATION_TOKEN } from '../../tokens';\r\nimport {\r\n  EXTENSIONS_IDENTIFIER,\r\n  FormPropData,\r\n  generateFormFromProps,\r\n} from '@abp/ng.theme.shared/extensions';\r\nimport { eAccountComponents } from '../../enums';\r\n\r\n@Component({\r\n  selector: 'abp-personal-settings-form',\r\n  templateUrl: './personal-settings.component.html',\r\n  exportAs: 'abpPersonalSettingsForm',\r\n  providers: [\r\n    {\r\n      provide: EXTENSIONS_IDENTIFIER,\r\n      useValue: eAccountComponents.PersonalSettings,\r\n    },\r\n  ],\r\n})\r\nexport class PersonalSettingsComponent\r\n  implements\r\n    OnInit,\r\n    Account.PersonalSettingsComponentInputs,\r\n    Account.PersonalSettingsComponentOutputs\r\n{\r\n  selected: ProfileDto;\r\n\r\n  form: UntypedFormGroup;\r\n\r\n  inProgress: boolean;\r\n  private profile: ProfileDto;\r\n\r\n  constructor(\r\n    private fb: UntypedFormBuilder,\r\n    private toasterService: ToasterService,\r\n    private profileService: ProfileService,\r\n    private manageProfileState: ManageProfileStateService,\r\n    private readonly authService: AuthService,\r\n    private confirmationService: ConfirmationService,\r\n    @Inject(RE_LOGIN_CONFIRMATION_TOKEN)\r\n    private isPersonalSettingsChangedConfirmationActive: boolean,\r\n    protected injector: Injector,\r\n  ) {}\r\n\r\n  buildForm() {\r\n    this.selected = this.manageProfileState.getProfile();\r\n    if (!this.selected) {\r\n      return;\r\n    }\r\n    const data = new FormPropData(this.injector, this.selected);\r\n    this.form = generateFormFromProps(data);\r\n  }\r\n\r\n  ngOnInit(): void {\r\n    this.buildForm();\r\n  }\r\n\r\n  submit() {\r\n    if (this.form.invalid) return;\r\n    const isLogOutConfirmMessageVisible = this.isLogoutConfirmMessageActive();\r\n    this.inProgress = true;\r\n    this.profileService\r\n      .update(this.form.value)\r\n      .pipe(finalize(() => (this.inProgress = false)))\r\n      .subscribe(profile => {\r\n        this.manageProfileState.setProfile(profile);\r\n        this.toasterService.success('AbpAccount::PersonalSettingsSaved', 'Success', { life: 5000 });\r\n        if (isLogOutConfirmMessageVisible) {\r\n          this.showLogoutConfirmMessage();\r\n        }\r\n      });\r\n  }\r\n\r\n  isDataSame(oldValue, newValue) {\r\n    return Object.entries(oldValue).some(([key, value]) => {\r\n      if (key in newValue) {\r\n        return value !== newValue[key];\r\n      }\r\n      return false;\r\n    });\r\n  }\r\n\r\n  logoutConfirmation = () => {\r\n    this.authService.logout().subscribe();\r\n  };\r\n\r\n  private isLogoutConfirmMessageActive() {\r\n    if (!this.isPersonalSettingsChangedConfirmationActive) {\r\n      return false;\r\n    }\r\n    return this.isDataSame(this.profile, this.form.value);\r\n  }\r\n\r\n  private showLogoutConfirmMessage() {\r\n    this.confirmationService\r\n      .info(\r\n        'AbpAccount::PersonalSettingsChangedConfirmationModalDescription',\r\n        'AbpAccount::PersonalSettingsChangedConfirmationModalTitle',\r\n      )\r\n      .pipe(filter(status => status === Confirmation.Status.confirm))\r\n      .subscribe(this.logoutConfirmation);\r\n  }\r\n}\r\n","<form [formGroup]=\"form\"   *ngIf=\"form\"  (ngSubmit)=\"submit()\" validateOnSubmit>\r\n  <abp-extensible-form [selectedRecord]=\"selected\"></abp-extensible-form>\r\n\r\n  <abp-button\r\n    buttonType=\"submit\"\r\n    iconClass=\"fa fa-check\"\r\n    buttonClass=\"btn btn-primary color-white\"\r\n    [loading]=\"inProgress\"\r\n  >\r\n    {{ 'AbpIdentity::Save' | abpLocalization }}</abp-button\r\n  >\r\n</form>\r\n"]}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLW9wdGlvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9hY2NvdW50L3NyYy9saWIvbW9kZWxzL2NvbmZpZy1vcHRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBlQWNjb3VudENvbXBvbmVudHMgfSBmcm9tICcuLi9lbnVtcyc7XHJcbmltcG9ydCB7IEVkaXRGb3JtUHJvcENvbnRyaWJ1dG9yQ2FsbGJhY2sgfSBmcm9tICdAYWJwL25nLnRoZW1lLnNoYXJlZC9leHRlbnNpb25zJztcclxuaW1wb3J0IHsgVXBkYXRlUHJvZmlsZUR0byB9IGZyb20gJ0BhYnAvbmcuYWNjb3VudC5jb3JlL3Byb3h5JztcclxuXHJcbmV4cG9ydCBpbnRlcmZhY2UgQWNjb3VudENvbmZpZ09wdGlvbnMge1xyXG4gIHJlZGlyZWN0VXJsPzogc3RyaW5nO1xyXG4gIGlzUGVyc29uYWxTZXR0aW5nc0NoYW5nZWRDb25maXJtYXRpb25BY3RpdmU/OiBib29sZWFuO1xyXG4gIGVkaXRGb3JtUHJvcENvbnRyaWJ1dG9ycz86IEFjY291bnRFZGl0Rm9ybVByb3BDb250cmlidXRvcnM7XHJcbn1cclxuZXhwb3J0IHR5cGUgQWNjb3VudEVkaXRGb3JtUHJvcENvbnRyaWJ1dG9ycyA9IFBhcnRpYWw8e1xyXG4gIFtlQWNjb3VudENvbXBvbmVudHMuUGVyc29uYWxTZXR0aW5nc106IEVkaXRGb3JtUHJvcENvbnRyaWJ1dG9yQ2FsbGJhY2s8VXBkYXRlUHJvZmlsZUR0bz5bXTtcclxufT47Il19
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export * from './config-options.token';
|
|
2
|
+
export * from './re-login-confirmation.token';
|
|
2
3
|
export * from './extensions.token';
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9hY2NvdW50L3NyYy9saWIvdG9rZW5zL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYywrQkFBK0IsQ0FBQztBQUM5QyxjQUFjLG9CQUFvQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSAnLi9jb25maWctb3B0aW9ucy50b2tlbic7XHJcbmV4cG9ydCAqIGZyb20gJy4vcmUtbG9naW4tY29uZmlybWF0aW9uLnRva2VuJztcclxuZXhwb3J0ICogZnJvbSAnLi9leHRlbnNpb25zLnRva2VuJztcclxuIl19
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { InjectionToken } from '@angular/core';
|
|
2
|
+
export const RE_LOGIN_CONFIRMATION_TOKEN = new InjectionToken('RE_LOGIN_CONFIRMATION_TOKEN');
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmUtbG9naW4tY29uZmlybWF0aW9uLnRva2VuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYWNjb3VudC9zcmMvbGliL3Rva2Vucy9yZS1sb2dpbi1jb25maXJtYXRpb24udG9rZW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUvQyxNQUFNLENBQUMsTUFBTSwyQkFBMkIsR0FBRyxJQUFJLGNBQWMsQ0FDM0QsNkJBQTZCLENBQzlCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3Rpb25Ub2tlbiB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5cclxuZXhwb3J0IGNvbnN0IFJFX0xPR0lOX0NPTkZJUk1BVElPTl9UT0tFTiA9IG5ldyBJbmplY3Rpb25Ub2tlbjxib29sZWFuPihcclxuICAnUkVfTE9HSU5fQ09ORklSTUFUSU9OX1RPS0VOJyxcclxuKTtcclxuIl19
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as i3$2 from '@abp/ng.core';
|
|
2
2
|
import { InternalStore, ConfigStateService, RouterOutletComponent, ReplaceableRouteContainerComponent, AuthGuard, LazyModuleFactory, CoreModule } from '@abp/ng.core';
|
|
3
3
|
import * as i2$1 from '@abp/ng.theme.shared';
|
|
4
|
-
import { getPasswordValidators, fadeIn, ThemeSharedModule } from '@abp/ng.theme.shared';
|
|
4
|
+
import { getPasswordValidators, Confirmation, fadeIn, ThemeSharedModule } from '@abp/ng.theme.shared';
|
|
5
5
|
import * as i0 from '@angular/core';
|
|
6
6
|
import { Component, InjectionToken, Injectable, Inject, NgModule } from '@angular/core';
|
|
7
7
|
import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
|
|
@@ -11,13 +11,13 @@ import * as i3$1 from '@angular/router';
|
|
|
11
11
|
import { ActivatedRoute, RouterModule } from '@angular/router';
|
|
12
12
|
import * as i1 from '@angular/forms';
|
|
13
13
|
import { Validators, UntypedFormControl } from '@angular/forms';
|
|
14
|
-
import { finalize, catchError, switchMap, map, tap, mapTo } from 'rxjs/operators';
|
|
14
|
+
import { finalize, catchError, filter, switchMap, map, tap, mapTo } from 'rxjs/operators';
|
|
15
15
|
import * as i2 from '@abp/ng.account.core/proxy';
|
|
16
16
|
import * as i3 from '@angular/common';
|
|
17
17
|
import { throwError } from 'rxjs';
|
|
18
18
|
import { trigger, transition, useAnimation } from '@angular/animations';
|
|
19
|
-
import * as
|
|
20
|
-
import {
|
|
19
|
+
import * as i4 from '@abp/ng.theme.shared/extensions';
|
|
20
|
+
import { EXTENSIONS_FORM_PROP, EXTENSIBLE_FORM_VIEW_PROVIDER, FormProp, FormPropData, generateFormFromProps, EXTENSIONS_IDENTIFIER, ExtensionsService, getObjectExtensionEntitiesFromStore, mapEntitiesToContributors, mergeWithDefaultProps, UiExtensionsModule } from '@abp/ng.theme.shared/extensions';
|
|
21
21
|
|
|
22
22
|
class ForgotPasswordComponent {
|
|
23
23
|
constructor(fb, accountService) {
|
|
@@ -204,13 +204,111 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.1", ngImpor
|
|
|
204
204
|
args: [{ selector: 'abp-change-password-form', exportAs: 'abpChangePasswordForm', template: "<form [formGroup]=\"form\" (ngSubmit)=\"onSubmit()\" [mapErrorsFn]=\"mapErrorsFn\" validateOnSubmit>\r\n <div *ngIf=\"!hideCurrentPassword\" class=\"mb-3 form-group\">\r\n <label for=\"current-password\" class=\"form-label\">{{\r\n 'AbpIdentity::DisplayName:CurrentPassword' | abpLocalization\r\n }}</label\r\n ><span> * </span\r\n ><input\r\n type=\"password\"\r\n id=\"current-password\"\r\n class=\"form-control\"\r\n formControlName=\"password\"\r\n autofocus\r\n autocomplete=\"current-password\"\r\n />\r\n </div>\r\n <div class=\"mb-3 form-group\">\r\n <label for=\"new-password\" class=\"form-label\">{{\r\n 'AbpIdentity::DisplayName:NewPassword' | abpLocalization\r\n }}</label\r\n ><span> * </span\r\n ><input\r\n type=\"password\"\r\n id=\"new-password\"\r\n class=\"form-control\"\r\n formControlName=\"newPassword\"\r\n autocomplete=\"new-password\"\r\n />\r\n </div>\r\n <div class=\"mb-3 form-group\">\r\n <label for=\"confirm-new-password\" class=\"form-label\">{{\r\n 'AbpIdentity::DisplayName:NewPasswordConfirm' | abpLocalization\r\n }}</label\r\n ><span> * </span\r\n ><input\r\n type=\"password\"\r\n id=\"confirm-new-password\"\r\n class=\"form-control\"\r\n formControlName=\"repeatNewPassword\"\r\n autocomplete=\"new-password\"\r\n />\r\n </div>\r\n <abp-button\r\n iconClass=\"fa fa-check\"\r\n buttonClass=\"btn btn-primary color-white\"\r\n buttonType=\"submit\"\r\n [loading]=\"inProgress\"\r\n [disabled]=\"form?.invalid\"\r\n >{{ 'AbpIdentity::Save' | abpLocalization }}</abp-button\r\n >\r\n</form>\r\n" }]
|
|
205
205
|
}], ctorParameters: function () { return [{ type: i1.UntypedFormBuilder }, { type: i0.Injector }, { type: i2$1.ToasterService }, { type: i2.ProfileService }, { type: ManageProfileStateService }]; } });
|
|
206
206
|
|
|
207
|
+
const RE_LOGIN_CONFIRMATION_TOKEN = new InjectionToken('RE_LOGIN_CONFIRMATION_TOKEN');
|
|
208
|
+
|
|
209
|
+
class PersonalSettingsHalfRowComponent {
|
|
210
|
+
constructor(propData) {
|
|
211
|
+
this.propData = propData;
|
|
212
|
+
this.displayName = propData.displayName;
|
|
213
|
+
this.name = propData.name;
|
|
214
|
+
this.id = propData.id;
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
PersonalSettingsHalfRowComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.1", ngImport: i0, type: PersonalSettingsHalfRowComponent, deps: [{ token: EXTENSIONS_FORM_PROP }], target: i0.ɵɵFactoryTarget.Component });
|
|
218
|
+
PersonalSettingsHalfRowComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.1", type: PersonalSettingsHalfRowComponent, selector: "abp-personal-settings-half-row", ngImport: i0, template: ` <div class="w-50 d-inline">
|
|
219
|
+
<div class="mb-3 form-group">
|
|
220
|
+
<label [attr.for]="name" class="form-label">{{ displayName | abpLocalization }} </label>
|
|
221
|
+
<input
|
|
222
|
+
type="text"
|
|
223
|
+
[attr.id]="id"
|
|
224
|
+
class="form-control"
|
|
225
|
+
[attr.name]="name"
|
|
226
|
+
[formControlName]="name"
|
|
227
|
+
/>
|
|
228
|
+
</div>
|
|
229
|
+
</div>`, isInline: true, dependencies: [{ kind: "directive", type: i1.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "directive", type: i7.ValidationDirective, selector: "[formControl],[formControlName]", exportAs: ["validationDirective"] }, { kind: "pipe", type: i3$2.LocalizationPipe, name: "abpLocalization" }], viewProviders: [EXTENSIBLE_FORM_VIEW_PROVIDER] });
|
|
230
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.1", ngImport: i0, type: PersonalSettingsHalfRowComponent, decorators: [{
|
|
231
|
+
type: Component,
|
|
232
|
+
args: [{ selector: 'abp-personal-settings-half-row', template: ` <div class="w-50 d-inline">
|
|
233
|
+
<div class="mb-3 form-group">
|
|
234
|
+
<label [attr.for]="name" class="form-label">{{ displayName | abpLocalization }} </label>
|
|
235
|
+
<input
|
|
236
|
+
type="text"
|
|
237
|
+
[attr.id]="id"
|
|
238
|
+
class="form-control"
|
|
239
|
+
[attr.name]="name"
|
|
240
|
+
[formControlName]="name"
|
|
241
|
+
/>
|
|
242
|
+
</div>
|
|
243
|
+
</div>`, viewProviders: [EXTENSIBLE_FORM_VIEW_PROVIDER] }]
|
|
244
|
+
}], ctorParameters: function () {
|
|
245
|
+
return [{ type: i4.FormProp, decorators: [{
|
|
246
|
+
type: Inject,
|
|
247
|
+
args: [EXTENSIONS_FORM_PROP]
|
|
248
|
+
}] }];
|
|
249
|
+
} });
|
|
250
|
+
|
|
251
|
+
const { maxLength: maxLength$1, required: required$1, email: email$1 } = Validators;
|
|
252
|
+
const DEFAULT_PERSONAL_SETTINGS_UPDATE_FORM_PROPS = FormProp.createMany([
|
|
253
|
+
{
|
|
254
|
+
type: "string" /* ePropType.String */,
|
|
255
|
+
name: 'userName',
|
|
256
|
+
displayName: 'AbpIdentity::DisplayName:UserName',
|
|
257
|
+
id: 'username',
|
|
258
|
+
validators: () => [required$1, maxLength$1(256)],
|
|
259
|
+
},
|
|
260
|
+
{
|
|
261
|
+
type: "string" /* ePropType.String */,
|
|
262
|
+
name: 'name',
|
|
263
|
+
displayName: 'AbpIdentity::DisplayName:Name',
|
|
264
|
+
id: 'name',
|
|
265
|
+
validators: () => [maxLength$1(64)],
|
|
266
|
+
template: PersonalSettingsHalfRowComponent,
|
|
267
|
+
className: 'd-inline-block w-50',
|
|
268
|
+
},
|
|
269
|
+
{
|
|
270
|
+
type: "string" /* ePropType.String */,
|
|
271
|
+
name: 'surname',
|
|
272
|
+
displayName: 'AbpIdentity::DisplayName:Surname',
|
|
273
|
+
id: 'surname',
|
|
274
|
+
validators: () => [maxLength$1(64)],
|
|
275
|
+
className: 'd-inline-block w-50 ps-4',
|
|
276
|
+
template: PersonalSettingsHalfRowComponent,
|
|
277
|
+
},
|
|
278
|
+
{
|
|
279
|
+
type: "string" /* ePropType.String */,
|
|
280
|
+
name: 'email',
|
|
281
|
+
displayName: 'AbpIdentity::DisplayName:Email',
|
|
282
|
+
id: 'email-address',
|
|
283
|
+
validators: () => [required$1, email$1, maxLength$1(256)],
|
|
284
|
+
},
|
|
285
|
+
{
|
|
286
|
+
type: "string" /* ePropType.String */,
|
|
287
|
+
name: 'phoneNumber',
|
|
288
|
+
displayName: 'AbpIdentity::DisplayName:PhoneNumber',
|
|
289
|
+
id: 'phone-number',
|
|
290
|
+
validators: () => [maxLength$1(16)],
|
|
291
|
+
},
|
|
292
|
+
]);
|
|
293
|
+
|
|
294
|
+
const DEFAULT_ACCOUNT_FORM_PROPS = {
|
|
295
|
+
["Account.PersonalSettingsComponent" /* eAccountComponents.PersonalSettings */]: DEFAULT_PERSONAL_SETTINGS_UPDATE_FORM_PROPS,
|
|
296
|
+
};
|
|
297
|
+
const ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS = new InjectionToken('ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS');
|
|
298
|
+
|
|
207
299
|
class PersonalSettingsComponent {
|
|
208
|
-
constructor(fb, toasterService, profileService, manageProfileState, injector) {
|
|
300
|
+
constructor(fb, toasterService, profileService, manageProfileState, authService, confirmationService, isPersonalSettingsChangedConfirmationActive, injector) {
|
|
209
301
|
this.fb = fb;
|
|
210
302
|
this.toasterService = toasterService;
|
|
211
303
|
this.profileService = profileService;
|
|
212
304
|
this.manageProfileState = manageProfileState;
|
|
305
|
+
this.authService = authService;
|
|
306
|
+
this.confirmationService = confirmationService;
|
|
307
|
+
this.isPersonalSettingsChangedConfirmationActive = isPersonalSettingsChangedConfirmationActive;
|
|
213
308
|
this.injector = injector;
|
|
309
|
+
this.logoutConfirmation = () => {
|
|
310
|
+
this.authService.logout().subscribe();
|
|
311
|
+
};
|
|
214
312
|
}
|
|
215
313
|
buildForm() {
|
|
216
314
|
this.selected = this.manageProfileState.getProfile();
|
|
@@ -226,6 +324,7 @@ class PersonalSettingsComponent {
|
|
|
226
324
|
submit() {
|
|
227
325
|
if (this.form.invalid)
|
|
228
326
|
return;
|
|
327
|
+
const isLogOutConfirmMessageVisible = this.isLogoutConfirmMessageActive();
|
|
229
328
|
this.inProgress = true;
|
|
230
329
|
this.profileService
|
|
231
330
|
.update(this.form.value)
|
|
@@ -233,16 +332,39 @@ class PersonalSettingsComponent {
|
|
|
233
332
|
.subscribe(profile => {
|
|
234
333
|
this.manageProfileState.setProfile(profile);
|
|
235
334
|
this.toasterService.success('AbpAccount::PersonalSettingsSaved', 'Success', { life: 5000 });
|
|
335
|
+
if (isLogOutConfirmMessageVisible) {
|
|
336
|
+
this.showLogoutConfirmMessage();
|
|
337
|
+
}
|
|
236
338
|
});
|
|
237
339
|
}
|
|
340
|
+
isDataSame(oldValue, newValue) {
|
|
341
|
+
return Object.entries(oldValue).some(([key, value]) => {
|
|
342
|
+
if (key in newValue) {
|
|
343
|
+
return value !== newValue[key];
|
|
344
|
+
}
|
|
345
|
+
return false;
|
|
346
|
+
});
|
|
347
|
+
}
|
|
348
|
+
isLogoutConfirmMessageActive() {
|
|
349
|
+
if (!this.isPersonalSettingsChangedConfirmationActive) {
|
|
350
|
+
return false;
|
|
351
|
+
}
|
|
352
|
+
return this.isDataSame(this.profile, this.form.value);
|
|
353
|
+
}
|
|
354
|
+
showLogoutConfirmMessage() {
|
|
355
|
+
this.confirmationService
|
|
356
|
+
.info('AbpAccount::PersonalSettingsChangedConfirmationModalDescription', 'AbpAccount::PersonalSettingsChangedConfirmationModalTitle')
|
|
357
|
+
.pipe(filter(status => status === Confirmation.Status.confirm))
|
|
358
|
+
.subscribe(this.logoutConfirmation);
|
|
359
|
+
}
|
|
238
360
|
}
|
|
239
|
-
PersonalSettingsComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.1", ngImport: i0, type: PersonalSettingsComponent, deps: [{ token: i1.UntypedFormBuilder }, { token: i2$1.ToasterService }, { token: i2.ProfileService }, { token: ManageProfileStateService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Component });
|
|
361
|
+
PersonalSettingsComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.1", ngImport: i0, type: PersonalSettingsComponent, deps: [{ token: i1.UntypedFormBuilder }, { token: i2$1.ToasterService }, { token: i2.ProfileService }, { token: ManageProfileStateService }, { token: i3$2.AuthService }, { token: i2$1.ConfirmationService }, { token: RE_LOGIN_CONFIRMATION_TOKEN }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Component });
|
|
240
362
|
PersonalSettingsComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.1", type: PersonalSettingsComponent, selector: "abp-personal-settings-form", providers: [
|
|
241
363
|
{
|
|
242
364
|
provide: EXTENSIONS_IDENTIFIER,
|
|
243
365
|
useValue: "Account.PersonalSettingsComponent" /* eAccountComponents.PersonalSettings */,
|
|
244
366
|
},
|
|
245
|
-
], exportAs: ["abpPersonalSettingsForm"], ngImport: i0, template: "<form [formGroup]=\"form\" *ngIf=\"form\" (ngSubmit)=\"submit()\" validateOnSubmit>\r\n <abp-extensible-form [selectedRecord]=\"selected\"></abp-extensible-form>\r\n\r\n <abp-button\r\n buttonType=\"submit\"\r\n iconClass=\"fa fa-check\"\r\n buttonClass=\"btn btn-primary color-white\"\r\n [loading]=\"inProgress\"\r\n >\r\n {{ 'AbpIdentity::Save' | abpLocalization }}</abp-button\r\n >\r\n</form>\r\n", dependencies: [{ kind: "directive", type: i3.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i1.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i1.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i3$2.FormSubmitDirective, selector: "form[ngSubmit][formGroup]", inputs: ["debounce", "notValidateOnSubmit", "markAsDirtyWhenSubmit"], outputs: ["ngSubmit"] }, { kind: "component", type: i2$1.ButtonComponent, selector: "abp-button", inputs: ["buttonId", "buttonClass", "buttonType", "formName", "iconClass", "loading", "disabled", "attributes"], outputs: ["click", "focus", "blur", "abpClick", "abpFocus", "abpBlur"] }, { kind: "directive", type: i7.ValidationGroupDirective, selector: "[formGroup],[formGroupName]", exportAs: ["validationGroup"] }, { kind: "component", type:
|
|
367
|
+
], exportAs: ["abpPersonalSettingsForm"], ngImport: i0, template: "<form [formGroup]=\"form\" *ngIf=\"form\" (ngSubmit)=\"submit()\" validateOnSubmit>\r\n <abp-extensible-form [selectedRecord]=\"selected\"></abp-extensible-form>\r\n\r\n <abp-button\r\n buttonType=\"submit\"\r\n iconClass=\"fa fa-check\"\r\n buttonClass=\"btn btn-primary color-white\"\r\n [loading]=\"inProgress\"\r\n >\r\n {{ 'AbpIdentity::Save' | abpLocalization }}</abp-button\r\n >\r\n</form>\r\n", dependencies: [{ kind: "directive", type: i3.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i1.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i1.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i3$2.FormSubmitDirective, selector: "form[ngSubmit][formGroup]", inputs: ["debounce", "notValidateOnSubmit", "markAsDirtyWhenSubmit"], outputs: ["ngSubmit"] }, { kind: "component", type: i2$1.ButtonComponent, selector: "abp-button", inputs: ["buttonId", "buttonClass", "buttonType", "formName", "iconClass", "loading", "disabled", "attributes"], outputs: ["click", "focus", "blur", "abpClick", "abpFocus", "abpBlur"] }, { kind: "directive", type: i7.ValidationGroupDirective, selector: "[formGroup],[formGroupName]", exportAs: ["validationGroup"] }, { kind: "component", type: i4.ExtensibleFormComponent, selector: "abp-extensible-form", inputs: ["selectedRecord"], exportAs: ["abpExtensibleForm"] }, { kind: "pipe", type: i3$2.LocalizationPipe, name: "abpLocalization" }] });
|
|
246
368
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.1", ngImport: i0, type: PersonalSettingsComponent, decorators: [{
|
|
247
369
|
type: Component,
|
|
248
370
|
args: [{ selector: 'abp-personal-settings-form', exportAs: 'abpPersonalSettingsForm', providers: [
|
|
@@ -251,7 +373,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.1", ngImpor
|
|
|
251
373
|
useValue: "Account.PersonalSettingsComponent" /* eAccountComponents.PersonalSettings */,
|
|
252
374
|
},
|
|
253
375
|
], template: "<form [formGroup]=\"form\" *ngIf=\"form\" (ngSubmit)=\"submit()\" validateOnSubmit>\r\n <abp-extensible-form [selectedRecord]=\"selected\"></abp-extensible-form>\r\n\r\n <abp-button\r\n buttonType=\"submit\"\r\n iconClass=\"fa fa-check\"\r\n buttonClass=\"btn btn-primary color-white\"\r\n [loading]=\"inProgress\"\r\n >\r\n {{ 'AbpIdentity::Save' | abpLocalization }}</abp-button\r\n >\r\n</form>\r\n" }]
|
|
254
|
-
}], ctorParameters: function () {
|
|
376
|
+
}], ctorParameters: function () {
|
|
377
|
+
return [{ type: i1.UntypedFormBuilder }, { type: i2$1.ToasterService }, { type: i2.ProfileService }, { type: ManageProfileStateService }, { type: i3$2.AuthService }, { type: i2$1.ConfirmationService }, { type: undefined, decorators: [{
|
|
378
|
+
type: Inject,
|
|
379
|
+
args: [RE_LOGIN_CONFIRMATION_TOKEN]
|
|
380
|
+
}] }, { type: i0.Injector }];
|
|
381
|
+
} });
|
|
255
382
|
|
|
256
383
|
class ManageProfileComponent {
|
|
257
384
|
constructor(profileService, manageProfileState) {
|
|
@@ -279,7 +406,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.1", ngImpor
|
|
|
279
406
|
args: [{ selector: 'abp-manage-profile', animations: [trigger('fadeIn', [transition(':enter', useAnimation(fadeIn))])], template: "<div id=\"AbpContentToolbar\"></div>\r\n\r\n<div class=\"card border-0 shadow-sm min-h-400\" [abpLoading]=\"!(profile$ | async)?.userName\">\r\n <div class=\"card-body\">\r\n <div class=\"row\">\r\n <div class=\"col-12 col-md-3\">\r\n <ul class=\"nav flex-column nav-pills\" id=\"nav-tab\" role=\"tablist\">\r\n <li\r\n *ngIf=\"!hideChangePasswordTab && (profile$ | async)\"\r\n class=\"nav-item\"\r\n (click)=\"selectedTab = 0\"\r\n >\r\n <a\r\n class=\"nav-link\"\r\n [ngClass]=\"{ active: selectedTab === 0 }\"\r\n role=\"tab\"\r\n href=\"javascript:void(0)\"\r\n >{{ 'AbpUi::ChangePassword' | abpLocalization }}</a\r\n >\r\n </li>\r\n <li class=\"nav-item mb-2\" (click)=\"selectedTab = 1\">\r\n <a\r\n class=\"nav-link\"\r\n [ngClass]=\"{ active: selectedTab === 1 }\"\r\n role=\"tab\"\r\n href=\"javascript:void(0)\"\r\n >{{ 'AbpAccount::PersonalSettings' | abpLocalization }}</a\r\n >\r\n </li>\r\n </ul>\r\n </div>\r\n <div *ngIf=\"profile$ | async\" class=\"col-12 col-md-9\">\r\n <div class=\"tab-content\" *ngIf=\"selectedTab === 0\" [@fadeIn]>\r\n <div class=\"tab-pane active\" role=\"tabpanel\">\r\n <h4>\r\n {{ 'AbpIdentity::ChangePassword' | abpLocalization }}\r\n <hr />\r\n </h4>\r\n <abp-change-password-form\r\n *abpReplaceableTemplate=\"{\r\n componentKey: changePasswordKey\r\n }\"\r\n ></abp-change-password-form>\r\n </div>\r\n </div>\r\n <div class=\"tab-content\" *ngIf=\"selectedTab === 1\" [@fadeIn]>\r\n <div class=\"tab-pane active\" role=\"tabpanel\">\r\n <h4>\r\n {{ 'AbpIdentity::PersonalSettings' | abpLocalization }}\r\n <hr />\r\n </h4>\r\n <abp-personal-settings-form\r\n *abpReplaceableTemplate=\"{\r\n componentKey: personalSettingsKey\r\n }\"\r\n ></abp-personal-settings-form>\r\n </div>\r\n </div>\r\n </div>\r\n </div>\r\n </div>\r\n</div>\r\n", styles: [".min-h-400{min-height:400px}\n"] }]
|
|
280
407
|
}], ctorParameters: function () { return [{ type: i2.ProfileService }, { type: ManageProfileStateService }]; } });
|
|
281
408
|
|
|
282
|
-
const { maxLength
|
|
409
|
+
const { maxLength, required, email } = Validators;
|
|
283
410
|
class RegisterComponent {
|
|
284
411
|
constructor(fb, accountService, configState, toasterService, authService, injector) {
|
|
285
412
|
this.fb = fb;
|
|
@@ -309,9 +436,9 @@ class RegisterComponent {
|
|
|
309
436
|
}
|
|
310
437
|
buildForm() {
|
|
311
438
|
this.form = this.fb.group({
|
|
312
|
-
username: ['', [required
|
|
313
|
-
password: ['', [required
|
|
314
|
-
email: ['', [required
|
|
439
|
+
username: ['', [required, maxLength(255)]],
|
|
440
|
+
password: ['', [required, ...getPasswordValidators(this.injector)]],
|
|
441
|
+
email: ['', [required, email]],
|
|
315
442
|
});
|
|
316
443
|
}
|
|
317
444
|
onSubmit() {
|
|
@@ -417,96 +544,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.1", ngImpor
|
|
|
417
544
|
type: Injectable
|
|
418
545
|
}], ctorParameters: function () { return [{ type: i3$2.AuthService }]; } });
|
|
419
546
|
|
|
420
|
-
class PersonalSettingsHalfRowComponent {
|
|
421
|
-
constructor(propData) {
|
|
422
|
-
this.propData = propData;
|
|
423
|
-
this.displayName = propData.displayName;
|
|
424
|
-
this.name = propData.name;
|
|
425
|
-
this.id = propData.id;
|
|
426
|
-
}
|
|
427
|
-
}
|
|
428
|
-
PersonalSettingsHalfRowComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.1", ngImport: i0, type: PersonalSettingsHalfRowComponent, deps: [{ token: EXTENSIONS_FORM_PROP }], target: i0.ɵɵFactoryTarget.Component });
|
|
429
|
-
PersonalSettingsHalfRowComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.1", type: PersonalSettingsHalfRowComponent, selector: "abp-personal-settings-half-row", ngImport: i0, template: ` <div class="w-50 d-inline">
|
|
430
|
-
<div class="mb-3 form-group">
|
|
431
|
-
<label [attr.for]="name" class="form-label">{{ displayName | abpLocalization }} </label>
|
|
432
|
-
<input
|
|
433
|
-
type="text"
|
|
434
|
-
[attr.id]="id"
|
|
435
|
-
class="form-control"
|
|
436
|
-
[attr.name]="name"
|
|
437
|
-
[formControlName]="name"
|
|
438
|
-
/>
|
|
439
|
-
</div>
|
|
440
|
-
</div>`, isInline: true, dependencies: [{ kind: "directive", type: i1.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "directive", type: i7.ValidationDirective, selector: "[formControl],[formControlName]", exportAs: ["validationDirective"] }, { kind: "pipe", type: i3$2.LocalizationPipe, name: "abpLocalization" }], viewProviders: [EXTENSIBLE_FORM_VIEW_PROVIDER] });
|
|
441
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.1", ngImport: i0, type: PersonalSettingsHalfRowComponent, decorators: [{
|
|
442
|
-
type: Component,
|
|
443
|
-
args: [{ selector: 'abp-personal-settings-half-row', template: ` <div class="w-50 d-inline">
|
|
444
|
-
<div class="mb-3 form-group">
|
|
445
|
-
<label [attr.for]="name" class="form-label">{{ displayName | abpLocalization }} </label>
|
|
446
|
-
<input
|
|
447
|
-
type="text"
|
|
448
|
-
[attr.id]="id"
|
|
449
|
-
class="form-control"
|
|
450
|
-
[attr.name]="name"
|
|
451
|
-
[formControlName]="name"
|
|
452
|
-
/>
|
|
453
|
-
</div>
|
|
454
|
-
</div>`, viewProviders: [EXTENSIBLE_FORM_VIEW_PROVIDER] }]
|
|
455
|
-
}], ctorParameters: function () {
|
|
456
|
-
return [{ type: i8.FormProp, decorators: [{
|
|
457
|
-
type: Inject,
|
|
458
|
-
args: [EXTENSIONS_FORM_PROP]
|
|
459
|
-
}] }];
|
|
460
|
-
} });
|
|
461
|
-
|
|
462
|
-
const { maxLength, required, email } = Validators;
|
|
463
|
-
const DEFAULT_PERSONAL_SETTINGS_UPDATE_FORM_PROPS = FormProp.createMany([
|
|
464
|
-
{
|
|
465
|
-
type: "string" /* ePropType.String */,
|
|
466
|
-
name: 'userName',
|
|
467
|
-
displayName: 'AbpIdentity::DisplayName:UserName',
|
|
468
|
-
id: 'username',
|
|
469
|
-
validators: () => [required, maxLength(256)],
|
|
470
|
-
},
|
|
471
|
-
{
|
|
472
|
-
type: "string" /* ePropType.String */,
|
|
473
|
-
name: 'name',
|
|
474
|
-
displayName: 'AbpIdentity::DisplayName:Name',
|
|
475
|
-
id: 'name',
|
|
476
|
-
validators: () => [maxLength(64)],
|
|
477
|
-
template: PersonalSettingsHalfRowComponent,
|
|
478
|
-
className: 'd-inline-block w-50',
|
|
479
|
-
},
|
|
480
|
-
{
|
|
481
|
-
type: "string" /* ePropType.String */,
|
|
482
|
-
name: 'surname',
|
|
483
|
-
displayName: 'AbpIdentity::DisplayName:Surname',
|
|
484
|
-
id: 'surname',
|
|
485
|
-
validators: () => [maxLength(64)],
|
|
486
|
-
className: 'd-inline-block w-50 ps-4',
|
|
487
|
-
template: PersonalSettingsHalfRowComponent,
|
|
488
|
-
},
|
|
489
|
-
{
|
|
490
|
-
type: "string" /* ePropType.String */,
|
|
491
|
-
name: 'email',
|
|
492
|
-
displayName: 'AbpIdentity::DisplayName:Email',
|
|
493
|
-
id: 'email-address',
|
|
494
|
-
validators: () => [required, email, maxLength(256)],
|
|
495
|
-
},
|
|
496
|
-
{
|
|
497
|
-
type: "string" /* ePropType.String */,
|
|
498
|
-
name: 'phoneNumber',
|
|
499
|
-
displayName: 'AbpIdentity::DisplayName:PhoneNumber',
|
|
500
|
-
id: 'phone-number',
|
|
501
|
-
validators: () => [maxLength(16)],
|
|
502
|
-
},
|
|
503
|
-
]);
|
|
504
|
-
|
|
505
|
-
const DEFAULT_ACCOUNT_FORM_PROPS = {
|
|
506
|
-
["Account.PersonalSettingsComponent" /* eAccountComponents.PersonalSettings */]: DEFAULT_PERSONAL_SETTINGS_UPDATE_FORM_PROPS,
|
|
507
|
-
};
|
|
508
|
-
const ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS = new InjectionToken('ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS');
|
|
509
|
-
|
|
510
547
|
class AccountExtensionsGuard {
|
|
511
548
|
constructor(injector) {
|
|
512
549
|
this.injector = injector;
|
|
@@ -622,6 +659,7 @@ const declarations = [
|
|
|
622
659
|
];
|
|
623
660
|
class AccountModule {
|
|
624
661
|
static forChild(options = {}) {
|
|
662
|
+
var _a;
|
|
625
663
|
return {
|
|
626
664
|
ngModule: AccountModule,
|
|
627
665
|
providers: [
|
|
@@ -632,6 +670,10 @@ class AccountModule {
|
|
|
632
670
|
useFactory: accountConfigOptionsFactory,
|
|
633
671
|
deps: [ACCOUNT_CONFIG_OPTIONS],
|
|
634
672
|
},
|
|
673
|
+
{
|
|
674
|
+
provide: RE_LOGIN_CONFIRMATION_TOKEN,
|
|
675
|
+
useValue: (_a = options.isPersonalSettingsChangedConfirmationActive) !== null && _a !== void 0 ? _a : true,
|
|
676
|
+
},
|
|
635
677
|
{
|
|
636
678
|
provide: ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS,
|
|
637
679
|
useValue: options.editFormPropContributors,
|
|
@@ -691,5 +733,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.1", ngImpor
|
|
|
691
733
|
* Generated bundle index. Do not edit.
|
|
692
734
|
*/
|
|
693
735
|
|
|
694
|
-
export { ACCOUNT_CONFIG_OPTIONS, ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS, AccountExtensionsGuard, AccountModule, AuthenticationFlowGuard, ChangePasswordComponent, DEFAULT_ACCOUNT_FORM_PROPS, ForgotPasswordComponent, LoginComponent, ManageProfileComponent, ManageProfileStateService, PersonalSettingsComponent, PersonalSettingsHalfRowComponent, RegisterComponent, ResetPasswordComponent };
|
|
736
|
+
export { ACCOUNT_CONFIG_OPTIONS, ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS, AccountExtensionsGuard, AccountModule, AuthenticationFlowGuard, ChangePasswordComponent, DEFAULT_ACCOUNT_FORM_PROPS, ForgotPasswordComponent, LoginComponent, ManageProfileComponent, ManageProfileStateService, PersonalSettingsComponent, PersonalSettingsHalfRowComponent, RE_LOGIN_CONFIRMATION_TOKEN, RegisterComponent, ResetPasswordComponent };
|
|
695
737
|
//# sourceMappingURL=abp-ng.account.mjs.map
|