From 2762277c60db7df5ad3214b10a0dd93d4f2f1128 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Fri, 10 Mar 2017 08:53:44 +0000
Subject: [PATCH] #3527 feature - Added more features to angular2 version
---
securis/src/main/java/net/curisit/securis/services/BasicServices.java | 167 ++++++++++++++++++++++++++++---------------------------
1 files changed, 85 insertions(+), 82 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/BasicServices.java b/securis/src/main/java/net/curisit/securis/services/BasicServices.java
index d1bba29..43289df 100644
--- a/securis/src/main/java/net/curisit/securis/services/BasicServices.java
+++ b/securis/src/main/java/net/curisit/securis/services/BasicServices.java
@@ -2,6 +2,8 @@
import java.net.URI;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
@@ -20,13 +22,13 @@
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.UriBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
import net.curisit.integrity.commons.Utils;
import net.curisit.securis.ioc.EnsureTransaction;
import net.curisit.securis.security.Securable;
import net.curisit.securis.utils.TokenHelper;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
/**
* Basic services for login and basic app wrkflow
@@ -37,93 +39,94 @@
@ApplicationScoped
public class BasicServices {
- private static final Logger LOG = LogManager.getLogger(BasicServices.class);
+ private static final Logger LOG = LogManager.getLogger(BasicServices.class);
- @Inject
- TokenHelper tokenHelper;
+ @Inject
+ TokenHelper tokenHelper;
- @Inject
- public BasicServices() {
- }
+ @Inject
+ public BasicServices() {
+ }
- @GET
- @Path("/info")
- @Produces({
- MediaType.TEXT_PLAIN
- })
- public Response info(@Context HttpServletRequest request) {
- return Response.ok().entity("License server running OK. Date: " + new Date()).build();
- }
+ @GET
+ @Path("/info")
+ @Produces({ MediaType.TEXT_PLAIN })
+ public Response info(@Context HttpServletRequest request) {
+ return Response.ok().entity("License server running OK. Date: " + new Date()).build();
+ }
- @GET
- @Path("/{module:(admin)|(login)|(licenses)}")
- @Produces({
- MediaType.TEXT_HTML
- })
- public Response init(@PathParam("module") String module, @Context HttpServletRequest request) {
- LOG.info("App index main.html");
- String page = "/index.jsp";
- URI uri = UriBuilder.fromUri(page).build();
- return Response.seeOther(uri).build();
- }
+ @GET
+ @Path("/version")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public Map<String, String> version(@Context HttpServletRequest request) {
+ Map<String, String> resp = new HashMap<>();
+ // TODO: Get the real version
+ String version = "2.0.0";
+ resp.put("version", version);
+ return resp;
+ }
- @POST
- @Path("/login")
- @Produces({
- MediaType.APPLICATION_JSON
- })
- public Response login(@FormParam("username") String user, @FormParam("password") String password, @Context HttpServletRequest request) {
- LOG.info("is user in role: {} == {} ? ", "advance", request.isUserInRole("advance"));
+ @GET
+ @Path("/{module:(admin)|(login)|(licenses)}")
+ @Produces({ MediaType.TEXT_HTML })
+ public Response init(@PathParam("module") String module, @Context HttpServletRequest request) {
+ LOG.info("App index main.html");
+ String page = "/index.jsp";
+ URI uri = UriBuilder.fromUri(page).build();
+ return Response.seeOther(uri).build();
+ }
- String tokenAuth = tokenHelper.generateToken(user);
- return Response.ok(Utils.createMap("success", true, "token", tokenAuth)).build();
- }
+ @POST
+ @Path("/login")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public Response login(@FormParam("username") String user, @FormParam("password") String password, @Context HttpServletRequest request) {
+ LOG.info("is user in role: {} == {} ? ", "advance", request.isUserInRole("advance"));
- /**
- * Check if current token is valid
- *
- * @param user
- * @param password
- * @param request
- * @return
- */
- @GET
- @Securable()
- @Path("/check")
- @Produces({
- MediaType.APPLICATION_JSON
- })
- @EnsureTransaction
- public Response check(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token, @QueryParam("token") String token2) {
- if (token == null) {
- token = token2;
- }
- if (token == null) {
- return Response.status(Status.FORBIDDEN).build();
- }
- boolean valid = tokenHelper.isTokenValid(token);
- if (!valid) {
- return Response.status(Status.UNAUTHORIZED).build();
- }
+ String tokenAuth = tokenHelper.generateToken(user);
+ return Response.ok(Utils.createMap("success", true, "token", tokenAuth)).build();
+ }
- String user = tokenHelper.extractUserFromToken(token);
- Date date = tokenHelper.extractDateCreationFromToken(token);
+ /**
+ * Check if current token is valid
+ *
+ * @param user
+ * @param password
+ * @param request
+ * @return
+ */
+ @GET
+ @Securable()
+ @Path("/check")
+ @Produces({ MediaType.APPLICATION_JSON })
+ @EnsureTransaction
+ public Response check(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token, @QueryParam("token") String token2) {
+ if (token == null) {
+ token = token2;
+ }
+ if (token == null) {
+ return Response.status(Status.FORBIDDEN).build();
+ }
+ boolean valid = tokenHelper.isTokenValid(token);
+ if (!valid) {
+ return Response.status(Status.UNAUTHORIZED).build();
+ }
- return Response.ok(Utils.createMap("valid", true, "user", user, "date", date)).build();
- }
+ String user = tokenHelper.extractUserFromToken(token);
+ Date date = tokenHelper.extractDateCreationFromToken(token);
- @GET
- @POST
- @Path("/logout")
- @Produces({
- MediaType.APPLICATION_JSON
- })
- public Response logout(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
- if (token == null) {
- Response.status(Status.BAD_REQUEST).build();
- }
- String user = tokenHelper.extractUserFromToken(token);
- LOG.info("User {} has logged out", user);
- return Response.ok().build();
- }
+ return Response.ok(Utils.createMap("valid", true, "user", user, "date", date)).build();
+ }
+
+ @GET
+ @POST
+ @Path("/logout")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public Response logout(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
+ if (token == null) {
+ Response.status(Status.BAD_REQUEST).build();
+ }
+ String user = tokenHelper.extractUserFromToken(token);
+ LOG.info("User {} has logged out", user);
+ return Response.ok().build();
+ }
}
--
Gitblit v1.3.2