libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Changed SaaSService to use login form from sdk-html instead of its own

Browse source
This commit is contained in:
Stian Thorgersen 2013-08-05 17:14:59 +01:00
parent 94051d5d22
commit dd65a41e86
4 changed files with 13 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/as7-eap-demo/server/src/main/webapp/saas/admin/partials/menu.html
View file

@ -20,7 +20,7 @@
<!-- <select class="nav pull-left" ng-options="r.name for r in current.realms"></select> --> <!-- <select class="nav pull-left" ng-options="r.name for r in current.realms"></select> -->
</div> </div>
<ul class="nav pull-right" data-ng-hide="auth.loggedIn"> <ul class="nav pull-right" data-ng-hide="auth.loggedIn">
<li><a href="/auth-server/saas/saas-login.jsp">Login</a></li> <li><a href="/auth-server/rest/saas/login">Login</a></li>
<li><a href="/auth-server/saas/saas-register.jsp">Register</a></li> <li><a href="/auth-server/saas/saas-register.jsp">Register</a></li>
</ul> </ul>
<ul class="nav pull-right" data-ng-show="auth.loggedIn"> <ul class="nav pull-right" data-ng-show="auth.loggedIn">

82
examples/as7-eap-demo/server/src/main/webapp/saas/saas-login.jsp
View file

@ -1,82 +0,0 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%><!doctype html>
<html>
<head>
<meta charset="utf-8">
<title>Log in to Keycloak</title>
<link rel="stylesheet" href="<%=application.getContextPath()%>/saas/css/reset.css">
<link rel="stylesheet" type="text/css" href="<%=application.getContextPath()%>/saas/css/base.css">
<link rel="stylesheet" type="text/css" href="<%=application.getContextPath()%>/saas/css/forms.css">
<link rel="stylesheet" type="text/css" href="<%=application.getContextPath()%>/saas/css/zocial/zocial.css">
<link rel="stylesheet" type="text/css" href="<%=application.getContextPath()%>/saas/css/login-screen.css">
<link rel="stylesheet" type="text/css" href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic'>
</head>
<body class="rcue-login-register">
<h1><a href="#" title="Go to the home page"><img src="<%=application.getContextPath()%>/saas/img/red-hat-logo.png" alt="Red Hat logo"></a></h1>
<div class="content">
<h2>Log in to <strong>Keycloak</strong></h2>
<div class="background-area">
<div class="form-area social clearfix">
<section class="app-form">
<h3>Application login area</h3>
<form action="<%=application.getContextPath()%>/rest/saas/login" method="POST">
<%
String errorMessage = (String)request.getAttribute("KEYCLOAK_LOGIN_ERROR_MESSAGE");
if (errorMessage != null) { %>
<div class="feedback feedback-error">
<p><font color="red"><%=errorMessage%></font></p>
</div>
<% } %>
<div>
<label for="username">Username</label><input type="text" id="username" name="username" autofocus>
</div>
<div>
<label for="password">Password</label><input type="password" name="Password" id="password">
</div> <!--
<div>
<label for="one-time-pswd" class="two-lines">One-time-password</label><input type="password" id="one-time-pswd">
</div> -->
<div class="aside-btn">
<input type="checkbox" id="remember"><label for="remember">Remember Username</label>
<p>Forgot <a href="#">Username</a> or <a href="#">Password</a>?</p>
</div>
<input type="submit" value="Log In">
</form>
</section>
<section class="social-login">
<span>or</span>
<h3>Social login area</h3>
<p>Log In with</p>
<ul>
<li>
<a href="#" class="zocial facebook">
<span class="text">Facebook</span>
</a>
</li>
<li>
<a href="#" class="zocial googleplus">
<span class="text">Google</span>
</a>
</li>
<li>
<a href="#" class="zocial twitter">
<span class="text">Twitter</span>
</a>
</li>
</ul>
</section>
<section class="info-area">
<h3>Info area</h3>
<p>Does not have an account? <a href="<%=application.getContextPath()%>/saas/saas-register.jsp">Register</a>.</p>
<ul>
<li><strong>Domain:</strong> 10.0.0.1</li>
<li><strong>Zone:</strong> Live</li>
<li><strong>Appliance:</strong> Yep</li>
</ul>
</section>
</div>
</div>
</div>
</body>
</html>

10
sdk-html/src/main/java/org/keycloak/sdk/LoginBean.java
View file

@ -24,6 +24,8 @@ public class LoginBean {
private RealmModel realm; private RealmModel realm;
private String name;
private String loginAction; private String loginAction;
private String socialLoginUrl; private String socialLoginUrl;
@ -50,6 +52,12 @@ public class LoginBean {
realm = (RealmModel) request.getAttribute(RealmModel.class.getName()); realm = (RealmModel) request.getAttribute(RealmModel.class.getName());
if (RealmModel.DEFAULT_REALM.equals(realm.getName())) {
name = "Keycloak";
} else {
name = realm.getName();
}
loginAction = ((URI) request.getAttribute("KEYCLOAK_LOGIN_ACTION")).toString(); loginAction = ((URI) request.getAttribute("KEYCLOAK_LOGIN_ACTION")).toString();
socialLoginUrl = ((URI) request.getAttribute("KEYCLOAK_SOCIAL_LOGIN")).toString(); socialLoginUrl = ((URI) request.getAttribute("KEYCLOAK_SOCIAL_LOGIN")).toString();
@ -87,7 +95,7 @@ public class LoginBean {
} }
public String getName() { public String getName() {
return realm.getName(); return name;
} }
public String getLoginAction() { public String getLoginAction() {

6
services/src/main/java/org/keycloak/services/resources/AbstractLoginService.java
View file

@ -29,9 +29,9 @@ public abstract class AbstractLoginService {
@Context @Context
HttpResponse response; HttpResponse response;
protected String securityFailurePath = "/saas/securityFailure.jsp"; public final static String securityFailurePath = "/saas/securityFailure.jsp";
protected String loginFormPath = "/sdk/login.xhtml"; public final static String loginFormPath = "/sdk/login.xhtml";
protected String oauthFormPath = "/saas/oauthGrantForm.jsp"; public final static String oauthFormPath = "/saas/oauthGrantForm.jsp";
protected RealmModel realm; protected RealmModel realm;
protected TokenManager tokenManager; protected TokenManager tokenManager;