minor changes
This commit is contained in:
@ -1,11 +1,7 @@
|
|||||||
package de.muehlencord.shared.account.web.presentation;
|
package de.muehlencord.shared.account.web.presentation;
|
||||||
|
|
||||||
import de.muehlencord.shared.account.business.application.entity.ApplicationRoleEntity;
|
|
||||||
import de.muehlencord.shared.account.business.application.control.ApplicationRoleControl;
|
|
||||||
import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
|
|
||||||
import de.muehlencord.shared.account.util.AccountPU;
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.UUID;
|
|
||||||
import javax.faces.application.FacesMessage;
|
import javax.faces.application.FacesMessage;
|
||||||
import javax.faces.component.UIComponent;
|
import javax.faces.component.UIComponent;
|
||||||
import javax.faces.component.UIInput;
|
import javax.faces.component.UIInput;
|
||||||
@ -16,6 +12,11 @@ import javax.faces.validator.ValidatorException;
|
|||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import javax.persistence.EntityManager;
|
import javax.persistence.EntityManager;
|
||||||
|
|
||||||
|
import de.muehlencord.shared.account.business.application.control.ApplicationRoleControl;
|
||||||
|
import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
|
||||||
|
import de.muehlencord.shared.account.business.application.entity.ApplicationRoleEntity;
|
||||||
|
import de.muehlencord.shared.account.util.AccountPU;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Joern Muehlencord <joern at muehlencord.de>
|
* @author Joern Muehlencord <joern at muehlencord.de>
|
||||||
|
|||||||
@ -1,9 +1,7 @@
|
|||||||
package de.muehlencord.shared.account.web.presentation;
|
package de.muehlencord.shared.account.web.presentation;
|
||||||
|
|
||||||
import de.muehlencord.shared.account.business.application.control.ApplicationControl;
|
|
||||||
import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.UUID;
|
|
||||||
import javax.faces.application.FacesMessage;
|
import javax.faces.application.FacesMessage;
|
||||||
import javax.faces.component.UIComponent;
|
import javax.faces.component.UIComponent;
|
||||||
import javax.faces.component.UIInput;
|
import javax.faces.component.UIInput;
|
||||||
@ -12,9 +10,13 @@ import javax.faces.validator.FacesValidator;
|
|||||||
import javax.faces.validator.Validator;
|
import javax.faces.validator.Validator;
|
||||||
import javax.faces.validator.ValidatorException;
|
import javax.faces.validator.ValidatorException;
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import de.muehlencord.shared.account.business.application.control.ApplicationControl;
|
||||||
|
import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Joern Muehlencord <joern at muehlencord.de>
|
* @author Joern Muehlencord <joern at muehlencord.de>
|
||||||
|
|||||||
@ -54,7 +54,7 @@ public abstract class AbstractController<T> {
|
|||||||
|
|
||||||
private final Class<T> entityClass;
|
private final Class<T> entityClass;
|
||||||
|
|
||||||
public AbstractController(Class clazz) {
|
public AbstractController(Class<T> clazz) {
|
||||||
this.entityClass = clazz;
|
this.entityClass = clazz;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -15,15 +15,9 @@
|
|||||||
*/
|
*/
|
||||||
package de.muehlencord.shared.account.shiro.filter;
|
package de.muehlencord.shared.account.shiro.filter;
|
||||||
|
|
||||||
import de.muehlencord.shared.account.business.account.boundary.ApiKeyError;
|
|
||||||
import de.muehlencord.shared.account.business.account.boundary.ApiKeyService;
|
|
||||||
import de.muehlencord.shared.account.business.account.entity.JWTObject;
|
|
||||||
import de.muehlencord.shared.account.shiro.token.JWTAuthenticationToken;
|
|
||||||
import de.muehlencord.shared.account.util.AccountSecurityException;
|
|
||||||
import de.muehlencord.shared.jeeutil.restexfw.APIException;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.StringReader;
|
import java.io.StringReader;
|
||||||
import java.util.Locale;
|
|
||||||
import javax.json.Json;
|
import javax.json.Json;
|
||||||
import javax.json.JsonObject;
|
import javax.json.JsonObject;
|
||||||
import javax.json.JsonReader;
|
import javax.json.JsonReader;
|
||||||
@ -35,6 +29,7 @@ import javax.servlet.ServletRequest;
|
|||||||
import javax.servlet.ServletResponse;
|
import javax.servlet.ServletResponse;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
import org.apache.commons.io.IOUtils;
|
import org.apache.commons.io.IOUtils;
|
||||||
import org.apache.shiro.authc.AuthenticationToken;
|
import org.apache.shiro.authc.AuthenticationToken;
|
||||||
import org.apache.shiro.authc.UsernamePasswordToken;
|
import org.apache.shiro.authc.UsernamePasswordToken;
|
||||||
@ -42,6 +37,12 @@ import org.apache.shiro.web.filter.authc.AuthenticatingFilter;
|
|||||||
import org.apache.shiro.web.util.WebUtils;
|
import org.apache.shiro.web.util.WebUtils;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import de.muehlencord.shared.account.business.account.boundary.ApiKeyService;
|
||||||
|
import de.muehlencord.shared.account.business.account.entity.JWTObject;
|
||||||
|
import de.muehlencord.shared.account.shiro.token.JWTAuthenticationToken;
|
||||||
|
import de.muehlencord.shared.account.util.AccountSecurityException;
|
||||||
|
import de.muehlencord.shared.jeeutil.restexfw.APIException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Joern Muehlencord <joern at muehlencord.de>
|
* @author Joern Muehlencord <joern at muehlencord.de>
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
|
<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd">
|
||||||
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
|
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
|
||||||
debug="true">
|
debug="true">
|
||||||
|
|
||||||
|
|||||||
@ -31,7 +31,7 @@ public class EmailClientValidationConstraint implements ClientValidationConstrai
|
|||||||
@Override
|
@Override
|
||||||
public Map<String, Object> getMetadata(ConstraintDescriptor constraintDescriptor) {
|
public Map<String, Object> getMetadata(ConstraintDescriptor constraintDescriptor) {
|
||||||
Map<String, Object> metadata = new HashMap<>();
|
Map<String, Object> metadata = new HashMap<>();
|
||||||
Map attrs = constraintDescriptor.getAttributes();
|
Map<?, ?> attrs = constraintDescriptor.getAttributes();
|
||||||
Object message = attrs.get("message");
|
Object message = attrs.get("message");
|
||||||
if (message != null) {
|
if (message != null) {
|
||||||
metadata.put(MESSAGE_METADATA, message);
|
metadata.put(MESSAGE_METADATA, message);
|
||||||
|
|||||||
Reference in New Issue
Block a user