svn commit: r1574048 - /wookie/trunk/wookie-server/src/main/java/org/apache/wookie/controller/Controller.java

[scottbw]

Author: scottbw
Date: Tue Mar  4 11:53:54 2014
New Revision: 1574048

URL: http://svn.apache.org/r1574048
Log:
Replaced calls to decryptAuthToken with calls to validateAuthToken. The 
difference is that the validate method also checks expiry times on tokens. The 
call decrpytAuthToken will be made private to avoid this problem in future. 
Also use new convenience constructor for a standard-lifespan token

Modified:
    
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/controller/Controller.java

Modified: 
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/controller/Controller.java
URL: 
http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/main/java/org/apache/wookie/controller/Controller.java?rev=1574048&r1=1574047&r2=1574048&view=diff
==============================================================================
--- 
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/controller/Controller.java
 (original)
+++ 
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/controller/Controller.java
 Tue Mar  4 11:53:54 2014
@@ -419,7 +419,7 @@ public abstract class Controller extends
                
                if (idkey != null && !idkey.trim().equals("")){
                try {
-                       authToken = AuthTokenUtils.decryptAuthToken(idkey);
+                       authToken = AuthTokenUtils.validateAuthToken(idkey);
                        return authToken;
                } catch (InvalidAuthTokenException e) {
                        return null;
@@ -432,7 +432,7 @@ public abstract class Controller extends
                idkey = getResourceId(request);
                if (idkey != null && !idkey.trim().equals("")){
                        try {
-                               authToken = 
AuthTokenUtils.decryptAuthToken(idkey);
+                               authToken = 
AuthTokenUtils.validateAuthToken(idkey);
                                return authToken;
                        } catch (InvalidAuthTokenException e) {
                                //
@@ -483,7 +483,7 @@ public abstract class Controller extends
             }
             
             
-            authToken = new AuthToken();
+            authToken = AuthToken.STANDARD_LIFESPAN_TOKEN();
             authToken.setApiKey(ApiKeys.getInstance().getApiKey(apiKey));
             authToken.setContextId(contextId);
             authToken.setLang(lang);