feat: protos refactoring

* start with user * user first try done in all services * user, org, idp for discussion * remove unused stuff * bla * dockerbuild * rename search, get multiple to list... * add annotation * update proto dependencies * update proto dependencies * change proto imports * replace all old imports * fix go out * remove unused lines * correct protoc flags * grpc and openapi flags * go out source path relative * -p * remove dead code * sourcepath relative * ls * is onenapi the problem? * hobla * authoption output * wrong field name * gopf * correct option, add correct flags * small improvments * SIMPLYFY * relative path * gopf bin ich en tubel * correct path * default policies in admin * grpc generation in one file * remove non ascii * metadata on manipulations * correct auth_option import * fixes * larry * idp provider to idp * fix generate * admin and auth nearly done * admin and auth nearly done * gen * healthz * imports * deleted too much imports * fix org * add import * imports * import * naming * auth_opt * gopf * management * imports * _TYPE_UNSPECIFIED * improts * auth opts * management policies * imports * passwordlessType to MFAType * auth_opt * add user grant calls * add missing messages * result * fix option * improvements * ids * fix http * imports * fixes * fields * body * add fields * remove wrong member query * fix request response * fixes * add copy files * variable versions * generate all files * improvements * add dependencies * factors * user session * oidc information, iam * remove unused file * changes * enums * dockerfile * fix build * remove unused folder * update readme for build * move old server impl * add event type to change * some changes * start admin * remove wrong field * admin only list calls missing * fix proto numbers * surprisingly it compiles * service ts changes * admin mgmt * mgmt * auth manipulation and gets done, lists missing * validations and some field changes * validations * enum validations * remove todo * move proto files to proto/zitadel * change proto path in dockerfile * it compiles! * add validate import * remove duplicate import * fix protos * fix import * tests * cleanup * remove unimplemented methods * iam member multiple queries * all auth and admin calls * add initial password on crate human * message names * management user server * machine done * fix: todos (#1346) * fix: pub sub in new eventstore * fix: todos * fix: todos * fix: todos * fix: todos * fix: todos * fix tests * fix: search method domain * admin service, user import type typescript * admin changes * admin changes * fix: search method domain * more user grpc and begin org, fix configs * fix: return object details * org grpc * remove creation date add details * app * fix: return object details * fix: return object details * mgmt service, project members * app * fix: convert policies * project, members, granted projects, searches * fix: convert usergrants * fix: convert usergrants * auth user detail, user detail, mfa, second factor, auth * fix: convert usergrants * mfa, memberships, password, owned proj detail * fix: convert usergrants * project grant * missing details * changes, userview * idp table, keys * org list and user table filter * unify rest paths (#1381) * unify rest paths * post for all searches, mfa to multi_factor, secondfactor to second_factor * remove v1 * fix tests * rename api client key to app key * machine keys, age policy * user list, machine keys, changes * fix: org states * add default flag to policy * second factor to type * idp id * app type * unify ListQuery, ListDetails, ObjectDetails field names * user grants, apps, memberships * fix type params * metadata to detail, linke idps * api create, membership, app detail, create * idp, app, policy * queries, multi -> auth factors and missing fields * update converters * provider to user, remove old mgmt refs * temp remove authfactor dialog, build finish Co-authored-by: Max Peintner <[email protected]> Co-authored-by: Fabi <[email protected]> Co-authored-by: Livio Amstutz <[email protected]> Co-authored-by: Fabiennne <[email protected]>
2026-11-13 09:25:12 +00:00 · 2021-03-09 10:30:11 +01:00
parent 9f417f3957
commit dabd5920dc
372 changed files with 17879 additions and 22034 deletions
@@ -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<UserGrant.AsObject> {
    public totalResult: number = 0;
    public viewTimestamp!: Timestamp.AsObject;

-    public grantsSubject: BehaviorSubject<UserGrantView.AsObject[]> = new BehaviorSubject<UserGrantView.AsObject[]>([]);
+    public grantsSubject: BehaviorSubject<UserGrant.AsObject[]> = new BehaviorSubject<UserGrant.AsObject[]>([]);
    private loadingSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
    public loading$: Observable<boolean> = this.loadingSubject.asObservable();

@@ -40,40 +40,44 @@ export class UserGrantsDataSource extends DataSource<UserGrant.AsObject> {
            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<UserGrant.AsObject> {
                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<UserGrantSearchResponse>): void {
+    private loadResponse(promise: Promise<ListUserGrantResponse.AsObject>): 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<UserGrant.AsObject> {
     * the returned stream emits new items.
     * @returns A stream of the items to be rendered.
     */
-    public connect(): Observable<UserGrantView.AsObject[]> {
+    public connect(): Observable<UserGrant.AsObject[]> {
        return this.grantsSubject.asObservable();
    }