feat: split users into human and machine (#470)

* feat(management): service accounts * chore: current go version * init * refactor: apis * feat(internal): start impl of service account * chore: start impl of machine/human users * code compiles * fix: tests * fix: tests * fix: add new event types to switches * chore: add cases to event types * fix(management): definitive proto messages * fix: machine/human * fix: add missing tables as todos * fix: remove unused permissions * fix: refactoring * fix: refactor * fix: human registered * fix: user id * fix: logid * fix: proto remove //equal * chore(management): remove no comment * fix: human mfas * fix: user subobjects * chore: rename existing to better name * fix: username in user (#634) * fix: username in user * fix: username * fix remove unused code * fix add validations * fix: use new user in all apis * fix: regexp for username in api * fix: fill user data for human and machine (#638) * fix: fill Display name grant/member handlers fix: add description to grant/member objects in api fix: check if user is human in login * fix: remove description from member and grant * chore: remove todos * feat: machine keys * fix: implement missing parts * feat: machine key management view * fix: remove keys from machine view * fix: set default expiration date * fix: get key by ids * feat: add machine keys in proto * feat: machine keys * fix: add migration * fix: mig * fix: correct method name * feat: user search * feat: user search * fix: log ids * fix partial authconfig prompt, domain c perm * membership read check * contributor refresh trigger, observe org write * fix: migrations * fix(console): machine build (#660) * frontend 1 * fix html bindings * trailing comma * user permissions, project deactivate * fix(console): human view (#661) * fix search user view, user detail form * rm log * feat(console): user services list and create (#663) * fix search user view, user detail form * rm log * machine list * generic table component * create user service * proove table for undefined values * tmp disable user link if machine * lint * lint styles * user table lint * Update console/src/assets/i18n/de.json Co-authored-by: Florian Forster <[email protected]> * feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664) * service users for sidenav, routing * i18n * back routes * machine detail form * update machine detail, fix svc user grants * keys table * add key dialog, timestamp creation * check permission on create, delete, fix selection * lint ts, scss * Update console/src/assets/i18n/de.json * Apply suggestions from code review Co-authored-by: Florian Forster <[email protected]> * allow user grants for project.write * management service * fix mgmt service * feat: Machine keys (#655) * fix: memberships (#633) * feat: add iam members to memberships * fix: search project grants * fix: rename * feat: idp and login policy configurations (#619) * feat: oidc config * fix: oidc configurations * feat: oidc idp config * feat: add oidc config test * fix: tests * fix: tests * feat: translate new events * feat: idp eventstore * feat: idp eventstore * fix: tests * feat: command side idp * feat: query side idp * feat: idp config on org * fix: tests * feat: authz idp on org * feat: org idps * feat: login policy * feat: login policy * feat: login policy * feat: add idp func on login policy * feat: add validation to loginpolicy and idp provider * feat: add default login policy * feat: login policy on org * feat: login policy on org * fix: id config handlers * fix: id config handlers * fix: create idp on org * fix: create idp on org * fix: not existing idp config * fix: default login policy * fix: add login policy on org * fix: idp provider search on org * fix: test * fix: remove idp on org * fix: test * fix: test * fix: remove admin idp * fix: logo src as byte * fix: migration * fix: tests * Update internal/iam/repository/eventsourcing/iam.go Co-authored-by: Silvan <[email protected]> * Update internal/iam/repository/eventsourcing/iam_test.go Co-authored-by: Silvan <[email protected]> * Update internal/iam/repository/eventsourcing/iam_test.go Co-authored-by: Silvan <[email protected]> * Update internal/iam/repository/eventsourcing/model/login_policy.go Co-authored-by: Silvan <[email protected]> * Update internal/iam/repository/eventsourcing/model/login_policy.go Co-authored-by: Silvan <[email protected]> * Update internal/org/repository/eventsourcing/org_test.go Co-authored-by: Silvan <[email protected]> * Update internal/iam/repository/eventsourcing/model/login_policy_test.go Co-authored-by: Silvan <[email protected]> * Update internal/iam/repository/eventsourcing/model/login_policy_test.go Co-authored-by: Silvan <[email protected]> * fix: pr comments * fix: tests * Update types.go * fix: merge request changes * fix: reduce optimization Co-authored-by: Silvan <[email protected]> Co-authored-by: Livio Amstutz <[email protected]> * fix: reread user mfas, preferred loginname as otp account name (#636) * fix: reread user mfas * fix: use preferred login name as otp account name * fix: tests * fix: reduce (#635) * fix: management reduce optimization * fix: reduce optimization * fix: reduce optimization * fix: merge master * chore(deps): bump github.com/gorilla/schema from 1.1.0 to 1.2.0 (#627) Bumps [github.com/gorilla/schema](https://github.com/gorilla/schema) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/gorilla/schema/releases) - [Commits](https://github.com/gorilla/schema/compare/v1.1.0...v1.2.0) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump github.com/gorilla/mux from 1.7.4 to 1.8.0 (#624) Bumps [github.com/gorilla/mux](https://github.com/gorilla/mux) from 1.7.4 to 1.8.0. - [Release notes](https://github.com/gorilla/mux/releases) - [Commits](https://github.com/gorilla/mux/compare/v1.7.4...v1.8.0) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump github.com/DATA-DOG/go-sqlmock from 1.4.1 to 1.5.0 (#591) Bumps [github.com/DATA-DOG/go-sqlmock](https://github.com/DATA-DOG/go-sqlmock) from 1.4.1 to 1.5.0. - [Release notes](https://github.com/DATA-DOG/go-sqlmock/releases) - [Commits](https://github.com/DATA-DOG/go-sqlmock/compare/v1.4.1...v1.5.0) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: auto assign issues and PR to ZTIADEL project board (#643) * Create main.yml * Update main.yml Co-authored-by: Livio Amstutz <[email protected]> * fix(console): project grant members, update deps (#645) * fix: searchprojectgrantmembers * chore(deps-dev): bump @angular/cli from 10.0.6 to 10.0.7 in /console (#622) Bumps [@angular/cli](https://github.com/angular/angular-cli) from 10.0.6 to 10.0.7. - [Release notes](https://github.com/angular/angular-cli/releases) - [Commits](https://github.com/angular/angular-cli/compare/v10.0.6...v10.0.7) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump @angular-devkit/build-angular in /console (#626) Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1000.6 to 0.1000.7. - [Release notes](https://github.com/angular/angular-cli/releases) - [Commits](https://github.com/angular/angular-cli/commits) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Max Peintner <[email protected]> * chore(deps-dev): bump @types/jasmine from 3.5.12 to 3.5.13 in /console (#623) Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.5.12 to 3.5.13. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump ts-node from 8.10.2 to 9.0.0 in /console (#629) Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 8.10.2 to 9.0.0. - [Release notes](https://github.com/TypeStrong/ts-node/releases) - [Commits](https://github.com/TypeStrong/ts-node/compare/v8.10.2...v9.0.0) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update packlock Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: delete main.yml (#648) * fix: usergrant (#650) * fix(console): mfa refresh after verification, member eventemitter (#651) * refresh mfa * fix: detail link from contributors * lint * feat: add domain verification notification (#649) * fix: dont (re)generate client secret with auth type none * fix(cors): allow Origin from request * feat: add origin allow list and fix some core issues * rename migration * fix UserIDsByDomain * feat: send email to users after domain claim * username * check origin on userinfo * update oidc pkg * fix: add migration 1.6 * change username * change username * remove unique email aggregate * change username in mgmt * search global user by login name * fix test * change user search in angular * fix tests * merge * userview in angular * fix merge * Update pkg/grpc/management/proto/management.proto Co-authored-by: Fabi <[email protected]> * Update internal/notification/static/i18n/de.yaml Co-authored-by: Fabi <[email protected]> * fix Co-authored-by: Fabi <[email protected]> * fix: translation (#647) * fix: translation * fix: translation * fix: translation * fix: remove unused code * fix: log err * fix: migration numbers (#652) * chore: issue / feature templates (#642) * feat: machine keys * fix: implement missing parts * feat: machine key management view * fix: remove keys from machine view * feat: global org read (#657) * fix: set default expiration date * fix: get key by ids * feat: add machine keys in proto * feat: machine keys * fix: add migration * fix: mig * fix: correct method name * feat: user search * feat: user search * fix: log ids * fix: migrations * fix(console): machine build (#660) * frontend 1 * fix html bindings * trailing comma * fix(console): human view (#661) * fix search user view, user detail form * rm log * feat(console): user services list and create (#663) * fix search user view, user detail form * rm log * machine list * generic table component * create user service * proove table for undefined values * tmp disable user link if machine * lint * lint styles * user table lint * Update console/src/assets/i18n/de.json Co-authored-by: Florian Forster <[email protected]> * feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664) * service users for sidenav, routing * i18n * back routes * machine detail form * update machine detail, fix svc user grants * keys table * add key dialog, timestamp creation * check permission on create, delete, fix selection * lint ts, scss * Update console/src/assets/i18n/de.json * Apply suggestions from code review Co-authored-by: Florian Forster <[email protected]> * refactor: protos * fix(management): key expiration date * fix: check if user is human * fix: marshal key details * fix: correct generate login names * fix: logid Co-authored-by: Fabi <[email protected]> Co-authored-by: Livio Amstutz <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Max Peintner <[email protected]> Co-authored-by: Fabiennne <[email protected]> Co-authored-by: Florian Forster <[email protected]> * fix: naming * refactor: findings * fix: username * fix: mfa upper case * fix: tests * fix: add translations * reactivatemyorg req typeö * fix: projectType for console * fix: user changes * fix: translate events * fix: event type translation * fix: remove unused types Co-authored-by: Fabiennne <[email protected]> Co-authored-by: Max Peintner <[email protected]> Co-authored-by: Florian Forster <[email protected]> Co-authored-by: Fabi <[email protected]> Co-authored-by: Livio Amstutz <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-11-06 14:22:15 +00:00 · 2020-08-31 17:48:01 +02:00
parent c1c85e632b
commit 5abd5b0505
207 changed files with 52837 additions and 26745 deletions
@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+import { UserCreateMachineComponent } from './user-create-machine.component';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: UserCreateMachineComponent,
+        data: { animation: 'DetailPage' },
+    },
+];
+
+@NgModule({
+    imports: [RouterModule.forChild(routes)],
+    exports: [RouterModule],
+})
+export class UserCreateMachineRoutingModule { }
@@ -0,0 +1,34 @@
+<app-detail-layout [backRouterLink]="[ '/users/list/machines']" title="{{ 'USER.CREATE.TITLE' | translate }}"
+    description="{{ 'USER.CREATE.DESCRIPTION' | translate }}">
+    <mat-progress-bar *ngIf="loading" color="accent" mode="indeterminate"></mat-progress-bar>
+
+    <form *ngIf="userForm" [formGroup]="userForm" (ngSubmit)="createUser()" class="form">
+        <div class="content">
+            <mat-form-field class="formfield">
+                <mat-label>{{ 'USER.MACHINE.USERNAME' | translate }}</mat-label>
+                <input matInput formControlName="userName" required />
+                <mat-error *ngIf="userName?.invalid && userName?.errors?.required">
+                    {{ 'USER.VALIDATION.REQUIRED' | translate }}
+                </mat-error>
+                <mat-error *ngIf="userName?.invalid && userName?.errors?.noEmailValidator">
+                    {{ 'USER.VALIDATION.NOEMAIL' | translate }}
+                </mat-error>
+            </mat-form-field>
+            <mat-form-field class="formfield">
+                <mat-label>{{ 'USER.MACHINE.NAME' | translate }}</mat-label>
+                <input matInput formControlName="name" required />
+                <mat-error *ngIf="name?.invalid && name?.errors?.required">
+                    {{ 'USER.VALIDATION.REQUIRED' | translate }}
+                </mat-error>
+            </mat-form-field>
+            <mat-form-field class="formfield">
+                <mat-label>{{ 'USER.MACHINE.DESCRIPTION' | translate }}</mat-label>
+                <input matInput formControlName="description" />
+            </mat-form-field>
+        </div>
+        <div class="btn-container">
+            <button color="primary" [disabled]="userForm.invalid" type="submit"
+                mat-raised-button>{{ 'ACTIONS.CREATE' | translate }}</button>
+        </div>
+    </form>
+</app-detail-layout>
@@ -0,0 +1,33 @@
+
+.form {
+  width: 100%;
+  padding-top: 1rem;
+
+  .btn-container {
+    button {
+      margin-top: 3rem;
+      display: block;
+      padding: .5rem 4rem;
+      border-radius: .5rem;
+    }
+  }
+}
+
+.content {
+  width: 100%;
+  display: flex wrap;
+  flex-direction: row;
+  margin: 0 -.5rem;
+
+  .section {
+    padding: .5rem;
+    flex-basis: 100%;
+    color: #8795a1;
+    font-size: .9rem;
+  }
+
+  .formfield {
+    flex: 1 0 33%;
+    margin: 0 .5rem;
+  }
+}
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UserCreateMachineComponent } from './user-create-machine.component';
+
+describe('UserCreateMachineComponent', () => {
+    let component: UserCreateMachineComponent;
+    let fixture: ComponentFixture<UserCreateMachineComponent>;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            declarations: [UserCreateMachineComponent],
+        })
+            .compileComponents();
+    }));
+
+    beforeEach(() => {
+        fixture = TestBed.createComponent(UserCreateMachineComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});
@@ -0,0 +1,100 @@
+import { Component, OnDestroy } from '@angular/core';
+import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { Router } from '@angular/router';
+import { Subscription } from 'rxjs';
+import { CreateMachineRequest } from 'src/app/proto/generated/admin_pb';
+import { UserResponse } from 'src/app/proto/generated/management_pb';
+import { ManagementService } from 'src/app/services/mgmt.service';
+import { ToastService } from 'src/app/services/toast.service';
+
+function noEmailValidator(c: AbstractControl): any {
+    const EMAIL_REGEXP: RegExp = /^((?!@).)*$/gm;
+    if (!c.parent || !c) {
+        return;
+    }
+    const username = c.parent.get('userName');
+
+    if (!username) {
+        return;
+    }
+
+    return EMAIL_REGEXP.test(username.value) ? null : {
+        noEmailValidator: {
+            valid: false,
+        },
+    };
+}
+
+@Component({
+    selector: 'app-user-create-machine',
+    templateUrl: './user-create-machine.component.html',
+    styleUrls: ['./user-create-machine.component.scss'],
+})
+export class UserCreateMachineComponent implements OnDestroy {
+    public user: CreateMachineRequest.AsObject = new CreateMachineRequest().toObject();
+    public userForm!: FormGroup;
+
+    private sub: Subscription = new Subscription();
+    public loading: boolean = false;
+
+    constructor(
+        private router: Router,
+        private toast: ToastService,
+        public userService: ManagementService,
+        private fb: FormBuilder,
+    ) {
+        this.initForm();
+    }
+
+    private initForm(): void {
+        this.userForm = this.fb.group({
+            userName: ['',
+                [
+                    Validators.required,
+                    Validators.minLength(2),
+                ],
+            ],
+            name: ['', [Validators.required]],
+            description: ['', []],
+        });
+    }
+
+    public createUser(): void {
+        this.user = this.userForm.value;
+
+        this.loading = true;
+
+        const machineReq = new CreateMachineRequest();
+        machineReq.setDescription(this.description?.value);
+        machineReq.setName(this.name?.value);
+
+        this.userService
+            .CreateUserMachine(this.userName?.value, machineReq)
+            .then((data: UserResponse) => {
+                this.loading = false;
+                this.toast.showInfo('USER.TOAST.CREATED', true);
+                const id = data.getId();
+                if (id) {
+                    this.router.navigate(['users', id]);
+                }
+            })
+            .catch((error: any) => {
+                this.loading = false;
+                this.toast.showError(error);
+            });
+    }
+
+    ngOnDestroy(): void {
+        this.sub.unsubscribe();
+    }
+
+    public get name(): AbstractControl | null {
+        return this.userForm.get('name');
+    }
+    public get description(): AbstractControl | null {
+        return this.userForm.get('description');
+    }
+    public get userName(): AbstractControl | null {
+        return this.userForm.get('userName');
+    }
+}
@@ -0,0 +1,41 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
+import { MatProgressBarModule } from '@angular/material/progress-bar';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { MatSelectModule } from '@angular/material/select';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { TranslateModule } from '@ngx-translate/core';
+import { DetailLayoutModule } from 'src/app/modules/detail-layout/detail-layout.module';
+
+import { UserCreateMachineRoutingModule } from './user-create-machine-routing.module';
+import { UserCreateMachineComponent } from './user-create-machine.component';
+
+
+
+@NgModule({
+    declarations: [UserCreateMachineComponent],
+    imports: [
+        UserCreateMachineRoutingModule,
+        CommonModule,
+        FormsModule,
+        ReactiveFormsModule,
+        MatInputModule,
+        MatFormFieldModule,
+        MatSelectModule,
+        MatButtonModule,
+        MatIconModule,
+        MatProgressSpinnerModule,
+        MatProgressBarModule,
+        MatCheckboxModule,
+        MatTooltipModule,
+        TranslateModule,
+        DetailLayoutModule,
+    ],
+})
+export class UserCreateMachineModule { }