-
+
+
+
+
-
diff --git a/console/src/app/modules/org-context/org-context.component.html b/console/src/app/modules/org-context/org-context.component.html
index 614156bf79..be108c82e5 100644
--- a/console/src/app/modules/org-context/org-context.component.html
+++ b/console/src/app/modules/org-context/org-context.component.html
@@ -1,49 +1,75 @@
-
\ No newline at end of file
+
diff --git a/console/src/app/modules/org-table/org-table.component.html b/console/src/app/modules/org-table/org-table.component.html
new file mode 100644
index 0000000000..0e79cb961e
--- /dev/null
+++ b/console/src/app/modules/org-table/org-table.component.html
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+ add
+ {{ 'ACTIONS.NEW' | translate }}
+
+
+
+
+
+
+
diff --git a/console/src/app/pages/orgs/org-list/org-list.component.scss b/console/src/app/modules/org-table/org-table.component.scss
similarity index 88%
rename from console/src/app/pages/orgs/org-list/org-list.component.scss
rename to console/src/app/modules/org-table/org-table.component.scss
index 5681e95a4c..b2d15ea57b 100644
--- a/console/src/app/pages/orgs/org-list/org-list.component.scss
+++ b/console/src/app/modules/org-table/org-table.component.scss
@@ -1,11 +1,3 @@
-h1 {
- margin: 0;
-}
-
-.org-desc {
- font-size: 14px;
-}
-
td {
cursor: pointer;
diff --git a/console/src/app/modules/org-table/org-table.component.spec.ts b/console/src/app/modules/org-table/org-table.component.spec.ts
new file mode 100644
index 0000000000..37d2672bfa
--- /dev/null
+++ b/console/src/app/modules/org-table/org-table.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { OrgTableComponent } from './org-table.component';
+
+describe('OrgsComponent', () => {
+ let component: OrgTableComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [OrgTableComponent],
+ }).compileComponents();
+ });
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(OrgTableComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/console/src/app/pages/orgs/org-list/org-list.component.ts b/console/src/app/modules/org-table/org-table.component.ts
similarity index 74%
rename from console/src/app/pages/orgs/org-list/org-list.component.ts
rename to console/src/app/modules/org-table/org-table.component.ts
index a1eec24303..412c636480 100644
--- a/console/src/app/pages/orgs/org-list/org-list.component.ts
+++ b/console/src/app/modules/org-table/org-table.component.ts
@@ -1,34 +1,30 @@
import { Component, Input, ViewChild } from '@angular/core';
-import { PageEvent } from '@angular/material/paginator';
import { MatTableDataSource } from '@angular/material/table';
import { Router } from '@angular/router';
import { Timestamp } from 'google-protobuf/google/protobuf/timestamp_pb';
-import { BehaviorSubject, from, Observable, of } from 'rxjs';
-import { catchError, finalize, map } from 'rxjs/operators';
-import { enterAnimations } from 'src/app/animations';
-import { PaginatorComponent } from 'src/app/modules/paginator/paginator.component';
+import { BehaviorSubject, catchError, finalize, from, map, Observable, of } from 'rxjs';
import { Org, OrgQuery, OrgState } from 'src/app/proto/generated/zitadel/org_pb';
-import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/breadcrumb.service';
import { GrpcAuthService } from 'src/app/services/grpc-auth.service';
+import { PageEvent, PaginatorComponent } from '../paginator/paginator.component';
+
enum OrgListSearchKey {
NAME = 'NAME',
}
@Component({
- selector: 'cnsl-org-list',
- templateUrl: './org-list.component.html',
- styleUrls: ['./org-list.component.scss'],
- animations: [enterAnimations],
+ selector: 'cnsl-org-table',
+ templateUrl: './org-table.component.html',
+ styleUrls: ['./org-table.component.scss'],
})
-export class OrgListComponent {
+export class OrgTableComponent {
public orgSearchKey: OrgListSearchKey | undefined = undefined;
@ViewChild(PaginatorComponent) public paginator!: PaginatorComponent;
@ViewChild('input') public filter!: Input;
public dataSource!: MatTableDataSource;
- public displayedColumns: string[] = ['select', 'name', 'state', 'primaryDomain', 'creationDate', 'changeDate'];
+ public displayedColumns: string[] = ['name', 'state', 'primaryDomain', 'creationDate', 'changeDate'];
private loadingSubject: BehaviorSubject = new BehaviorSubject(false);
public loading$: Observable = this.loadingSubject.asObservable();
public activeOrg!: Org.AsObject;
@@ -39,20 +35,9 @@ export class OrgListComponent {
public filterOpen: boolean = false;
public OrgState: any = OrgState;
public copied: string = '';
- constructor(private authService: GrpcAuthService, private router: Router, breadcrumbService: BreadcrumbService) {
+ constructor(private authService: GrpcAuthService, private router: Router) {
this.loadOrgs(this.initialLimit, 0);
this.authService.getActiveOrg().then((org) => (this.activeOrg = org));
-
- const iamBread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'IAM',
- routerLink: ['/system'],
- });
- const bread: Breadcrumb = {
- type: BreadcrumbType.ORG,
- routerLink: ['/org'],
- };
- breadcrumbService.setBreadcrumb([iamBread, bread]);
}
public loadOrgs(limit: number, offset: number, queries?: OrgQuery[]): void {
diff --git a/console/src/app/pages/orgs/org-list/org-list.module.ts b/console/src/app/modules/org-table/org-table.module.ts
similarity index 69%
rename from console/src/app/pages/orgs/org-list/org-list.module.ts
rename to console/src/app/modules/org-table/org-table.module.ts
index 7d0e26c297..b19a40611f 100644
--- a/console/src/app/pages/orgs/org-list/org-list.module.ts
+++ b/console/src/app/modules/org-table/org-table.module.ts
@@ -7,25 +7,24 @@ import { MatRadioModule } from '@angular/material/radio';
import { MatSortModule } from '@angular/material/sort';
import { MatTableModule } from '@angular/material/table';
import { MatTooltipModule } from '@angular/material/tooltip';
+import { RouterModule } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';
import { CopyToClipboardModule } from 'src/app/directives/copy-to-clipboard/copy-to-clipboard.module';
import { HasRoleModule } from 'src/app/directives/has-role/has-role.module';
-import { ActionKeysModule } from 'src/app/modules/action-keys/action-keys.module';
-import { FilterOrgModule } from 'src/app/modules/filter-org/filter-org.module';
-import { InputModule } from 'src/app/modules/input/input.module';
-import { PaginatorModule } from 'src/app/modules/paginator/paginator.module';
-import { RefreshTableModule } from 'src/app/modules/refresh-table/refresh-table.module';
import { LocalizedDatePipeModule } from 'src/app/pipes/localized-date-pipe/localized-date-pipe.module';
import { TimestampToDatePipeModule } from 'src/app/pipes/timestamp-to-date-pipe/timestamp-to-date-pipe.module';
-import { OrgListRoutingModule } from './org-list-routing.module';
-import { OrgListComponent } from './org-list.component';
+import { ActionKeysModule } from '../action-keys/action-keys.module';
+import { FilterOrgModule } from '../filter-org/filter-org.module';
+import { InputModule } from '../input/input.module';
+import { PaginatorModule } from '../paginator/paginator.module';
+import { RefreshTableModule } from '../refresh-table/refresh-table.module';
+import { OrgTableComponent } from './org-table.component';
@NgModule({
- declarations: [OrgListComponent],
+ declarations: [OrgTableComponent],
imports: [
CommonModule,
- OrgListRoutingModule,
MatTableModule,
TranslateModule,
RefreshTableModule,
@@ -37,6 +36,7 @@ import { OrgListComponent } from './org-list.component';
MatIconModule,
PaginatorModule,
HasRoleModule,
+ RouterModule,
MatButtonModule,
MatTooltipModule,
CopyToClipboardModule,
@@ -44,5 +44,6 @@ import { OrgListComponent } from './org-list.component';
InputModule,
FormsModule,
],
+ exports: [OrgTableComponent],
})
-export class OrgListModule {}
+export class OrgTableModule {}
diff --git a/console/src/app/modules/policies/general-settings/general-settings.component.html b/console/src/app/modules/policies/general-settings/general-settings.component.html
new file mode 100644
index 0000000000..229c1593c0
--- /dev/null
+++ b/console/src/app/modules/policies/general-settings/general-settings.component.html
@@ -0,0 +1,17 @@
+
+ {{ 'SETTING.DEFAULTLANGUAGE' | translate }}
+
+
+ {{ lang }} - {{ 'SETTING.LANGUAGE.' + lang | translate }}
+
+
+
+;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [ GeneralSettingsComponent ]
+ })
+ .compileComponents();
+ });
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(GeneralSettingsComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/console/src/app/modules/policies/general-settings/general-settings.component.ts b/console/src/app/modules/policies/general-settings/general-settings.component.ts
new file mode 100644
index 0000000000..864c7a6dc8
--- /dev/null
+++ b/console/src/app/modules/policies/general-settings/general-settings.component.ts
@@ -0,0 +1,88 @@
+import { Component, Injector, Input, OnInit, Type } from '@angular/core';
+import { SetDefaultLanguageResponse } from 'src/app/proto/generated/zitadel/admin_pb';
+import { AdminService } from 'src/app/services/admin.service';
+import { ManagementService } from 'src/app/services/mgmt.service';
+import { ToastService } from 'src/app/services/toast.service';
+
+import { PolicyComponentServiceType } from '../policy-component-types.enum';
+
+@Component({
+ selector: 'cnsl-general-settings',
+ templateUrl: './general-settings.component.html',
+ styleUrls: ['./general-settings.component.scss'],
+})
+export class GeneralSettingsComponent implements OnInit {
+ @Input() public serviceType!: PolicyComponentServiceType;
+ public service!: ManagementService | AdminService;
+
+ public defaultLanguage: string = '';
+ public defaultLanguageOptions: string[] = [];
+
+ public loading: boolean = false;
+ constructor(private injector: Injector, private toast: ToastService) {}
+
+ ngOnInit(): void {
+ switch (this.serviceType) {
+ case PolicyComponentServiceType.MGMT:
+ this.service = this.injector.get(ManagementService as Type);
+ break;
+ case PolicyComponentServiceType.ADMIN:
+ this.service = this.injector.get(AdminService as Type);
+ break;
+ }
+ this.fetchData();
+ }
+
+ private fetchData(): void {
+ if (this.serviceType === PolicyComponentServiceType.ADMIN) {
+ (this.service as AdminService).getDefaultLanguage().then((langResp) => {
+ this.defaultLanguage = langResp.language;
+ });
+ (this.service as AdminService).getSupportedLanguages().then((supportedResp) => {
+ this.defaultLanguageOptions = supportedResp.languagesList;
+ });
+ }
+ }
+
+ private updateData(): Promise | void {
+ if (this.serviceType === PolicyComponentServiceType.ADMIN) {
+ return (this.service as AdminService).setDefaultLanguage(this.defaultLanguage);
+ } else {
+ return;
+ }
+ }
+
+ public savePolicy(): void {
+ const prom = this.updateData();
+ if (prom) {
+ prom
+ .then(() => {
+ this.toast.showInfo('POLICY.LOGIN_POLICY.SAVED', true);
+ this.loading = true;
+ setTimeout(() => {
+ this.fetchData();
+ }, 2000);
+ })
+ .catch((error) => {
+ this.toast.showError(error);
+ });
+ }
+ }
+
+ public removePolicy(): void {
+ if (this.serviceType === PolicyComponentServiceType.MGMT) {
+ (this.service as ManagementService)
+ .resetLoginPolicyToDefault()
+ .then(() => {
+ this.toast.showInfo('POLICY.TOAST.RESETSUCCESS', true);
+ this.loading = true;
+ setTimeout(() => {
+ this.fetchData();
+ }, 2000);
+ })
+ .catch((error) => {
+ this.toast.showError(error);
+ });
+ }
+ }
+}
diff --git a/console/src/app/modules/policies/general-settings/general-settings.module.ts b/console/src/app/modules/policies/general-settings/general-settings.module.ts
new file mode 100644
index 0000000000..cc59a79450
--- /dev/null
+++ b/console/src/app/modules/policies/general-settings/general-settings.module.ts
@@ -0,0 +1,27 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { MatSelectModule } from '@angular/material/select';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { CardModule } from '../../card/card.module';
+import { FormFieldModule } from '../../form-field/form-field.module';
+import { GeneralSettingsComponent } from './general-settings.component';
+
+@NgModule({
+ declarations: [GeneralSettingsComponent],
+ imports: [
+ CommonModule,
+ CardModule,
+ FormsModule,
+ MatButtonModule,
+ FormFieldModule,
+ MatProgressSpinnerModule,
+ MatSelectModule,
+ TranslateModule,
+ ],
+ exports: [GeneralSettingsComponent],
+})
+export class GeneralSettingsModule {}
diff --git a/console/src/app/modules/policies/idp-settings/idp-settings.component.html b/console/src/app/modules/policies/idp-settings/idp-settings.component.html
new file mode 100644
index 0000000000..ce6309d355
--- /dev/null
+++ b/console/src/app/modules/policies/idp-settings/idp-settings.component.html
@@ -0,0 +1,3 @@
+
diff --git a/console/src/app/modules/policies/idp-settings/idp-settings.component.scss b/console/src/app/modules/policies/idp-settings/idp-settings.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/console/src/app/modules/policies/idp-settings/idp-settings.component.spec.ts b/console/src/app/modules/policies/idp-settings/idp-settings.component.spec.ts
new file mode 100644
index 0000000000..b60137a3cd
--- /dev/null
+++ b/console/src/app/modules/policies/idp-settings/idp-settings.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { IdpSettingsComponent } from './idp-settings.component';
+
+describe('IdpSettingsComponent', () => {
+ let component: IdpSettingsComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [IdpSettingsComponent],
+ }).compileComponents();
+ });
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(IdpSettingsComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/console/src/app/modules/policies/idp-settings/idp-settings.component.ts b/console/src/app/modules/policies/idp-settings/idp-settings.component.ts
new file mode 100644
index 0000000000..a3ec92e3e0
--- /dev/null
+++ b/console/src/app/modules/policies/idp-settings/idp-settings.component.ts
@@ -0,0 +1,29 @@
+import { Component, Injector, Input, OnInit, Type } from '@angular/core';
+import { AdminService } from 'src/app/services/admin.service';
+import { ManagementService } from 'src/app/services/mgmt.service';
+
+import { PolicyComponentServiceType } from '../policy-component-types.enum';
+
+@Component({
+ selector: 'cnsl-idp-settings',
+ templateUrl: './idp-settings.component.html',
+ styleUrls: ['./idp-settings.component.scss'],
+})
+export class IdpSettingsComponent implements OnInit {
+ @Input() public serviceType!: PolicyComponentServiceType;
+ public service!: ManagementService | AdminService;
+
+ public PolicyComponentServiceType: any = PolicyComponentServiceType;
+ constructor(private injector: Injector) {}
+
+ ngOnInit(): void {
+ switch (this.serviceType) {
+ case PolicyComponentServiceType.MGMT:
+ this.service = this.injector.get(ManagementService as Type);
+ break;
+ case PolicyComponentServiceType.ADMIN:
+ this.service = this.injector.get(AdminService as Type);
+ break;
+ }
+ }
+}
diff --git a/console/src/app/modules/policies/idp-settings/idp-settings.module.ts b/console/src/app/modules/policies/idp-settings/idp-settings.module.ts
new file mode 100644
index 0000000000..c9b0aa39c0
--- /dev/null
+++ b/console/src/app/modules/policies/idp-settings/idp-settings.module.ts
@@ -0,0 +1,15 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { CardModule } from '../../card/card.module';
+import { IdpTableModule } from '../../idp-table/idp-table.module';
+import { IdpSettingsComponent } from './idp-settings.component';
+
+@NgModule({
+ declarations: [IdpSettingsComponent],
+ imports: [CommonModule, CardModule, IdpTableModule, MatProgressSpinnerModule, TranslateModule],
+ exports: [IdpSettingsComponent],
+})
+export class IdpSettingsModule {}
diff --git a/console/src/app/modules/policies/login-policy/login-policy.component.html b/console/src/app/modules/policies/login-policy/login-policy.component.html
index 837df0381d..b8459cdf50 100644
--- a/console/src/app/modules/policies/login-policy/login-policy.component.html
+++ b/console/src/app/modules/policies/login-policy/login-policy.component.html
@@ -1,236 +1,153 @@
-
- {{ 'POLICY.DEFAULTLABEL' | translate }}
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
+
-{{ 'MFA.LIST.SECONDFACTORTITLE' | translate }}
+
+
+
+
+
+
+ +
+
- {{ 'POLICY.DATA.FORCEMFA' | translate }}
+ {{ 'POLICY.DATA.ALLOWUSERNAMEPASSWORD' | translate }}
-
-
-
+
+
+
-
+ {{ 'MENU.SETTINGS' | translate }}
+
+
@@ -56,7 +76,7 @@
-
-
+
-
+
-
| + {{ 'ORG.PAGES.ACTIVE' | translate }} + | +
+ |
+ {{ 'ORG.PAGES.ID' | translate }} | +{{ org.id }} | +{{ 'ORG.PAGES.PRIMARYDOMAIN' | translate }} | ++ {{ org.primaryDomain }} + + | ++ {{ 'ORG.PAGES.NAME' | translate }} + | +{{ org.name }} | +{{ 'ORG.PAGES.STATE' | translate }} | ++ {{ 'ORG.STATE.' + org.state | translate }} + | ++ {{ 'ORG.PAGES.CREATIONDATE' | translate }} + | ++ {{ org.details?.creationDate | timestampToDate | localizedDate: 'fromNow' }} + | ++ {{ 'ORG.PAGES.DATECHANGED' | translate }} + | ++ {{ org.details?.changeDate | timestampToDate | localizedDate: 'fromNow' }} + | +
|---|
+
+{{ 'SETTING.DEFAULTLANGUAGE' | translate }}
+
+
+
diff --git a/console/src/app/modules/policies/general-settings/general-settings.component.scss b/console/src/app/modules/policies/general-settings/general-settings.component.scss
new file mode 100644
index 0000000000..d10152fb9c
--- /dev/null
+++ b/console/src/app/modules/policies/general-settings/general-settings.component.scss
@@ -0,0 +1,17 @@
+.spinner-wr {
+ margin: 0.5rem 0;
+}
+
+.default-language {
+ max-width: 400px;
+ display: block;
+}
+
+.general-btn-container {
+ display: flex;
+ justify-content: flex-start;
+
+ .save-button {
+ display: block;
+ }
+}
diff --git a/console/src/app/modules/policies/general-settings/general-settings.component.spec.ts b/console/src/app/modules/policies/general-settings/general-settings.component.spec.ts
new file mode 100644
index 0000000000..ec96a642a9
--- /dev/null
+++ b/console/src/app/modules/policies/general-settings/general-settings.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { GeneralSettingsComponent } from './general-settings.component';
+
+describe('GeneralSettingsComponent', () => {
+ let component: GeneralSettingsComponent;
+ let fixture: ComponentFixture{{ 'IDP.LIST.TITLE' | translate }}
+{{ 'IDP.LIST.DESCRIPTION' | translate }}
+
- {{ 'POLICY.APPLIEDTO' | translate }}:
- {{ orgName }}
-
+
-
-
+{{ 'MFA.LIST.MULTIFACTORTITLE' | translate }}
+{{ 'MFA.LIST.MULTIFACTORDESCRIPTION' | translate }}
-
+
+ {{ 'LOGINPOLICY.PASSWORDLESS' | translate }}
+
+
+ {{ 'LOGINPOLICY.PASSWORDLESSTYPE.' + pt | translate }}
+
+
+
+
-
-
- {{ 'LOGINPOLICY.PASSWORDLESS' | translate }}
-
-
- {{ 'LOGINPOLICY.PASSWORDLESSTYPE.' + pt | translate }}
-
-
-
-
+ -
{{ 'MFA.LIST.SECONDFACTORDESCRIPTION' | translate }}
+ +
+
+ {{ 'POLICY.DATA.FORCEMFA' | translate }}
+
+
++ +
{{ 'POLICY.LOGIN_POLICY.ADVANCED' | translate }}
+ +
+
+ {{ 'POLICY.DATA.ALLOWREGISTER' | translate }}
+
-
-
-
-
-
-
+
+
+
+
+
diff --git a/console/src/app/modules/policies/login-policy/login-policy.component.scss b/console/src/app/modules/policies/login-policy/login-policy.component.scss
index 69397719d5..604df2a7db 100644
--- a/console/src/app/modules/policies/login-policy/login-policy.component.scss
+++ b/console/src/app/modules/policies/login-policy/login-policy.component.scss
@@ -2,9 +2,9 @@
margin: 0.5rem 0;
}
-.policy-applied-to {
- margin: -1rem 0 0 0;
- font-size: 14px;
+.max-card-width {
+ max-width: 400px;
+ display: block;
}
.passwordless-allowed {
@@ -12,15 +12,9 @@
display: block;
}
-.force-mfa-toggle {
- margin-right: 1rem;
-}
-
.login-policy-content {
- padding-top: 1rem;
-
.login-policy-row {
- padding-bottom: 1.5rem;
+ padding-bottom: 0.5rem;
.login-policy-toggle {
margin: 0.3rem 0;
@@ -34,10 +28,9 @@
.login-policy-btn-container {
display: flex;
- justify-content: flex-end;
+ justify-content: flex-start;
.login-policy-save-button {
- margin-bottom: 3rem;
display: block;
}
}
diff --git a/console/src/app/modules/policies/login-policy/login-policy.component.ts b/console/src/app/modules/policies/login-policy/login-policy.component.ts
index 2153002421..ab61cdf822 100644
--- a/console/src/app/modules/policies/login-policy/login-policy.component.ts
+++ b/console/src/app/modules/policies/login-policy/login-policy.component.ts
@@ -1,7 +1,4 @@
-import { Component, Injector, OnDestroy, Type } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Subscription } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { Component, Injector, Input, OnInit, Type } from '@angular/core';
import {
GetLoginPolicyResponse as AdminGetLoginPolicyResponse,
UpdateLoginPolicyRequest,
@@ -11,16 +8,12 @@ import {
AddCustomLoginPolicyRequest,
GetLoginPolicyResponse as MgmtGetLoginPolicyResponse,
} from 'src/app/proto/generated/zitadel/management_pb';
-import { Org } from 'src/app/proto/generated/zitadel/org_pb';
import { LoginPolicy, PasswordlessType } from 'src/app/proto/generated/zitadel/policy_pb';
import { AdminService } from 'src/app/services/admin.service';
-import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/breadcrumb.service';
import { ManagementService } from 'src/app/services/mgmt.service';
-import { StorageLocation, StorageService } from 'src/app/services/storage.service';
import { ToastService } from 'src/app/services/toast.service';
import { InfoSectionType } from '../../info-section/info-section.component';
-import { GridPolicy, LOGIN_POLICY } from '../../policy-grid/policies';
import { PolicyComponentServiceType } from '../policy-component-types.enum';
import { LoginMethodComponentType } from './mfa-table/mfa-table.component';
@@ -29,7 +22,7 @@ import { LoginMethodComponentType } from './mfa-table/mfa-table.component';
templateUrl: './login-policy.component.html',
styleUrls: ['./login-policy.component.scss'],
})
-export class LoginPolicyComponent implements OnDestroy {
+export class LoginPolicyComponent implements OnInit {
public LoginMethodComponentType: any = LoginMethodComponentType;
public passwordlessTypes: Array = [
PasswordlessType.PASSWORDLESS_TYPE_NOT_ALLOWED,
@@ -37,90 +30,43 @@ export class LoginPolicyComponent implements OnDestroy {
];
public loginData!: LoginPolicy.AsObject;
- private sub: Subscription = new Subscription();
public service!: ManagementService | AdminService;
public PolicyComponentServiceType: any = PolicyComponentServiceType;
- public serviceType: PolicyComponentServiceType = PolicyComponentServiceType.MGMT;
+ @Input() public serviceType: PolicyComponentServiceType = PolicyComponentServiceType.MGMT;
public loading: boolean = false;
- public disabled: boolean = true;
-
- public currentPolicy: GridPolicy = LOGIN_POLICY;
public InfoSectionType: any = InfoSectionType;
- public orgName: string = '';
public PasswordlessType: any = PasswordlessType;
- constructor(
- private route: ActivatedRoute,
- private toast: ToastService,
- private injector: Injector,
- breadcrumbService: BreadcrumbService,
- private storageService: StorageService,
- ) {
- this.sub = this.route.data
- .pipe(
- switchMap((data) => {
- this.serviceType = data.serviceType;
- switch (this.serviceType) {
- case PolicyComponentServiceType.MGMT:
- this.service = this.injector.get(ManagementService as Type);
- this.passwordlessTypes = [
- PasswordlessType.PASSWORDLESS_TYPE_ALLOWED,
- PasswordlessType.PASSWORDLESS_TYPE_NOT_ALLOWED,
- ];
- const org: Org.AsObject | null = this.storageService.getItem('organization', StorageLocation.session);
- if (org && org.id) {
- this.orgName = org.name;
- }
-
- const iambread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'System',
- routerLink: ['/system'],
- });
- const bread: Breadcrumb = {
- type: BreadcrumbType.ORG,
- routerLink: ['/org'],
- };
- breadcrumbService.setBreadcrumb([iambread, bread]);
-
- break;
- case PolicyComponentServiceType.ADMIN:
- this.service = this.injector.get(AdminService as Type);
- this.passwordlessTypes = [
- PasswordlessType.PASSWORDLESS_TYPE_ALLOWED,
- PasswordlessType.PASSWORDLESS_TYPE_NOT_ALLOWED,
- ];
-
- const iamBread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'System',
- routerLink: ['/system'],
- });
- breadcrumbService.setBreadcrumb([iamBread]);
- break;
- }
-
- return this.route.params;
- }),
- )
- .subscribe(() => {
- this.fetchData();
- });
- }
+ constructor(private toast: ToastService, private injector: Injector) {}
private fetchData(): void {
this.getData().then((resp) => {
if (resp.policy) {
this.loginData = resp.policy;
this.loading = false;
- this.disabled = this.isDefault;
}
});
}
- public ngOnDestroy(): void {
- this.sub.unsubscribe();
+ public ngOnInit(): void {
+ switch (this.serviceType) {
+ case PolicyComponentServiceType.MGMT:
+ this.service = this.injector.get(ManagementService as Type);
+ this.passwordlessTypes = [
+ PasswordlessType.PASSWORDLESS_TYPE_ALLOWED,
+ PasswordlessType.PASSWORDLESS_TYPE_NOT_ALLOWED,
+ ];
+ break;
+ case PolicyComponentServiceType.ADMIN:
+ this.service = this.injector.get(AdminService as Type);
+ this.passwordlessTypes = [
+ PasswordlessType.PASSWORDLESS_TYPE_ALLOWED,
+ PasswordlessType.PASSWORDLESS_TYPE_NOT_ALLOWED,
+ ];
+ break;
+ }
+ this.fetchData();
}
private async getData(): Promise {
diff --git a/console/src/app/modules/policies/login-policy/login-policy.module.ts b/console/src/app/modules/policies/login-policy/login-policy.module.ts
index f3e1006640..71fe8c4d04 100644
--- a/console/src/app/modules/policies/login-policy/login-policy.module.ts
+++ b/console/src/app/modules/policies/login-policy/login-policy.module.ts
@@ -13,12 +13,10 @@ import { TranslateModule } from '@ngx-translate/core';
import { HasRoleModule } from 'src/app/directives/has-role/has-role.module';
import { CardModule } from 'src/app/modules/card/card.module';
import { DetailLayoutModule } from 'src/app/modules/detail-layout/detail-layout.module';
-import { IdpTableModule } from 'src/app/modules/idp-table/idp-table.module';
import { InputModule } from 'src/app/modules/input/input.module';
import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
import { InfoSectionModule } from '../../info-section/info-section.module';
-import { PolicyGridModule } from '../../policy-grid/policy-grid.module';
import { LoginPolicyRoutingModule } from './login-policy-routing.module';
import { LoginPolicyComponent } from './login-policy.component';
import { DialogAddTypeComponent } from './mfa-table/dialog-add-type/dialog-add-type.component';
@@ -41,12 +39,11 @@ import { MfaTableComponent } from './mfa-table/mfa-table.component';
HasRolePipeModule,
MatTooltipModule,
DetailLayoutModule,
- IdpTableModule,
MatProgressSpinnerModule,
MatSelectModule,
MatRippleModule,
TranslateModule,
- PolicyGridModule,
],
+ exports: [LoginPolicyComponent],
})
export class LoginPolicyModule {}
diff --git a/console/src/app/modules/policies/login-policy/mfa-table/mfa-table.component.html b/console/src/app/modules/policies/login-policy/mfa-table/mfa-table.component.html
index 8919ff12d2..35416a706b 100644
--- a/console/src/app/modules/policies/login-policy/mfa-table/mfa-table.component.html
+++ b/console/src/app/modules/policies/login-policy/mfa-table/mfa-table.component.html
@@ -5,19 +5,29 @@
\ No newline at end of file
+
diff --git a/console/src/app/modules/policies/login-policy/mfa-table/mfa-table.component.scss b/console/src/app/modules/policies/login-policy/mfa-table/mfa-table.component.scss
index 8d9319c3da..efe0cf38b5 100644
--- a/console/src/app/modules/policies/login-policy/mfa-table/mfa-table.component.scss
+++ b/console/src/app/modules/policies/login-policy/mfa-table/mfa-table.component.scss
@@ -13,6 +13,7 @@
justify-content: space-between;
padding: 0.5rem 0;
min-height: 40px;
+ max-width: 400px;
border-bottom: 1px solid map-get($foreground, dividers);
&:last-child {
@@ -42,7 +43,8 @@
.mfa-list-btns {
display: flex;
- justify-content: flex-end;
+ justify-content: flex-start;
+ max-width: 400px;
.new-mfa {
margin-top: 0.5rem;
diff --git a/console/src/app/modules/policies/login-texts/login-texts.component.html b/console/src/app/modules/policies/login-texts/login-texts.component.html
index 2d72071263..027d8e6df0 100644
--- a/console/src/app/modules/policies/login-texts/login-texts.component.html
+++ b/console/src/app/modules/policies/login-texts/login-texts.component.html
@@ -1,94 +1,81 @@
-
-
-
-
- {{ 'POLICY.DATA.ALLOWUSERNAMEPASSWORD' | translate }}
-
+
+
+
+
+ {{ 'POLICY.DATA.ALLOWEXTERNALIDP' | translate }}
+
-
-
- {{ 'POLICY.DATA.ALLOWUSERNAMEPASSWORD_DESC' | translate }}
-
-
-
-
-
- {{ 'POLICY.DATA.ALLOWREGISTER' | translate }}
-
-
-
-
- {{ 'POLICY.DATA.ALLOWREGISTER_DESC' | translate }}
-
-
-
-
-
- {{ 'POLICY.DATA.ALLOWEXTERNALIDP' | translate }}
-
-
-
-
- {{ 'POLICY.DATA.ALLOWEXTERNALIDP_DESC' | translate }}
-
-
-
-
-
-
- {{ 'POLICY.DATA.HIDEPASSWORDRESET' | translate }}
-
-
-
-
- {{ 'POLICY.DATA.HIDEPASSWORDRESET_DESC' | translate }}
-
-
-
-
-
+
-
+
+ {{ 'POLICY.DATA.HIDEPASSWORDRESET' | translate }}
+
+
+
+
+
+
+
+
+
+
+
- {{(componentType === LoginMethodComponentType.SecondFactor ? 'MFA.SECONDFACTORTYPES.':
- LoginMethodComponentType.MultiFactor ? 'MFA.MULTIFACTORTYPES.': '')+mfa | translate}}
+ {{
+ (componentType === LoginMethodComponentType.SecondFactor
+ ? 'MFA.SECONDFACTORTYPES.'
+ : LoginMethodComponentType.MultiFactor
+ ? 'MFA.MULTIFACTORTYPES.'
+ : '') + mfa | translate
+ }}
-
-
- {{ 'POLICY.APPLIEDTO' | translate }}:
- {{ orgName }}
-
-
+ {{ 'POLICY.LOGIN_TEXTS.LOCALE' | translate }}
+
+
+
+
+
+
-
+
- = new Subject();
public InfoSectionType: any = InfoSectionType;
- public orgName: string = '';
public form: FormGroup = new FormGroup({
currentSubMap: new FormControl('emailVerificationDoneText'),
locale: new FormControl('en'),
@@ -135,76 +128,10 @@ export class LoginTextsComponent implements OnDestroy {
]);
constructor(
private authService: GrpcAuthService,
- private route: ActivatedRoute,
private injector: Injector,
private dialog: MatDialog,
private toast: ToastService,
- private storageService: StorageService,
- breadcrumbService: BreadcrumbService,
) {
- this.sub = this.route.data
- .pipe(
- switchMap((data) => {
- this.serviceType = data.serviceType;
- switch (this.serviceType) {
- case PolicyComponentServiceType.MGMT:
- this.service = this.injector.get(ManagementService as Type);
-
- this.service.getSupportedLanguages().then((lang) => {
- this.LOCALES = lang.languagesList;
- });
-
- this.loadData();
-
- const org: Org.AsObject | null = this.storageService.getItem('organization', StorageLocation.session);
- if (org && org.id) {
- this.orgName = org.name;
- }
-
- const iambread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'System',
- routerLink: ['/system'],
- });
- const bread: Breadcrumb = {
- type: BreadcrumbType.ORG,
- routerLink: ['/org'],
- };
- breadcrumbService.setBreadcrumb([iambread, bread]);
-
- break;
- case PolicyComponentServiceType.ADMIN:
- this.service = this.injector.get(AdminService as Type);
-
- this.service.getSupportedLanguages().then((lang) => {
- this.LOCALES = lang.languagesList;
- });
-
- this.loadData();
-
- const iamBread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'System',
- routerLink: ['/system'],
- });
- breadcrumbService.setBreadcrumb([iamBread]);
- break;
- }
-
- return this.route.params;
- }),
- )
- .subscribe(() => {
- interval(10000)
- .pipe(
- // debounceTime(5000),
- takeUntil(this.destroy$),
- )
- .subscribe((x) => {
- this.checkForChanges();
- });
- });
-
this.form.valueChanges
.pipe(startWith({ currentSubMap: 'emailVerificationDoneText', locale: 'en' }), pairwise(), takeUntil(this.destroy$))
.subscribe((pair) => {
@@ -225,6 +152,38 @@ export class LoginTextsComponent implements OnDestroy {
});
}
+ ngOnInit(): void {
+ switch (this.serviceType) {
+ case PolicyComponentServiceType.MGMT:
+ this.service = this.injector.get(ManagementService as Type);
+
+ this.service.getSupportedLanguages().then((lang) => {
+ this.LOCALES = lang.languagesList;
+ });
+
+ this.loadData();
+ break;
+ case PolicyComponentServiceType.ADMIN:
+ this.service = this.injector.get(AdminService as Type);
+
+ this.service.getSupportedLanguages().then((lang) => {
+ this.LOCALES = lang.languagesList;
+ });
+
+ this.loadData();
+ break;
+ }
+
+ interval(10000)
+ .pipe(
+ // debounceTime(5000),
+ takeUntil(this.destroy$),
+ )
+ .subscribe((x) => {
+ this.checkForChanges();
+ });
+ }
+
public getDefaultValues(req: any): Promise {
return this.service.getDefaultLoginTexts(req).then((res) => {
if (res.customText) {
diff --git a/console/src/app/modules/policies/login-texts/login-texts.module.ts b/console/src/app/modules/policies/login-texts/login-texts.module.ts
index 39e63723c7..9cb7ff3f91 100644
--- a/console/src/app/modules/policies/login-texts/login-texts.module.ts
+++ b/console/src/app/modules/policies/login-texts/login-texts.module.ts
@@ -16,10 +16,10 @@ import { HasRoleModule } from '../../../directives/has-role/has-role.module';
import { DetailLayoutModule } from '../../../modules/detail-layout/detail-layout.module';
import { InputModule } from '../../../modules/input/input.module';
import { HasRolePipeModule } from '../../../pipes/has-role-pipe/has-role-pipe.module';
+import { CardModule } from '../../card/card.module';
import { EditTextModule } from '../../edit-text/edit-text.module';
import { FormFieldModule } from '../../form-field/form-field.module';
import { InfoSectionModule } from '../../info-section/info-section.module';
-import { PolicyGridModule } from '../../policy-grid/policy-grid.module';
import { WarnDialogModule } from '../../warn-dialog/warn-dialog.module';
import { LoginTextsRoutingModule } from './login-texts-routing.module';
import { LoginTextsComponent } from './login-texts.component';
@@ -48,9 +48,11 @@ import { LoginTextsComponent } from './login-texts.component';
TextFieldModule,
MatDialogModule,
WarnDialogModule,
- PolicyGridModule,
+ CardModule,
+
TimestampToDatePipeModule,
LocalizedDatePipeModule,
],
+ exports: [LoginTextsComponent],
})
export class LoginTextsPolicyModule {}
diff --git a/console/src/app/modules/policies/message-texts/message-texts.component.html b/console/src/app/modules/policies/message-texts/message-texts.component.html
index e14cccabe6..58e35c8d8b 100644
--- a/console/src/app/modules/policies/message-texts/message-texts.component.html
+++ b/console/src/app/modules/policies/message-texts/message-texts.component.html
@@ -1,77 +1,64 @@
-
-
+ = this.authService.isAllowed([
this.serviceType === PolicyComponentServiceType.ADMIN
? 'iam.policy.write'
@@ -404,61 +397,29 @@ export class MessageTextsComponent implements OnDestroy {
constructor(
private authService: GrpcAuthService,
- private route: ActivatedRoute,
private toast: ToastService,
private injector: Injector,
private dialog: MatDialog,
private storageService: StorageService,
- breadcrumbService: BreadcrumbService,
- ) {
- this.sub = this.route.data
- .pipe(
- switchMap((data) => {
- this.serviceType = data.serviceType;
- switch (this.serviceType) {
- case PolicyComponentServiceType.MGMT:
- this.service = this.injector.get(ManagementService as Type);
- this.service.getSupportedLanguages().then((lang) => {
- this.LOCALES = lang.languagesList;
- });
- this.loadData(this.currentType);
- const org: Org.AsObject | null = this.storageService.getItem('organization', StorageLocation.session);
- if (org && org.id) {
- this.orgName = org.name;
- }
+ ) {}
- const iambread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'System',
- routerLink: ['/system'],
- });
- const bread: Breadcrumb = {
- type: BreadcrumbType.ORG,
- routerLink: ['/org'],
- };
- breadcrumbService.setBreadcrumb([iambread, bread]);
- break;
- case PolicyComponentServiceType.ADMIN:
- this.service = this.injector.get(AdminService as Type);
- this.service.getSupportedLanguages().then((lang) => {
- this.LOCALES = lang.languagesList;
- });
- this.loadData(this.currentType);
-
- const iamBread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'System',
- routerLink: ['/system'],
- });
- breadcrumbService.setBreadcrumb([iamBread]);
-
- break;
- }
-
- return this.route.params;
- }),
- )
- .subscribe();
+ ngOnInit(): void {
+ switch (this.serviceType) {
+ case PolicyComponentServiceType.MGMT:
+ this.service = this.injector.get(ManagementService as Type);
+ this.service.getSupportedLanguages().then((lang) => {
+ this.LOCALES = lang.languagesList;
+ });
+ this.loadData(this.currentType);
+ break;
+ case PolicyComponentServiceType.ADMIN:
+ this.service = this.injector.get(AdminService as Type);
+ this.service.getSupportedLanguages().then((lang) => {
+ this.LOCALES = lang.languagesList;
+ });
+ this.loadData(this.currentType);
+ break;
+ }
}
public getDefaultValues(type: MESSAGETYPES, req: any): Promise {
diff --git a/console/src/app/modules/policies/message-texts/message-texts.module.ts b/console/src/app/modules/policies/message-texts/message-texts.module.ts
index 63d62e4ca4..5614b6a15f 100644
--- a/console/src/app/modules/policies/message-texts/message-texts.module.ts
+++ b/console/src/app/modules/policies/message-texts/message-texts.module.ts
@@ -13,10 +13,10 @@ import { DetailLayoutModule } from 'src/app/modules/detail-layout/detail-layout.
import { InputModule } from 'src/app/modules/input/input.module';
import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
+import { CardModule } from '../../card/card.module';
import { EditTextModule } from '../../edit-text/edit-text.module';
import { FormFieldModule } from '../../form-field/form-field.module';
import { InfoSectionModule } from '../../info-section/info-section.module';
-import { PolicyGridModule } from '../../policy-grid/policy-grid.module';
import { MessageTextsRoutingModule } from './message-texts-routing.module';
import { MessageTextsComponent } from './message-texts.component';
@@ -37,12 +37,13 @@ import { MessageTextsComponent } from './message-texts.component';
HasRolePipeModule,
MatTooltipModule,
TranslateModule,
+ CardModule,
MatTooltipModule,
MatSelectModule,
DetailLayoutModule,
MatProgressSpinnerModule,
- PolicyGridModule,
TextFieldModule,
],
+ exports: [MessageTextsComponent],
})
export class MessageTextsPolicyModule {}
diff --git a/console/src/app/modules/policies/org-iam-policy/org-iam-policy.component.html b/console/src/app/modules/policies/org-iam-policy/org-iam-policy.component.html
index 8c902f8f24..adf8a6ea10 100644
--- a/console/src/app/modules/policies/org-iam-policy/org-iam-policy.component.html
+++ b/console/src/app/modules/policies/org-iam-policy/org-iam-policy.component.html
@@ -1,55 +1,41 @@
-
- {{ 'POLICY.DEFAULTLABEL' | translate }}
- {{ 'POLICY.DEFAULTLABEL' | translate }}
+
+
+
-
-
-
-
-
+);
}
- this.sub = this.route.data
- .pipe(
- switchMap((data) => {
- this.serviceType = data.serviceType;
- if (this.serviceType === PolicyComponentServiceType.MGMT) {
- const org: Org.AsObject | null = this.storageService.getItem('organization', StorageLocation.session);
- if (org && org.id) {
- this.orgName = org.name;
- }
- this.managementService = this.injector.get(ManagementService as Type);
-
- const iambread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'System',
- routerLink: ['/system'],
- });
- const bread: Breadcrumb = {
- type: BreadcrumbType.ORG,
- routerLink: ['/org'],
- };
- breadcrumbService.setBreadcrumb([iambread, bread]);
- }
- return this.route.params;
- }),
- )
- .subscribe((_) => {
- this.fetchData();
- });
+ this.fetchData();
}
public ngOnDestroy(): void {
@@ -103,7 +62,6 @@ export class OrgIamPolicyComponent implements OnDestroy {
}
public savePolicy(): void {
- console.log(this.iamData);
switch (this.serviceType) {
case PolicyComponentServiceType.MGMT:
if ((this.iamData as OrgIAMPolicy.AsObject).isDefault) {
diff --git a/console/src/app/modules/policies/org-iam-policy/org-iam-policy.module.ts b/console/src/app/modules/policies/org-iam-policy/org-iam-policy.module.ts
index 33048c7a70..8c91d070d9 100644
--- a/console/src/app/modules/policies/org-iam-policy/org-iam-policy.module.ts
+++ b/console/src/app/modules/policies/org-iam-policy/org-iam-policy.module.ts
@@ -11,8 +11,8 @@ import { DetailLayoutModule } from 'src/app/modules/detail-layout/detail-layout.
import { InputModule } from 'src/app/modules/input/input.module';
import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
+import { CardModule } from '../../card/card.module';
import { InfoSectionModule } from '../../info-section/info-section.module';
-import { PolicyGridModule } from '../../policy-grid/policy-grid.module';
import { OrgIamPolicyRoutingModule } from './org-iam-policy-routing.module';
import { OrgIamPolicyComponent } from './org-iam-policy.component';
@@ -22,6 +22,7 @@ import { OrgIamPolicyComponent } from './org-iam-policy.component';
OrgIamPolicyRoutingModule,
CommonModule,
FormsModule,
+ CardModule,
InputModule,
MatButtonModule,
HasRolePipeModule,
@@ -32,7 +33,7 @@ import { OrgIamPolicyComponent } from './org-iam-policy.component';
InfoSectionModule,
TranslateModule,
DetailLayoutModule,
- PolicyGridModule,
],
+ exports: [OrgIamPolicyComponent],
})
export class OrgIamPolicyModule {}
diff --git a/console/src/app/modules/policies/password-age-policy/password-age-policy.component.ts b/console/src/app/modules/policies/password-age-policy/password-age-policy.component.ts
index c19b2f47f9..f24045803b 100644
--- a/console/src/app/modules/policies/password-age-policy/password-age-policy.component.ts
+++ b/console/src/app/modules/policies/password-age-policy/password-age-policy.component.ts
@@ -4,11 +4,10 @@ import { Subscription } from 'rxjs';
import { switchMap } from 'rxjs/operators';
import { GetPasswordAgePolicyResponse as AdminGetPasswordAgePolicyResponse } from 'src/app/proto/generated/zitadel/admin_pb';
import {
- GetPasswordAgePolicyResponse as MgmtGetPasswordAgePolicyResponse,
+ GetPasswordAgePolicyResponse as MgmtGetPasswordAgePolicyResponse,
} from 'src/app/proto/generated/zitadel/management_pb';
import { PasswordAgePolicy } from 'src/app/proto/generated/zitadel/policy_pb';
import { AdminService } from 'src/app/services/admin.service';
-import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/breadcrumb.service';
import { ManagementService } from 'src/app/services/mgmt.service';
import { ToastService } from 'src/app/services/toast.service';
@@ -28,12 +27,7 @@ export class PasswordAgePolicyComponent implements OnDestroy {
private sub: Subscription = new Subscription();
public PolicyComponentServiceType: any = PolicyComponentServiceType;
- constructor(
- private route: ActivatedRoute,
- private toast: ToastService,
- private injector: Injector,
- breadcrumbService: BreadcrumbService,
- ) {
+ constructor(private route: ActivatedRoute, private toast: ToastService, private injector: Injector) {
this.sub = this.route.data
.pipe(
switchMap((data) => {
@@ -41,27 +35,9 @@ export class PasswordAgePolicyComponent implements OnDestroy {
switch (this.serviceType) {
case PolicyComponentServiceType.MGMT:
this.service = this.injector.get(ManagementService as Type);
-
- const iambread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'IAM',
- routerLink: ['/system'],
- });
- const bread: Breadcrumb = {
- type: BreadcrumbType.ORG,
- routerLink: ['/org'],
- };
- breadcrumbService.setBreadcrumb([iambread, bread]);
break;
case PolicyComponentServiceType.ADMIN:
this.service = this.injector.get(AdminService as Type);
-
- const iamBread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'IAM',
- routerLink: ['/system'],
- });
- breadcrumbService.setBreadcrumb([iamBread]);
break;
}
diff --git a/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.html b/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.html
index eccca0e677..cff4fd15cf 100644
--- a/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.html
+++ b/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.html
@@ -1,38 +1,29 @@
-
- {{ 'POLICY.DEFAULTLABEL' | translate }}
+
+
-
-
+
+
+
-
-
-
+{{ 'POLICY.LOGIN_TEXTS.NEWERVERSIONEXISTS' | translate }}
-- {{ 'POLICY.LOGIN_TEXTS.CHANGEDATE' | translate }}: - {{ newerPolicyChangeDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm:ss' }} -
-- {{ 'POLICY.LOGIN_TEXTS.CURRENTDATE' | translate }}: - {{ currentPolicyChangeDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm:ss' }} -
-{{ 'POLICY.LOGIN_TEXTS.TITLE' | translate }}
+{{ 'POLICY.LOGIN_TEXTS.DESCRIPTION' | translate }}
+
+
+
+
+
- {{ 'POLICY.LOGIN_TEXTS.NEWERVERSIONEXISTS' | translate }}
++ {{ 'POLICY.LOGIN_TEXTS.CHANGEDATE' | translate }}: + {{ newerPolicyChangeDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm:ss' }} +
++ {{ 'POLICY.LOGIN_TEXTS.CURRENTDATE' | translate }}: + {{ currentPolicyChangeDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm:ss' }} +
+ {{ loc }}
+ | {{ 'POLICY.LOGIN_TEXTS.LOCALES.' + loc | translate }}
+
+
-
+
+
-
-
-
-
-
-
-
+
+
+
+
diff --git a/console/src/app/modules/policies/login-texts/login-texts.component.scss b/console/src/app/modules/policies/login-texts/login-texts.component.scss
index 71d5084a25..0c4359debd 100644
--- a/console/src/app/modules/policies/login-texts/login-texts.component.scss
+++ b/console/src/app/modules/policies/login-texts/login-texts.component.scss
@@ -32,18 +32,16 @@
}
.top-actions {
- display: flex;
- margin: 0 -0.5rem;
- flex-wrap: wrap;
+ display: grid;
+ grid-template-columns: 1fr 1fr 1fr 1fr;
+ column-gap: 1rem;
.keys {
- flex: 1;
- margin: 0 0.5rem;
min-width: 150px;
+ grid-column: span 3;
}
.language {
- margin: 0 0.5rem;
min-width: 150px;
.lighter {
diff --git a/console/src/app/modules/policies/login-texts/login-texts.component.ts b/console/src/app/modules/policies/login-texts/login-texts.component.ts
index 3abb7cf41b..da363da730 100644
--- a/console/src/app/modules/policies/login-texts/login-texts.component.ts
+++ b/console/src/app/modules/policies/login-texts/login-texts.component.ts
@@ -1,30 +1,25 @@
-import { Component, Injector, OnDestroy, Type } from '@angular/core';
+import { Component, Injector, Input, OnDestroy, OnInit, Type } from '@angular/core';
import { FormControl, FormGroup } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
-import { ActivatedRoute } from '@angular/router';
import { Timestamp } from 'google-protobuf/google/protobuf/timestamp_pb';
import { BehaviorSubject, from, interval, Observable, of, Subject, Subscription } from 'rxjs';
-import { map, pairwise, startWith, switchMap, takeUntil } from 'rxjs/operators';
+import { map, pairwise, startWith, takeUntil } from 'rxjs/operators';
import {
- GetCustomLoginTextsRequest as AdminGetCustomLoginTextsRequest,
- GetDefaultLoginTextsRequest as AdminGetDefaultLoginTextsRequest,
- SetCustomLoginTextsRequest as AdminSetCustomLoginTextsRequest,
+ GetCustomLoginTextsRequest as AdminGetCustomLoginTextsRequest,
+ GetDefaultLoginTextsRequest as AdminGetDefaultLoginTextsRequest,
+ SetCustomLoginTextsRequest as AdminSetCustomLoginTextsRequest,
} from 'src/app/proto/generated/zitadel/admin_pb';
import {
- GetCustomLoginTextsRequest,
- GetDefaultLoginTextsRequest,
- SetCustomLoginTextsRequest,
+ GetCustomLoginTextsRequest,
+ GetDefaultLoginTextsRequest,
+ SetCustomLoginTextsRequest,
} from 'src/app/proto/generated/zitadel/management_pb';
-import { Org } from 'src/app/proto/generated/zitadel/org_pb';
import { AdminService } from 'src/app/services/admin.service';
-import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/breadcrumb.service';
import { GrpcAuthService } from 'src/app/services/grpc-auth.service';
import { ManagementService } from 'src/app/services/mgmt.service';
-import { StorageLocation, StorageService } from 'src/app/services/storage.service';
import { ToastService } from 'src/app/services/toast.service';
import { InfoSectionType } from '../../info-section/info-section.component';
-import { GridPolicy, LOGIN_TEXTS_POLICY } from '../../policy-grid/policies';
import { WarnDialogComponent } from '../../warn-dialog/warn-dialog.component';
import { PolicyComponentServiceType } from '../policy-component-types.enum';
import { mapRequestValues } from './helper';
@@ -97,7 +92,7 @@ const REQUESTMAP = {
templateUrl: './login-texts.component.html',
styleUrls: ['./login-texts.component.scss'],
})
-export class LoginTextsComponent implements OnDestroy {
+export class LoginTextsComponent implements OnInit, OnDestroy {
public currentPolicyChangeDate!: Timestamp.AsObject | undefined;
public newerPolicyChangeDate!: Timestamp.AsObject | undefined;
@@ -108,7 +103,7 @@ export class LoginTextsComponent implements OnDestroy {
public service!: ManagementService | AdminService;
public PolicyComponentServiceType: any = PolicyComponentServiceType;
- public serviceType: PolicyComponentServiceType = PolicyComponentServiceType.MGMT;
+ @Input() public serviceType: PolicyComponentServiceType = PolicyComponentServiceType.MGMT;
public KeyNamesArray: string[] = KeyNamesArray;
public LOCALES: string[] = ['en', 'de', 'it'];
@@ -116,11 +111,9 @@ export class LoginTextsComponent implements OnDestroy {
private sub: Subscription = new Subscription();
public updateRequest!: SetCustomLoginTextsRequest;
- public currentPolicy: GridPolicy = LOGIN_TEXTS_POLICY;
public destroy$: Subject
- {{ 'POLICY.APPLIEDTO' | translate }}:
- {{ orgName }}
-
{{ 'POLICY.MESSAGE_TEXTS.TITLE' | translate }}
+{{ 'POLICY.MESSAGE_TEXTS.DESCRIPTION' | translate }}
- -
-
+
+
-
-
-
-
-
-
+
+
+
diff --git a/console/src/app/modules/policies/message-texts/message-texts.component.ts b/console/src/app/modules/policies/message-texts/message-texts.component.ts
index 6664f0ae54..8228ee3ee0 100644
--- a/console/src/app/modules/policies/message-texts/message-texts.component.ts
+++ b/console/src/app/modules/policies/message-texts/message-texts.component.ts
@@ -1,51 +1,46 @@
-import { Component, Injector, OnDestroy, Type } from '@angular/core';
+import { Component, Injector, Input, OnDestroy, OnInit, Type } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
import { MatSelectChange } from '@angular/material/select';
-import { ActivatedRoute } from '@angular/router';
import { BehaviorSubject, from, Observable, of, Subscription } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
import {
- GetCustomPasswordResetMessageTextRequest as AdminGetCustomPasswordResetMessageTextRequest,
- GetDefaultInitMessageTextRequest as AdminGetDefaultInitMessageTextRequest,
- GetDefaultVerifyEmailMessageTextRequest as AdminGetDefaultVerifyEmailMessageTextRequest,
- GetDefaultVerifyPhoneMessageTextRequest as AdminGetDefaultVerifyPhoneMessageTextRequest,
- SetDefaultDomainClaimedMessageTextRequest,
- SetDefaultInitMessageTextRequest,
- SetDefaultPasswordlessRegistrationMessageTextRequest,
- SetDefaultPasswordResetMessageTextRequest,
- SetDefaultVerifyEmailMessageTextRequest,
- SetDefaultVerifyPhoneMessageTextRequest,
+ GetCustomPasswordResetMessageTextRequest as AdminGetCustomPasswordResetMessageTextRequest,
+ GetDefaultInitMessageTextRequest as AdminGetDefaultInitMessageTextRequest,
+ GetDefaultVerifyEmailMessageTextRequest as AdminGetDefaultVerifyEmailMessageTextRequest,
+ GetDefaultVerifyPhoneMessageTextRequest as AdminGetDefaultVerifyPhoneMessageTextRequest,
+ SetDefaultDomainClaimedMessageTextRequest,
+ SetDefaultInitMessageTextRequest,
+ SetDefaultPasswordlessRegistrationMessageTextRequest,
+ SetDefaultPasswordResetMessageTextRequest,
+ SetDefaultVerifyEmailMessageTextRequest,
+ SetDefaultVerifyPhoneMessageTextRequest,
} from 'src/app/proto/generated/zitadel/admin_pb';
import {
- GetCustomDomainClaimedMessageTextRequest,
- GetCustomPasswordlessRegistrationMessageTextRequest,
- GetCustomPasswordResetMessageTextRequest,
- GetCustomVerifyEmailMessageTextRequest,
- GetCustomVerifyPhoneMessageTextRequest,
- GetDefaultDomainClaimedMessageTextRequest,
- GetDefaultInitMessageTextRequest,
- GetDefaultPasswordlessRegistrationMessageTextRequest,
- GetDefaultPasswordResetMessageTextRequest,
- GetDefaultVerifyEmailMessageTextRequest,
- GetDefaultVerifyPhoneMessageTextRequest,
- SetCustomDomainClaimedMessageTextRequest,
- SetCustomInitMessageTextRequest,
- SetCustomPasswordlessRegistrationMessageTextRequest,
- SetCustomPasswordResetMessageTextRequest,
- SetCustomVerifyEmailMessageTextRequest,
- SetCustomVerifyPhoneMessageTextRequest,
+ GetCustomDomainClaimedMessageTextRequest,
+ GetCustomPasswordlessRegistrationMessageTextRequest,
+ GetCustomPasswordResetMessageTextRequest,
+ GetCustomVerifyEmailMessageTextRequest,
+ GetCustomVerifyPhoneMessageTextRequest,
+ GetDefaultDomainClaimedMessageTextRequest,
+ GetDefaultInitMessageTextRequest,
+ GetDefaultPasswordlessRegistrationMessageTextRequest,
+ GetDefaultPasswordResetMessageTextRequest,
+ GetDefaultVerifyEmailMessageTextRequest,
+ GetDefaultVerifyPhoneMessageTextRequest,
+ SetCustomDomainClaimedMessageTextRequest,
+ SetCustomInitMessageTextRequest,
+ SetCustomPasswordlessRegistrationMessageTextRequest,
+ SetCustomPasswordResetMessageTextRequest,
+ SetCustomVerifyEmailMessageTextRequest,
+ SetCustomVerifyPhoneMessageTextRequest,
} from 'src/app/proto/generated/zitadel/management_pb';
-import { Org } from 'src/app/proto/generated/zitadel/org_pb';
import { MessageCustomText } from 'src/app/proto/generated/zitadel/text_pb';
import { AdminService } from 'src/app/services/admin.service';
-import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/breadcrumb.service';
import { GrpcAuthService } from 'src/app/services/grpc-auth.service';
import { ManagementService } from 'src/app/services/mgmt.service';
-import { StorageLocation, StorageService } from 'src/app/services/storage.service';
+import { StorageService } from 'src/app/services/storage.service';
import { ToastService } from 'src/app/services/toast.service';
import { InfoSectionType } from '../../info-section/info-section.component';
-import { GridPolicy, MESSAGE_TEXTS_POLICY } from '../../policy-grid/policies';
import { WarnDialogComponent } from '../../warn-dialog/warn-dialog.component';
import { PolicyComponentServiceType } from '../policy-component-types.enum';
@@ -279,7 +274,7 @@ const REQUESTMAP = {
templateUrl: './message-texts.component.html',
styleUrls: ['./message-texts.component.scss'],
})
-export class MessageTextsComponent implements OnDestroy {
+export class MessageTextsComponent implements OnInit, OnDestroy {
public getDefaultInitMessageTextMap$: Observable<{ [key: string]: string }> = of({});
public getCustomInitMessageTextMap$: BehaviorSubject<{ [key: string]: string | boolean }> = new BehaviorSubject({}); // boolean because of isDefault
@@ -287,7 +282,7 @@ export class MessageTextsComponent implements OnDestroy {
public service!: ManagementService | AdminService;
public PolicyComponentServiceType: any = PolicyComponentServiceType;
- public serviceType: PolicyComponentServiceType = PolicyComponentServiceType.MGMT;
+ @Input() public serviceType: PolicyComponentServiceType = PolicyComponentServiceType.MGMT;
public MESSAGETYPES: any = MESSAGETYPES;
@@ -392,8 +387,6 @@ export class MessageTextsComponent implements OnDestroy {
public locale: string = 'en';
public LOCALES: string[] = ['en', 'de', 'it'];
private sub: Subscription = new Subscription();
- public currentPolicy: GridPolicy = MESSAGE_TEXTS_POLICY;
- public orgName: string = '';
public canWrite$: Observable
- {{ 'POLICY.APPLIEDTO' | translate }}:
- {{ orgName }}
-
{{ 'POLICY.IAM_POLICY.TITLE' | translate }}
+{{ 'POLICY.IAM_POLICY.DESCRIPTION' | translate }}
+
-
-
-
-
- {{ 'POLICY.DATA.USERLOGINMUSTBEDOMAIN' | translate }}
-
-
-
-
-
+
+
diff --git a/console/src/app/modules/policies/org-iam-policy/org-iam-policy.component.scss b/console/src/app/modules/policies/org-iam-policy/org-iam-policy.component.scss
index 230004c37e..b9b588ecd4 100644
--- a/console/src/app/modules/policies/org-iam-policy/org-iam-policy.component.scss
+++ b/console/src/app/modules/policies/org-iam-policy/org-iam-policy.component.scss
@@ -36,12 +36,10 @@
.btn-container {
display: flex;
- justify-content: flex-end;
+ justify-content: flex-start;
width: 100%;
- margin-bottom: 50px;
button {
- margin-top: 3rem;
display: block;
}
}
diff --git a/console/src/app/modules/policies/org-iam-policy/org-iam-policy.component.ts b/console/src/app/modules/policies/org-iam-policy/org-iam-policy.component.ts
index c3d8763024..17126272a9 100644
--- a/console/src/app/modules/policies/org-iam-policy/org-iam-policy.component.ts
+++ b/console/src/app/modules/policies/org-iam-policy/org-iam-policy.component.ts
@@ -1,18 +1,13 @@
-import { Component, Injector, OnDestroy, Type } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { Component, Injector, Input, OnDestroy, OnInit, Type } from '@angular/core';
import { Subscription } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
import { GetCustomOrgIAMPolicyResponse } from 'src/app/proto/generated/zitadel/admin_pb';
import { GetOrgIAMPolicyResponse } from 'src/app/proto/generated/zitadel/management_pb';
import { Org } from 'src/app/proto/generated/zitadel/org_pb';
import { OrgIAMPolicy } from 'src/app/proto/generated/zitadel/policy_pb';
import { AdminService } from 'src/app/services/admin.service';
-import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/breadcrumb.service';
import { ManagementService } from 'src/app/services/mgmt.service';
-import { StorageKey, StorageLocation, StorageService } from 'src/app/services/storage.service';
import { ToastService } from 'src/app/services/toast.service';
-import { GridPolicy, IAM_POLICY } from '../../policy-grid/policies';
import { PolicyComponentServiceType } from '../policy-component-types.enum';
@Component({
@@ -20,9 +15,9 @@ import { PolicyComponentServiceType } from '../policy-component-types.enum';
templateUrl: './org-iam-policy.component.html',
styleUrls: ['./org-iam-policy.component.scss'],
})
-export class OrgIamPolicyComponent implements OnDestroy {
+export class OrgIamPolicyComponent implements OnInit, OnDestroy {
private managementService!: ManagementService;
- public serviceType!: PolicyComponentServiceType;
+ @Input() public serviceType!: PolicyComponentServiceType;
public iamData!: OrgIAMPolicy.AsObject;
@@ -30,50 +25,14 @@ export class OrgIamPolicyComponent implements OnDestroy {
private org!: Org.AsObject;
public PolicyComponentServiceType: any = PolicyComponentServiceType;
- public currentPolicy: GridPolicy = IAM_POLICY;
- public orgName: string = '';
- constructor(
- private route: ActivatedRoute,
- private toast: ToastService,
- private storage: StorageService,
- private injector: Injector,
- private adminService: AdminService,
- private storageService: StorageService,
- breadcrumbService: BreadcrumbService,
- ) {
- const temporg = this.storage.getItem(StorageKey.organization, StorageLocation.session) as Org.AsObject;
- if (temporg) {
- this.org = temporg;
+ constructor(private toast: ToastService, private injector: Injector, private adminService: AdminService) {}
+
+ ngOnInit(): void {
+ if (this.serviceType === PolicyComponentServiceType.MGMT) {
+ this.managementService = this.injector.get(ManagementService as Type
- {{ 'POLICY.APPLIEDTO' | translate }}:
- {{ orgName }}
-
{{ 'POLICY.PWD_COMPLEXITY.TITLE' | translate }}
+{{ 'POLICY.PWD_COMPLEXITY.DESCRIPTION' | translate }}
-
-
+
+
-
+
+
+
- );
- const org: Org.AsObject | null = this.storageService.getItem('organization', StorageLocation.session);
- if (org && org.id) {
- this.orgName = org.name;
- }
-
- const iambread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'System',
- routerLink: ['/system'],
- });
- const bread: Breadcrumb = {
- type: BreadcrumbType.ORG,
- routerLink: ['/org'],
- };
- breadcrumbService.setBreadcrumb([iambread, bread]);
- break;
- case PolicyComponentServiceType.ADMIN:
- const iamBread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'System',
- routerLink: ['/system'],
- });
- breadcrumbService.setBreadcrumb([iamBread]);
-
- this.service = this.injector.get(AdminService as Type);
- break;
- }
-
- return this.route.params;
- }),
- )
- .subscribe(() => {
- this.fetchData();
- });
+ public ngOnInit(): void {
+ switch (this.serviceType) {
+ case PolicyComponentServiceType.MGMT:
+ this.service = this.injector.get(ManagementService as Type);
+ break;
+ case PolicyComponentServiceType.ADMIN:
+ this.service = this.injector.get(AdminService as Type);
+ break;
+ }
+ this.fetchData();
}
public fetchData(): void {
@@ -101,10 +54,6 @@ export class PasswordComplexityPolicyComponent implements OnDestroy {
});
}
- public ngOnDestroy(): void {
- this.sub.unsubscribe();
- }
-
private async getData(): Promise<
MgmtGetPasswordComplexityPolicyResponse.AsObject | AdminGetPasswordComplexityPolicyResponse.AsObject
> {
diff --git a/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.module.ts b/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.module.ts
index 512bb6eecf..6139119274 100644
--- a/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.module.ts
+++ b/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.module.ts
@@ -12,8 +12,8 @@ import { DetailLayoutModule } from 'src/app/modules/detail-layout/detail-layout.
import { InputModule } from 'src/app/modules/input/input.module';
import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
+import { CardModule } from '../../card/card.module';
import { InfoSectionModule } from '../../info-section/info-section.module';
-import { PolicyGridModule } from '../../policy-grid/policy-grid.module';
import { PasswordComplexityPolicyRoutingModule } from './password-complexity-policy-routing.module';
import { PasswordComplexityPolicyComponent } from './password-complexity-policy.component';
@@ -32,9 +32,10 @@ import { PasswordComplexityPolicyComponent } from './password-complexity-policy.
HasRolePipeModule,
TranslateModule,
DetailLayoutModule,
+ CardModule,
MatProgressSpinnerModule,
- PolicyGridModule,
InfoSectionModule,
],
+ exports: [PasswordComplexityPolicyComponent],
})
export class PasswordComplexityPolicyModule {}
diff --git a/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.html b/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.html
index 26c2622d68..e1b2437e40 100644
--- a/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.html
+++ b/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.html
@@ -1,34 +1,15 @@
-
- {{ 'POLICY.DEFAULTLABEL' | translate }}
+
+
-
-
+ {{ 'POLICY.DEFAULTLABEL' | translate }}
- = this.authService.isAllowed([
this.serviceType === PolicyComponentServiceType.ADMIN
@@ -60,13 +53,10 @@ export class PrivacyPolicyComponent implements OnDestroy {
constructor(
private authService: GrpcAuthService,
- private route: ActivatedRoute,
private injector: Injector,
private dialog: MatDialog,
private toast: ToastService,
private fb: FormBuilder,
- private storageService: StorageService,
- breadcrumbService: BreadcrumbService,
) {
this.form = this.fb.group({
tosLink: ['', []],
@@ -81,48 +71,19 @@ export class PrivacyPolicyComponent implements OnDestroy {
this.form.disable();
}
});
+ }
- this.route.data
- .pipe(
- switchMap((data) => {
- this.serviceType = data.serviceType;
- switch (this.serviceType) {
- case PolicyComponentServiceType.MGMT:
- this.service = this.injector.get(ManagementService as Type);
- this.loadData();
- const org: Org.AsObject | null = this.storageService.getItem('organization', StorageLocation.session);
- if (org && org.id) {
- this.orgName = org.name;
- }
-
- const iambread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'IAM',
- routerLink: ['/system'],
- });
- const bread: Breadcrumb = {
- type: BreadcrumbType.ORG,
- routerLink: ['/org'],
- };
- breadcrumbService.setBreadcrumb([iambread, bread]);
- break;
- case PolicyComponentServiceType.ADMIN:
- this.service = this.injector.get(AdminService as Type);
- this.loadData();
-
- const iamBread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'IAM',
- routerLink: ['/system'],
- });
- breadcrumbService.setBreadcrumb([iamBread]);
- break;
- }
-
- return this.route.params;
- }),
- )
- .subscribe();
+ ngOnInit(): void {
+ switch (this.serviceType) {
+ case PolicyComponentServiceType.MGMT:
+ this.service = this.injector.get(ManagementService as Type);
+ this.loadData();
+ break;
+ case PolicyComponentServiceType.ADMIN:
+ this.service = this.injector.get(AdminService as Type);
+ this.loadData();
+ break;
+ }
}
public addChip(formControlName: string, value: string): void {
diff --git a/console/src/app/modules/policies/privacy-policy/privacy-policy.module.ts b/console/src/app/modules/policies/privacy-policy/privacy-policy.module.ts
index ddca35a371..3ba9d03607 100644
--- a/console/src/app/modules/policies/privacy-policy/privacy-policy.module.ts
+++ b/console/src/app/modules/policies/privacy-policy/privacy-policy.module.ts
@@ -15,9 +15,9 @@ import { HasRoleModule } from '../../../directives/has-role/has-role.module';
import { DetailLayoutModule } from '../../../modules/detail-layout/detail-layout.module';
import { InputModule } from '../../../modules/input/input.module';
import { HasRolePipeModule } from '../../../pipes/has-role-pipe/has-role-pipe.module';
+import { CardModule } from '../../card/card.module';
import { FormFieldModule } from '../../form-field/form-field.module';
import { InfoSectionModule } from '../../info-section/info-section.module';
-import { PolicyGridModule } from '../../policy-grid/policy-grid.module';
import { WarnDialogModule } from '../../warn-dialog/warn-dialog.module';
import { PrivacyPolicyRoutingModule } from './privacy-policy-routing.module';
import { PrivacyPolicyComponent } from './privacy-policy.component';
@@ -39,14 +39,15 @@ import { PrivacyPolicyComponent } from './privacy-policy.component';
HasRolePipeModule,
MatTooltipModule,
TranslateModule,
+ CardModule,
MatTooltipModule,
DetailLayoutModule,
MatProgressSpinnerModule,
TextFieldModule,
MatDialogModule,
WarnDialogModule,
- PolicyGridModule,
InfoSectionModule,
],
+ exports: [PrivacyPolicyComponent],
})
export class PrivacyPolicyModule {}
diff --git a/console/src/app/modules/policies/private-labeling-policy/private-labeling-policy.component.html b/console/src/app/modules/policies/private-labeling-policy/private-labeling-policy.component.html
index 71c0ad500b..397ba1b519 100644
--- a/console/src/app/modules/policies/private-labeling-policy/private-labeling-policy.component.html
+++ b/console/src/app/modules/policies/private-labeling-policy/private-labeling-policy.component.html
@@ -1,441 +1,429 @@
-
-
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
diff --git a/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.scss b/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.scss
index d72df30a1e..6fc46c95cf 100644
--- a/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.scss
+++ b/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.scss
@@ -8,7 +8,6 @@
}
.complexity-content {
- padding-top: 1rem;
display: flex;
flex-direction: column;
width: 100%;
@@ -18,12 +17,36 @@
align-items: center;
padding: 0.3rem 0;
- .icon {
- margin-right: 1rem;
+ .number-toggle-row {
+ display: flex;
+ align-items: center;
+ margin-left: 1rem;
+
+ .icon {
+ margin-right: 1rem;
+ }
+
+ .left-desc {
+ font-size: 0.9rem;
+ }
}
- .left-desc {
- font-size: 0.9rem;
+ .slide-toggle {
+ margin-left: 1.75rem;
+
+ .slide-toggle-row {
+ display: flex;
+ align-items: center;
+ margin-left: 1.5rem;
+
+ .icon {
+ margin-right: 1rem;
+ }
+
+ .left-desc {
+ font-size: 0.9rem;
+ }
+ }
}
.fill-space {
@@ -40,12 +63,9 @@
.btn-container {
display: flex;
- justify-content: flex-end;
- width: 100%;
- margin-bottom: 50px;
+ justify-content: flex-start;
button {
- margin-top: 3rem;
display: block;
}
}
diff --git a/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.ts b/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.ts
index 6e310a4929..b89eab6f88 100644
--- a/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.ts
+++ b/console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.ts
@@ -1,93 +1,46 @@
-import { Component, Injector, OnDestroy, Type } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Subscription } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { Component, Injector, Input, OnInit, Type } from '@angular/core';
import {
- GetPasswordComplexityPolicyResponse as AdminGetPasswordComplexityPolicyResponse,
+ GetPasswordComplexityPolicyResponse as AdminGetPasswordComplexityPolicyResponse,
} from 'src/app/proto/generated/zitadel/admin_pb';
import {
- GetPasswordComplexityPolicyResponse as MgmtGetPasswordComplexityPolicyResponse,
+ GetPasswordComplexityPolicyResponse as MgmtGetPasswordComplexityPolicyResponse,
} from 'src/app/proto/generated/zitadel/management_pb';
-import { Org } from 'src/app/proto/generated/zitadel/org_pb';
import { PasswordComplexityPolicy } from 'src/app/proto/generated/zitadel/policy_pb';
import { AdminService } from 'src/app/services/admin.service';
-import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/breadcrumb.service';
import { ManagementService } from 'src/app/services/mgmt.service';
-import { StorageLocation, StorageService } from 'src/app/services/storage.service';
import { ToastService } from 'src/app/services/toast.service';
import { InfoSectionType } from '../../info-section/info-section.component';
-import { COMPLEXITY_POLICY, GridPolicy } from '../../policy-grid/policies';
import { PolicyComponentServiceType } from '../policy-component-types.enum';
@Component({
- selector: 'cnsl-password-policy',
+ selector: 'cnsl-password-complexity-policy',
templateUrl: './password-complexity-policy.component.html',
styleUrls: ['./password-complexity-policy.component.scss'],
})
-export class PasswordComplexityPolicyComponent implements OnDestroy {
- public serviceType: PolicyComponentServiceType = PolicyComponentServiceType.MGMT;
+export class PasswordComplexityPolicyComponent implements OnInit {
+ @Input() public serviceType: PolicyComponentServiceType = PolicyComponentServiceType.MGMT;
public service!: ManagementService | AdminService;
public complexityData!: PasswordComplexityPolicy.AsObject;
- private sub: Subscription = new Subscription();
public PolicyComponentServiceType: any = PolicyComponentServiceType;
public loading: boolean = false;
- public currentPolicy: GridPolicy = COMPLEXITY_POLICY;
public InfoSectionType: any = InfoSectionType;
- public orgName: string = '';
- constructor(
- private route: ActivatedRoute,
- private toast: ToastService,
- private injector: Injector,
- private storageService: StorageService,
- breadcrumbService: BreadcrumbService,
- ) {
- this.sub = this.route.data
- .pipe(
- switchMap((data) => {
- this.serviceType = data.serviceType;
+ constructor(private toast: ToastService, private injector: Injector) {}
- switch (this.serviceType) {
- case PolicyComponentServiceType.MGMT:
- this.service = this.injector.get(ManagementService as Type
- {{ 'POLICY.APPLIEDTO' | translate }}:
- {{ orgName }}
-
{{ 'POLICY.PWD_LOCKOUT.TITLE' | translate }}
+{{ 'POLICY.PWD_LOCKOUT.DESCRIPTION' | translate }}
-
+
+
+
- );
- const org: Org.AsObject | null = this.storageService.getItem('organization', StorageLocation.session);
- if (org && org.id) {
- this.orgName = org.name;
- }
-
- const iambread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'System',
- routerLink: ['/system'],
- });
- const bread: Breadcrumb = {
- type: BreadcrumbType.ORG,
- routerLink: ['/org'],
- };
- breadcrumbService.setBreadcrumb([iambread, bread]);
-
- break;
- case PolicyComponentServiceType.ADMIN:
- this.service = this.injector.get(AdminService as Type);
-
- const iamBread = new Breadcrumb({
- type: BreadcrumbType.IAM,
- name: 'System',
- routerLink: ['/system'],
- });
- breadcrumbService.setBreadcrumb([iamBread]);
-
- break;
- }
-
- return this.route.params;
- }),
- )
- .subscribe(() => {
- this.fetchData();
- });
- }
-
- public ngOnDestroy(): void {
- this.sub.unsubscribe();
+ public ngOnInit(): void {
+ switch (this.serviceType) {
+ case PolicyComponentServiceType.MGMT:
+ this.service = this.injector.get(ManagementService as Type);
+ break;
+ case PolicyComponentServiceType.ADMIN:
+ this.service = this.injector.get(AdminService as Type);
+ break;
+ }
+ this.fetchData();
}
private fetchData(): void {
+ console.log(this.serviceType);
this.getData().then((resp) => {
+ console.log(resp);
if (resp.policy) {
this.lockoutData = resp.policy;
}
diff --git a/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.module.ts b/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.module.ts
index 5d89eb9d44..9881e33e18 100644
--- a/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.module.ts
+++ b/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.module.ts
@@ -11,8 +11,8 @@ import { DetailLayoutModule } from 'src/app/modules/detail-layout/detail-layout.
import { InputModule } from 'src/app/modules/input/input.module';
import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
+import { CardModule } from '../../card/card.module';
import { InfoSectionModule } from '../../info-section/info-section.module';
-import { PolicyGridModule } from '../../policy-grid/policy-grid.module';
import { PasswordLockoutPolicyRoutingModule } from './password-lockout-policy-routing.module';
import { PasswordLockoutPolicyComponent } from './password-lockout-policy.component';
@@ -29,10 +29,11 @@ import { PasswordLockoutPolicyComponent } from './password-lockout-policy.compon
MatIconModule,
HasRoleModule,
MatTooltipModule,
+ CardModule,
TranslateModule,
DetailLayoutModule,
- PolicyGridModule,
InfoSectionModule,
],
+ exports: [PasswordLockoutPolicyComponent],
})
export class PasswordLockoutPolicyModule {}
diff --git a/console/src/app/modules/policies/policy-component-types.enum.ts b/console/src/app/modules/policies/policy-component-types.enum.ts
index 6d673bf830..12431ade66 100644
--- a/console/src/app/modules/policies/policy-component-types.enum.ts
+++ b/console/src/app/modules/policies/policy-component-types.enum.ts
@@ -1,15 +1,3 @@
-export enum PolicyComponentType {
- LOCKOUT = 'lockout',
- AGE = 'age',
- COMPLEXITY = 'complexity',
- IAM = 'iam',
- LOGIN = 'login',
- PRIVATELABEL = 'privatelabel',
- MESSAGETEXTS = 'messagetexts',
- LOGINTEXTS = 'logintexts',
- PRIVACYPOLICY = 'privacypolicy',
-}
-
export enum PolicyComponentServiceType {
MGMT = 'mgmt',
ADMIN = 'admin',
diff --git a/console/src/app/modules/policies/privacy-policy/privacy-policy.component.html b/console/src/app/modules/policies/privacy-policy/privacy-policy.component.html
index fecac71267..8846f76bc4 100644
--- a/console/src/app/modules/policies/privacy-policy/privacy-policy.component.html
+++ b/console/src/app/modules/policies/privacy-policy/privacy-policy.component.html
@@ -1,68 +1,53 @@
-
- {{ 'POLICY.DEFAULTLABEL' | translate }}
+ {{ 'POLICY.DEFAULTLABEL' | translate }}
-
+
+
-
\ No newline at end of file
+
diff --git a/console/src/app/modules/policies/privacy-policy/privacy-policy.component.scss b/console/src/app/modules/policies/privacy-policy/privacy-policy.component.scss
index 3b70849fcd..a276a70de8 100644
--- a/console/src/app/modules/policies/privacy-policy/privacy-policy.component.scss
+++ b/console/src/app/modules/policies/privacy-policy/privacy-policy.component.scss
@@ -2,29 +2,7 @@
margin: 0.5rem 0;
}
-.policy-applied-to {
- margin: -1rem 0 0 0;
- font-size: 14px;
-}
-
-.top-actions {
- display: flex;
- margin: 0 -0.5rem;
- flex-wrap: wrap;
-
- .keys {
- flex: 1;
- margin: 0 0.5rem;
- min-width: 150px;
- }
-}
-
-.centerline {
- display: flex;
- align-items: center;
-}
-
-.content {
+.policy-content {
padding-top: 1rem;
display: grid;
grid-template-columns: 1fr;
@@ -40,7 +18,7 @@
display: flex;
flex-wrap: wrap;
opacity: 0;
- margin: 0 -0.25rem;
+ margin: 0;
transition: all 0.2s ease;
.chip {
@@ -49,7 +27,7 @@
font-size: 12px;
background: #5282c1;
color: white;
- margin: 0.25rem;
+ margin-right: 0.5rem;
display: flex;
align-items: center;
justify-content: center;
@@ -79,22 +57,14 @@
}
}
-.divider {
- width: 100%;
- height: 1px;
- background-color: rgba(#81868a, 0.5);
- margin: 1.5rem 0 0 0;
-}
-
-.actions {
+.policy-actions {
display: flex;
- justify-content: flex-end;
- margin: 0 -0.25rem;
+ justify-content: flex-start;
.save-button,
.reset-button {
display: block;
- margin: 0 0.25rem 3rem 0.25rem;
+ margin: 0 1rem 0 0;
}
.reset-button {
diff --git a/console/src/app/modules/policies/privacy-policy/privacy-policy.component.ts b/console/src/app/modules/policies/privacy-policy/privacy-policy.component.ts
index 544defe980..6b474cd354 100644
--- a/console/src/app/modules/policies/privacy-policy/privacy-policy.component.ts
+++ b/console/src/app/modules/policies/privacy-policy/privacy-policy.component.ts
@@ -1,30 +1,25 @@
-import { Component, Injector, OnDestroy, Type } from '@angular/core';
+import { Component, Injector, Input, OnDestroy, OnInit, Type } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
-import { ActivatedRoute } from '@angular/router';
import { Observable, Subscription } from 'rxjs';
-import { switchMap, take } from 'rxjs/operators';
+import { take } from 'rxjs/operators';
import {
- GetPrivacyPolicyResponse as AdminGetPrivacyPolicyResponse,
- UpdatePrivacyPolicyRequest,
+ GetPrivacyPolicyResponse as AdminGetPrivacyPolicyResponse,
+ UpdatePrivacyPolicyRequest,
} from 'src/app/proto/generated/zitadel/admin_pb';
import {
- AddCustomPrivacyPolicyRequest,
- GetPrivacyPolicyResponse,
- UpdateCustomPrivacyPolicyRequest,
+ AddCustomPrivacyPolicyRequest,
+ GetPrivacyPolicyResponse,
+ UpdateCustomPrivacyPolicyRequest,
} from 'src/app/proto/generated/zitadel/management_pb';
-import { Org } from 'src/app/proto/generated/zitadel/org_pb';
import { PrivacyPolicy } from 'src/app/proto/generated/zitadel/policy_pb';
import { AdminService } from 'src/app/services/admin.service';
-import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/breadcrumb.service';
import { GrpcAuthService } from 'src/app/services/grpc-auth.service';
import { ManagementService } from 'src/app/services/mgmt.service';
-import { StorageLocation, StorageService } from 'src/app/services/storage.service';
import { ToastService } from 'src/app/services/toast.service';
import { InfoSectionType } from '../../info-section/info-section.component';
import { CnslLinks } from '../../links/links.component';
-import { GridPolicy, PRIVACY_POLICY } from '../../policy-grid/policies';
import { WarnDialogComponent } from '../../warn-dialog/warn-dialog.component';
import { PolicyComponentServiceType } from '../policy-component-types.enum';
@@ -33,19 +28,17 @@ import { PolicyComponentServiceType } from '../policy-component-types.enum';
templateUrl: './privacy-policy.component.html',
styleUrls: ['./privacy-policy.component.scss'],
})
-export class PrivacyPolicyComponent implements OnDestroy {
+export class PrivacyPolicyComponent implements OnInit, OnDestroy {
public service!: ManagementService | AdminService;
public PolicyComponentServiceType: any = PolicyComponentServiceType;
- public serviceType: PolicyComponentServiceType = PolicyComponentServiceType.MGMT;
+ @Input() public serviceType: PolicyComponentServiceType = PolicyComponentServiceType.MGMT;
public nextLinks: CnslLinks[] = [];
private sub: Subscription = new Subscription();
public privacyPolicy: PrivacyPolicy.AsObject | undefined = undefined;
public form!: FormGroup;
- public currentPolicy: GridPolicy = PRIVACY_POLICY;
public InfoSectionType: any = InfoSectionType;
- public orgName: string = '';
public canWrite$: Observable
- {{ 'POLICY.DATA.MAXATTEMPTS' | translate }}
-
+
+
+ {{ 'POLICY.DATA.MAXATTEMPTS' | translate }}
+
+
+
+
diff --git a/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.scss b/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.scss
index 0926475fe7..79cecfc40a 100644
--- a/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.scss
+++ b/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.scss
@@ -8,8 +8,7 @@
font-size: 14px;
}
-.content {
- padding-top: 1rem;
+.lockout-content {
display: flex;
flex-direction: column;
width: 100%;
@@ -19,8 +18,14 @@
align-items: center;
padding: 0.3rem 0;
- .left-desc {
- font-size: 0.9rem;
+ .number-toggle-row {
+ margin-left: 1rem;
+ display: flex;
+ align-items: center;
+
+ .left-desc {
+ font-size: 0.9rem;
+ }
}
.fill-space {
@@ -36,11 +41,11 @@
.btn-container {
display: flex;
- justify-content: flex-end;
+ justify-content: flex-start;
width: 100%;
button {
- margin-top: 3rem;
display: block;
+ margin-right: 1rem;
}
}
diff --git a/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.ts b/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.ts
index bfc3179cf2..ba5c57af60 100644
--- a/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.ts
+++ b/console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.ts
@@ -1,22 +1,16 @@
-import { Component, Injector, Input, OnDestroy, Type } from '@angular/core';
+import { Component, Injector, Input, OnInit, Type } from '@angular/core';
import { FormGroup } from '@angular/forms';
-import { ActivatedRoute } from '@angular/router';
-import { Subscription } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
import { GetLockoutPolicyResponse as AdminGetPasswordLockoutPolicyResponse } from 'src/app/proto/generated/zitadel/admin_pb';
import {
- GetLockoutPolicyResponse as MgmtGetPasswordLockoutPolicyResponse,
+ GetLockoutPolicyResponse as MgmtGetPasswordLockoutPolicyResponse,
} from 'src/app/proto/generated/zitadel/management_pb';
-import { Org } from 'src/app/proto/generated/zitadel/org_pb';
import { LockoutPolicy } from 'src/app/proto/generated/zitadel/policy_pb';
import { AdminService } from 'src/app/services/admin.service';
-import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/breadcrumb.service';
import { ManagementService } from 'src/app/services/mgmt.service';
-import { StorageLocation, StorageService } from 'src/app/services/storage.service';
+import { StorageService } from 'src/app/services/storage.service';
import { ToastService } from 'src/app/services/toast.service';
import { InfoSectionType } from '../../info-section/info-section.component';
-import { GridPolicy, LOCKOUT_POLICY } from '../../policy-grid/policies';
import { PolicyComponentServiceType } from '../policy-component-types.enum';
@Component({
@@ -24,77 +18,33 @@ import { PolicyComponentServiceType } from '../policy-component-types.enum';
templateUrl: './password-lockout-policy.component.html',
styleUrls: ['./password-lockout-policy.component.scss'],
})
-export class PasswordLockoutPolicyComponent implements OnDestroy {
+export class PasswordLockoutPolicyComponent implements OnInit {
@Input() public service!: ManagementService | AdminService;
- public serviceType: PolicyComponentServiceType = PolicyComponentServiceType.MGMT;
+ @Input() public serviceType: PolicyComponentServiceType = PolicyComponentServiceType.MGMT;
public lockoutForm!: FormGroup;
public lockoutData!: LockoutPolicy.AsObject;
- private sub: Subscription = new Subscription();
public PolicyComponentServiceType: any = PolicyComponentServiceType;
public InfoSectionType: any = InfoSectionType;
- public currentPolicy: GridPolicy = LOCKOUT_POLICY;
- public orgName: string = '';
- constructor(
- private route: ActivatedRoute,
- breadcrumbService: BreadcrumbService,
- private toast: ToastService,
- private injector: Injector,
- private storageService: StorageService,
- ) {
- this.sub = this.route.data
- .pipe(
- switchMap((data) => {
- this.serviceType = data.serviceType;
+ constructor(private toast: ToastService, private injector: Injector, private storageService: StorageService) {}
- switch (this.serviceType) {
- case PolicyComponentServiceType.MGMT:
- this.service = this.injector.get(ManagementService as Type
+
+
+
-
-
-
- {{ 'POLICY.APPLIEDTO' | translate }}:
- {{ orgName }}
-
{{ 'POLICY.PRIVACY_POLICY.TITLE' | translate }}
+{{ 'POLICY.PRIVACY_POLICY.DESCRIPTION' | translate }}
-
+
-
-
-
-
-
-
-
-
+
+
+
@@ -78,4 +63,4 @@
- {{ 'POLICY.APPLIEDTO' | translate }}:
- {{ org.name }}
-
{{ 'POLICY.PRIVATELABELING.TITLE' | translate }}
+
+ {{ 'POLICY.DEFAULTLABEL' | translate }}
-
- {{ 'POLICY.DEFAULTLABEL' | translate }}
+
+
-
-
+
+
+
+
+
+
+
-
- {{ 'POLICY.PRIVATELABELING.PREVIEW_DESCRIPTION' | translate }}
-
+
+
-
+
+ {{ 'POLICY.PRIVATELABELING.LIGHT' | translate }}
+
+
+
+
+ {{ 'POLICY.PRIVATELABELING.DARK' | translate }}
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
- {{ 'POLICY.PRIVATELABELING.LIGHT' | translate }}
-
-
-
-
- {{ 'POLICY.PRIVATELABELING.DARK' | translate }}
-
-
-
+ {{ 'POLICY.PRIVATELABELING.VIEWS.PREVIEW' | translate }}
+
+
+
+ {{ 'POLICY.PRIVATELABELING.VIEWS.CURRENT' | translate }}
+
+
+
- {{ 'POLICY.PRIVATELABELING.VIEWS.PREVIEW' | translate }}
-
-
-
- {{ 'POLICY.PRIVATELABELING.VIEWS.CURRENT' | translate }}
-
-
-
-
-
-
-
-
-
+
+ {{ 'POLICY.PRIVATELABELING.PREVIEW_DESCRIPTION' | translate }}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Logos
-
- ({{ 'POLICY.PRIVATELABELING.DARK' | translate }})
- ({{ 'POLICY.PRIVATELABELING.LIGHT' | translate }})
-
-
-
-
-
- {{ 'POLICY.PRIVATELABELING.MAXSIZE' | translate }}
-
-
- {{ 'POLICY.PRIVATELABELING.EMAILNOSVG' | translate }}
-
-
-
-
- Logo
-
-
-
-
- ![logo]()
-
-
-
-
-
-
-
-
- Icon
-
-
-
- ![icon]()
-
-
-
-
-
-
-
-
-
- {{ 'POLICY.PRIVATELABELING.COLORS' | translate }}
-
- ({{ 'POLICY.PRIVATELABELING.DARK' | translate }})
- ({{ 'POLICY.PRIVATELABELING.LIGHT' | translate }})
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ 'POLICY.PRIVATELABELING.FONT' | translate }}
-
-
- {{ 'POLICY.PRIVATELABELING.FONTINLOGINONLY' | translate }}
-
-
- text_fields
-
-
-
-