@volo/abp.ng.identity 10.4.1 → 10.5.0-rc.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/fesm2022/volo-abp.ng.identity-config.mjs +17 -11
- package/fesm2022/volo-abp.ng.identity-config.mjs.map +1 -1
- package/fesm2022/volo-abp.ng.identity-proxy.mjs +4 -0
- package/fesm2022/volo-abp.ng.identity-proxy.mjs.map +1 -1
- package/fesm2022/volo-abp.ng.identity.mjs +59 -4
- package/fesm2022/volo-abp.ng.identity.mjs.map +1 -1
- package/package.json +7 -7
- package/types/volo-abp.ng.identity-config.d.ts +6 -3
- package/types/volo-abp.ng.identity-proxy.d.ts +1 -0
|
@@ -524,6 +524,8 @@ class MyLinkUsersModalComponent {
|
|
|
524
524
|
this.filteredData = [];
|
|
525
525
|
this.filterText = '';
|
|
526
526
|
this.resultCount = 0;
|
|
527
|
+
this.isNewLinkAccountModalOpen = false;
|
|
528
|
+
this.newLinkTargetUserNameOrEmailValue = '';
|
|
527
529
|
this.list.maxResultCount = 5;
|
|
528
530
|
}
|
|
529
531
|
get currentUser() {
|
|
@@ -543,7 +545,7 @@ class MyLinkUsersModalComponent {
|
|
|
543
545
|
this.getAllList();
|
|
544
546
|
}
|
|
545
547
|
navigateToLogin() {
|
|
546
|
-
this.linkUserService.generateLinkToken().subscribe(token => {
|
|
548
|
+
this.linkUserService.generateLinkToken({ targetUserNameOrEmail: this.newLinkTargetUserNameOrEmailValue.trim() }).subscribe(token => {
|
|
547
549
|
if (this.authService.isInternalAuth) {
|
|
548
550
|
const { id: linkUserId, userName: linkUserName } = this.currentUser;
|
|
549
551
|
const { id: linkTenantId, name: linkTenantName } = this.currentTenant;
|
|
@@ -588,14 +590,18 @@ class MyLinkUsersModalComponent {
|
|
|
588
590
|
.hookToQuery(query => of({ items: this.getPageData(query.skipCount, query.skipCount + query.maxResultCount) }))
|
|
589
591
|
.subscribe(res => (this.filteredData = res.items));
|
|
590
592
|
}
|
|
591
|
-
|
|
592
|
-
this.
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
593
|
+
openNewLinkAccountModal() {
|
|
594
|
+
this.newLinkTargetUserNameOrEmailValue = '';
|
|
595
|
+
this.isNewLinkAccountModalOpen = true;
|
|
596
|
+
}
|
|
597
|
+
submitNewLinkAccount(form) {
|
|
598
|
+
if (form.invalid) {
|
|
599
|
+
Object.values(form.controls).forEach(c => c.markAsTouched());
|
|
600
|
+
form.submitted = true;
|
|
601
|
+
return;
|
|
602
|
+
}
|
|
603
|
+
this.isNewLinkAccountModalOpen = false;
|
|
604
|
+
this.navigateToLogin();
|
|
599
605
|
}
|
|
600
606
|
delete(record) {
|
|
601
607
|
this.confirmation
|
|
@@ -619,7 +625,7 @@ class MyLinkUsersModalComponent {
|
|
|
619
625
|
.subscribe(() => (this.isModalOpen = false));
|
|
620
626
|
}
|
|
621
627
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.15", ngImport: i0, type: MyLinkUsersModalComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
|
|
622
|
-
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.15", type: MyLinkUsersModalComponent, isStandalone: true, selector: "abp-my-link-users-modal", providers: [ListService], ngImport: i0, template: "<abp-modal [(visible)]=\"isModalOpen\" [suppressUnsavedChangesWarning]=\"true\">\r\n <ng-template #abpHeader>\r\n <h5 class=\"modal-title\">{{ 'AbpAccount::LinkedAccounts' | abpLocalization }}</h5>\r\n </ng-template>\r\n <ng-template #abpBody>\r\n <div class=\"text-end mb-3\">\r\n <button\r\n id=\"create-link-user\"\r\n class=\"btn btn-primary\"\r\n type=\"button\"\r\n (click)=\"
|
|
628
|
+
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.15", type: MyLinkUsersModalComponent, isStandalone: true, selector: "abp-my-link-users-modal", providers: [ListService], ngImport: i0, template: "<abp-modal [(visible)]=\"isModalOpen\" [suppressUnsavedChangesWarning]=\"true\">\r\n <ng-template #abpHeader>\r\n <h5 class=\"modal-title\">{{ 'AbpAccount::LinkedAccounts' | abpLocalization }}</h5>\r\n </ng-template>\r\n <ng-template #abpBody>\r\n <div class=\"text-end mb-3\">\r\n <button\r\n id=\"create-link-user\"\r\n class=\"btn btn-primary\"\r\n type=\"button\"\r\n (click)=\"openNewLinkAccountModal()\"\r\n >\r\n {{ 'AbpAccount::NewLinkAccount' | abpLocalization }}\r\n </button>\r\n\r\n <div class=\"mt-2\">\r\n <label class=\"form-label d-inline-block\">\r\n {{ 'AbpAccount::Search' | abpLocalization }}\r\n <input\r\n type=\"search\"\r\n class=\"form-control form-control-sm d-inline-block w-auto\"\r\n [(ngModel)]=\"filterText\"\r\n [ngModelOptions]=\"{ standalone: true }\"\r\n (ngModelChange)=\"filterByText()\"\r\n aria-controls=\"MyLinkUsersTable\"\r\n />\r\n </label>\r\n </div>\r\n <div class=\"mt-2\">\r\n <ngx-datatable [rows]=\"filteredData\" [count]=\"resultCount\" [list]=\"list\" default>\r\n <ngx-datatable-column\r\n [name]=\"'AbpUi::Actions' | abpLocalization\"\r\n [maxWidth]=\"150\"\r\n [sortable]=\"false\"\r\n >\r\n <ng-template let-row=\"row\" ngx-datatable-cell-template>\r\n <div ngbDropdown container=\"body\" class=\"d-inline-block\">\r\n <button\r\n class=\"btn btn-primary btn-sm dropdown-toggle\"\r\n data-toggle=\"dropdown\"\r\n aria-haspopup=\"true\"\r\n ngbDropdownToggle\r\n >\r\n <i class=\"fa fa-cog me-1\" aria-hidden=\"true\"></i\r\n >{{ 'AbpUi::Actions' | abpLocalization }}\r\n </button>\r\n <div ngbDropdownMenu>\r\n <button ngbDropdownItem (click)=\"LoginAsThisAccount(row)\">\r\n {{ 'AbpAccount::LoginAsThisAccount' | abpLocalization }}\r\n </button>\r\n @if (row.directlyLinked) {\r\n <button ngbDropdownItem (click)=\"delete(row)\">\r\n {{ 'AbpUi::Delete' | abpLocalization }}\r\n </button>\r\n }\r\n </div>\r\n </div>\r\n </ng-template>\r\n </ngx-datatable-column>\r\n <ngx-datatable-column [name]=\"'AbpAccount::UserName' | abpLocalization\">\r\n <ng-template let-row=\"row\" ngx-datatable-cell-template>\r\n <a href=\"javascript:void(0)\" class=\"text-body\" (click)=\"LoginAsThisAccount(row)\">\r\n {{ row.targetTenantName ? row.targetTenantName + '\\\\' : ''\r\n }}{{ row.targetUserName }}\r\n </a>\r\n </ng-template>\r\n </ngx-datatable-column>\r\n <ngx-datatable-column [name]=\"'AbpAccount::DirectlyLinked' | abpLocalization\">\r\n <ng-template let-row=\"row\" ngx-datatable-cell-template>\r\n <i class=\"fas fa-{{ row.directlyLinked ? 'check' : 'times' }}\" aria-hidden=\"true\"></i>\r\n </ng-template>\r\n </ngx-datatable-column>\r\n </ngx-datatable>\r\n </div>\r\n </div>\r\n </ng-template>\r\n</abp-modal>\r\n\r\n<abp-modal [(visible)]=\"isNewLinkAccountModalOpen\" [suppressUnsavedChangesWarning]=\"true\">\r\n <ng-template #abpHeader>\r\n <h5 class=\"modal-title\">{{ 'AbpAccount::NewLinkAccount' | abpLocalization }}</h5>\r\n </ng-template>\r\n <ng-template #abpBody>\r\n <p class=\"text-muted small mb-3\">{{ 'AbpAccount::NewLinkAccountWarning' | abpLocalization }}</p>\r\n <form id=\"newLinkAccountForm\" #newLinkAccountForm=\"ngForm\" (ngSubmit)=\"submitNewLinkAccount(newLinkAccountForm)\" novalidate>\r\n <div class=\"mb-2\">\r\n <label for=\"newLinkTargetUserNameOrEmail\" class=\"form-label\">\r\n {{ 'AbpAccount::NewLinkAccountTargetUserNameOrEmail' | abpLocalization }}\r\n </label>\r\n <input\r\n type=\"text\"\r\n id=\"newLinkTargetUserNameOrEmail\"\r\n name=\"newLinkTargetUserNameOrEmail\"\r\n class=\"form-control\"\r\n [class.is-invalid]=\"newLinkAccountForm.submitted && newLinkTargetUserNameOrEmail.invalid\"\r\n [(ngModel)]=\"newLinkTargetUserNameOrEmailValue\"\r\n #newLinkTargetUserNameOrEmail=\"ngModel\"\r\n required\r\n autofocus\r\n />\r\n @if (newLinkAccountForm.submitted && newLinkTargetUserNameOrEmail.errors?.['required']) {\r\n <div class=\"invalid-feedback\">\r\n {{ 'AbpAccount::ThisFieldIsRequired.' | abpLocalization }}\r\n </div>\r\n }\r\n </div>\r\n </form>\r\n </ng-template>\r\n <ng-template #abpFooter>\r\n <button type=\"button\" class=\"btn btn-secondary\" (click)=\"isNewLinkAccountModalOpen = false\">\r\n {{ 'AbpUi::Cancel' | abpLocalization }}\r\n </button>\r\n <button type=\"submit\" form=\"newLinkAccountForm\" class=\"btn btn-primary\">\r\n {{ 'AbpAccount::Continue' | abpLocalization }}\r\n </button>\r\n </ng-template>\r\n</abp-modal>\r\n", dependencies: [{ kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { 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.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],[formArray],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i1.RequiredValidator, selector: ":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]", inputs: ["required"] }, { kind: "directive", type: i1.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: i1.NgForm, selector: "form:not([ngNoForm]):not([formGroup]):not([formArray]),ng-form,[ngForm]", inputs: ["ngFormOptions"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "ngmodule", type: NgxDatatableModule }, { kind: "component", type: i2$1.DatatableComponent, selector: "ngx-datatable", inputs: ["targetMarkerTemplate", "rows", "groupRowsBy", "groupedRows", "columns", "selected", "scrollbarV", "scrollbarVDynamic", "scrollbarH", "rowHeight", "columnMode", "headerHeight", "footerHeight", "externalPaging", "externalSorting", "limit", "count", "offset", "loadingIndicator", "ghostLoadingIndicator", "selectionType", "reorderable", "swapColumns", "sortType", "sorts", "cssClasses", "messages", "rowClass", "selectCheck", "displayCheck", "groupExpansionDefault", "trackByProp", "selectAllRowsOnPage", "virtualization", "treeFromRelation", "treeToRelation", "summaryRow", "summaryHeight", "summaryPosition", "disableRowCheck", "rowDraggable", "enableClearingSortState", "rowIdentity"], outputs: ["scroll", "activate", "select", "sort", "page", "reorder", "resize", "tableContextmenu", "treeAction", "rowDragEvents"] }, { kind: "directive", type: i2$1.DataTableColumnDirective, selector: "ngx-datatable-column", inputs: ["name", "prop", "bindAsUnsafeHtml", "frozenLeft", "frozenRight", "flexGrow", "resizeable", "comparator", "pipe", "sortable", "draggable", "canAutoResize", "minWidth", "width", "maxWidth", "checkboxable", "headerCheckboxable", "headerClass", "cellClass", "isTreeColumn", "treeLevelIndent", "summaryFunc", "summaryTemplate", "cellTemplate", "headerTemplate", "treeToggleTemplate", "ghostCellTemplate"] }, { kind: "directive", type: i2$1.DataTableColumnCellDirective, selector: "[ngx-datatable-cell-template]" }, { kind: "directive", type: NgbDropdown, selector: "[ngbDropdown]", inputs: ["autoClose", "dropdownClass", "open", "placement", "popperOptions", "container", "display"], outputs: ["openChange"], exportAs: ["ngbDropdown"] }, { kind: "directive", type: NgbDropdownToggle, selector: "[ngbDropdownToggle]" }, { kind: "directive", type: NgbDropdownMenu, selector: "[ngbDropdownMenu]" }, { kind: "directive", type: NgbDropdownButtonItem, selector: "button[ngbDropdownItem]" }, { kind: "directive", type: NgbDropdownItem, selector: "[ngbDropdownItem]", inputs: ["tabindex", "disabled"] }, { kind: "directive", type: NgxDatatableDefaultDirective, selector: "ngx-datatable[default]", inputs: ["class"], exportAs: ["ngxDatatableDefault"] }, { kind: "directive", type: NgxDatatableListDirective, selector: "ngx-datatable[list]", inputs: ["list"], exportAs: ["ngxDatatableList"] }, { kind: "component", type: ModalComponent, selector: "abp-modal", inputs: ["visible", "busy", "options", "suppressUnsavedChangesWarning"], outputs: ["visibleChange", "init", "appear", "disappear"] }, { kind: "pipe", type: LocalizationPipe, name: "abpLocalization" }] }); }
|
|
623
629
|
}
|
|
624
630
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.15", ngImport: i0, type: MyLinkUsersModalComponent, decorators: [{
|
|
625
631
|
type: Component,
|
|
@@ -635,7 +641,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.15", ngImpo
|
|
|
635
641
|
NgxDatatableListDirective,
|
|
636
642
|
LocalizationPipe,
|
|
637
643
|
ModalComponent,
|
|
638
|
-
], template: "<abp-modal [(visible)]=\"isModalOpen\" [suppressUnsavedChangesWarning]=\"true\">\r\n <ng-template #abpHeader>\r\n <h5 class=\"modal-title\">{{ 'AbpAccount::LinkedAccounts' | abpLocalization }}</h5>\r\n </ng-template>\r\n <ng-template #abpBody>\r\n <div class=\"text-end mb-3\">\r\n <button\r\n id=\"create-link-user\"\r\n class=\"btn btn-primary\"\r\n type=\"button\"\r\n (click)=\"
|
|
644
|
+
], template: "<abp-modal [(visible)]=\"isModalOpen\" [suppressUnsavedChangesWarning]=\"true\">\r\n <ng-template #abpHeader>\r\n <h5 class=\"modal-title\">{{ 'AbpAccount::LinkedAccounts' | abpLocalization }}</h5>\r\n </ng-template>\r\n <ng-template #abpBody>\r\n <div class=\"text-end mb-3\">\r\n <button\r\n id=\"create-link-user\"\r\n class=\"btn btn-primary\"\r\n type=\"button\"\r\n (click)=\"openNewLinkAccountModal()\"\r\n >\r\n {{ 'AbpAccount::NewLinkAccount' | abpLocalization }}\r\n </button>\r\n\r\n <div class=\"mt-2\">\r\n <label class=\"form-label d-inline-block\">\r\n {{ 'AbpAccount::Search' | abpLocalization }}\r\n <input\r\n type=\"search\"\r\n class=\"form-control form-control-sm d-inline-block w-auto\"\r\n [(ngModel)]=\"filterText\"\r\n [ngModelOptions]=\"{ standalone: true }\"\r\n (ngModelChange)=\"filterByText()\"\r\n aria-controls=\"MyLinkUsersTable\"\r\n />\r\n </label>\r\n </div>\r\n <div class=\"mt-2\">\r\n <ngx-datatable [rows]=\"filteredData\" [count]=\"resultCount\" [list]=\"list\" default>\r\n <ngx-datatable-column\r\n [name]=\"'AbpUi::Actions' | abpLocalization\"\r\n [maxWidth]=\"150\"\r\n [sortable]=\"false\"\r\n >\r\n <ng-template let-row=\"row\" ngx-datatable-cell-template>\r\n <div ngbDropdown container=\"body\" class=\"d-inline-block\">\r\n <button\r\n class=\"btn btn-primary btn-sm dropdown-toggle\"\r\n data-toggle=\"dropdown\"\r\n aria-haspopup=\"true\"\r\n ngbDropdownToggle\r\n >\r\n <i class=\"fa fa-cog me-1\" aria-hidden=\"true\"></i\r\n >{{ 'AbpUi::Actions' | abpLocalization }}\r\n </button>\r\n <div ngbDropdownMenu>\r\n <button ngbDropdownItem (click)=\"LoginAsThisAccount(row)\">\r\n {{ 'AbpAccount::LoginAsThisAccount' | abpLocalization }}\r\n </button>\r\n @if (row.directlyLinked) {\r\n <button ngbDropdownItem (click)=\"delete(row)\">\r\n {{ 'AbpUi::Delete' | abpLocalization }}\r\n </button>\r\n }\r\n </div>\r\n </div>\r\n </ng-template>\r\n </ngx-datatable-column>\r\n <ngx-datatable-column [name]=\"'AbpAccount::UserName' | abpLocalization\">\r\n <ng-template let-row=\"row\" ngx-datatable-cell-template>\r\n <a href=\"javascript:void(0)\" class=\"text-body\" (click)=\"LoginAsThisAccount(row)\">\r\n {{ row.targetTenantName ? row.targetTenantName + '\\\\' : ''\r\n }}{{ row.targetUserName }}\r\n </a>\r\n </ng-template>\r\n </ngx-datatable-column>\r\n <ngx-datatable-column [name]=\"'AbpAccount::DirectlyLinked' | abpLocalization\">\r\n <ng-template let-row=\"row\" ngx-datatable-cell-template>\r\n <i class=\"fas fa-{{ row.directlyLinked ? 'check' : 'times' }}\" aria-hidden=\"true\"></i>\r\n </ng-template>\r\n </ngx-datatable-column>\r\n </ngx-datatable>\r\n </div>\r\n </div>\r\n </ng-template>\r\n</abp-modal>\r\n\r\n<abp-modal [(visible)]=\"isNewLinkAccountModalOpen\" [suppressUnsavedChangesWarning]=\"true\">\r\n <ng-template #abpHeader>\r\n <h5 class=\"modal-title\">{{ 'AbpAccount::NewLinkAccount' | abpLocalization }}</h5>\r\n </ng-template>\r\n <ng-template #abpBody>\r\n <p class=\"text-muted small mb-3\">{{ 'AbpAccount::NewLinkAccountWarning' | abpLocalization }}</p>\r\n <form id=\"newLinkAccountForm\" #newLinkAccountForm=\"ngForm\" (ngSubmit)=\"submitNewLinkAccount(newLinkAccountForm)\" novalidate>\r\n <div class=\"mb-2\">\r\n <label for=\"newLinkTargetUserNameOrEmail\" class=\"form-label\">\r\n {{ 'AbpAccount::NewLinkAccountTargetUserNameOrEmail' | abpLocalization }}\r\n </label>\r\n <input\r\n type=\"text\"\r\n id=\"newLinkTargetUserNameOrEmail\"\r\n name=\"newLinkTargetUserNameOrEmail\"\r\n class=\"form-control\"\r\n [class.is-invalid]=\"newLinkAccountForm.submitted && newLinkTargetUserNameOrEmail.invalid\"\r\n [(ngModel)]=\"newLinkTargetUserNameOrEmailValue\"\r\n #newLinkTargetUserNameOrEmail=\"ngModel\"\r\n required\r\n autofocus\r\n />\r\n @if (newLinkAccountForm.submitted && newLinkTargetUserNameOrEmail.errors?.['required']) {\r\n <div class=\"invalid-feedback\">\r\n {{ 'AbpAccount::ThisFieldIsRequired.' | abpLocalization }}\r\n </div>\r\n }\r\n </div>\r\n </form>\r\n </ng-template>\r\n <ng-template #abpFooter>\r\n <button type=\"button\" class=\"btn btn-secondary\" (click)=\"isNewLinkAccountModalOpen = false\">\r\n {{ 'AbpUi::Cancel' | abpLocalization }}\r\n </button>\r\n <button type=\"submit\" form=\"newLinkAccountForm\" class=\"btn btn-primary\">\r\n {{ 'AbpAccount::Continue' | abpLocalization }}\r\n </button>\r\n </ng-template>\r\n</abp-modal>\r\n" }]
|
|
639
645
|
}], ctorParameters: () => [] });
|
|
640
646
|
|
|
641
647
|
class SwitchTenantModalComponent {
|