首页 发现 帮助
登录
dromara
/
MaxKey
镜像自地址 https://gitee.com/dromara/MaxKey.git
2
0
派生 0
文件 工单管理 0 Wiki
浏览代码

init sso credential

MaxKey 3 年之前
父节点
41ab480920
当前提交
1141894808
共有 3 个文件被更改，包括 15 次插入 和 9 次删除
分列视图 显示文件统计
  1. 1 0
      maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java
  2. 1 1
      maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java
  3. 13 8
      maxkey-web-maxkey/src/main/resources/templates/views/authorize/init_sso_credential.ftl

+ 1 - 0
maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java
查看文件 

@@ -49,6 +49,7 @@ public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{
 
 		modelAndView.addObject("setpassword", true);
 
 		modelAndView.addObject("uid", WebContext.getUserInfo().getId());
 
 		modelAndView.addObject("appId", appId);
 
+		modelAndView.addObject("appName",getApp(appId).getName());
 
 		modelAndView.addObject("redirect_uri", redirect_uri);
 
 		return modelAndView;
 
 	}

+ 1 - 1
maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java
查看文件 

@@ -73,7 +73,7 @@ public class FormBasedAuthorizeEndpoint  extends AuthorizeBaseEndpoint{
 
 		
 		_logger.debug("Accounts "+appUser);
 
 		if(appUser	==	null){
 
-			return generateInitCredentialModelAndView(id,"/authorize/formbased/"+id);
 
+			return generateInitCredentialModelAndView(id,"/authz/formbased/"+id);
 
 			
 		}else{
 
 			formBasedDetails.setAppUser(appUser);

+ 13 - 8
maxkey-web-maxkey/src/main/resources/templates/views/authorize/init_sso_credential.ftl
查看文件 

@@ -2,19 +2,24 @@
 
 <html>
 
 <head>
 
   	<#include  "authorize_common.ftl">
 
-  	<title>SSO Credential Init</title>
 
+  	<#include  "../layout/common.cssjs.ftl">
 
+  	<title>Single Sign-On Credential Initialize</title>
 
 </head>
 
 
 <body>
 
-	<form id="credentialsubmit" name="credentialsubmit" action="<s:Base/>/authz/credential" method="post">
 
-		<table  style="margin: auto;width:50%">
 
+	<form id="credentialsubmit" name="credentialsubmit" action="<@base/>/authz/credential" method="post">
 
+		<table  style="margin: auto;width:50%"  class="table table-bordered">
 
 			<tr>
 
-				<td><@locale code="userinfo.appaccouts.relatedUsername" /></td>
 
-				<td><input type="text" id="identity_username" name="identity_username" value="" /></td>
 
+                <td><@locale code="account.appName" /></td>
 
+                <td>${appName}</td>
 
+            </tr>
 
+			<tr>
 
+				<td><@locale code="account.relatedUsername" /></td>
 
+				<td><input required="" class="form-control" type='text'  id="identity_username" name="identity_username" value="" /></td>
 
 			</tr>
 
 			<tr>
 
-				<td><@locale code="userinfo.appaccouts.relatedPassword" /></td>
 
-				<td><input type="password" id="identity_password" name="identity_password" value="" /></td>
 
+				<td><@locale code="account.relatedPassword" /></td>
 
+				<td><input required="" class="form-control"  type="password" id="identity_password" name="identity_password" value="" /></td>
 
 			</tr>
 
 			<tr  style="display:none">
 
 				<td>uid</td>
 
@@ -29,7 +34,7 @@
 
 				<td><input type="text" id="redirect_uri" name="redirect_uri" value="${redirect_uri}" /></td>
 
 			</tr>
 
 			<tr>
 
-				<td colspan="2"><input class="button" type="submit" style="width: 100px" id="credentialsubmitbutton"value="<s:Locale code="button.text.continue" />"/></td>
 
+				<td colspan="2"><input class="button btn btn-primary mr-3" type="submit" style="width: 200px" id="credentialsubmitbutton"value="<@locale code="button.text.save" />"/></td>
 
 			</tr>
 
 		</table>
 
 	</form>