mariusz.pacek/keycloak
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Gabriel Cardoso committed 2013-11-11 16:59:48 -02:00
2 parents a9ec8757d4 70f3ffa40c
commit 50abe0d84d
206 files changed
+6596 -1993
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

forms/pom.xml
-5
View File
@@ -33,11 +33,6 @@
<artifactId>keycloak-social-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
forms/src/main/java/org/keycloak/forms/LoginBean.java
+3 -4
View File
@@ -21,12 +21,11 @@
*/
package org.keycloak.forms;
import java.util.LinkedList;
import java.util.List;
import org.keycloak.forms.model.RequiredCredential;
import javax.ws.rs.core.MultivaluedMap;
import org.keycloak.forms.model.RequiredCredential;
import java.util.LinkedList;
import java.util.List;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
forms/src/main/java/org/keycloak/forms/OAuthGrantBean.java
Regular → Executable
+4 -5
View File
@@ -21,14 +21,13 @@
*/
package org.keycloak.forms;
import java.util.ArrayList;
import java.util.List;
import javax.ws.rs.core.MultivaluedMap;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserModel;
import javax.ws.rs.core.MultivaluedMap;
import java.util.ArrayList;
import java.util.List;
/**
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
forms/src/main/java/org/keycloak/forms/RegisterBean.java
+1 -2
View File
@@ -21,11 +21,10 @@
*/
package org.keycloak.forms;
import javax.ws.rs.core.MultivaluedMap;
import java.util.HashMap;
import java.util.Map;
import javax.ws.rs.core.MultivaluedMap;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/
forms/src/main/java/org/keycloak/forms/SocialBean.java
Regular → Executable
+5 -6
View File
@@ -21,15 +21,14 @@
*/
package org.keycloak.forms;
import java.net.URI;
import java.util.*;
import javax.imageio.spi.ServiceRegistry;
import javax.ws.rs.core.UriBuilder;
import org.keycloak.forms.model.SocialProvider;
import org.keycloak.services.resources.flows.Urls;
import javax.ws.rs.core.UriBuilder;
import java.net.URI;
import java.util.LinkedList;
import java.util.List;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/
forms/src/main/java/org/keycloak/forms/TotpBean.java
Regular → Executable
+2 -1
View File
@@ -21,11 +21,12 @@
*/
package org.keycloak.forms;
import org.keycloak.models.utils.Base32;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Random;
import org.picketlink.common.util.Base32;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
forms/src/main/java/org/keycloak/forms/UrlBean.java
+2 -2
View File
@@ -21,10 +21,10 @@
*/
package org.keycloak.forms;
import java.net.URI;
import org.keycloak.services.resources.flows.Urls;
import java.net.URI;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/
forms/src/main/java/org/keycloak/service/FormServiceImpl.java
Regular → Executable
+8 -8
View File
@@ -21,19 +21,12 @@
*/
package org.keycloak.service;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
import java.util.ResourceBundle;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import org.jboss.resteasy.logging.Logger;
import org.keycloak.forms.MessageBean;
import org.keycloak.forms.LoginBean;
import org.keycloak.forms.MessageBean;
import org.keycloak.forms.OAuthGrantBean;
import org.keycloak.forms.RealmBean;
import org.keycloak.forms.RegisterBean;
@@ -45,6 +38,13 @@ import org.keycloak.forms.UserBean;
import org.keycloak.services.FormService;
import org.keycloak.services.resources.flows.Pages;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
import java.util.ResourceBundle;
/**
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css
+1 -1
View File
@@ -71,7 +71,7 @@ body {
width: auto;
position: relative;
}
.rcue-login-register .background-area .separator .section,
.rcue-login-register .background-area .section,
.rcue-login-register .background-area .social .section {
padding-top: 1.5em;
padding-bottom: 1.5em;
forms/src/main/resources/META-INF/resources/forms/theme/default/login-reset-password.ftl
+2 -2
View File
@@ -1,5 +1,5 @@
<#import "template-login-action.ftl" as layout>
<@layout.registrationLayout bodyClass="reset"; section>
<@layout.registrationLayout bodyClass="reset" isSeparator=true forceSeparator=true; section>
<#if section = "title">
${rb.getString('emailForgotHeader')}
@@ -23,6 +23,6 @@
</form>
</div>
<#elseif section = "info" >
<p><a href="#">&laquo; Back to Login</a></p>
<p><a href="${url.loginUrl}">&laquo; Back to Login</a></p>
</#if>
</@layout.registrationLayout>
forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-password.ftl
+1 -1
View File
@@ -1,5 +1,5 @@
<#import "template-login-action.ftl" as layout>
<@layout.registrationLayout bodyClass="reset"; section>
<@layout.registrationLayout bodyClass="reset" isSeparator=false forceSeparator=true; section>
<#if section = "title">
${rb.getString('emailUpdateHeader')}
forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl
+1 -1
View File
@@ -1,5 +1,5 @@
<#import "template-login-action.ftl" as layout>
<@layout.registrationLayout bodyClass=""; section>
<@layout.registrationLayout bodyClass="" isSeparator=false forceSeparator=true; section>
<#if section = "title">
Update Account Information
forms/src/main/resources/META-INF/resources/forms/theme/default/login-verify-email.ftl
+1 -1
View File
@@ -1,5 +1,5 @@
<#import "template-login-action.ftl" as layout>
<@layout.registrationLayout bodyClass="email"; section>
<@layout.registrationLayout bodyClass="email" isSeparator=false forceSeparator=true; section>
<#if section = "title">
Email verification
forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl
+9 -3
View File
@@ -1,4 +1,4 @@
<#macro registrationLayout bodyClass isErrorPage=false>
<#macro registrationLayout bodyClass isErrorPage=false isSeparator=false forceSeparator=false>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
@@ -7,6 +7,7 @@
<title>
<#nested "title">
</title>
<link rel="icon" href="${template.formsPath}/theme/${template.theme}/img/favicon.ico">
<link href="${template.themeConfig.styles}" rel="stylesheet" />
<style type="text/css">
body.rcue-login-register {
@@ -25,7 +26,7 @@
</div>
<#if (template.themeConfig.logo)?has_content>
<h1>
<a href="#" title="Go to the login page"><img src="${template.themeConfig.logo}" alt="Red Hat Logo" /></a>
<a href="${url.loginUrl}" title="Go to the login page"><img src="${template.themeConfig.logo}" alt="Red Hat Logo" /></a>
</h1>
</#if>
@@ -35,7 +36,12 @@
</h2>
<div class="background-area">
<div class="form-area clearfix">
<#if !forceSeparator && realm?has_content>
<#assign drawSeparator = realm.registrationAllowed>
<#else>
<#assign drawSeparator = isSeparator>
</#if>
<div class="form-area clearfix ${(drawSeparator)?string('separator','')}">
<div class="section app-form">
<#if !isErrorPage && message?has_content>
<#if message.error>
forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl
+9 -3
View File
@@ -1,4 +1,4 @@
<#macro registrationLayout bodyClass>
<#macro registrationLayout bodyClass isSeparator=false forceSeparator=false>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
@@ -7,6 +7,7 @@
<title>
<#nested "title">
</title>
<link rel="icon" href="${template.formsPath}/theme/${template.theme}/img/favicon.ico">
<link href="${template.themeConfig.styles}" rel="stylesheet" />
<style type="text/css">
body.rcue-login-register {
@@ -18,7 +19,7 @@
<body class="rcue-login-register ${bodyClass}">
<#if (template.themeConfig.logo)?has_content>
<h1>
<a href="#" title="Go to the login page"><img src="${template.themeConfig.logo}" alt="Red Hat Logo" /></a>
<a href="${url.loginUrl}" title="Go to the login page"><img src="${template.themeConfig.logo}" alt="Red Hat Logo" /></a>
</h1>
</#if>
@@ -28,7 +29,12 @@
</h2>
<div class="background-area">
<div class="form-area ${(realm.social)?string('social','')} clearfix">
<#if !forceSeparator && realm?has_content>
<#assign drawSeparator = realm.registrationAllowed>
<#else>
<#assign drawSeparator = isSeparator>
</#if>
<div class="form-area ${(realm.social && bodyClass != "register")?string('social','')} ${(drawSeparator)?string('separator','')} clearfix">
<div class="section app-form">
<h3>Application login area</h3>
<#if message?has_content && message.error>
forms/src/main/resources/META-INF/resources/forms/theme/default/template-main.ftl
+1 -2
View File
@@ -4,8 +4,7 @@
<head>
<meta charset="utf-8">
<title>Edit Account - <#nested "title"></title>
<!-- TODO replace with actual logo once
<link rel="icon" href="img/favicon.ico">
<link rel="icon" href="${template.formsPath}/theme/${template.theme}/img/favicon.ico">
<!-- Frameworks -->
<link rel="stylesheet" href="${template.formsPath}/theme/${template.theme}/css/reset.css">