blame | history | patch | commit | commitdiff
Roberto Sánchez
2014-09-19 8d5386be38db25a2a41c3bf6c876adee21ca26cc 
 securis/src/main/java/net/curisit/securis/services/BasicServices.java
....@@ -36,90 +36,87 @@
3636 @Singleton
3737 public class BasicServices {
3838 
39
-	private static final Logger LOG = LogManager.getLogger(BasicServices.class);
39
+    private static final Logger LOG = LogManager.getLogger(BasicServices.class);
4040 
41
-	@Inject
42
-	TokenHelper tokenHelper;
41
+    @Inject
42
+    TokenHelper tokenHelper;
4343 
44
-	@Inject
45
-	public BasicServices() {
46
-	}
44
+    @Inject
45
+    public BasicServices() {}
4746 
48
-	@GET
49
-	@Path("/info")
50
-	@Produces(
51
-		{ MediaType.TEXT_PLAIN })
52
-	public Response info(@Context HttpServletRequest request) {
53
-		return Response.ok().entity("License server running OK. Date: " + new Date()).build();
54
-	}
47
+    @GET
48
+    @Path("/info")
49
+    @Produces({ MediaType.TEXT_PLAIN })
50
+    public Response info(@Context HttpServletRequest request) {
51
+        return Response.ok().entity("License server running OK. Date: " + new Date()).build();
52
+    }
5553 
56
-	@GET
57
-	@Path("/{module:(admin)|(login)|(licenses)}")
58
-	@Produces(
59
-		{ MediaType.TEXT_HTML })
60
-	public Response init(@PathParam("module") String module, @Context HttpServletRequest request) {
61
-		LOG.info("App index main.html");
62
-		String page = "/main.html";
63
-		URI uri = UriBuilder.fromUri(page).build();
64
-		return Response.seeOther(uri).build();
65
-	}
54
+    @GET
55
+    @Path("/{module:(admin)|(login)|(licenses)}")
56
+    @Produces({ MediaType.TEXT_HTML })
57
+    public Response init(@PathParam("module") String module, @Context HttpServletRequest request) {
58
+        LOG.info("App index main.html");
59
+        String page = "/main.html";
60
+        URI uri = UriBuilder.fromUri(page).build();
61
+        return Response.seeOther(uri).build();
62
+    }
6663 
67
-	@POST
68
-	@Path("/login")
69
-	@Produces(
70
-		{ MediaType.APPLICATION_JSON })
71
-	public Response login(@FormParam("username") String user, @FormParam("password") String password, @Context HttpServletRequest request) {
72
-		LOG.info("index session: " + request.getSession());
73
-		LOG.info("user: {}, pass: {}", user, password);
74
-		LOG.info("is user in role: {} == {} ? ", "advance", request.isUserInRole("advance"));
64
+    @POST
65
+    @Path("/login")
66
+    @Produces({ MediaType.APPLICATION_JSON })
67
+    public Response login(@FormParam("username") String user, @FormParam("password") String password, @Context HttpServletRequest request) {
68
+        LOG.info("index session: " + request.getSession());
69
+        LOG.info("user: {}, pass: {}", user, password);
70
+        LOG.info("is user in role: {} == {} ? ", "advance", request.isUserInRole("advance"));
7571 
76
-		if ("no".equals(password))
77
-			return Response.status(Status.UNAUTHORIZED).build();
78
-		String tokenAuth = tokenHelper.generateToken(user);
79
-		return Response.ok(Utils.createMap("success", true, "token", tokenAuth)).build();
80
-	}
72
+        if ("no".equals(password)) {
73
+            // TODO: Code to text exception handling
74
+            return Response.status(Status.UNAUTHORIZED).build();
75
+        }
76
+        String tokenAuth = tokenHelper.generateToken(user);
77
+        return Response.ok(Utils.createMap("success", true, "token", tokenAuth)).build();
78
+    }
8179 
82
-	/**
83
-	 * Check if current token is valid
84
-	 * 
85
-	 * @param user
86
-	 * @param password
87
-	 * @param request
88
-	 * @return
89
-	 */
90
-	@GET
91
-	@Securable()
92
-	@Path("/check")
93
-	@Produces(
94
-		{ MediaType.APPLICATION_JSON })
95
-	public Response check(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token, @QueryParam("token") String token2) {
96
-		if (token == null)
97
-			token = token2;
98
-		if (token == null)
99
-			return Response.status(Status.FORBIDDEN).build();
100
-		boolean valid = tokenHelper.isTokenValid(token);
101
-		if (!valid)
102
-			return Response.status(Status.UNAUTHORIZED).build();
80
+    /**
81
+     * Check if current token is valid
82
+     * 
83
+     * @param user
84
+     * @param password
85
+     * @param request
86
+     * @return
87
+     */
88
+    @GET
89
+    @Securable()
90
+    @Path("/check")
91
+    @Produces({ MediaType.APPLICATION_JSON })
92
+    public Response check(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token, @QueryParam("token") String token2) {
93
+        if (token == null) {
94
+            token = token2;
95
+        }
96
+        if (token == null) {
97
+            return Response.status(Status.FORBIDDEN).build();
98
+        }
99
+        boolean valid = tokenHelper.isTokenValid(token);
100
+        if (!valid) {
101
+            return Response.status(Status.UNAUTHORIZED).build();
102
+        }
103103 
104
-		// LOG.info("Token : " + token);
105
-		String user = tokenHelper.extractUserFromToken(token);
106
-		// LOG.info("Token user: " + user);
107
-		Date date = tokenHelper.extractDateCreationFromToken(token);
108
-		// LOG.info("Token date: " + date);
104
+        String user = tokenHelper.extractUserFromToken(token);
105
+        Date date = tokenHelper.extractDateCreationFromToken(token);
109106 
110
-		return Response.ok(Utils.createMap("valid", true, "user", user, "date", date)).build();
111
-	}
107
+        return Response.ok(Utils.createMap("valid", true, "user", user, "date", date)).build();
108
+    }
112109 
113
-	@GET
114
-	@POST
115
-	@Path("/logout")
116
-	@Produces(
117
-		{ MediaType.APPLICATION_JSON })
118
-	public Response logout(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
119
-		if (token == null)
120
-			Response.status(Status.BAD_REQUEST).build();
121
-		String user = tokenHelper.extractUserFromToken(token);
122
-		LOG.info("User {} has logged out", user);
123
-		return Response.ok().build();
124
-	}
110
+    @GET
111
+    @POST
112
+    @Path("/logout")
113
+    @Produces({ MediaType.APPLICATION_JSON })
114
+    public Response logout(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
115
+        if (token == null) {
116
+            Response.status(Status.BAD_REQUEST).build();
117
+        }
118
+        String user = tokenHelper.extractUserFromToken(token);
119
+        LOG.info("User {} has logged out", user);
120
+        return Response.ok().build();
121
+    }
125122 }