From 6d04b0ae0f4eeb9f0963b1595d0f2e7469fa5f3f Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Thu, 26 Dec 2013 14:53:29 +0000
Subject: [PATCH] #333 feature - Added schema and JPA entities

---
 securis/src/main/java/net/curisit/securis/services/UserResource.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/securis/src/main/java/net/curisit/securis/services/UserResource.java b/securis/src/main/java/net/curisit/securis/services/UserResource.java
index 603dd16..8048e89 100644
--- a/securis/src/main/java/net/curisit/securis/services/UserResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/UserResource.java
@@ -1,6 +1,6 @@
 package net.curisit.securis.services;
 
-import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
@@ -14,6 +14,7 @@
 import javax.ws.rs.core.Response.Status;
 
 import net.curisit.integrity.commons.Utils;
+import net.curisit.securis.utils.TokenHelper;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,6 +26,9 @@
  */
 @Path("/user")
 public class UserResource {
+
+	@Inject
+	TokenHelper tokenHelper;
 
 	// private LicenseHelper licenseHelper = InjectorFactory.getInjector().getInstance(LicenseHelper.class);
 	private static final Logger log = LoggerFactory.getLogger(UserResource.class);
@@ -56,7 +60,8 @@
 		request.getSession().setAttribute("username", user);
 		if ("no".equals(password))
 			return Response.status(Status.FORBIDDEN).build();
-		return Response.ok(Utils.createMap("name", "Pepito", "username", user)).build();
+		String tokenAuth = tokenHelper.generateToken(user);
+		return Response.ok(Utils.createMap("success", true, "token", tokenAuth)).build();
 	}
 
 	/**
@@ -66,7 +71,7 @@
 	@Path("/{username}")
 	@Produces(
 		{ MediaType.APPLICATION_JSON })
-	@RolesAllowed("advance")
+	// @RolesAllowed("advance")
 	public Response main(@PathParam("username") String username) {
 		return Response.ok().entity(Utils.createMap("name", "Pepito", "username", username)).build();
 	}

--
Gitblit v1.3.2