From d49fee23bfea820d9fe57e2d7d3493a0e26eb5b7 Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Mon, 24 Aug 2020 08:10:45 +0200 Subject: [PATCH] allow none for web flow (#620) --- console/package-lock.json | 75 ------------------- .../apps/app-create/app-create.component.ts | 13 +++- .../apps/app-detail/app-detail.component.html | 3 +- .../apps/app-detail/app-detail.component.ts | 1 + 4 files changed, 12 insertions(+), 80 deletions(-) diff --git a/console/package-lock.json b/console/package-lock.json index 9ea67f7fe..93242ae8a 100644 --- a/console/package-lock.json +++ b/console/package-lock.json @@ -4,33 +4,6 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@angular-devkit/architect": { - "version": "0.1000.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.5.tgz", - "integrity": "sha512-BhNqB7fmmrDQwxoJ3zdw5FslFD+nYGgMTiC48ERVYJVuN3BK6xtt2OGA7vho3eJ13OE5cPGUi8crQDRROgxxQg==", - "dev": true, - "requires": { - "@angular-devkit/core": "10.0.5", - "rxjs": "6.5.5" - }, - "dependencies": { - "rxjs": { - "version": "6.5.5", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz", - "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", - "dev": true - } - } - }, "@angular-devkit/build-angular": { "version": "0.1000.6", "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1000.6.tgz", @@ -333,54 +306,6 @@ } } }, - "@angular-devkit/core": { - "version": "10.0.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.5.tgz", - "integrity": "sha512-ZaF1EYniIo+yRLvvaKnLrjYCdKeg2U3YtbA932M2AIfjgfFv/9mnAbH4jmZsBZhCstxZPz+ItwJesdR20h4Z1Q==", - "dev": true, - "requires": { - "ajv": "6.12.3", - "fast-json-stable-stringify": "2.1.0", - "magic-string": "0.25.7", - "rxjs": "6.5.5", - "source-map": "0.7.3" - }, - "dependencies": { - "ajv": { - "version": "6.12.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", - "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "rxjs": { - "version": "6.5.5", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz", - "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true - }, - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", - "dev": true - } - } - }, "@angular-devkit/schematics": { "version": "10.0.6", "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.6.tgz", diff --git a/console/src/app/pages/projects/apps/app-create/app-create.component.ts b/console/src/app/pages/projects/apps/app-create/app-create.component.ts index 0e05a5c01..a25bfc797 100644 --- a/console/src/app/pages/projects/apps/app-create/app-create.component.ts +++ b/console/src/app/pages/projects/apps/app-create/app-create.component.ts @@ -125,9 +125,9 @@ export class AppCreateComponent implements OnInit, OnDestroy { break; case OIDCApplicationType.OIDCAPPLICATIONTYPE_WEB: this.oidcAuthMethodType[0].disabled = false; - this.oidcAuthMethodType[1].disabled = true; // NONE DISABLED - this.oidcAuthMethodType[2].disabled = false; // POST POSSIBLE - this.authMethodType?.setValue(OIDCAuthMethodType.OIDCAUTHMETHODTYPE_BASIC); // BASIC DEFAULT + this.oidcAuthMethodType[1].disabled = false; + this.oidcAuthMethodType[2].disabled = false; + this.authMethodType?.setValue(OIDCAuthMethodType.OIDCAUTHMETHODTYPE_BASIC); this.oidcApp.authMethodType = OIDCAuthMethodType.OIDCAUTHMETHODTYPE_BASIC; this.oidcResponseTypes[0].checked = true; @@ -190,7 +190,12 @@ export class AppCreateComponent implements OnInit, OnDestroy { .CreateOIDCApp(this.oidcApp) .then((data: Application) => { this.loading = false; - this.showSavedDialog(data.toObject()); + const response = data.toObject(); + if (response.oidcConfig?.authMethodType !== OIDCAuthMethodType.OIDCAUTHMETHODTYPE_NONE) { + this.showSavedDialog(response); + } else { + this.router.navigate(['projects', this.projectId, 'apps', response.id]); + } }) .catch(error => { this.loading = false; diff --git a/console/src/app/pages/projects/apps/app-detail/app-detail.component.html b/console/src/app/pages/projects/apps/app-detail/app-detail.component.html index 369c53cd3..2b17afcee 100644 --- a/console/src/app/pages/projects/apps/app-detail/app-detail.component.html +++ b/console/src/app/pages/projects/apps/app-detail/app-detail.component.html @@ -40,7 +40,8 @@ -
+
diff --git a/console/src/app/pages/projects/apps/app-detail/app-detail.component.ts b/console/src/app/pages/projects/apps/app-detail/app-detail.component.ts index 50e9506cc..74ba50deb 100644 --- a/console/src/app/pages/projects/apps/app-detail/app-detail.component.ts +++ b/console/src/app/pages/projects/apps/app-detail/app-detail.component.ts @@ -78,6 +78,7 @@ export class AppDetailComponent implements OnInit, OnDestroy { public docs!: ZitadelDocs.AsObject; public OIDCApplicationType: any = OIDCApplicationType; + public OIDCAuthMethodType: any = OIDCAuthMethodType; public redirectControl: FormControl = new FormControl(''); public postRedirectControl: FormControl = new FormControl('');