@@ -58,7 +59,7 @@
{{ 'IDP.STATE' | translate }} |
{{
+ [ngClass]="{'active': idp.state === IDPState.IDP_STATE_ACTIVE, 'inactive': idp.state === IDPState.IDP_STATE_INACTIVE}">{{
'IDP.STATES.'+idp.state | translate }}
|
@@ -87,7 +88,7 @@
|
+ *ngIf="idp.stylingType == IDPStylingType.STYLING_TYPE_GOOGLE" alt="google" />
{{idp.name}}
{{ 'IDP.TYPE' | translate }}: {{ 'IDP.TYPES.'+idp.type | translate }}
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 32f1ee3ac5..28e99e89c8 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
@@ -5,29 +5,28 @@ import { Subscription } from 'rxjs';
import { switchMap } from 'rxjs/operators';
import { LoginMethodComponentType } from 'src/app/modules/mfa-table/mfa-table.component';
import {
- DefaultLoginPolicy,
- DefaultLoginPolicyRequest,
- DefaultLoginPolicyView,
- IdpProviderView as AdminIdpProviderView,
- IdpStylingType,
- IdpView as AdminIdpView,
- PasswordlessType as AdminPasswordlessType,
-} from 'src/app/proto/generated/admin_pb';
+ GetLoginPolicyResponse as AdminGetLoginPolicyResponse,
+ UpdateLoginPolicyRequest,
+ UpdateLoginPolicyResponse,
+} from 'src/app/proto/generated/zitadel/admin_pb';
+import { IDP, IDPLoginPolicyLink, IDPStylingType } from 'src/app/proto/generated/zitadel/idp_pb';
import {
- IdpProviderType,
- IdpProviderView as MgmtIdpProviderView,
- IdpView as MgmtIdpView,
- LoginPolicy,
- LoginPolicyRequest,
- LoginPolicyView,
- PasswordlessType as MgmtPasswordlessType,
-} from 'src/app/proto/generated/management_pb';
+ AddCustomLoginPolicyRequest,
+ GetLoginPolicyResponse as MgmtGetLoginPolicyResponse,
+} from 'src/app/proto/generated/zitadel/management_pb';
+import { LoginPolicy, PasswordlessType } from 'src/app/proto/generated/zitadel/policy_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 { CnslLinks } from '../../links/links.component';
-import { IAM_COMPLEXITY_LINK, IAM_LABEL_LINK, IAM_LOGIN_POLICY_LINK, IAM_POLICY_LINK, ORG_COMPLEXITY_LINK, ORG_IAM_POLICY_LINK } from '../../policy-grid/policy-links';
+import { CnslLinks } from '../../links/links.component';
+import {
+ IAM_COMPLEXITY_LINK,
+ IAM_LABEL_LINK,
+ IAM_POLICY_LINK,
+ ORG_COMPLEXITY_LINK,
+ ORG_IAM_POLICY_LINK,
+} from '../../policy-grid/policy-links';
import { PolicyComponentServiceType } from '../policy-component-types.enum';
import { AddIdpDialogComponent } from './add-idp-dialog/add-idp-dialog.component';
@@ -38,19 +37,19 @@ import { AddIdpDialogComponent } from './add-idp-dialog/add-idp-dialog.component
})
export class LoginPolicyComponent implements OnDestroy {
public LoginMethodComponentType: any = LoginMethodComponentType;
- public passwordlessTypes: Array = [];
- public loginData!: LoginPolicyView.AsObject | DefaultLoginPolicyView.AsObject;
+ public passwordlessTypes: Array = [];
+ public loginData!: LoginPolicy.AsObject;
private sub: Subscription = new Subscription();
public service!: ManagementService | AdminService;
public PolicyComponentServiceType: any = PolicyComponentServiceType;
public serviceType: PolicyComponentServiceType = PolicyComponentServiceType.MGMT;
- public idps: MgmtIdpProviderView.AsObject[] | AdminIdpProviderView.AsObject[] = [];
+ public idps: IDPLoginPolicyLink.AsObject[] = [];
public loading: boolean = false;
public disabled: boolean = true;
- public IdpStylingType: any = IdpStylingType;
+ public IDPStylingType: any = IDPStylingType;
public nextLinks: CnslLinks[] = [];
constructor(
private route: ActivatedRoute,
@@ -63,8 +62,10 @@ export class LoginPolicyComponent implements OnDestroy {
switch (this.serviceType) {
case PolicyComponentServiceType.MGMT:
this.service = this.injector.get(ManagementService as Type);
- this.passwordlessTypes = [MgmtPasswordlessType.PASSWORDLESSTYPE_ALLOWED,
- MgmtPasswordlessType.PASSWORDLESSTYPE_NOT_ALLOWED];
+ this.passwordlessTypes = [
+ PasswordlessType.PASSWORDLESS_TYPE_ALLOWED,
+ PasswordlessType.PASSWORDLESS_TYPE_NOT_ALLOWED,
+ ];
this.nextLinks = [
ORG_COMPLEXITY_LINK,
ORG_IAM_POLICY_LINK,
@@ -72,8 +73,10 @@ export class LoginPolicyComponent implements OnDestroy {
break;
case PolicyComponentServiceType.ADMIN:
this.service = this.injector.get(AdminService as Type);
- this.passwordlessTypes = [AdminPasswordlessType.PASSWORDLESSTYPE_ALLOWED,
- AdminPasswordlessType.PASSWORDLESSTYPE_NOT_ALLOWED];
+ this.passwordlessTypes = [
+ PasswordlessType.PASSWORDLESS_TYPE_ALLOWED,
+ PasswordlessType.PASSWORDLESS_TYPE_NOT_ALLOWED,
+ ];
this.nextLinks = [
IAM_COMPLEXITY_LINK,
IAM_POLICY_LINK,
@@ -89,15 +92,15 @@ export class LoginPolicyComponent implements OnDestroy {
}
private fetchData(): void {
- this.getData().then(data => {
- if (data) {
- this.loginData = data.toObject();
+ this.getData().then(resp => {
+ if (resp.policy) {
+ this.loginData = resp.policy;
this.loading = false;
- this.disabled = ((this.loginData as LoginPolicyView.AsObject)?.pb_default) ?? false;
+ this.disabled = ((this.loginData as LoginPolicy.AsObject)?.isDefault) ?? false;
}
});
- this.getIdps().then(idps => {
- this.idps = idps;
+ this.getIdps().then(resp => {
+ this.idps = resp;
});
}
@@ -106,48 +109,48 @@ export class LoginPolicyComponent implements OnDestroy {
}
private async getData():
- Promise {
+ Promise {
switch (this.serviceType) {
case PolicyComponentServiceType.MGMT:
- return (this.service as ManagementService).GetLoginPolicy();
+ return (this.service as ManagementService).getLoginPolicy();
case PolicyComponentServiceType.ADMIN:
- return (this.service as AdminService).GetDefaultLoginPolicy();
+ return (this.service as AdminService).getLoginPolicy();
}
}
- private async getIdps(): Promise {
+ private async getIdps(): Promise {
switch (this.serviceType) {
case PolicyComponentServiceType.MGMT:
- return (this.service as ManagementService).GetLoginPolicyIdpProviders()
- .then((providers) => {
- return providers.toObject().resultList;
+ return (this.service as ManagementService).listLoginPolicyIDPs()
+ .then((resp) => {
+ return resp.resultList;
});
case PolicyComponentServiceType.ADMIN:
- return (this.service as AdminService).GetDefaultLoginPolicyIdpProviders()
+ return (this.service as AdminService).listLoginPolicyIDPs()
.then((providers) => {
- return providers.toObject().resultList;
+ return providers.resultList;
});
}
}
private async updateData():
- Promise {
+ Promise {
switch (this.serviceType) {
case PolicyComponentServiceType.MGMT:
- const mgmtreq = new LoginPolicyRequest();
+ const mgmtreq = new AddCustomLoginPolicyRequest();
mgmtreq.setAllowExternalIdp(this.loginData.allowExternalIdp);
mgmtreq.setAllowRegister(this.loginData.allowRegister);
mgmtreq.setAllowUsernamePassword(this.loginData.allowUsernamePassword);
mgmtreq.setForceMfa(this.loginData.forceMfa);
mgmtreq.setPasswordlessType(this.loginData.passwordlessType);
// console.log(mgmtreq.toObject());
- if ((this.loginData as LoginPolicyView.AsObject).pb_default) {
- return (this.service as ManagementService).CreateLoginPolicy(mgmtreq);
+ if ((this.loginData as LoginPolicy.AsObject).isDefault) {
+ return (this.service as ManagementService).addCustomLoginPolicy(mgmtreq);
} else {
- return (this.service as ManagementService).UpdateLoginPolicy(mgmtreq);
+ return (this.service as ManagementService).updateCustomLoginPolicy(mgmtreq);
}
case PolicyComponentServiceType.ADMIN:
- const adminreq = new DefaultLoginPolicyRequest();
+ const adminreq = new UpdateLoginPolicyRequest();
adminreq.setAllowExternalIdp(this.loginData.allowExternalIdp);
adminreq.setAllowRegister(this.loginData.allowRegister);
adminreq.setAllowUsernamePassword(this.loginData.allowUsernamePassword);
@@ -156,7 +159,7 @@ export class LoginPolicyComponent implements OnDestroy {
// console.log(adminreq.toObject());
- return (this.service as AdminService).UpdateDefaultLoginPolicy(adminreq);
+ return (this.service as AdminService).updateLoginPolicy(adminreq);
}
}
@@ -174,7 +177,7 @@ export class LoginPolicyComponent implements OnDestroy {
public removePolicy(): void {
if (this.serviceType === PolicyComponentServiceType.MGMT) {
- (this.service as ManagementService).RemoveLoginPolicy().then(() => {
+ (this.service as ManagementService).resetLoginPolicyToDefault().then(() => {
this.toast.showInfo('POLICY.TOAST.RESETSUCCESS', true);
this.loading = true;
setTimeout(() => {
@@ -195,8 +198,8 @@ export class LoginPolicyComponent implements OnDestroy {
});
dialogRef.afterClosed().subscribe(resp => {
- if (resp && resp.idp && resp.type) {
- this.addIdp(resp.idp, resp.type).then(() => {
+ if (resp && resp.idp) {
+ this.addIdp(resp.idp).then(() => {
this.loading = true;
setTimeout(() => {
this.fetchData();
@@ -208,29 +211,28 @@ export class LoginPolicyComponent implements OnDestroy {
});
}
- private addIdp(idp: AdminIdpView.AsObject | MgmtIdpView.AsObject,
- type: IdpProviderType = IdpProviderType.IDPPROVIDERTYPE_SYSTEM): Promise {
+ private addIdp(idp: IDP.AsObject | IDP.AsObject): Promise {
switch (this.serviceType) {
case PolicyComponentServiceType.MGMT:
- return (this.service as ManagementService).addIdpProviderToLoginPolicy(idp.id, type);
+ return (this.service as ManagementService).addIDPToLoginPolicy(idp.id);
case PolicyComponentServiceType.ADMIN:
- return (this.service as AdminService).AddIdpProviderToDefaultLoginPolicy(idp.id);
+ return (this.service as AdminService).addIDPToLoginPolicy(idp.id);
}
}
- public removeIdp(idp: AdminIdpProviderView.AsObject | MgmtIdpProviderView.AsObject): void {
+ public removeIdp(idp: IDPLoginPolicyLink.AsObject): void {
switch (this.serviceType) {
case PolicyComponentServiceType.MGMT:
- (this.service as ManagementService).RemoveIdpProviderFromLoginPolicy(idp.idpConfigId).then(() => {
- const index = (this.idps as MgmtIdpProviderView.AsObject[]).findIndex(temp => temp === idp);
+ (this.service as ManagementService).removeIDPFromLoginPolicy(idp.idpId).then(() => {
+ const index = this.idps.findIndex(temp => temp === idp);
if (index > -1) {
this.idps.splice(index, 1);
}
});
break;
case PolicyComponentServiceType.ADMIN:
- (this.service as AdminService).RemoveIdpProviderFromDefaultLoginPolicy(idp.idpConfigId).then(() => {
- const index = (this.idps as AdminIdpProviderView.AsObject[]).findIndex(temp => temp === idp);
+ (this.service as AdminService).removeIDPFromLoginPolicy(idp.idpId).then(() => {
+ const index = this.idps.findIndex(temp => temp === idp);
if (index > -1) {
this.idps.splice(index, 1);
}
@@ -241,7 +243,7 @@ export class LoginPolicyComponent implements OnDestroy {
public get isDefault(): boolean {
if (this.loginData && this.serviceType === PolicyComponentServiceType.MGMT) {
- return (this.loginData as LoginPolicyView.AsObject).pb_default;
+ return (this.loginData as LoginPolicy.AsObject).isDefault;
} else {
return false;
}
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 408866a560..98e5d883db 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
@@ -2,16 +2,23 @@ import { Component, Injector, Input, OnDestroy, Type } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { Subscription } from 'rxjs';
import { switchMap } from 'rxjs/operators';
-import { OrgIamPolicyView as AdminOrgIamPolicyView } from 'src/app/proto/generated/admin_pb';
-import { Org } from 'src/app/proto/generated/auth_pb';
-import { OrgIamPolicyView as MgmtOrgIamPolicyView } from 'src/app/proto/generated/management_pb';
+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 { ManagementService } from 'src/app/services/mgmt.service';
import { StorageService } from 'src/app/services/storage.service';
import { ToastService } from 'src/app/services/toast.service';
-import { CnslLinks } from '../../links/links.component';
-import { IAM_COMPLEXITY_LINK, IAM_LABEL_LINK, IAM_LOGIN_POLICY_LINK, ORG_LOGIN_POLICY_LINK, ORG_COMPLEXITY_LINK } from '../../policy-grid/policy-links';
+import { CnslLinks } from '../../links/links.component';
+import {
+ IAM_COMPLEXITY_LINK,
+ IAM_LABEL_LINK,
+ IAM_LOGIN_POLICY_LINK,
+ ORG_COMPLEXITY_LINK,
+ ORG_LOGIN_POLICY_LINK,
+} from '../../policy-grid/policy-links';
import { PolicyComponentServiceType } from '../policy-component-types.enum';
@Component({
@@ -24,7 +31,7 @@ export class OrgIamPolicyComponent implements OnDestroy {
private managementService!: ManagementService;
public serviceType!: PolicyComponentServiceType;
- public iamData!: AdminOrgIamPolicyView.AsObject | MgmtOrgIamPolicyView.AsObject;
+ public iamData!: OrgIAMPolicy.AsObject;
private sub: Subscription = new Subscription();
private org!: Org.AsObject;
@@ -68,20 +75,20 @@ export class OrgIamPolicyComponent implements OnDestroy {
}
public fetchData(): void {
- this.getData().then(data => {
- if (data) {
- this.iamData = data.toObject();
+ this.getData().then(resp => {
+ if (resp?.policy) {
+ this.iamData = resp.policy;
}
});
}
- private async getData(): Promise {
+ private async getData(): Promise {
switch (this.serviceType) {
case PolicyComponentServiceType.MGMT:
- return this.managementService.GetMyOrgIamPolicy();
+ return this.managementService.getOrgIAMPolicy();
case PolicyComponentServiceType.ADMIN:
if (this.org?.id) {
- return this.adminService.GetOrgIamPolicy(this.org.id);
+ return this.adminService.getCustomOrgIAMPolicy(this.org.id);
}
break;
}
@@ -90,8 +97,8 @@ export class OrgIamPolicyComponent implements OnDestroy {
public savePolicy(): void {
switch (this.serviceType) {
case PolicyComponentServiceType.MGMT:
- if ((this.iamData as MgmtOrgIamPolicyView.AsObject).pb_default) {
- this.adminService.CreateOrgIamPolicy(
+ if ((this.iamData as OrgIAMPolicy.AsObject).isDefault) {
+ this.adminService.addCustomOrgIAMPolicy(
this.org.id,
this.iamData.userLoginMustBeDomain,
).then(() => {
@@ -101,7 +108,7 @@ export class OrgIamPolicyComponent implements OnDestroy {
});
break;
} else {
- this.adminService.UpdateOrgIamPolicy(
+ this.adminService.updateCustomOrgIAMPolicy(
this.org.id,
this.iamData.userLoginMustBeDomain,
).then(() => {
@@ -113,8 +120,7 @@ export class OrgIamPolicyComponent implements OnDestroy {
}
case PolicyComponentServiceType.ADMIN:
// update Default org iam policy?
- this.adminService.UpdateOrgIamPolicy(
- this.org.id,
+ this.adminService.updateOrgIAMPolicy(
this.iamData.userLoginMustBeDomain,
).then(() => {
this.toast.showInfo('POLICY.TOAST.SET', true);
@@ -127,7 +133,7 @@ export class OrgIamPolicyComponent implements OnDestroy {
public removePolicy(): void {
if (this.serviceType === PolicyComponentServiceType.MGMT) {
- this.adminService.RemoveOrgIamPolicy(this.org.id).then(() => {
+ this.adminService.resetCustomOrgIAMPolicyToDefault(this.org.id).then(() => {
this.toast.showInfo('POLICY.TOAST.RESETSUCCESS', true);
setTimeout(() => {
this.fetchData();
@@ -140,7 +146,7 @@ export class OrgIamPolicyComponent implements OnDestroy {
public get isDefault(): boolean {
if (this.iamData && this.serviceType === PolicyComponentServiceType.MGMT) {
- return (this.iamData as MgmtOrgIamPolicyView.AsObject).pb_default;
+ return (this.iamData as OrgIAMPolicy.AsObject).isDefault;
} else {
return false;
}
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 86fca53382..c3cb43d630 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
@@ -2,8 +2,11 @@ import { Component, Injector, OnDestroy, Type } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { Subscription } from 'rxjs';
import { switchMap } from 'rxjs/operators';
-import { DefaultPasswordAgePolicyView } from 'src/app/proto/generated/admin_pb';
-import { PasswordAgePolicyView } from 'src/app/proto/generated/management_pb';
+import { GetPasswordAgePolicyResponse as AdminGetPasswordAgePolicyResponse } from 'src/app/proto/generated/zitadel/admin_pb';
+import {
+ 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 { ManagementService } from 'src/app/services/mgmt.service';
import { ToastService } from 'src/app/services/toast.service';
@@ -20,7 +23,7 @@ export class PasswordAgePolicyComponent implements OnDestroy {
public serviceType: PolicyComponentServiceType = PolicyComponentServiceType.MGMT;
public service!: AdminService | ManagementService;
- public ageData!: PasswordAgePolicyView.AsObject | DefaultPasswordAgePolicyView.AsObject;
+ public ageData!: PasswordAgePolicy.AsObject | PasswordAgePolicy.AsObject;
private sub: Subscription = new Subscription();
@@ -43,9 +46,9 @@ export class PasswordAgePolicyComponent implements OnDestroy {
return this.route.params;
})).subscribe(() => {
- this.getData().then(data => {
- if (data) {
- this.ageData = data.toObject();
+ this.getData().then(resp => {
+ if (resp.policy) {
+ this.ageData = resp.policy;
}
});
});
@@ -56,19 +59,19 @@ export class PasswordAgePolicyComponent implements OnDestroy {
}
private async getData():
- Promise {
+ Promise {
switch (this.serviceType) {
case PolicyComponentServiceType.MGMT:
- return (this.service as ManagementService).GetPasswordAgePolicy();
+ return (this.service as ManagementService).getPasswordAgePolicy();
case PolicyComponentServiceType.ADMIN:
- return (this.service as AdminService).GetDefaultPasswordAgePolicy();
+ return (this.service as AdminService).getPasswordAgePolicy();
}
}
public removePolicy(): void {
if (this.serviceType === PolicyComponentServiceType.MGMT) {
- (this.service as ManagementService).RemovePasswordAgePolicy().then(() => {
+ (this.service as ManagementService).resetPasswordAgePolicyToDefault().then(() => {
this.toast.showInfo('POLICY.TOAST.RESETSUCCESS', true);
setTimeout(() => {
this.getData();
@@ -106,8 +109,8 @@ export class PasswordAgePolicyComponent implements OnDestroy {
public savePolicy(): void {
switch (this.serviceType) {
case PolicyComponentServiceType.MGMT:
- if ((this.ageData as PasswordAgePolicyView.AsObject).pb_default) {
- (this.service as ManagementService).CreatePasswordAgePolicy(
+ if (this.ageData.isDefault) {
+ (this.service as ManagementService).addCustomPasswordAgePolicy(
this.ageData.maxAgeDays,
this.ageData.expireWarnDays,
).then(() => {
@@ -116,7 +119,7 @@ export class PasswordAgePolicyComponent implements OnDestroy {
this.toast.showError(error);
});
} else {
- (this.service as ManagementService).UpdatePasswordAgePolicy(
+ (this.service as ManagementService).updateCustomPasswordAgePolicy(
this.ageData.maxAgeDays,
this.ageData.expireWarnDays,
).then(() => {
@@ -127,7 +130,7 @@ export class PasswordAgePolicyComponent implements OnDestroy {
}
break;
case PolicyComponentServiceType.ADMIN:
- (this.service as AdminService).UpdateDefaultPasswordAgePolicy(
+ (this.service as AdminService).updatePasswordAgePolicy(
this.ageData.maxAgeDays,
this.ageData.expireWarnDays,
).then(() => {
@@ -141,7 +144,7 @@ export class PasswordAgePolicyComponent implements OnDestroy {
public get isDefault(): boolean {
if (this.ageData && this.serviceType === PolicyComponentServiceType.MGMT) {
- return (this.ageData as PasswordAgePolicyView.AsObject).pb_default;
+ return (this.ageData as PasswordAgePolicy.AsObject).isDefault;
} else {
return false;
}
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 eeab223485..0fedeb4890 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
@@ -2,14 +2,25 @@ import { Component, Injector, OnDestroy, Type } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { Subscription } from 'rxjs';
import { switchMap } from 'rxjs/operators';
-import { DefaultPasswordComplexityPolicy } from 'src/app/proto/generated/admin_pb';
-import { PasswordComplexityPolicyView } from 'src/app/proto/generated/management_pb';
+import {
+ GetPasswordComplexityPolicyResponse as AdminGetPasswordComplexityPolicyResponse,
+} from 'src/app/proto/generated/zitadel/admin_pb';
+import {
+ GetPasswordComplexityPolicyResponse as MgmtGetPasswordComplexityPolicyResponse,
+} from 'src/app/proto/generated/zitadel/management_pb';
+import { PasswordComplexityPolicy } from 'src/app/proto/generated/zitadel/policy_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 { CnslLinks } from '../../links/links.component';
-import { IAM_LABEL_LINK, IAM_LOGIN_POLICY_LINK, IAM_POLICY_LINK, ORG_IAM_POLICY_LINK, ORG_LOGIN_POLICY_LINK } from '../../policy-grid/policy-links';
+import { CnslLinks } from '../../links/links.component';
+import {
+ IAM_LABEL_LINK,
+ IAM_LOGIN_POLICY_LINK,
+ IAM_POLICY_LINK,
+ ORG_IAM_POLICY_LINK,
+ ORG_LOGIN_POLICY_LINK,
+} from '../../policy-grid/policy-links';
import { PolicyComponentServiceType } from '../policy-component-types.enum';
@Component({
@@ -21,7 +32,7 @@ export class PasswordComplexityPolicyComponent implements OnDestroy {
public serviceType: PolicyComponentServiceType = PolicyComponentServiceType.MGMT;
public service!: ManagementService | AdminService;
- public complexityData!: PasswordComplexityPolicyView.AsObject | DefaultPasswordComplexityPolicy.AsObject;
+ public complexityData!: PasswordComplexityPolicy.AsObject;
private sub: Subscription = new Subscription();
public PolicyComponentServiceType: any = PolicyComponentServiceType;
@@ -64,8 +75,8 @@ export class PasswordComplexityPolicyComponent implements OnDestroy {
this.loading = true;
this.getData().then(data => {
- if (data) {
- this.complexityData = data.toObject();
+ if (data.policy) {
+ this.complexityData = data.policy;
this.loading = false;
}
});
@@ -76,18 +87,18 @@ export class PasswordComplexityPolicyComponent implements OnDestroy {
}
private async getData():
- Promise {
+ Promise {
switch (this.serviceType) {
case PolicyComponentServiceType.MGMT:
- return (this.service as ManagementService).GetPasswordComplexityPolicy();
+ return (this.service as ManagementService).getPasswordComplexityPolicy();
case PolicyComponentServiceType.ADMIN:
- return (this.service as AdminService).GetDefaultPasswordComplexityPolicy();
+ return (this.service as AdminService).getPasswordComplexityPolicy();
}
}
public removePolicy(): void {
if (this.service instanceof ManagementService) {
- this.service.removePasswordComplexityPolicy().then(() => {
+ this.service.resetPasswordComplexityPolicyToDefault().then(() => {
this.toast.showInfo('POLICY.TOAST.RESETSUCCESS', true);
setTimeout(() => {
this.fetchData();
@@ -113,8 +124,8 @@ export class PasswordComplexityPolicyComponent implements OnDestroy {
public savePolicy(): void {
switch (this.serviceType) {
case PolicyComponentServiceType.MGMT:
- if ((this.complexityData as PasswordComplexityPolicyView.AsObject).pb_default) {
- (this.service as ManagementService).CreatePasswordComplexityPolicy(
+ if ((this.complexityData as PasswordComplexityPolicy.AsObject).isDefault) {
+ (this.service as ManagementService).addCustomPasswordComplexityPolicy(
this.complexityData.hasLowercase,
this.complexityData.hasUppercase,
@@ -127,7 +138,7 @@ export class PasswordComplexityPolicyComponent implements OnDestroy {
this.toast.showError(error);
});
} else {
- (this.service as ManagementService).UpdatePasswordComplexityPolicy(
+ (this.service as ManagementService).updateCustomPasswordComplexityPolicy(
this.complexityData.hasLowercase,
this.complexityData.hasUppercase,
this.complexityData.hasNumber,
@@ -141,7 +152,7 @@ export class PasswordComplexityPolicyComponent implements OnDestroy {
}
break;
case PolicyComponentServiceType.ADMIN:
- (this.service as AdminService).UpdateDefaultPasswordComplexityPolicy(
+ (this.service as AdminService).updatePasswordComplexityPolicy(
this.complexityData.hasLowercase,
this.complexityData.hasUppercase,
this.complexityData.hasNumber,
@@ -158,7 +169,7 @@ export class PasswordComplexityPolicyComponent implements OnDestroy {
public get isDefault(): boolean {
if (this.complexityData && this.serviceType === PolicyComponentServiceType.MGMT) {
- return (this.complexityData as PasswordComplexityPolicyView.AsObject).pb_default;
+ return (this.complexityData as PasswordComplexityPolicy.AsObject).isDefault;
} else {
return false;
}
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 a01cb8eda6..0a96506f1b 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
@@ -3,8 +3,13 @@ import { FormGroup } from '@angular/forms';
import { ActivatedRoute } from '@angular/router';
import { Subscription } from 'rxjs';
import { switchMap } from 'rxjs/operators';
-import { DefaultPasswordLockoutPolicyView } from 'src/app/proto/generated/admin_pb';
-import { PasswordLockoutPolicyView } from 'src/app/proto/generated/management_pb';
+import {
+ GetPasswordLockoutPolicyResponse as AdminGetPasswordLockoutPolicyResponse,
+} from 'src/app/proto/generated/zitadel/admin_pb';
+import {
+ GetPasswordLockoutPolicyResponse as MgmtGetPasswordLockoutPolicyResponse,
+} from 'src/app/proto/generated/zitadel/management_pb';
+import { PasswordLockoutPolicy } from 'src/app/proto/generated/zitadel/policy_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';
@@ -22,7 +27,7 @@ export class PasswordLockoutPolicyComponent implements OnDestroy {
public lockoutForm!: FormGroup;
- public lockoutData!: PasswordLockoutPolicyView.AsObject;
+ public lockoutData!: PasswordLockoutPolicy.AsObject;
private sub: Subscription = new Subscription();
public PolicyComponentServiceType: any = PolicyComponentServiceType;
@@ -54,25 +59,25 @@ export class PasswordLockoutPolicyComponent implements OnDestroy {
}
private fetchData(): void {
- this.getData().then(data => {
- if (data) {
- this.lockoutData = data.toObject() as PasswordLockoutPolicyView.AsObject;
+ this.getData().then(resp => {
+ if (resp.policy) {
+ this.lockoutData = resp.policy;
}
});
}
- private getData(): Promise {
+ private getData(): Promise {
switch (this.serviceType) {
case PolicyComponentServiceType.MGMT:
- return (this.service as ManagementService).GetPasswordLockoutPolicy();
+ return (this.service as ManagementService).getPasswordLockoutPolicy();
case PolicyComponentServiceType.ADMIN:
- return (this.service as AdminService).GetDefaultPasswordLockoutPolicy();
+ return (this.service as AdminService).getPasswordLockoutPolicy();
}
}
public removePolicy(): void {
if (this.service instanceof ManagementService) {
- this.service.RemovePasswordLockoutPolicy().then(() => {
+ this.service.resetPasswordLockoutPolicyToDefault().then(() => {
this.toast.showInfo('POLICY.TOAST.RESETSUCCESS', true);
this.fetchData();
}).catch(error => {
@@ -96,7 +101,7 @@ export class PasswordLockoutPolicyComponent implements OnDestroy {
public savePolicy(): void {
let promise: Promise;
if (this.service instanceof AdminService) {
- promise = this.service.UpdateDefaultPasswordLockoutPolicy(
+ promise = this.service.updatePasswordLockoutPolicy(
this.lockoutData.maxAttempts,
this.lockoutData.showLockoutFailure,
).then(() => {
@@ -105,8 +110,8 @@ export class PasswordLockoutPolicyComponent implements OnDestroy {
this.toast.showError(error);
});
} else {
- if ((this.lockoutData as PasswordLockoutPolicyView.AsObject).pb_default) {
- promise = this.service.CreatePasswordLockoutPolicy(
+ if ((this.lockoutData as PasswordLockoutPolicy.AsObject).isDefault) {
+ promise = this.service.addCustomPasswordLockoutPolicy(
this.lockoutData.maxAttempts,
this.lockoutData.showLockoutFailure,
).then(() => {
@@ -115,7 +120,7 @@ export class PasswordLockoutPolicyComponent implements OnDestroy {
this.toast.showError(error);
});
} else {
- promise = this.service.UpdatePasswordLockoutPolicy(
+ promise = this.service.updateCustomPasswordLockoutPolicy(
this.lockoutData.maxAttempts,
this.lockoutData.showLockoutFailure,
).then(() => {
@@ -129,7 +134,7 @@ export class PasswordLockoutPolicyComponent implements OnDestroy {
public get isDefault(): boolean {
if (this.lockoutData && this.serviceType === PolicyComponentServiceType.MGMT) {
- return (this.lockoutData as PasswordLockoutPolicyView.AsObject).pb_default;
+ return (this.lockoutData as PasswordLockoutPolicy.AsObject).isDefault;
} else {
return false;
}
diff --git a/console/src/app/modules/policy-grid/policy-grid.component.ts b/console/src/app/modules/policy-grid/policy-grid.component.ts
index ba66e493dc..3f8fbf1b97 100644
--- a/console/src/app/modules/policy-grid/policy-grid.component.ts
+++ b/console/src/app/modules/policy-grid/policy-grid.component.ts
@@ -1,9 +1,8 @@
import { Component, Input, OnInit } from '@angular/core';
import { PolicyComponentType } from 'src/app/modules/policies/policy-component-types.enum';
-import { PasswordComplexityPolicyView as MgmtPasswordComplexityPolicyView } from 'src/app/proto/generated/management_pb';
-import { DefaultPasswordComplexityPolicyView as AdminPasswordComplexityPolicyView } from 'src/app/proto/generated/admin_pb';
-import { ManagementService } from 'src/app/services/mgmt.service';
+import { PasswordComplexityPolicy } from 'src/app/proto/generated/zitadel/policy_pb';
import { AdminService } from 'src/app/services/admin.service';
+import { ManagementService } from 'src/app/services/mgmt.service';
export enum PolicyGridType {
ORG,
@@ -20,18 +19,22 @@ export class PolicyGridComponent implements OnInit {
public PolicyComponentType: any = PolicyComponentType;
public PolicyGridType: any = PolicyGridType;
- public complexityPolicy!: MgmtPasswordComplexityPolicyView.AsObject | AdminPasswordComplexityPolicyView.AsObject | any;
+ public complexityPolicy!: PasswordComplexityPolicy.AsObject;
constructor(private mgmtService: ManagementService, private adminService: AdminService) { }
public ngOnInit(): void {
if (this.type == PolicyGridType.ORG) {
- this.mgmtService.GetDefaultPasswordComplexityPolicy().then((policy) => {
- this.complexityPolicy = policy.toObject();
+ this.mgmtService.getPasswordComplexityPolicy().then((resp) => {
+ if (resp.policy) {
+ this.complexityPolicy = resp.policy;
+ }
});
} else if (this.type == PolicyGridType.IAM) {
- this.adminService.GetDefaultPasswordComplexityPolicy().then((policy) => {
- this.complexityPolicy = policy.toObject();
+ this.adminService.getPasswordComplexityPolicy().then((resp) => {
+ if (resp.policy) {
+ this.complexityPolicy = resp.policy;
+ }
});
}
}
diff --git a/console/src/app/modules/project-members/project-members-datasource.ts b/console/src/app/modules/project-members/project-members-datasource.ts
index 43a0f0b637..9f37e8c97f 100644
--- a/console/src/app/modules/project-members/project-members-datasource.ts
+++ b/console/src/app/modules/project-members/project-members-datasource.ts
@@ -2,19 +2,22 @@ import { DataSource } from '@angular/cdk/collections';
import { Timestamp } from 'google-protobuf/google/protobuf/timestamp_pb';
import { BehaviorSubject, from, Observable, of } from 'rxjs';
import { catchError, finalize, map } from 'rxjs/operators';
-import { ProjectMember, ProjectMemberSearchResponse, ProjectType } from 'src/app/proto/generated/management_pb';
+import { ListProjectGrantMembersResponse, ListProjectMembersResponse } from 'src/app/proto/generated/zitadel/management_pb';
+import { Member } from 'src/app/proto/generated/zitadel/member_pb';
import { ManagementService } from 'src/app/services/mgmt.service';
+import { ProjectType } from './project-members.component';
+
/**
* Data source for the ProjectMembers view. This class should
* encapsulate all logic for fetching and manipulating the displayed data
* (including sorting, pagination, and filtering).
*/
-export class ProjectMembersDataSource extends DataSource {
+export class ProjectMembersDataSource extends DataSource {
public totalResult: number = 0;
public viewTimestamp!: Timestamp.AsObject;
- public membersSubject: BehaviorSubject = new BehaviorSubject([]);
+ public membersSubject: BehaviorSubject = new BehaviorSubject([]);
private loadingSubject: BehaviorSubject = new BehaviorSubject(false);
public loading$: Observable = this.loadingSubject.asObservable();
@@ -29,21 +32,22 @@ export class ProjectMembersDataSource extends DataSource
this.loadingSubject.next(true);
- const promise: Promise | undefined =
+ const promise: Promise | Promise | undefined =
projectType === ProjectType.PROJECTTYPE_OWNED ?
- this.mgmtService.SearchProjectMembers(projectId, pageSize, offset) :
+ this.mgmtService.listProjectMembers(projectId, pageSize, offset) :
projectType === ProjectType.PROJECTTYPE_GRANTED && grantId ?
- this.mgmtService.SearchProjectGrantMembers(projectId,
+ this.mgmtService.listProjectGrantMembers(projectId,
grantId, pageSize, offset) : undefined;
if (promise) {
from(promise).pipe(
map(resp => {
- const response = resp.toObject();
- this.totalResult = response.totalResult;
- if (response.viewTimestamp) {
- this.viewTimestamp = response.viewTimestamp;
+ if (resp.details?.totalResult) {
+ this.totalResult = resp.details?.totalResult;
}
- return response.resultList;
+ if (resp.details?.viewTimestamp) {
+ this.viewTimestamp = resp.details.viewTimestamp;
+ }
+ return resp.resultList;
}),
catchError(() => of([])),
finalize(() => this.loadingSubject.next(false)),
@@ -59,7 +63,7 @@ export class ProjectMembersDataSource extends DataSource
* the returned stream emits new items.
* @returns A stream of the items to be rendered.
*/
- public connect(): Observable {
+ public connect(): Observable {
return this.membersSubject.asObservable();
}
diff --git a/console/src/app/modules/project-members/project-members.component.html b/console/src/app/modules/project-members/project-members.component.html
index 7d845b04fb..09e87d1c22 100644
--- a/console/src/app/modules/project-members/project-members.component.html
+++ b/console/src/app/modules/project-members/project-members.component.html
@@ -1,14 +1,14 @@
-
+ [appHasRole]="['project.member.delete:' + (projectType === ProjectType.PROJECTTYPE_OWNED) ? $any(project)?.id : (projectType === ProjectType.PROJECTTYPE_GRANTED) ? $any(project)?.projectId: '', 'project.member.delete']">
+ [appHasRole]="['project.member.write:'+(projectType === ProjectType.PROJECTTYPE_OWNED) ? $any(project)?.id : (projectType === ProjectType.PROJECTTYPE_GRANTED) ? $any(project)?.projectId: '','project.member.write']">
add{{ 'ACTIONS.NEW' | translate }}
diff --git a/console/src/app/modules/project-members/project-members.component.ts b/console/src/app/modules/project-members/project-members.component.ts
index 5cde0de798..d39153ae7a 100644
--- a/console/src/app/modules/project-members/project-members.component.ts
+++ b/console/src/app/modules/project-members/project-members.component.ts
@@ -4,21 +4,19 @@ import { PageEvent } from '@angular/material/paginator';
import { MatSelectChange } from '@angular/material/select';
import { ActivatedRoute } from '@angular/router';
import { take } from 'rxjs/operators';
-import {
- ProjectGrantMemberView,
- ProjectGrantView,
- ProjectMember,
- ProjectMemberView,
- ProjectType,
- ProjectView,
- UserView,
-} from 'src/app/proto/generated/management_pb';
+import { Member } from 'src/app/proto/generated/zitadel/member_pb';
+import { GrantedProject, Project } from 'src/app/proto/generated/zitadel/project_pb';
+import { User } from 'src/app/proto/generated/zitadel/user_pb';
import { ManagementService } from 'src/app/services/mgmt.service';
import { ToastService } from 'src/app/services/toast.service';
import { CreationType, MemberCreateDialogComponent } from '../add-member-dialog/member-create-dialog.component';
import { ProjectMembersDataSource } from './project-members-datasource';
+export enum ProjectType {
+ PROJECTTYPE_OWNED = "OWNED",
+ PROJECTTYPE_GRANTED = "GRANTED"
+}
@Component({
selector: 'app-project-members',
@@ -27,7 +25,7 @@ import { ProjectMembersDataSource } from './project-members-datasource';
})
export class ProjectMembersComponent {
public INITIALPAGESIZE: number = 25;
- public project!: ProjectView.AsObject | ProjectGrantView.AsObject;
+ public project!: Project.AsObject | GrantedProject.AsObject;
public projectType: ProjectType = ProjectType.PROJECTTYPE_OWNED;
public grantId: string = '';
public projectName: string = '';
@@ -36,7 +34,9 @@ export class ProjectMembersComponent {
public changePageFactory!: Function;
public changePage: EventEmitter = new EventEmitter();
- public selection: Array = [];
+ public selection: Array = [];
+
+ public ProjectType: any = ProjectType;
constructor(
private mgmtService: ManagementService,
private dialog: MatDialog,
@@ -50,43 +50,47 @@ export class ProjectMembersComponent {
this.route.params.subscribe(params => {
this.grantId = params.grantid;
if (this.projectType === ProjectType.PROJECTTYPE_OWNED) {
- this.mgmtService.GetProjectById(params.projectid).then(project => {
- this.project = project.toObject();
- this.projectName = this.project.name;
- this.dataSource = new ProjectMembersDataSource(this.mgmtService);
- this.dataSource.loadMembers(this.project.projectId, this.projectType, 0, this.INITIALPAGESIZE);
+ this.mgmtService.getProjectByID(params.projectid).then(resp => {
+ if (resp.project) {
+ this.project = resp.project;
+ this.projectName = this.project.name;
+ this.dataSource = new ProjectMembersDataSource(this.mgmtService);
+ this.dataSource.loadMembers(this.project.id, this.projectType, 0, this.INITIALPAGESIZE);
- this.changePageFactory = (event?: PageEvent) => {
- return this.dataSource.loadMembers(
- this.project.projectId,
- this.projectType,
- event?.pageIndex ?? 0,
- event?.pageSize ?? this.INITIALPAGESIZE,
- this.grantId,
- );
- };
+ this.changePageFactory = (event?: PageEvent) => {
+ return this.dataSource.loadMembers(
+ (this.project as Project.AsObject).id,
+ this.projectType,
+ event?.pageIndex ?? 0,
+ event?.pageSize ?? this.INITIALPAGESIZE,
+ this.grantId,
+ );
+ };
+ }
});
} else if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) {
- this.mgmtService.GetGrantedProjectByID(params.projectid, params.grantid).then(project => {
- this.project = project.toObject();
- this.projectName = this.project.projectName;
- this.dataSource = new ProjectMembersDataSource(this.mgmtService);
- this.dataSource.loadMembers(this.project.projectId,
- this.projectType,
- 0,
- this.INITIALPAGESIZE,
- this.grantId,
- );
-
- this.changePageFactory = (event?: PageEvent) => {
- return this.dataSource.loadMembers(
- this.project.projectId,
+ this.mgmtService.getGrantedProjectByID(params.projectid, params.grantid).then(resp => {
+ if (resp.grantedProject) {
+ this.project = resp.grantedProject;
+ this.projectName = this.project.projectName;
+ this.dataSource = new ProjectMembersDataSource(this.mgmtService);
+ this.dataSource.loadMembers(this.project.projectId,
this.projectType,
- event?.pageIndex ?? 0,
- event?.pageSize ?? this.INITIALPAGESIZE,
+ 0,
+ this.INITIALPAGESIZE,
this.grantId,
);
- };
+
+ this.changePageFactory = (event?: PageEvent) => {
+ return this.dataSource.loadMembers(
+ (this.project as GrantedProject.AsObject).projectId,
+ this.projectType,
+ event?.pageIndex ?? 0,
+ event?.pageSize ?? this.INITIALPAGESIZE,
+ this.grantId,
+ );
+ };
+ }
});
}
});
@@ -95,14 +99,14 @@ export class ProjectMembersComponent {
public getRoleOptions(): void {
if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) {
- this.mgmtService.GetProjectGrantMemberRoles().then(resp => {
- this.memberRoleOptions = resp.toObject().rolesList;
+ this.mgmtService.listProjectGrantMemberRoles().then(resp => {
+ this.memberRoleOptions = resp.resultList;
}).catch(error => {
this.toast.showError(error);
});
} else if (this.projectType === ProjectType.PROJECTTYPE_OWNED) {
- this.mgmtService.GetProjectMemberRoles().then(resp => {
- this.memberRoleOptions = resp.toObject().rolesList;
+ this.mgmtService.listProjectMemberRoles().then(resp => {
+ this.memberRoleOptions = resp.resultList;
}).catch(error => {
this.toast.showError(error);
});
@@ -112,13 +116,13 @@ export class ProjectMembersComponent {
public removeProjectMemberSelection(): void {
Promise.all(this.selection.map(member => {
if (this.projectType === ProjectType.PROJECTTYPE_OWNED) {
- return this.mgmtService.RemoveProjectMember(this.project.projectId, member.userId).then(() => {
+ return this.mgmtService.removeProjectMember((this.project as Project.AsObject).id, member.userId).then(() => {
this.toast.showInfo('PROJECT.TOAST.MEMBERREMOVED', true);
}).catch(error => {
this.toast.showError(error);
});
} else if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) {
- return this.mgmtService.RemoveProjectGrantMember(this.project.projectId, this.grantId,
+ return this.mgmtService.removeProjectGrantMember((this.project as GrantedProject.AsObject).projectId, this.grantId,
member.userId).then(() => {
this.toast.showInfo('PROJECT.TOAST.MEMBERREMOVED', true);
}).catch(error => {
@@ -132,9 +136,9 @@ export class ProjectMembersComponent {
});
}
- public removeProjectMember(member: ProjectMemberView.AsObject | ProjectGrantMemberView.AsObject): void {
+ public removeProjectMember(member: Member.AsObject | Member.AsObject): void {
if (this.projectType === ProjectType.PROJECTTYPE_OWNED) {
- this.mgmtService.RemoveProjectMember(this.project.projectId, member.userId).then(() => {
+ this.mgmtService.removeProjectMember((this.project as Project.AsObject).id, member.userId).then(() => {
setTimeout(() => {
this.changePage.emit();
}, 1000);
@@ -143,7 +147,7 @@ export class ProjectMembersComponent {
this.toast.showError(error);
});
} else if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) {
- this.mgmtService.RemoveProjectGrantMember(this.project.projectId, this.grantId,
+ this.mgmtService.removeProjectGrantMember((this.project as GrantedProject.AsObject).projectId, this.grantId,
member.userId).then(() => {
setTimeout(() => {
this.changePage.emit();
@@ -165,16 +169,16 @@ export class ProjectMembersComponent {
dialogRef.afterClosed().subscribe(resp => {
if (resp) {
- const users: UserView.AsObject[] = resp.users;
+ const users: User.AsObject[] = resp.users;
const roles: string[] = resp.roles;
if (users && users.length && roles && roles.length) {
Promise.all(users.map(user => {
if (this.projectType === ProjectType.PROJECTTYPE_OWNED) {
- return this.mgmtService.AddProjectMember(this.project.projectId, user.id, roles);
+ return this.mgmtService.addProjectMember((this.project as Project.AsObject).id, user.id, roles);
} else if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) {
- return this.mgmtService.AddProjectGrantMember(this.project.projectId, this.grantId,
+ return this.mgmtService.addProjectGrantMember((this.project as GrantedProject.AsObject).projectId, this.grantId,
user.id, roles);
}
})).then(() => {
@@ -190,18 +194,18 @@ export class ProjectMembersComponent {
});
}
- updateRoles(member: ProjectMember.AsObject, selectionChange: MatSelectChange): void {
+ updateRoles(member: Member.AsObject, selectionChange: MatSelectChange): void {
if (this.projectType === ProjectType.PROJECTTYPE_OWNED) {
- this.mgmtService.ChangeProjectMember(this.project.projectId, member.userId, selectionChange.value)
- .then((_: ProjectMember) => {
+ this.mgmtService.updateProjectMember((this.project as Project.AsObject).id, member.userId, selectionChange.value)
+ .then(() => {
this.toast.showInfo('PROJECT.TOAST.MEMBERCHANGED', true);
}).catch(error => {
this.toast.showError(error);
});
} else if (this.projectType === ProjectType.PROJECTTYPE_GRANTED) {
- this.mgmtService.ChangeProjectGrantMember(this.project.projectId,
+ this.mgmtService.updateProjectGrantMember((this.project as GrantedProject.AsObject).projectId,
this.grantId, member.userId, selectionChange.value)
- .then((_: ProjectMember) => {
+ .then(() => {
this.toast.showInfo('PROJECT.TOAST.MEMBERCHANGED', true);
}).catch(error => {
this.toast.showError(error);
diff --git a/console/src/app/modules/project-roles/project-role-detail/project-role-detail.component.ts b/console/src/app/modules/project-roles/project-role-detail/project-role-detail.component.ts
index cb6fa62a65..e876445e94 100644
--- a/console/src/app/modules/project-roles/project-role-detail/project-role-detail.component.ts
+++ b/console/src/app/modules/project-roles/project-role-detail/project-role-detail.component.ts
@@ -29,7 +29,7 @@ export class ProjectRoleDetailComponent {
submitForm(): void {
if (this.formGroup.valid && this.key?.value && this.group?.value && this.displayName?.value) {
- this.mgmtService.ChangeProjectRole(this.projectId, this.key.value, this.displayName.value, this.group.value)
+ this.mgmtService.updateProjectRole(this.projectId, this.key.value, this.displayName.value, this.group.value)
.then(() => {
this.toast.showInfo('PROJECT.TOAST.ROLECHANGED', true);
this.dialogRef.close(true);
diff --git a/console/src/app/modules/project-roles/project-roles-datasource.ts b/console/src/app/modules/project-roles/project-roles-datasource.ts
index 3418a256fc..1c027fb82c 100644
--- a/console/src/app/modules/project-roles/project-roles-datasource.ts
+++ b/console/src/app/modules/project-roles/project-roles-datasource.ts
@@ -2,7 +2,7 @@ import { DataSource } from '@angular/cdk/collections';
import { Timestamp } from 'google-protobuf/google/protobuf/timestamp_pb';
import { BehaviorSubject, from, Observable, of } from 'rxjs';
import { catchError, finalize, map } from 'rxjs/operators';
-import { ProjectRole } from 'src/app/proto/generated/management_pb';
+import { Role } from 'src/app/proto/generated/zitadel/project_pb';
import { ManagementService } from 'src/app/services/mgmt.service';
/**
@@ -10,11 +10,11 @@ import { ManagementService } from 'src/app/services/mgmt.service';
* encapsulate all logic for fetching and manipulating the displayed data
* (including sorting, pagination, and filtering).
*/
-export class ProjectRolesDataSource extends DataSource {
+export class ProjectRolesDataSource extends DataSource {
public totalResult: number = 0;
public viewTimestamp!: Timestamp.AsObject;
- public rolesSubject: BehaviorSubject = new BehaviorSubject([]);
+ public rolesSubject: BehaviorSubject = new BehaviorSubject([]);
private loadingSubject: BehaviorSubject = new BehaviorSubject(false);
public loading$: Observable = this.loadingSubject.asObservable();
@@ -26,14 +26,15 @@ export class ProjectRolesDataSource extends DataSource {
const offset = pageIndex * pageSize;
this.loadingSubject.next(true);
- from(this.mgmtService.SearchProjectRoles(projectId, pageSize, offset)).pipe(
+ from(this.mgmtService.listProjectRoles(projectId, pageSize, offset)).pipe(
map(resp => {
- const response = resp.toObject();
- this.totalResult = response.totalResult;
- if (response.viewTimestamp) {
- this.viewTimestamp = response.viewTimestamp;
+ if (resp.details?.totalResult !== undefined) {
+ this.totalResult = resp.details.totalResult;
}
- return resp.toObject().resultList;
+ if (resp.details?.viewTimestamp) {
+ this.viewTimestamp = resp.details.viewTimestamp;
+ }
+ return resp.resultList;
}),
catchError(() => of([])),
finalize(() => this.loadingSubject.next(false)),
@@ -48,7 +49,7 @@ export class ProjectRolesDataSource extends DataSource {
* the returned stream emits new items.
* @returns A stream of the items to be rendered.
*/
- public connect(): Observable {
+ public connect(): Observable {
return this.rolesSubject.asObservable();
}
diff --git a/console/src/app/modules/project-roles/project-roles.component.ts b/console/src/app/modules/project-roles/project-roles.component.ts
index ff08a20d06..f5dee5c2de 100644
--- a/console/src/app/modules/project-roles/project-roles.component.ts
+++ b/console/src/app/modules/project-roles/project-roles.component.ts
@@ -4,7 +4,7 @@ import { MatDialog } from '@angular/material/dialog';
import { MatPaginator } from '@angular/material/paginator';
import { MatTable } from '@angular/material/table';
import { tap } from 'rxjs/operators';
-import { ProjectRole } from 'src/app/proto/generated/management_pb';
+import { Role } from 'src/app/proto/generated/zitadel/project_pb';
import { ManagementService } from 'src/app/services/mgmt.service';
import { ToastService } from 'src/app/services/toast.service';
@@ -22,10 +22,10 @@ export class ProjectRolesComponent implements AfterViewInit, OnInit {
@Input() public disabled: boolean = false;
@Input() public actionsVisible: boolean = false;
@ViewChild(MatPaginator) public paginator!: MatPaginator;
- @ViewChild(MatTable) public table!: MatTable;
+ @ViewChild(MatTable) public table!: MatTable;
public dataSource!: ProjectRolesDataSource;
- public selection: SelectionModel = new SelectionModel(true, []);
- @Output() public changedSelection: EventEmitter> = new EventEmitter();
+ public selection: SelectionModel = new SelectionModel(true, []);
+ @Output() public changedSelection: EventEmitter> = new EventEmitter();
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
public displayedColumns: string[] = ['select', 'key', 'displayname', 'group', 'creationDate'];
@@ -51,7 +51,7 @@ export class ProjectRolesComponent implements AfterViewInit, OnInit {
}
public selectAllOfGroup(group: string): void {
- const groupRoles: ProjectRole.AsObject[] = this.dataSource.rolesSubject.getValue()
+ const groupRoles: Role.AsObject[] = this.dataSource.rolesSubject.getValue()
.filter(role => role.group === group);
this.selection.select(...groupRoles);
}
@@ -73,7 +73,7 @@ export class ProjectRolesComponent implements AfterViewInit, OnInit {
public masterToggle(): void {
this.isAllSelected() ?
this.selection.clear() :
- this.dataSource.rolesSubject.value.forEach((row: ProjectRole.AsObject) => this.selection.select(row));
+ this.dataSource.rolesSubject.value.forEach((row: Role.AsObject) => this.selection.select(row));
}
public deleteSelectedRoles(): Promise {
@@ -83,7 +83,7 @@ export class ProjectRolesComponent implements AfterViewInit, OnInit {
});
return Promise.all(this.selection.selected.map(role => {
- return this.mgmtService.RemoveProjectRole(role.projectId, role.key);
+ return this.mgmtService.removeProjectRole(this.projectId, role.key);
})).then(() => {
this.toast.showInfo('PROJECT.TOAST.ROLEREMOVED', true);
indexes.forEach(index => {
@@ -98,9 +98,9 @@ export class ProjectRolesComponent implements AfterViewInit, OnInit {
});
}
- public removeRole(role: ProjectRole.AsObject, index: number): void {
+ public removeRole(role: Role.AsObject, index: number): void {
this.mgmtService
- .RemoveProjectRole(role.projectId, role.key)
+ .removeProjectRole(this.projectId, role.key)
.then(() => {
this.toast.showInfo('PROJECT.TOAST.ROLEREMOVED', true);
this.dataSource.rolesSubject.value.splice(index, 1);
@@ -111,7 +111,7 @@ export class ProjectRolesComponent implements AfterViewInit, OnInit {
});
}
- public openDetailDialog(role: ProjectRole.AsObject): void {
+ public openDetailDialog(role: Role.AsObject): void {
this.dialog.open(ProjectRoleDetailComponent, {
data: {
role,
diff --git a/console/src/app/modules/search-project-autocomplete/search-project-autocomplete.component.ts b/console/src/app/modules/search-project-autocomplete/search-project-autocomplete.component.ts
index 6847950379..c5c3632d11 100644
--- a/console/src/app/modules/search-project-autocomplete/search-project-autocomplete.component.ts
+++ b/console/src/app/modules/search-project-autocomplete/search-project-autocomplete.component.ts
@@ -5,15 +5,8 @@ import { MatAutocomplete, MatAutocompleteSelectedEvent } from '@angular/material
import { MatChipInputEvent } from '@angular/material/chips';
import { forkJoin, from, Subject } from 'rxjs';
import { debounceTime, switchMap, takeUntil, tap } from 'rxjs/operators';
-import {
- ProjectGrantSearchResponse,
- ProjectGrantView,
- ProjectSearchKey,
- ProjectSearchQuery,
- ProjectSearchResponse,
- ProjectView,
- SearchMethod,
-} from 'src/app/proto/generated/management_pb';
+import { ListProjectGrantsResponse, ListProjectsResponse } from 'src/app/proto/generated/zitadel/management_pb';
+import { GrantedProject, Project, ProjectNameQuery, ProjectQuery } from 'src/app/proto/generated/zitadel/project_pb';
import { ManagementService } from 'src/app/services/mgmt.service';
@@ -34,18 +27,18 @@ export class SearchProjectAutocompleteComponent implements OnDestroy {
public separatorKeysCodes: number[] = [ENTER, COMMA];
public myControl: FormControl = new FormControl();
public names: string[] = [];
- public projects: Array = [];
- public filteredProjects: Array = [];
+ public projects: Array = [];
+ public filteredProjects: Array = [];
public isLoading: boolean = false;
@ViewChild('nameInput') public nameInput!: ElementRef;
@ViewChild('auto') public matAutocomplete!: MatAutocomplete;
@Input() public singleOutput: boolean = false;
@Input() public autocompleteType!: ProjectAutocompleteType;
@Output() public selectionChanged: EventEmitter<
- ProjectGrantView.AsObject[]
- | ProjectGrantView.AsObject
- | ProjectView.AsObject
- | ProjectView.AsObject[]
+ GrantedProject.AsObject[]
+ | GrantedProject.AsObject
+ | Project.AsObject
+ | Project.AsObject[]
> = new EventEmitter();
private unsubscribed$: Subject = new Subject();
@@ -56,20 +49,20 @@ export class SearchProjectAutocompleteComponent implements OnDestroy {
debounceTime(200),
tap(() => this.isLoading = true),
switchMap(value => {
- const query = new ProjectSearchQuery();
- query.setKey(ProjectSearchKey.PROJECTSEARCHKEY_PROJECT_NAME);
- query.setValue(value);
- query.setMethod(SearchMethod.SEARCHMETHOD_CONTAINS_IGNORE_CASE);
+ const query = new ProjectQuery();
+ const nameQuery = new ProjectNameQuery();
+ nameQuery.setName(value);
+ query.setNameQuery(nameQuery);
switch (this.autocompleteType) {
case ProjectAutocompleteType.PROJECT_GRANTED:
- return from(this.mgmtService.SearchGrantedProjects(10, 0, [query]));
+ return from(this.mgmtService.listGrantedProjects(10, 0, [query]));
case ProjectAutocompleteType.PROJECT_OWNED:
- return from(this.mgmtService.SearchProjects(10, 0, [query]));
+ return from(this.mgmtService.listProjects(10, 0, [query]));
default:
return forkJoin([
- from(this.mgmtService.SearchGrantedProjects(10, 0, [query])),
- from(this.mgmtService.SearchProjects(10, 0, [query])),
+ from(this.mgmtService.listGrantedProjects(10, 0, [query])),
+ from(this.mgmtService.listProjects(10, 0, [query])),
]);
}
}),
@@ -77,19 +70,19 @@ export class SearchProjectAutocompleteComponent implements OnDestroy {
switch (this.autocompleteType) {
case ProjectAutocompleteType.PROJECT_GRANTED:
this.isLoading = false;
- this.filteredProjects = [...(returnValue as ProjectGrantSearchResponse).toObject().resultList];
+ this.filteredProjects = [...(returnValue as ListProjectGrantsResponse.AsObject).resultList];
break;
case ProjectAutocompleteType.PROJECT_OWNED:
this.isLoading = false;
- this.filteredProjects = [...(returnValue as ProjectSearchResponse).toObject().resultList];
+ this.filteredProjects = [...(returnValue as ListProjectsResponse.AsObject).resultList];
break;
default:
this.isLoading = false;
this.filteredProjects = [
- ...(returnValue as (ProjectSearchResponse | ProjectGrantSearchResponse)[])[0]
- .toObject().resultList,
- ...(returnValue as (ProjectSearchResponse | ProjectGrantSearchResponse)[])[1]
- .toObject().resultList,
+ ...(returnValue as (ListProjectsResponse.AsObject | ListProjectGrantsResponse.AsObject)[])[0]
+ .resultList,
+ ...(returnValue as (ListProjectsResponse.AsObject | ListProjectGrantsResponse.AsObject)[])[1]
+ .resultList,
];
break;
}
@@ -133,7 +126,7 @@ export class SearchProjectAutocompleteComponent implements OnDestroy {
}
}
- public remove(project: ProjectGrantView.AsObject): void {
+ public remove(project: GrantedProject.AsObject): void {
const index = this.projects.indexOf(project);
if (index >= 0) {
diff --git a/console/src/app/modules/search-roles-autocomplete/search-roles-autocomplete.component.ts b/console/src/app/modules/search-roles-autocomplete/search-roles-autocomplete.component.ts
index f97568a0aa..ec69459ca5 100644
--- a/console/src/app/modules/search-roles-autocomplete/search-roles-autocomplete.component.ts
+++ b/console/src/app/modules/search-roles-autocomplete/search-roles-autocomplete.component.ts
@@ -5,12 +5,7 @@ import { MatAutocomplete, MatAutocompleteSelectedEvent } from '@angular/material
import { MatChipInputEvent } from '@angular/material/chips';
import { from, Subject } from 'rxjs';
import { debounceTime, switchMap, takeUntil, tap } from 'rxjs/operators';
-import {
- ProjectRole,
- ProjectRoleSearchKey,
- ProjectRoleSearchQuery,
- SearchMethod,
-} from 'src/app/proto/generated/management_pb';
+import { Role, RoleDisplayNameQuery, RoleQuery } from 'src/app/proto/generated/zitadel/project_pb';
import { ManagementService } from 'src/app/services/mgmt.service';
@@ -26,14 +21,14 @@ export class SearchRolesAutocompleteComponent implements OnDestroy {
public separatorKeysCodes: number[] = [ENTER, COMMA];
public myControl: FormControl = new FormControl();
public names: string[] = [];
- public roles: Array = [];
- public filteredRoles: Array = [];
+ public roles: Array = [];
+ public filteredRoles: Array = [];
public isLoading: boolean = false;
@ViewChild('nameInput') public nameInput!: ElementRef;
@ViewChild('auto') public matAutocomplete!: MatAutocomplete;
@Input() public projectId: string = '';
@Input() public singleOutput: boolean = false;
- @Output() public selectionChanged: EventEmitter = new EventEmitter();
+ @Output() public selectionChanged: EventEmitter = new EventEmitter();
private unsubscribed$: Subject = new Subject();
constructor(private mgmtService: ManagementService) {
@@ -43,15 +38,21 @@ export class SearchRolesAutocompleteComponent implements OnDestroy {
debounceTime(200),
tap(() => this.isLoading = true),
switchMap(value => {
- const query = new ProjectRoleSearchQuery();
- query.setKey(ProjectRoleSearchKey.PROJECTROLESEARCHKEY_DISPLAY_NAME);
- query.setMethod(SearchMethod.SEARCHMETHOD_CONTAINS_IGNORE_CASE);
- query.setValue(value);
- return from(this.mgmtService.SearchProjectRoles(this.projectId, 10, 0, [query]));
+ const query = new RoleQuery();
+
+ // const key = new RoleKeyQuery();
+ // key.setKey(key)
+ // query.setKey(key)
+
+ const dQuery = new RoleDisplayNameQuery();
+ dQuery.setDisplayName(value);
+ query.setDisplayNameQuery(dQuery);
+
+ return from(this.mgmtService.listProjectRoles(this.projectId, 10, 0, [query]));
}),
- ).subscribe((roles) => {
+ ).subscribe((resp) => {
this.isLoading = false;
- this.filteredRoles = roles.toObject().resultList;
+ this.filteredRoles = resp.resultList;
}, error => {
this.isLoading = false;
});
@@ -61,7 +62,7 @@ export class SearchRolesAutocompleteComponent implements OnDestroy {
this.unsubscribed$.next();
}
- public displayFn(project?: ProjectRole.AsObject): string | undefined {
+ public displayFn(project?: Role.AsObject): string | undefined {
return project ? `${project.displayName}` : undefined;
}
@@ -91,7 +92,7 @@ export class SearchRolesAutocompleteComponent implements OnDestroy {
}
}
- public remove(role: ProjectRole.AsObject): void {
+ public remove(role: Role.AsObject): void {
const index = this.roles.indexOf(role);
if (index >= 0) {
diff --git a/console/src/app/modules/search-user-autocomplete/search-user-autocomplete.component.ts b/console/src/app/modules/search-user-autocomplete/search-user-autocomplete.component.ts
index d4809db3e4..524acad866 100644
--- a/console/src/app/modules/search-user-autocomplete/search-user-autocomplete.component.ts
+++ b/console/src/app/modules/search-user-autocomplete/search-user-autocomplete.component.ts
@@ -15,7 +15,8 @@ import { MatAutocomplete, MatAutocompleteSelectedEvent } from '@angular/material
import { MatChipInputEvent } from '@angular/material/chips';
import { from, of, Subject } from 'rxjs';
import { debounceTime, switchMap, takeUntil, tap } from 'rxjs/operators';
-import { SearchMethod, UserSearchKey, UserSearchQuery, UserView } from 'src/app/proto/generated/management_pb';
+import { TextQueryMethod } from 'src/app/proto/generated/zitadel/object_pb';
+import { SearchQuery, User, UserNameQuery } from 'src/app/proto/generated/zitadel/user_pb';
import { ManagementService } from 'src/app/services/mgmt.service';
import { ToastService } from 'src/app/services/toast.service';
@@ -39,15 +40,15 @@ export class SearchUserAutocompleteComponent implements OnInit, AfterContentChec
public globalLoginNameControl: FormControl = new FormControl();
public loginNames: string[] = [];
- @Input() public users: Array = [];
- public filteredUsers: Array = [];
+ @Input() public users: Array = [];
+ public filteredUsers: Array = [];
public isLoading: boolean = false;
@Input() public target: UserTarget = UserTarget.SELF;
public hint: string = '';
public UserTarget: any = UserTarget;
@ViewChild('usernameInput') public usernameInput!: ElementRef;
@ViewChild('auto') public matAutocomplete!: MatAutocomplete;
- @Output() public selectionChanged: EventEmitter = new EventEmitter();
+ @Output() public selectionChanged: EventEmitter = new EventEmitter();
@Input() public singleOutput: boolean = false;
private unsubscribed$: Subject = new Subject();
@@ -71,14 +72,15 @@ export class SearchUserAutocompleteComponent implements OnInit, AfterContentChec
takeUntil(this.unsubscribed$),
tap(() => this.isLoading = true),
switchMap(value => {
- const query = new UserSearchQuery();
- query.setKey(UserSearchKey.USERSEARCHKEY_USER_NAME);
- query.setValue(value);
- query.setMethod(SearchMethod.SEARCHMETHOD_CONTAINS_IGNORE_CASE);
+ const query = new SearchQuery();
+ const unQuery = new UserNameQuery();
+ unQuery.setMethod(TextQueryMethod.TEXT_QUERY_METHOD_CONTAINS_IGNORE_CASE);
+ query.setUserNameQuery(value);
+
if (this.target === UserTarget.SELF) {
- return from(this.userService.SearchUsers(10, 0, [query]));
+ return from(this.userService.listUsers(10, 0, [query]));
} else {
- return of(); // from(this.userService.GetUserByEmailGlobal(value));
+ return of();
}
}),
).subscribe((userresp: any) => {
@@ -89,7 +91,7 @@ export class SearchUserAutocompleteComponent implements OnInit, AfterContentChec
});
}
- public displayFn(user?: UserView.AsObject): string | undefined {
+ public displayFn(user?: User.AsObject): string | undefined {
return user ? `${user.preferredLoginName}` : undefined;
}
@@ -119,7 +121,7 @@ export class SearchUserAutocompleteComponent implements OnInit, AfterContentChec
}
}
- public remove(user: UserView.AsObject): void {
+ public remove(user: User.AsObject): void {
const index = this.users.indexOf(user);
if (index >= 0) {
@@ -163,12 +165,12 @@ export class SearchUserAutocompleteComponent implements OnInit, AfterContentChec
}
public getGlobalUser(): void {
- this.userService.GetUserByLoginNameGlobal(this.globalLoginNameControl.value).then(user => {
- if (this.singleOutput) {
- this.users = [user.toObject()];
+ this.userService.getUserByLoginNameGlobal(this.globalLoginNameControl.value).then(resp => {
+ if (this.singleOutput && resp.user) {
+ this.users = [resp.user];
this.selectionChanged.emit(this.users[0]);
- } else {
- this.users.push(user.toObject());
+ } else if (resp.user) {
+ this.users.push(resp.user);
this.selectionChanged.emit(this.users);
}
}).catch(error => {
diff --git a/console/src/app/modules/show-key-dialog/show-key-dialog.component.html b/console/src/app/modules/show-key-dialog/show-key-dialog.component.html
index bf0bdde670..0064ae1c3b 100644
--- a/console/src/app/modules/show-key-dialog/show-key-dialog.component.html
+++ b/console/src/app/modules/show-key-dialog/show-key-dialog.component.html
@@ -1,23 +1,22 @@
{{'USER.MACHINE.ADDED.TITLE' | translate}}
{{'USER.MACHINE.ADDED.DESCRIPTION' | translate}}
-
+
{{'USER.MACHINE.ID' | translate}}
- {{addedKey?.id}}
-
-
- {{'USER.MACHINE.TYPE' | translate}}
- {{'USER.MACHINE.KEYTYPES.'+addedKey?.type | translate}}
+ {{keyResponse?.keyId}}
{{'USER.MACHINE.CREATIONDATE' | translate}}
- {{addedKey?.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM YYYY, HH:mm' }}
+ {{keyResponse?.details?.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM YYYY,
+ HH:mm' }}
{{'USER.MACHINE.EXPIRATIONDATE' | translate}}
- {{addedKey?.expirationDate | timestampToDate | localizedDate: 'EEE dd. MMM YYYY, HH:mm'}}
+ {{keyResponse?.details.expirationDate | timestampToDate | localizedDate: 'EEE dd. MMM YYYY,
+ HH:mm'}}
diff --git a/console/src/app/modules/show-key-dialog/show-key-dialog.component.ts b/console/src/app/modules/show-key-dialog/show-key-dialog.component.ts
index cc45b76c7a..531f8de6aa 100644
--- a/console/src/app/modules/show-key-dialog/show-key-dialog.component.ts
+++ b/console/src/app/modules/show-key-dialog/show-key-dialog.component.ts
@@ -1,7 +1,7 @@
import { Component, Inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { saveAs } from 'file-saver';
-import { AddMachineKeyResponse } from 'src/app/proto/generated/management_pb';
+import { AddMachineKeyResponse } from 'src/app/proto/generated/zitadel/management_pb';
@Component({
selector: 'app-show-key-dialog',
@@ -9,19 +9,19 @@ import { AddMachineKeyResponse } from 'src/app/proto/generated/management_pb';
styleUrls: ['./show-key-dialog.component.scss'],
})
export class ShowKeyDialogComponent {
- public addedKey!: AddMachineKeyResponse.AsObject;
+ public keyResponse!: AddMachineKeyResponse.AsObject;
constructor(
public dialogRef: MatDialogRef,
@Inject(MAT_DIALOG_DATA) public data: any,
) {
- this.addedKey = data.key;
+ this.keyResponse = data.key;
}
public saveFile(): void {
- const json = atob(this.addedKey.keyDetails.toString());
+ const json = atob(this.keyResponse.keyDetails.toString());
const blob = new Blob([json], { type: 'text/plain;charset=utf-8' });
- saveAs(blob, `${this.addedKey.id}.json`);
+ saveAs(blob, `${this.keyResponse.keyId}.json`);
}
public closeDialog(): void {
diff --git a/console/src/app/modules/user-grants/user-grants-datasource.ts b/console/src/app/modules/user-grants/user-grants-datasource.ts
index c01cbcb2ca..ddb4a3ad6c 100644
--- a/console/src/app/modules/user-grants/user-grants-datasource.ts
+++ b/console/src/app/modules/user-grants/user-grants-datasource.ts
@@ -2,14 +2,14 @@ import { DataSource } from '@angular/cdk/collections';
import { Timestamp } from 'google-protobuf/google/protobuf/timestamp_pb';
import { BehaviorSubject, from, Observable, of } from 'rxjs';
import { catchError, finalize, map } from 'rxjs/operators';
+import { ListUserGrantResponse } from 'src/app/proto/generated/zitadel/management_pb';
import {
- SearchMethod,
UserGrant,
- UserGrantSearchKey,
- UserGrantSearchQuery,
- UserGrantSearchResponse,
- UserGrantView,
-} from 'src/app/proto/generated/management_pb';
+ UserGrantProjectGrantIDQuery,
+ UserGrantProjectIDQuery,
+ UserGrantQuery,
+ UserGrantUserIDQuery,
+} from 'src/app/proto/generated/zitadel/user_pb';
import { ManagementService } from 'src/app/services/mgmt.service';
export enum UserGrantContext {
@@ -23,7 +23,7 @@ export class UserGrantsDataSource extends DataSource {
public totalResult: number = 0;
public viewTimestamp!: Timestamp.AsObject;
- public grantsSubject: BehaviorSubject = new BehaviorSubject([]);
+ public grantsSubject: BehaviorSubject = new BehaviorSubject([]);
private loadingSubject: BehaviorSubject = new BehaviorSubject(false);
public loading$: Observable = this.loadingSubject.asObservable();
@@ -40,40 +40,44 @@ export class UserGrantsDataSource extends DataSource {
grantId?: string;
userId?: string;
},
- queries?: UserGrantSearchQuery[],
+ queries?: UserGrantQuery[],
): void {
switch (context) {
case UserGrantContext.USER:
if (data && data.userId) {
this.loadingSubject.next(true);
- const userfilter = new UserGrantSearchQuery();
- userfilter.setKey(UserGrantSearchKey.USERGRANTSEARCHKEY_USER_ID);
- userfilter.setMethod(SearchMethod.SEARCHMETHOD_EQUALS);
- userfilter.setValue(data.userId);
+
+ const userfilter = new UserGrantQuery();
+ const ugUiq = new UserGrantUserIDQuery();
+ ugUiq.setUserId(data.userId);
+ userfilter.setUserIdQuery(ugUiq);
+
if (queries) {
queries.push(userfilter);
} else {
queries = [userfilter];
}
- const promise = this.userService.SearchUserGrants(pageSize, pageSize * pageIndex, queries);
+ const promise = this.userService.listUserGrants(pageSize, pageSize * pageIndex, queries);
this.loadResponse(promise);
}
break;
case UserGrantContext.OWNED_PROJECT:
if (data && data.projectId) {
this.loadingSubject.next(true);
- const projectfilter = new UserGrantSearchQuery();
- projectfilter.setKey(UserGrantSearchKey.USERGRANTSEARCHKEY_PROJECT_ID);
- projectfilter.setMethod(SearchMethod.SEARCHMETHOD_EQUALS);
- projectfilter.setValue(data.projectId);
+
+ const projectfilter = new UserGrantQuery();
+ const ugPfq = new UserGrantProjectIDQuery();
+ ugPfq.setProjectId(data.projectId);
+ projectfilter.setProjectIdQuery(ugPfq);
+
if (queries) {
queries.push(projectfilter);
} else {
queries = [projectfilter];
}
- const promise1 = this.userService.SearchUserGrants(pageSize, pageSize * pageIndex, queries);
+ const promise1 = this.userService.listUserGrants(pageSize, pageSize * pageIndex, queries);
this.loadResponse(promise1);
}
break;
@@ -81,43 +85,45 @@ export class UserGrantsDataSource extends DataSource {
if (data && data.grantId && data.projectId) {
this.loadingSubject.next(true);
- const grantquery: UserGrantSearchQuery = new UserGrantSearchQuery();
- grantquery.setKey(UserGrantSearchKey.USERGRANTSEARCHKEY_GRANT_ID);
- grantquery.setMethod(SearchMethod.SEARCHMETHOD_EQUALS);
- grantquery.setValue(data.grantId);
+ const grantfilter = new UserGrantQuery();
- const projectfilter = new UserGrantSearchQuery();
- projectfilter.setKey(UserGrantSearchKey.USERGRANTSEARCHKEY_PROJECT_ID);
- projectfilter.setValue(data.projectId);
+ const uggiq = new UserGrantProjectGrantIDQuery();
+ uggiq.setProjectGrantId(data.grantId);
+ grantfilter.setProjectGrantIdQuery(uggiq);
+
+ const projectfilter = new UserGrantQuery();
+ const ugPfq = new UserGrantProjectIDQuery();
+ ugPfq.setProjectId(data.projectId);
+ projectfilter.setProjectIdQuery(ugPfq);
if (queries) {
- queries.push(projectfilter);
- queries.push(grantquery);
+ queries.push(grantfilter);
} else {
- queries = [projectfilter, grantquery];
+ queries = [grantfilter];
}
- const promise2 = this.userService.SearchUserGrants(pageSize, pageSize * pageIndex, queries);
+ const promise2 = this.userService.listUserGrants(pageSize, pageSize * pageIndex, queries);
this.loadResponse(promise2);
}
break;
default:
this.loadingSubject.next(true);
- const promise3 = this.userService.SearchUserGrants(pageSize, pageSize * pageIndex, queries ?? []);
+ const promise3 = this.userService.listUserGrants(pageSize, pageSize * pageIndex, queries ?? []);
this.loadResponse(promise3);
break;
}
}
- private loadResponse(promise: Promise): void {
+ private loadResponse(promise: Promise): void {
from(promise).pipe(
map(resp => {
- const response = resp.toObject();
- this.totalResult = response.totalResult;
- if (response.viewTimestamp) {
- this.viewTimestamp = response.viewTimestamp;
+ if (resp.details?.totalResult) {
+ this.totalResult = resp.details.totalResult;
}
- return response.resultList;
+ if (resp.details?.viewTimestamp) {
+ this.viewTimestamp = resp.details.viewTimestamp;
+ }
+ return resp.resultList;
}),
catchError(() => of([])),
finalize(() => this.loadingSubject.next(false)),
@@ -132,7 +138,7 @@ export class UserGrantsDataSource extends DataSource {
* the returned stream emits new items.
* @returns A stream of the items to be rendered.
*/
- public connect(): Observable {
+ public connect(): Observable {
return this.grantsSubject.asObservable();
}
diff --git a/console/src/app/modules/user-grants/user-grants.component.html b/console/src/app/modules/user-grants/user-grants.component.html
index 85e77309e5..5fe6e401e1 100644
--- a/console/src/app/modules/user-grants/user-grants.component.html
+++ b/console/src/app/modules/user-grants/user-grants.component.html
@@ -1,9 +1,9 @@
-
+
+ [placeholder]="('USER.TABLE.FILTER.' + userGrantListSearchKey.toString()) | translate" #input>
|