Atualização do arquétipo

Cleverson Sacramento
1 parent 902c6576
Showing 7 changed files with 30 additions and 24 deletions Show diff stats
archetype/html-rest/src/main/resources/archetype-resources/src/main/java/security/AppAuthenticator.java
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/login.js
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/login.html
impl/core/src/main/java/br/gov/frameworkdemoiselle/security/InvalidCredentialsException.java
impl/core/src/main/resources/demoiselle-core-bundle.properties
impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/security/ServletAuthenticator.java
impl/extension/servlet/src/main/resources/demoiselle-servlet-bundle.properties
 package ${package}.security;
 import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
 import br.gov.frameworkdemoiselle.security.Authenticator;
 import br.gov.frameworkdemoiselle.security.Credentials;
 import br.gov.frameworkdemoiselle.security.InvalidCredentialsException;
 import br.gov.frameworkdemoiselle.security.User;
+import br.gov.frameworkdemoiselle.util.Beans;
 @RequestScoped
 public class AppAuthenticator implements Authenticator {
 	private static final long serialVersionUID = 1L;
-	@Inject
-	private Credentials credentials;
-
 	private User user;
 	@Override
 	public void authenticate() throws Exception {
-		if ("admin".equals(credentials.getUsername()) && "admin".equals(credentials.getPassword())) {
+		Credentials credentials = Beans.getReference(Credentials.class);
+
+		if (credentials.getUsername().equals("admin") && credentials.getPassword().equals("admin")) {
 			this.user = new AppUser(credentials.getUsername());
 		} else {
-			throw new InvalidCredentialsException("usuário ou senha inválidos");
+			throw new InvalidCredentialsException();
 		}
 	}
 $(function() {
-
 	$("#username").focus();
 	$("form").submit(function(event) {
@@ -17,16 +16,15 @@ $(function() {
 // Função utilitária
 function make_base_auth(user, password) {
-  var tok = user + ':' + password;
-  var hash = btoa(tok);
-  return "Basic " + hash;
+	var tok = user + ':' + password;
+	var hash = btoa(tok);
+	return "Basic " + hash;
 }
 // Funções de Callback
 function loginOk(data) {
-	sessionStorage.setItem('credential', 
-							make_base_auth($("#username").val().trim(), $("#password").val().trim()));
+	sessionStorage.setItem('credential', make_base_auth($("#username").val().trim(), $("#password").val().trim()));
 	location.href = "bookmark-list.html";
 }
@@ -36,6 +34,7 @@ function loginFail(request) {
 		case 401:
 			$("#global-message").html("Usuário ou senha inválidos.").show();
 			break;
+
 		case 412:
 			$($("form input").get().reverse()).each(function() {
 				var id = $(this).attr('id');
 <!DOCTYPE html>
 <html>
-<head> 
-	<meta charset="UTF-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>Notifica | Login</title>
-	<link href="css/bootstrap.min.css" rel="stylesheet">
-	<link href="css/bookmark.css" rel="stylesheet">
+<head>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>Notifica | Login</title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+<link href="css/bookmark.css" rel="stylesheet">
 </head>
 <body>
 	<div class="container">
-		<form id="form-login"  role="form">
+		<form id="form-login" role="form">
 			<div class="col-md-4 col-md-offset-4">
 				<div class="form-group">
 					<h1>Bookmark | Login</h1>
@@ -18,14 +18,14 @@
 			</div>
 			<div class="col-md-4 col-md-offset-4">
 				<div class="form-group">
-					<label for="username">Login</label>
+					<label for="username">Login (admin)</label>
 					<input id="username" type="text" class="form-control input-lg" />
 					<div id="username-message" class="label label-danger" hidden="true"></div>
 				</div>
 			</div>
 			<div class="col-md-4 col-md-offset-4">
 				<div class="form-group">
-					<label for="password">Senha</label>
+					<label for="password">Senha (admin)</label>
 					<input id="password" type="password" class="form-control input-lg" />
 					<div id="password-message" class="label label-danger" hidden="true"></div>
 				</div>
 package br.gov.frameworkdemoiselle.security;
+import java.util.ResourceBundle;
+
+import br.gov.frameworkdemoiselle.util.Beans;
+
 /**
  * Thrown when the user's credentials are invalid.
  * 
@@ -9,6 +13,10 @@ public class InvalidCredentialsException extends AuthenticationException {
 	private static final long serialVersionUID = 1L;
+	public InvalidCredentialsException() {
+		super(Beans.getReference(ResourceBundle.class).getString("invalid-credentials"));
+	}
+
 	/**
 	 * Constructs an <code>InvalidCredentialsException</code> with a message.
 	 */
@@ -96,6 +96,7 @@ access-denied=O usu\u00E1rio {0} n\u00E3o possui permiss\u00E3o para executar a 
 access-denied-ui=Voc\u00EA n\u00E3o est\u00E1 autorizado a executar a a\u00E7\u00E3o {1} no recurso {0}
 authorizer-not-defined=Nenhuma regra de resolu\u00E7\u00E3o de permiss\u00F5es foi definida. Para utilizar @{0} \u00E9 preciso definir a propriedade frameworkdemoiselle.security.authorizer.class como regra de resolu\u00E7\u00E3o de permiss\u00F5es desejada no arquivo demoiselle.properties.
 user-not-authenticated=Usu\u00E1rio n\u00E3o autenticado
+invalid-credentials=Usu\u00E1rio ou senha inv\u00E1lidos
 has-role-verification=Verificando se o usu\u00E1rio {0} possui a(s) role(s)\: {1}
 does-not-have-role=Usu\u00E1rio {0} n\u00E3o possui a(s) role(s)\: {1}
 does-not-have-role-ui=Para acessar este recurso \u00E9 necess\u00E1rio ser {0}
@@ -71,7 +71,7 @@ public class ServletAuthenticator implements Authenticator {
 			if (cause.getMessage().toLowerCase().contains("invalid")
 					|| cause.getMessage().toLowerCase().contains("incorrect")
 					|| cause.getMessage().toLowerCase().contains("failed")) {
-				throw new InvalidCredentialsException(getBundle().getString("invalid-credentials"), cause);
+				throw new InvalidCredentialsException();
 			} else {
 				throw new AuthenticationException(getBundle().getString("authentication-failed"), cause);
 			}
@@ -34,5 +34,4 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
 has-permission-not-supported=N\u00E3o \u00E9 poss\u00EDvel utilizar @{0}, pois esta funcionalidade n\u00E3o \u00E9 suportada pelo JAAS.
-invalid-credentials=Usu\u00E1rio ou senha inv\u00E1lidos.
 authentication-failed=Falha no processo de autentica\u00E7\u00E3o.
	@@ -71,7 +71,7 @@ public class ServletAuthenticator implements Authenticator {		@@ -71,7 +71,7 @@ public class ServletAuthenticator implements Authenticator {
71	if (cause.getMessage().toLowerCase().contains("invalid")	71	if (cause.getMessage().toLowerCase().contains("invalid")
72	\|\| cause.getMessage().toLowerCase().contains("incorrect")	72	\|\| cause.getMessage().toLowerCase().contains("incorrect")
73	\|\| cause.getMessage().toLowerCase().contains("failed")) {	73	\|\| cause.getMessage().toLowerCase().contains("failed")) {
74	- throw new InvalidCredentialsException(getBundle().getString("invalid-credentials"), cause);	74	+ throw new InvalidCredentialsException();
75	} else {	75	} else {
76	throw new AuthenticationException(getBundle().getString("authentication-failed"), cause);	76	throw new AuthenticationException(getBundle().getString("authentication-failed"), cause);
77	}	77	}
	@@ -34,5 +34,4 @@		@@ -34,5 +34,4 @@
34	# 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.	34	# 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
35		35
36	has-permission-not-supported=N\u00E3o \u00E9 poss\u00EDvel utilizar @{0}, pois esta funcionalidade n\u00E3o \u00E9 suportada pelo JAAS.	36	has-permission-not-supported=N\u00E3o \u00E9 poss\u00EDvel utilizar @{0}, pois esta funcionalidade n\u00E3o \u00E9 suportada pelo JAAS.
37	-invalid-credentials=Usu\u00E1rio ou senha inv\u00E1lidos.
38	authentication-failed=Falha no processo de autentica\u00E7\u00E3o.	37	authentication-failed=Falha no processo de autentica\u00E7\u00E3o.