fix: secure logic

fivesmallq · Apr 17, 2018 · 7656a7d · 7656a7d
1 parent d7c8ece
commit 7656a7d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -14,11 +14,11 @@ Add it to your ``dependencies.yml``
 ```yaml
 require:
     - play
-    - play1-base -> api 0.3.6
+    - play1-base -> api 0.3.7
 repositories:
     - play-api:
           type: http
-          artifact: http://pek3a.qingstor.com/playbase/play-api/api-0.3.6.zip
+          artifact: http://pek3a.qingstor.com/playbase/play-api/api-0.3.7.zip
           contains:
             - play1-base -> api
 ```

diff --git a/api/app/controllers/api/interceptor/Secure.java b/api/app/controllers/api/interceptor/Secure.java
@@ -44,10 +44,8 @@ static void checkAccess() {
                 token = header.value();
                 //header value with 'Bearer'
                 token = StringUtils.substringAfter(token, "Bearer").trim();
-            } else if (Boolean.parseBoolean(enableQueryStringAuth)) {
-                if (StringUtils.isNotBlank(authQuery)) {
-                    token = authQuery;
-                }
+            } else if (StringUtils.isNotBlank(authQuery) && Boolean.parseBoolean(enableQueryStringAuth)) {
+                token = authQuery;
             } else if (Boolean.parseBoolean(enableCookieAuth)) {
                 if (cookie != null && StringUtils.isNotEmpty(cookie.value)) {
                     token = cookie.value;

diff --git a/api/conf/dependencies.yml b/api/conf/dependencies.yml
@@ -1,4 +1,4 @@
-self: play -> api 0.3.6
+self: play -> api 0.3.7
 
 require:
     - play 1.4

diff --git a/demo/conf/dependencies.yml b/demo/conf/dependencies.yml
@@ -2,7 +2,7 @@
 
 require:
     - play
-    - play1-base -> api 0.3.6
+    - play1-base -> api 0.3.7
     - play1-base -> jongo 0.1
     - play-codeborne -> logger 2.1
 repositories: