diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java index 6439c877a..8f0422713 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java @@ -192,7 +192,7 @@ public class SocialSignOnProviderService{ _logger.debug("Social Provider {} ({})" , socialsProvider.getProvider() ,socialsProvider.getProviderName()); - if(!socialsProvider.getHidden().equals("true")) { + if(socialsProvider.getDisplay().equals("true")) { socialSignOnProviders.add(new SocialsProvider(socialsProvider)); } @@ -226,7 +226,7 @@ public class SocialSignOnProviderService{ clientSecret = PasswordReciprocal.getInstance().decoder(clientSecret); socialsProvider.setClientSecret(clientSecret); socialsProvider.setAgentId(rs.getString("agentId")); - socialsProvider.setHidden(rs.getString("hidden")); + socialsProvider.setDisplay(rs.getString("display")); socialsProvider.setSortIndex(rs.getInt("sortindex")); socialsProvider.setScanCode(rs.getString("scancode")); socialsProvider.setStatus(rs.getInt("status")); diff --git a/maxkey-core/src/main/java/org/maxkey/entity/SocialsProvider.java b/maxkey-core/src/main/java/org/maxkey/entity/SocialsProvider.java index bf48c5fac..b3a007afe 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/SocialsProvider.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/SocialsProvider.java @@ -56,7 +56,7 @@ public class SocialsProvider extends JpaBaseEntity implements Serializable { @Column private String agentId; @Column - private String hidden; + private String display; @Column private long sortIndex; @Column @@ -217,15 +217,15 @@ public class SocialsProvider extends JpaBaseEntity implements Serializable { this.id = id; } - public String getHidden() { - return hidden; - } + public String getDisplay() { + return display; + } - public void setHidden(String hidden) { - this.hidden = hidden; - } + public void setDisplay(String display) { + this.display = display; + } - public int getStatus() { + public int getStatus() { return status; } @@ -306,8 +306,8 @@ public class SocialsProvider extends JpaBaseEntity implements Serializable { builder.append(clientSecret); builder.append(", agentId="); builder.append(agentId); - builder.append(", hidden="); - builder.append(hidden); + builder.append(", display="); + builder.append(display); builder.append(", sortIndex="); builder.append(sortIndex); builder.append(", scanCode="); diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/access/sessions/sessions.component.html b/maxkey-web-frontend/maxkey-web-app/src/app/routes/access/sessions/sessions.component.html index dd0be1366..e8193bcfa 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/access/sessions/sessions.component.html +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/access/sessions/sessions.component.html @@ -5,14 +5,9 @@ {{ 'mxk.text.startDate' | i18n }} - + + @@ -20,24 +15,19 @@ {{ 'mxk.text.endDate' | i18n }} - + +
- + + {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}
@@ -46,32 +36,21 @@
+ }}
- + - + {{ 'mxk.history.login.sessionId' | i18n }} {{ 'mxk.history.login.username' | i18n }} {{ 'mxk.history.login.displayName' | i18n }} - {{ 'mxk.history.login.message' | i18n }} - {{ 'mxk.history.login.loginType' | i18n }} {{ 'mxk.history.login.sourceIp' | i18n }} {{ 'mxk.history.login.browser' | i18n }} {{ 'mxk.history.login.platform' | i18n }} @@ -80,18 +59,13 @@ - + {{ data.sessionId }} {{ data.username }} {{ data.displayName }} - {{ data.provider }} - {{ data.loginType }} {{ data.sourceIp }} {{ data.browser }} {{ data.platform }} @@ -100,4 +74,4 @@
- + \ No newline at end of file diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/SocialsProvider.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/SocialsProvider.ts index 0f7e51fac..f909c79a0 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/SocialsProvider.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/SocialsProvider.ts @@ -1,19 +1,18 @@ /* * Copyright [2022] [MaxKey of copyright http://www.maxkey.top] - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ - import { BaseEntity } from './BaseEntity'; @@ -24,9 +23,8 @@ export class SocialsProvider extends BaseEntity { clientId!: String; clientSecret!: String; agentId!: String; - hidden!: String; + display!: String; scanCode!: String; - switch_hidden: boolean = false; constructor() { super(); @@ -40,9 +38,6 @@ export class SocialsProvider extends BaseEntity { if (this.status == 1) { this.switch_status = true; } - if (this.hidden == 'true') { - this.switch_hidden = true; - } } override trans(): void { @@ -51,9 +46,5 @@ export class SocialsProvider extends BaseEntity { } else { this.status = 0; } - - if (this.switch_hidden) { - this.hidden = 'true'; - } } } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.html index c2f80a1be..8218e8b41 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.html @@ -67,9 +67,9 @@ - {{ 'mxk.socialsproviders.hidden' | i18n }} - - + {{ 'mxk.socialsproviders.display' | i18n }} + + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html index 4d42fe125..d40294359 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html @@ -44,7 +44,7 @@ {{ 'mxk.socialsproviders.provider' | i18n }} {{ 'mxk.socialsproviders.providerName' | i18n }} {{ 'mxk.text.sortIndex' | i18n }} - {{ 'mxk.socialsproviders.hidden' | i18n }} + {{ 'mxk.socialsproviders.display' | i18n }} {{ 'mxk.socialsproviders.scanCode' | i18n }} {{ 'mxk.text.status' | i18n }} @@ -62,7 +62,7 @@ {{ data.provider }} {{ data.providerName }} {{ data.sortIndex }} - diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json index f0a165f64..30118d3e5 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json @@ -531,7 +531,7 @@ "clientSecret": "ClientSecret", "agentId": "AgentId", "scanCode": "ScanCode", - "hidden": "Is Show" + "display": "Is Show" }, "synchronizers": { "name": "Name", diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json index bbf63bba0..c596cf8d9 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json @@ -529,7 +529,7 @@ "clientSecret": "密钥", "agentId": "AgentId", "scanCode": "扫码登录", - "hidden": "是否显示" + "display": "是否显示" }, "synchronizers": { "name": "名称", diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json index 05eed5fb0..88bfcc4a2 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json @@ -530,7 +530,7 @@ "clientSecret": "密鑰", "agentId": "AgentId", "scanCode": "掃碼登錄", - "hidden": "是否顯示" + "display": "是否顯示" }, "synchronizers": { "name": "名稱",