From 9a55b6b8d5c5f75cae2e1e0cad2620fa547e4d12 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Tue, 19 Jul 2022 17:33:57 +0800 Subject: [PATCH] app init --- ReleaseNotes.txt | 2 +- .../src/app/entity/AppsCasDetails.ts | 3 ++- .../src/app/entity/AppsFormBasedDetails.ts | 3 +++ .../src/app/entity/AppsJwtDetails.ts | 4 ++++ .../src/app/entity/AppsOauth20Details.ts | 3 +++ .../src/app/entity/AppsSamlDetails.ts | 15 +++++++++++---- .../src/app/entity/AppsTokenBasedDetails.ts | 4 ++++ .../app-cas-details-editer.component.ts | 1 - .../app-oauth20-details-editer.component.ts | 2 ++ .../app-token-based-details-editer.component.html | 1 + 10 files changed, 31 insertions(+), 7 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 25c911f6a..e6dc7ff9e 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,6 +1,6 @@ MaxKey v 3.5.3 GA 2022/07/23 *(MAXKEY-220801) formbase用户初始化跳转问题修复 - *(MAXKEY-220802) OAuth2自动提交认证 + *(MAXKEY-220802) OAuth2 select多选保存问题 *(MAXKEY-220803) OAuth2密码保存不一致修复 *(MAXKEY-220804) HttpSessionListenerAdapter中userinfo空指针异常 *(MAXKEY-220805) 增加LDAP登录认证的参数配置 diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsCasDetails.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsCasDetails.ts index 373ed6326..08f14cf01 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsCasDetails.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsCasDetails.ts @@ -26,7 +26,8 @@ export class AppsCasDetails extends Apps { constructor() { super(); - this.expires = 30; + this.expires = 300; + this.casUser = 'username'; } override init(data: any): void { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsFormBasedDetails.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsFormBasedDetails.ts index e2842150b..64cce0b86 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsFormBasedDetails.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsFormBasedDetails.ts @@ -27,6 +27,9 @@ export class AppsFormBasedDetails extends Apps { constructor() { super(); + this.usernameMapping = 'username'; + this.passwordMapping = 'password'; + this.passwordAlgorithm = 'NONE'; } override init(data: any): void { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsJwtDetails.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsJwtDetails.ts index 0cc59399e..b3b27283d 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsJwtDetails.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsJwtDetails.ts @@ -35,6 +35,10 @@ export class AppsJwtDetails extends Apps { constructor() { super(); + this.expires = 300; + this.jwtName = 'jwt'; + this.subject = 'username'; + this.tokenType = 'POST'; } override init(data: any): void { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsOauth20Details.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsOauth20Details.ts index bf0d1aae9..73c5e9477 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsOauth20Details.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsOauth20Details.ts @@ -71,6 +71,9 @@ export class AppsOauth20Details extends Apps { this.select_scope = ['read']; this.pkce = 'no'; this.approvalPrompt = 'auto'; + this.accessTokenValiditySeconds = '300'; + this.refreshTokenValiditySeconds = '300'; + this.subject = 'username'; } override init(data: any): void { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsSamlDetails.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsSamlDetails.ts index 785a7dea3..92cd215dd 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsSamlDetails.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsSamlDetails.ts @@ -48,10 +48,10 @@ export class AppsSamlDetails extends Apps { binding!: String; /** - * 0 false 1 true + * yes or no */ - encrypted!: Number; + encrypted!: String; /** * metadata_file metadata_url or certificate */ @@ -62,16 +62,23 @@ export class AppsSamlDetails extends Apps { metaFileId!: String; /** - * 0 original 1 uppercase 2 lowercase + * original , uppercase or lowercase */ - nameIdConvert!: Number; + nameIdConvert!: String; nameIdSuffix!: String; constructor() { super(); this.fileType = 'certificate'; + this.validityInterval = '300'; + this.nameidFormat = 'persistent'; + this.nameIdConvert = 'original'; + this.signature = 'RSAwithSHA1'; + this.digestMethod = 'SHA1'; + this.encrypted = 'no'; + this.binding = 'Redirect-Post'; } override init(data: any): void { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsTokenBasedDetails.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsTokenBasedDetails.ts index b82661954..446ff69bc 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsTokenBasedDetails.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsTokenBasedDetails.ts @@ -28,6 +28,10 @@ export class AppsTokenBasedDetails extends Apps { constructor() { super(); + this.expires = 300; + this.tokenType = 'POST'; + this.cookieName = 'ltpa_token'; + this.algorithm = 'AES'; } override init(data: any): void { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-cas-details-editer/app-cas-details-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-cas-details-editer/app-cas-details-editer.component.ts index 41194267e..4745ef5d8 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-cas-details-editer/app-cas-details-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-cas-details-editer/app-cas-details-editer.component.ts @@ -86,7 +86,6 @@ export class AppCasDetailsEditerComponent implements OnInit { if (this.isEdit) { this.appsCasDetailsService.get(`${this.id}`).subscribe(res => { this.form.model.init(res.data); - //console.log(this.form.model); this.previewImage = this.form.model.iconBase64.toString(); this.fileList = [ { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-oauth20-details-editer/app-oauth20-details-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-oauth20-details-editer/app-oauth20-details-editer.component.ts index 5b6bc437a..0f09a4157 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-oauth20-details-editer/app-oauth20-details-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-oauth20-details-editer/app-oauth20-details-editer.component.ts @@ -86,6 +86,7 @@ export class AppOauth20DetailsEditerComponent implements OnInit { if (this.isEdit) { this.appsOauth20DetailsService.get(`${this.id}`).subscribe(res => { this.form.model.init(res.data); + //console.log(this.form.model); this.previewImage = this.form.model.iconBase64.toString(); this.fileList = [ { @@ -178,6 +179,7 @@ export class AppOauth20DetailsEditerComponent implements OnInit { e.preventDefault(); this.form.submitting = true; this.form.model.trans(); + //console.log(this.form.model); (this.isEdit ? this.appsOauth20DetailsService.update(this.form.model) : this.appsOauth20DetailsService.add(this.form.model)).subscribe( res => { if (res.code == 0) { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-token-based-details-editer/app-token-based-details-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-token-based-details-editer/app-token-based-details-editer.component.html index 003cb923e..1ebf28869 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-token-based-details-editer/app-token-based-details-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/apps/app-token-based-details-editer/app-token-based-details-editer.component.html @@ -156,6 +156,7 @@ +