This commit is contained in:
MaxKey 2022-07-19 17:33:57 +08:00
parent e2c21894f2
commit 9a55b6b8d5
10 changed files with 31 additions and 7 deletions

View File

@ -1,6 +1,6 @@
MaxKey v 3.5.3 GA 2022/07/23 MaxKey v 3.5.3 GA 2022/07/23
*(MAXKEY-220801) formbase用户初始化跳转问题修复 *(MAXKEY-220801) formbase用户初始化跳转问题修复
*(MAXKEY-220802) OAuth2自动提交认证 *(MAXKEY-220802) OAuth2 select多选保存问题
*(MAXKEY-220803) OAuth2密码保存不一致修复 *(MAXKEY-220803) OAuth2密码保存不一致修复
*(MAXKEY-220804) HttpSessionListenerAdapter中userinfo空指针异常 *(MAXKEY-220804) HttpSessionListenerAdapter中userinfo空指针异常
*(MAXKEY-220805) 增加LDAP登录认证的参数配置 *(MAXKEY-220805) 增加LDAP登录认证的参数配置

View File

@ -26,7 +26,8 @@ export class AppsCasDetails extends Apps {
constructor() { constructor() {
super(); super();
this.expires = 30; this.expires = 300;
this.casUser = 'username';
} }
override init(data: any): void { override init(data: any): void {

View File

@ -27,6 +27,9 @@ export class AppsFormBasedDetails extends Apps {
constructor() { constructor() {
super(); super();
this.usernameMapping = 'username';
this.passwordMapping = 'password';
this.passwordAlgorithm = 'NONE';
} }
override init(data: any): void { override init(data: any): void {

View File

@ -35,6 +35,10 @@ export class AppsJwtDetails extends Apps {
constructor() { constructor() {
super(); super();
this.expires = 300;
this.jwtName = 'jwt';
this.subject = 'username';
this.tokenType = 'POST';
} }
override init(data: any): void { override init(data: any): void {

View File

@ -71,6 +71,9 @@ export class AppsOauth20Details extends Apps {
this.select_scope = ['read']; this.select_scope = ['read'];
this.pkce = 'no'; this.pkce = 'no';
this.approvalPrompt = 'auto'; this.approvalPrompt = 'auto';
this.accessTokenValiditySeconds = '300';
this.refreshTokenValiditySeconds = '300';
this.subject = 'username';
} }
override init(data: any): void { override init(data: any): void {

View File

@ -48,10 +48,10 @@ export class AppsSamlDetails extends Apps {
binding!: String; binding!: String;
/** /**
* 0 false 1 true * yes or no
*/ */
encrypted!: Number; encrypted!: String;
/** /**
* metadata_file metadata_url or certificate * metadata_file metadata_url or certificate
*/ */
@ -62,16 +62,23 @@ export class AppsSamlDetails extends Apps {
metaFileId!: String; metaFileId!: String;
/** /**
* 0 original 1 uppercase 2 lowercase * original , uppercase or lowercase
*/ */
nameIdConvert!: Number; nameIdConvert!: String;
nameIdSuffix!: String; nameIdSuffix!: String;
constructor() { constructor() {
super(); super();
this.fileType = 'certificate'; 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 { override init(data: any): void {

View File

@ -28,6 +28,10 @@ export class AppsTokenBasedDetails extends Apps {
constructor() { constructor() {
super(); super();
this.expires = 300;
this.tokenType = 'POST';
this.cookieName = 'ltpa_token';
this.algorithm = 'AES';
} }
override init(data: any): void { override init(data: any): void {

View File

@ -86,7 +86,6 @@ export class AppCasDetailsEditerComponent implements OnInit {
if (this.isEdit) { if (this.isEdit) {
this.appsCasDetailsService.get(`${this.id}`).subscribe(res => { this.appsCasDetailsService.get(`${this.id}`).subscribe(res => {
this.form.model.init(res.data); this.form.model.init(res.data);
//console.log(this.form.model);
this.previewImage = this.form.model.iconBase64.toString(); this.previewImage = this.form.model.iconBase64.toString();
this.fileList = [ this.fileList = [
{ {

View File

@ -86,6 +86,7 @@ export class AppOauth20DetailsEditerComponent implements OnInit {
if (this.isEdit) { if (this.isEdit) {
this.appsOauth20DetailsService.get(`${this.id}`).subscribe(res => { this.appsOauth20DetailsService.get(`${this.id}`).subscribe(res => {
this.form.model.init(res.data); this.form.model.init(res.data);
//console.log(this.form.model);
this.previewImage = this.form.model.iconBase64.toString(); this.previewImage = this.form.model.iconBase64.toString();
this.fileList = [ this.fileList = [
{ {
@ -178,6 +179,7 @@ export class AppOauth20DetailsEditerComponent implements OnInit {
e.preventDefault(); e.preventDefault();
this.form.submitting = true; this.form.submitting = true;
this.form.model.trans(); this.form.model.trans();
//console.log(this.form.model);
(this.isEdit ? this.appsOauth20DetailsService.update(this.form.model) : this.appsOauth20DetailsService.add(this.form.model)).subscribe( (this.isEdit ? this.appsOauth20DetailsService.update(this.form.model) : this.appsOauth20DetailsService.add(this.form.model)).subscribe(
res => { res => {
if (res.code == 0) { if (res.code == 0) {

View File

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