mirrors/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-25 16:42:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed login forms provider classes

Browse Source
This commit is contained in:
Stian Thorgersen
2014-02-04 14:45:11 +00:00
parent 97897cab1d
commit 4c22a8c92b
9 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
forms/login-api/src/main/java/org/keycloak/login/FormsLoader.java
View File

@@ -1,17 +0,0 @@
package org.keycloak.login;
import java.util.ServiceLoader;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/
public class FormsLoader {
private FormsLoader() {
}
public static FormsProvider load() {
return ServiceLoader.load(FormsProvider.class).iterator().next();
}
}

17
forms/login-api/src/main/java/org/keycloak/login/LoginFormsLoader.java Normal file
View File

@@ -0,0 +1,17 @@
package org.keycloak.login;
import java.util.ServiceLoader;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/
public class LoginFormsLoader {
private LoginFormsLoader() {
}
public static LoginFormsProvider load() {
return ServiceLoader.load(LoginFormsProvider.class).iterator().next();
}
}

2
forms/login-api/src/main/java/org/keycloak/login/FormsPages.java → forms/login-api/src/main/java/org/keycloak/login/LoginFormsPages.java
View File

@@ -3,7 +3,7 @@ package org.keycloak.login;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/
public enum FormsPages {
public enum LoginFormsPages {
LOGIN, LOGIN_TOTP, LOGIN_CONFIG_TOTP, LOGIN_VERIFY_EMAIL, OAUTH_GRANT, LOGIN_RESET_PASSWORD, LOGIN_UPDATE_PASSWORD, LOGIN_USERNAME_REMINDER, REGISTER, ERROR, LOGIN_UPDATE_PROFILE;

2
forms/login-api/src/main/java/org/keycloak/login/FormsProvider.java → forms/login-api/src/main/java/org/keycloak/login/LoginFormsProvider.java
View File

@@ -8,7 +8,7 @@ import javax.ws.rs.core.UriInfo;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/
public interface FormsProvider {
public interface LoginFormsProvider {
public LoginForms createForms(RealmModel realm, HttpRequest request, UriInfo uriInfo);

28
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginForms.java
View File

@@ -7,7 +7,7 @@ import org.keycloak.freemarker.FreeMarkerUtil;
import org.keycloak.freemarker.Theme;
import org.keycloak.freemarker.ThemeLoader;
import org.keycloak.login.LoginForms;
import org.keycloak.login.FormsPages;
import org.keycloak.login.LoginFormsPages;
import org.keycloak.login.freemarker.model.LoginBean;
import org.keycloak.login.freemarker.model.MessageBean;
import org.keycloak.login.freemarker.model.OAuthGrantBean;
@@ -75,20 +75,20 @@ public class FreeMarkerLoginForms implements LoginForms {
public Response createResponse(UserModel.RequiredAction action) {
String actionMessage;
FormsPages page;
LoginFormsPages page;
switch (action) {
case CONFIGURE_TOTP:
actionMessage = Messages.ACTION_WARN_TOTP;
page = FormsPages.LOGIN_CONFIG_TOTP;
page = LoginFormsPages.LOGIN_CONFIG_TOTP;
break;
case UPDATE_PROFILE:
actionMessage = Messages.ACTION_WARN_PROFILE;
page = FormsPages.LOGIN_UPDATE_PROFILE;
page = LoginFormsPages.LOGIN_UPDATE_PROFILE;
break;
case UPDATE_PASSWORD:
actionMessage = Messages.ACTION_WARN_PASSWD;
page = FormsPages.LOGIN_UPDATE_PASSWORD;
page = LoginFormsPages.LOGIN_UPDATE_PASSWORD;
break;
case VERIFY_EMAIL:
try {
@@ -98,7 +98,7 @@ public class FreeMarkerLoginForms implements LoginForms {
}
actionMessage = Messages.ACTION_WARN_EMAIL;
page = FormsPages.LOGIN_VERIFY_EMAIL;
page = LoginFormsPages.LOGIN_VERIFY_EMAIL;
break;
default:
return Response.serverError().build();
@@ -111,7 +111,7 @@ public class FreeMarkerLoginForms implements LoginForms {
return createResponse(page);
}
private Response createResponse(FormsPages page) {
private Response createResponse(LoginFormsPages page) {
MultivaluedMap<String, String> queryParameterMap = uriInfo.getQueryParameters();
String requestURI = uriInfo.getBaseUri().getPath();
@@ -189,32 +189,32 @@ public class FreeMarkerLoginForms implements LoginForms {
}
public Response createLogin() {
return createResponse(FormsPages.LOGIN);
return createResponse(LoginFormsPages.LOGIN);
}
public Response createPasswordReset() {
return createResponse(FormsPages.LOGIN_RESET_PASSWORD);
return createResponse(LoginFormsPages.LOGIN_RESET_PASSWORD);
}
public Response createUsernameReminder() {
return createResponse(FormsPages.LOGIN_USERNAME_REMINDER);
return createResponse(LoginFormsPages.LOGIN_USERNAME_REMINDER);
}
public Response createLoginTotp() {
return createResponse(FormsPages.LOGIN_TOTP);
return createResponse(LoginFormsPages.LOGIN_TOTP);
}
public Response createRegistration() {
return createResponse(FormsPages.REGISTER);
return createResponse(LoginFormsPages.REGISTER);
}
public Response createErrorPage() {
setStatus(Response.Status.INTERNAL_SERVER_ERROR);
return createResponse(FormsPages.ERROR);
return createResponse(LoginFormsPages.ERROR);
}
public Response createOAuthGrant() {
return createResponse(FormsPages.OAUTH_GRANT);
return createResponse(LoginFormsPages.OAUTH_GRANT);
}
public FreeMarkerLoginForms setError(String message) {

4
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java
View File

@@ -2,7 +2,7 @@ package org.keycloak.login.freemarker;
import org.jboss.resteasy.spi.HttpRequest;
import org.keycloak.login.LoginForms;
import org.keycloak.login.FormsProvider;
import org.keycloak.login.LoginFormsProvider;
import org.keycloak.models.RealmModel;
import javax.ws.rs.core.UriInfo;
@@ -10,7 +10,7 @@ import javax.ws.rs.core.UriInfo;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/
public class FreeMarkerLoginFormsProvider implements FormsProvider {
public class FreeMarkerLoginFormsProvider implements LoginFormsProvider {
@Override
public LoginForms createForms(RealmModel realm, HttpRequest request, UriInfo uriInfo) {

4
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/Templates.java
View File

@@ -1,13 +1,13 @@
package org.keycloak.login.freemarker;
import org.keycloak.login.FormsPages;
import org.keycloak.login.LoginFormsPages;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/
public class Templates {
public static String getTemplate(FormsPages page) {
public static String getTemplate(LoginFormsPages page) {
switch (page) {
case LOGIN:
return "login.ftl";

0
forms/login-freemarker/src/main/resources/META-INF/services/org.keycloak.login.FormsProvider → forms/login-freemarker/src/main/resources/META-INF/services/org.keycloak.login.LoginFormsProvider
View File

4
services/src/main/java/org/keycloak/services/resources/flows/Flows.java
View File

@@ -23,7 +23,7 @@ package org.keycloak.services.resources.flows;
import org.jboss.resteasy.spi.HttpRequest;
import org.keycloak.login.LoginForms;
import org.keycloak.login.FormsLoader;
import org.keycloak.login.LoginFormsLoader;
import org.keycloak.models.RealmModel;
import org.keycloak.services.managers.AuthenticationManager;
import org.keycloak.services.managers.TokenManager;
@@ -39,7 +39,7 @@ public class Flows {
}
public static LoginForms forms(RealmModel realm, HttpRequest request, UriInfo uriInfo) {
return FormsLoader.load().createForms(realm, request, uriInfo);
return LoginFormsLoader.load().createForms(realm, request, uriInfo);
}
public static OAuthFlows oauth(RealmModel realm, HttpRequest request, UriInfo uriInfo, AuthenticationManager authManager,