Merge pull request #98 from TAMULib/2.x-referer-query-param

use URIBuilder to preserve query params during redirect with addition…
TAMULib · Jan 9, 2019 · 2da6a7d · 2da6a7d
2 parents 6cd9c55 + f16d7ce
commit 2da6a7d
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 28 deletions.
diff --git a/auth/pom.xml b/auth/pom.xml
@@ -12,33 +12,33 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+    <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
   </parent>
 
   <dependencies>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>core</artifactId>
-      <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+      <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>user</artifactId>
-      <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+      <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>token</artifactId>
-      <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+      <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>email</artifactId>
-      <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+      <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
     </dependency>
 
     <dependency>

diff --git a/core/pom.xml b/core/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+    <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/data/pom.xml b/data/pom.xml
@@ -12,15 +12,15 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+    <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
   </parent>
 
   <dependencies>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>core</artifactId>
-      <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+      <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
     </dependency>
 
     <dependency>

diff --git a/email/pom.xml b/email/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+    <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
   <artifactId>webservice-parent</artifactId>
 
-  <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+  <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
 
   <name>Weaver Webservice Parent</name>
 

diff --git a/reporting/pom.xml b/reporting/pom.xml
@@ -12,21 +12,21 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+    <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
   </parent>
 
   <dependencies>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>core</artifactId>
-      <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+      <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>email</artifactId>
-      <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+      <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
     </dependency>
 
     <dependency>

diff --git a/token-provider/pom.xml b/token-provider/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
@@ -12,7 +13,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+    <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -25,13 +26,18 @@
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>token</artifactId>
-      <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+      <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>core</artifactId>
-      <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+      <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
     </dependency>
 
   </dependencies>

diff --git a/token-provider/src/main/java/edu/tamu/weaver/token/provider/controller/TokenController.java b/token-provider/src/main/java/edu/tamu/weaver/token/provider/controller/TokenController.java
@@ -2,6 +2,7 @@
 
 import static edu.tamu.weaver.response.ApiStatus.SUCCESS;
 
+import java.net.URISyntaxException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.Map;
@@ -10,6 +11,7 @@
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
 
+import org.apache.http.client.utils.URIBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,16 +34,20 @@ public class TokenController {
     protected TokenService tokenService;
 
     @RequestMapping("/token")
-    public RedirectView token(@RequestParam Map<String, String> params, @RequestHeader Map<String, String> headers) throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException {
+    public RedirectView token(@RequestParam Map<String, String> params, @RequestHeader Map<String, String> headers) throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException, URISyntaxException {
         LOG.debug("params: " + params);
         String referer = params.get("referer");
         if (referer == null) {
-            LOG.debug("No referer in params!!");
+            LOG.error("No referer in params!!");
             throw new RuntimeException("No referer in params!!");
         }
+        URIBuilder builder = new URIBuilder(referer);
+        builder.addParameter("jwt", tokenService.craftToken(headers));
+        String url = builder.build().toASCIIString();
+        LOG.debug(String.format("Auth url redirect: %s", url));
         RedirectView redirect = new RedirectView();
         redirect.setContextRelative(false);
-        redirect.setUrl(referer + "?jwt=" + tokenService.craftToken(headers));
+        redirect.setUrl(url);
         return redirect;
     }
 

diff --git a/token/pom.xml b/token/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+    <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/user/pom.xml b/user/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+    <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -21,13 +21,13 @@
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>data</artifactId>
-      <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+      <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>validation</artifactId>
-      <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+      <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

diff --git a/validation/pom.xml b/validation/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+    <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>data</artifactId>
-      <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+      <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
     </dependency>
 
     <dependency>

diff --git a/wro/pom.xml b/wro/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+    <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>data</artifactId>
-      <version>2.0.0-WRO-UPDATES-SNAPSHOT</version>
+      <version>2.0.0-AUTH-REDIRECT-QUERY-SNAPSHOT</version>
     </dependency>
 
     <dependency>