2
0
MaxKey 2 жил өмнө
parent
commit
9a55b6b8d5

+ 1 - 1
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登录认证的参数配置

+ 2 - 1
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 {

+ 3 - 0
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 {

+ 4 - 0
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 {

+ 3 - 0
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 {

+ 11 - 4
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 {

+ 4 - 0
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 {

+ 0 - 1
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 = [
           {

+ 2 - 0
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) {

+ 1 - 0
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 @@
               <nz-select [(ngModel)]="form.model.tokenType" [ngModelOptions]="{ standalone: true }" name="tokenType"
                 id="tokenType">
                 <nz-option nzValue="POST" nzLabel="POST"></nz-option>
+                <nz-option nzValue="GET" nzLabel="GET"></nz-option>
                 <nz-option nzValue="LTPA" nzLabel="LTPA"></nz-option>
               </nz-select>
             </nz-form-control>