diff --git a/projects/ziti-console-lib/src/lib/pages/auth-policies/auth-policies-page.component.scss b/projects/ziti-console-lib/src/lib/pages/auth-policies/auth-policies-page.component.scss
new file mode 100644
index 00000000..db459e7c
--- /dev/null
+++ b/projects/ziti-console-lib/src/lib/pages/auth-policies/auth-policies-page.component.scss
@@ -0,0 +1,8 @@
+.configurations {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ position: relative;
+ flex: 1 1 auto;
+}
diff --git a/projects/ziti-console-lib/src/lib/pages/auth-policies/auth-policies-page.component.ts b/projects/ziti-console-lib/src/lib/pages/auth-policies/auth-policies-page.component.ts
new file mode 100644
index 00000000..e641f945
--- /dev/null
+++ b/projects/ziti-console-lib/src/lib/pages/auth-policies/auth-policies-page.component.ts
@@ -0,0 +1,127 @@
+/*
+ Copyright NetFoundry Inc.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+import {Component, OnInit} from '@angular/core';
+import {DataTableFilterService} from "../../features/data-table/data-table-filter.service";
+import {AuthPoliciesPageService} from "./auth-policies-page.service";
+import {TabNameService} from "../../services/tab-name.service";
+import {ListPageComponent} from "../../shared/list-page-component.class";
+import {ConsoleEventsService} from "../../services/console-events.service";
+import {MatDialog} from "@angular/material/dialog";
+import {ConfirmComponent} from "../../features/confirm/confirm.component";
+import {firstValueFrom} from "rxjs";
+
+
+@Component({
+ selector: 'lib-auth-policies',
+ templateUrl: './auth-policies-page.component.html',
+ styleUrls: ['./auth-policies-page.component.scss']
+})
+export class AuthPoliciesPageComponent extends ListPageComponent implements OnInit {
+ title = 'Auth Policies Management'
+ tabs: { url: string, label: string }[] ;
+ isLoading: boolean;
+ formDataChanged = false;
+
+ constructor(
+ override svc: AuthPoliciesPageService,
+ filterService: DataTableFilterService,
+ private tabNames: TabNameService,
+ consoleEvents: ConsoleEventsService,
+ dialogForm: MatDialog
+ ) {
+ super(filterService, svc, consoleEvents, dialogForm);
+ }
+
+ override ngOnInit() {
+ this.tabs = this.tabNames.getTabs('policies');
+ this.svc.refreshData = this.refreshData;
+ super.ngOnInit();
+ }
+
+ headerActionClicked(action: string) {
+ switch (action) {
+ case 'add':
+ this.svc.openEditForm();
+ break;
+ case 'edit':
+ this.svc.openEditForm();
+ break;
+ case 'delete':
+ let defaultPolicy;
+ const selectedItems = this.rowData.filter((row) => {
+ if (row.id === 'default') {
+ defaultPolicy = row;
+ }
+ return row.selected;
+ });
+ this.svc.checkDefaultAuthPolicy(defaultPolicy).then((result) => {
+ if (!result) {
+ return;
+ }
+ const label = selectedItems.length > 1 ? 'auth policies' : 'auth policy';
+ this.openBulkDelete(selectedItems, label);
+ });
+ break;
+ default:
+ }
+ }
+
+ tableAction(event: any) {
+ switch(event?.action) {
+ case 'toggleAll':
+ case 'toggleItem':
+ this.itemToggled(event.item)
+ break;
+ case 'update':
+ this.svc.checkDefaultAuthPolicy(event.item).then((result) => {
+ if (!result) {
+ return;
+ }
+ this.svc.openEditForm(event.item?.id);
+ });
+ break;
+ case 'create':
+ this.svc.openEditForm();
+ break;
+ case 'delete':
+ this.svc.checkDefaultAuthPolicy(event.item).then((result) => {
+ if (!result) {
+ return;
+ }
+ this.deleteItem(event.item)
+ });
+ break;
+ default:
+ break;
+ }
+ }
+
+ deleteItem(item: any) {
+ this.openBulkDelete([item], 'auth-policy');
+ }
+
+ closeModal(event: any) {
+ this.svc.sideModalOpen = false;
+ if(event?.refresh) {
+ this.refreshData();
+ }
+ }
+
+ dataChanged(event) {
+ this.formDataChanged = event;
+ }
+}
diff --git a/projects/ziti-console-lib/src/lib/pages/auth-policies/auth-policies-page.service.ts b/projects/ziti-console-lib/src/lib/pages/auth-policies/auth-policies-page.service.ts
new file mode 100644
index 00000000..106ca54d
--- /dev/null
+++ b/projects/ziti-console-lib/src/lib/pages/auth-policies/auth-policies-page.service.ts
@@ -0,0 +1,215 @@
+/*
+ Copyright NetFoundry Inc.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+import {Inject, Injectable} from '@angular/core';
+import {DataTableFilterService, FilterObj} from "../../features/data-table/data-table-filter.service";
+import _, {isEmpty, unset} from "lodash";
+import moment from "moment";
+import {ListPageServiceClass} from "../../shared/list-page-service.class";
+import {
+ TableColumnDefaultComponent
+} from "../../features/data-table/column-headers/table-column-default/table-column-default.component";
+import {CallbackResults} from "../../features/list-page-features/list-page-form/list-page-form.component";
+import {SchemaService} from "../../services/schema.service";
+import {SETTINGS_SERVICE, SettingsService} from "../../services/settings.service";
+import {CsvDownloadService} from "../../services/csv-download.service";
+import {ExtensionService, SHAREDZ_EXTENSION} from "../../features/extendable/extensions-noop.service";
+import {Service} from "../../models/service";
+import {TableCellNameComponent} from "../../features/data-table/cells/table-cell-name/table-cell-name.component";
+import {Router} from "@angular/router";
+import {ConfirmComponent} from "../../features/confirm/confirm.component";
+import {firstValueFrom} from "rxjs";
+import {MatDialog} from "@angular/material/dialog";
+
+@Injectable({
+ providedIn: 'root'
+})
+export class AuthPoliciesPageService extends ListPageServiceClass {
+
+ private paging = this.DEFAULT_PAGING;
+
+ resourceType = 'auth-policies';
+ selectedConfig: any = {};
+ modalType = '';
+
+ override menuItems = [
+ {name: 'Edit', action: 'update'},
+ {name: 'Delete', action: 'delete'},
+ ]
+
+ constructor(
+ private schemaSvc: SchemaService,
+ @Inject(SETTINGS_SERVICE) settings: SettingsService,
+ filterService: DataTableFilterService,
+ csvDownloadService: CsvDownloadService,
+ @Inject(SHAREDZ_EXTENSION) extService: ExtensionService,
+ protected override router: Router,
+ private dialogForm: MatDialog
+ ) {
+ super(settings, filterService, csvDownloadService, extService, router);
+ }
+
+ initTableColumns(): any {
+
+ const allowedHeaderComponentParams = {
+ filterType: 'SELECT',
+ enableSorting: true,
+ filterOptions: [
+ { label: 'All', value: '' },
+ { label: 'Allowed', value: true },
+ { label: 'Not Allowed', value: false },
+ ]
+ };
+ const createdAtHeaderComponentParams = {
+ filterType: 'DATETIME',
+ };
+ return [
+ {
+ colId: 'name',
+ field: 'name',
+ headerName: 'Name',
+ headerComponent: TableColumnDefaultComponent,
+ headerComponentParams: this.headerComponentParams,
+ cellRenderer: TableCellNameComponent,
+ cellRendererParams: { pathRoot: this.basePath, cellNamePreCheck: this.checkDefaultAuthPolicy.bind(this) },
+ onCellClicked: (data) => {
+ if (this.hasSelectedText()) {
+ return;
+ }
+ this.checkDefaultAuthPolicy(data?.data).then((result) => {
+ if (!result) {
+ return;
+ }
+ this.openEditForm(data?.data?.id);
+ });
+ },
+ resizable: true,
+ cellClass: 'nf-cell-vert-align tCol',
+ sortable: true,
+ filter: true,
+ sortColumn: this.sort.bind(this)
+ },
+ {
+ colId: 'primary.cert.allowed',
+ field: 'primary.cert.allowed',
+ headerName: 'Cert',
+ headerComponent: TableColumnDefaultComponent,
+ headerComponentParams: allowedHeaderComponentParams,
+ resizable: true,
+ cellClass: 'nf-cell-vert-align tCol',
+ sortable: true,
+ filter: true,
+ sortColumn: this.sort.bind(this),
+ },
+ {
+ colId: 'primary.extJwt.allowed',
+ field: 'primary.extJwt.allowed',
+ headerName: 'External JWT',
+ headerComponent: TableColumnDefaultComponent,
+ headerComponentParams: allowedHeaderComponentParams,
+ resizable: true,
+ cellClass: 'nf-cell-vert-align tCol',
+ sortable: true,
+ filter: true,
+ sortColumn: this.sort.bind(this),
+ },
+ {
+ colId: 'primary.updb.allowed',
+ field: 'primary.updb.allowed',
+ headerName: 'UPDB',
+ headerComponent: TableColumnDefaultComponent,
+ headerComponentParams: allowedHeaderComponentParams,
+ resizable: true,
+ cellClass: 'nf-cell-vert-align tCol',
+ sortable: true,
+ filter: true,
+ sortColumn: this.sort.bind(this),
+ },
+ {
+ colId: 'createdAt',
+ field: 'createdAt',
+ headerName: 'Created At',
+ headerComponent: TableColumnDefaultComponent,
+ headerComponentParams: createdAtHeaderComponentParams,
+ valueFormatter: this.createdAtFormatter,
+ resizable: true,
+ cellClass: 'nf-cell-vert-align tCol',
+ }
+ ];
+ }
+
+ checkDefaultAuthPolicy(authPolicy) {
+ if (authPolicy.id !== 'default') {
+ return Promise.resolve(true);
+ }
+ const confirmationMessage =
+ `
WARNING: Do not change the default policy unless you're sure you know what you are doing.
+
Before changing the default policy, it's recommended that you make another policy and apply that to other users first. Then make sure you can still authenticate.
+
Do you still want to continue?
`;
+ const data = {
+ appendId: 'ConfirmDefaultAuthPolicy',
+ title: 'Are You Sure?',
+ message: confirmationMessage,
+ confirmLabel: 'Yes',
+ cancelLabel: 'Oops, no get me out of here',
+ showCancelLink: true
+ };
+ this.dialogRef = this.dialogForm.open(ConfirmComponent, {
+ data: data,
+ autoFocus: false,
+ });
+ return firstValueFrom(this.dialogRef.afterClosed());
+ }
+
+ getData(filters?: FilterObj[], sort?: any) {
+ // we can customize filters or sorting here before moving on...
+ return super.getTableData(this.resourceType, this.paging, filters, sort)
+ .then((results: any) => {
+ return this.processData(results);
+ });
+ }
+
+ validate = (formData): Promise
=> {
+ return Promise.resolve({ passed: true});
+ }
+
+ private processData(results: any) {
+ if (!isEmpty(results?.data)) {
+ //pre-process data before rendering
+ results.data = this.addActionsPerRow(results);
+ }
+ return results;
+ }
+
+ private addActionsPerRow(results: any): any[] {
+ return results.data.map((row) => {
+ row.actionList = ['update', 'delete'];
+ return row;
+ });
+ }
+
+ public openUpdate(item?: any) {
+ this.modalType = 'auth-policy';
+ if (item) {
+ this.selectedConfig = item;
+ this.selectedConfig.badges = [];
+ unset(this.selectedConfig, '_links');
+ } else {
+ this.selectedConfig = new Service();
+ }
+ this.sideModalOpen = true;
+ }
+}
diff --git a/projects/ziti-console-lib/src/lib/pages/jwt-signers/jwt-signers-page.component.ts b/projects/ziti-console-lib/src/lib/pages/jwt-signers/jwt-signers-page.component.ts
index f3e01d4d..a39d4e28 100644
--- a/projects/ziti-console-lib/src/lib/pages/jwt-signers/jwt-signers-page.component.ts
+++ b/projects/ziti-console-lib/src/lib/pages/jwt-signers/jwt-signers-page.component.ts
@@ -24,7 +24,7 @@ import {MatDialog} from "@angular/material/dialog";
@Component({
- selector: 'lib-configurations',
+ selector: 'lib-jwt-signers',
templateUrl: './jwt-signers-page.component.html',
styleUrls: ['./jwt-signers-page.component.scss']
})
diff --git a/projects/ziti-console-lib/src/lib/shared-assets/styles/global.scss b/projects/ziti-console-lib/src/lib/shared-assets/styles/global.scss
index 218ee86d..c5b2f3c4 100644
--- a/projects/ziti-console-lib/src/lib/shared-assets/styles/global.scss
+++ b/projects/ziti-console-lib/src/lib/shared-assets/styles/global.scss
@@ -313,6 +313,12 @@ input {
color: var(--tableText);
text-transform: uppercase;
height: 14px;
+
+ .form-sub-text {
+ margin-left: 5px;
+ font-size: 12px;
+ text-transform: none;
+ }
}
.form-field-label {
@@ -777,8 +783,7 @@ lib-form-field-container {
border-radius: 5px;
&.toggle-container {
- padding-top: 10px;
- padding-bottom: 10px;
+ padding: 10px;
.config-container-label {
color: var(--offWhite);
@@ -1111,6 +1116,28 @@ p-dropdown {
display: none;
}
}
+ .p-icon-wrapper {
+ width: 20px;
+ position: absolute;
+ right: 32px;
+ top: 11px;
+ height: 20px;
+
+ .p-dropdown-clear-icon {
+ right: 0;
+ path {
+ fill: var(--icon) !important;
+ }
+ }
+
+ &:hover {
+ .p-dropdown-clear-icon {
+ path {
+ fill: var(--primaryColor) !important;
+ }
+ }
+ }
+ }
}
}
@@ -1219,3 +1246,75 @@ p-dropdown {
border:none;
}
}
+
+p-dropdown {
+ .p-dropdown {
+ .p-dropdown-header {
+ .dropdown-filter-container {
+ display: flex;
+ flex-direction: row;
+
+ .p-inputtext {
+ border-radius: 0;
+ border-width: 1px;
+ border-color: var(--stroke);
+ border-style: solid;
+
+ &:focus {
+ box-shadow: none;
+ &:enabled {
+ box-shadow: none;
+ }
+ }
+ }
+
+ .spinner {
+ display: inline-block;
+ width: var(--spinnerSizeMedium);
+ height: var(--spinnerSizeMedium);
+ border-radius: 50%;
+ background: transparent;
+ border-top: var(--spinerBorderTopMedium);
+ border-right: var(--spinerBorderRightMedium);
+ border-bottom: var(--spinerBorderBottomMedium);
+ border-left: var(--spinerBorderLeftMedium);
+ animation: loading .5s infinite linear;
+ margin-left: var(--marginSmall);
+ position: absolute;
+ right: 18px;
+ top: 20px;
+ opacity: .7;
+ }
+ }
+
+ .p-inputgroup-addon {
+ border-top-left-radius: var(--inputBorderRadius);
+ border-bottom-left-radius: var(--inputBorderRadius);
+ }
+
+ .p-button {
+ border-radius: 0;
+ border-top-right-radius: var(--inputBorderRadius);
+ border-bottom-right-radius: var(--inputBorderRadius);
+ background-color: var(--primary);
+
+ &.configs-loading {
+ .p-button-icon {
+ display: none;
+ }
+ }
+
+ &:focus {
+ box-shadow: none;
+ }
+ }
+ .p-button {
+ &.configs-loading {
+ .p-button-icon {
+ display: none;
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/projects/ziti-console-lib/src/lib/ziti-console-lib.module.ts b/projects/ziti-console-lib/src/lib/ziti-console-lib.module.ts
index d97c4589..e57b9b33 100644
--- a/projects/ziti-console-lib/src/lib/ziti-console-lib.module.ts
+++ b/projects/ziti-console-lib/src/lib/ziti-console-lib.module.ts
@@ -111,6 +111,8 @@ import {TerminatorsPageComponent} from "./pages/terminators/terminators-page.com
import {ConfigurationFormComponent} from "./features/projectable-forms/configuration/configuration-form.component";
import {JwtSignersPageComponent} from "./pages/jwt-signers/jwt-signers-page.component";
import {JwtSignerFormComponent} from "./features/projectable-forms/jwt-signer/jwt-signer-form.component";
+import {AuthPoliciesPageComponent} from "./pages/auth-policies/auth-policies-page.component";
+import {AuthPolicyFormComponent} from "./features/projectable-forms/auth-policy/auth-policy-form.component";
export function playerFactory() {
return import(/* webpackChunkName: 'lottie-web' */ 'lottie-web');
@@ -192,7 +194,9 @@ export function playerFactory() {
TerminatorFormComponent,
ConfigurationFormComponent,
JwtSignersPageComponent,
- JwtSignerFormComponent
+ JwtSignerFormComponent,
+ AuthPoliciesPageComponent,
+ AuthPolicyFormComponent
],
imports: [
CommonModule,
@@ -249,7 +253,9 @@ export function playerFactory() {
TerminatorsPageComponent,
TerminatorFormComponent,
JwtSignersPageComponent,
- JwtSignerFormComponent
+ JwtSignerFormComponent,
+ AuthPoliciesPageComponent,
+ AuthPolicyFormComponent
],
providers: [
{provide: SHAREDZ_EXTENSION, useClass: ExtensionsNoopService},
diff --git a/projects/ziti-console-lib/src/public-api.ts b/projects/ziti-console-lib/src/public-api.ts
index d64b9f77..e3595843 100644
--- a/projects/ziti-console-lib/src/public-api.ts
+++ b/projects/ziti-console-lib/src/public-api.ts
@@ -22,6 +22,8 @@ export * from './lib/pages/service-policies/service-policies-page.component';
export * from './lib/pages/service-policies/service-policies-page.service';
export * from './lib/pages/jwt-signers/jwt-signers-page.component';
export * from './lib/pages/jwt-signers/jwt-signers-page.service';
+export * from './lib/pages/auth-policies/auth-policies-page.component';
+export * from './lib/pages/auth-policies/auth-policies-page.service';
export * from './lib/services/login-service.class';
export * from './lib/services/noop-login.service';
export * from './lib/services/settings-service.class';
@@ -77,6 +79,8 @@ export * from './lib/features/projectable-forms/terminator/terminator-form.servi
export * from './lib/features/projectable-forms/terminator/terminator-form.component';
export * from './lib/features/projectable-forms/jwt-signer/jwt-signer-form.service';
export * from './lib/features/projectable-forms/jwt-signer/jwt-signer-form.component';
+export * from './lib/features/projectable-forms/auth-policy/auth-policy-form.service';
+export * from './lib/features/projectable-forms/auth-policy/auth-policy-form.component';
export * from './lib/features/reset-enrollment/reset-enrollment.service';
export * from './lib/features/extendable/extensions-noop.service';
export * from './lib/features/projectable-forms/form-header/form-header.component';