GTNPORTAL-2458 Fix some bugs for GadgetTokenInfoService

gatein · Aug 22, 2012 · b53f821 · b53f821
1 parent 7203991
commit b53f821
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetToken.java b/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetToken.java
@@ -15,7 +15,7 @@ public GadgetToken(String accessToken, String tokenSecret, String sessionHandle,
 
    public boolean isExpired()
    {
-      return false;
+      return System.currentTimeMillis() > getExpirationTimeMillis();
    }
 
    public long getExpirationTimeMillis()

diff --git a/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenContainer.java b/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenContainer.java
@@ -37,14 +37,15 @@ public GadgetToken removeToken(BasicOAuthStoreTokenIndex tokenKey)
          BasicOAuthStoreTokenIndex key = tokenEntry.getKey();
          if (tokenKey.equals(key))
          {
+            GadgetToken token = tokenEntry.getToken();
             tokenEntry.remove();
-            return tokenEntry.getToken();
+            return token;
          }
       }
       return null;
    }
 
-   public GadgetToken saveToken(BasicOAuthStoreTokenIndex tokenKey, TokenInfo tokenInfo)
+   public GadgetToken saveToken(BasicOAuthStoreTokenIndex tokenKey, TokenInfo tokenInfo, long expirationTime)
    {
       Map<String, GadgetTokenEntry> tokens = getGadgetTokens();
       GadgetTokenEntry entry = null;
@@ -70,7 +71,7 @@ public GadgetToken saveToken(BasicOAuthStoreTokenIndex tokenKey, TokenInfo token
       entry.setAccessToken(tokenInfo.getAccessToken());
       entry.setTokenSecret(tokenInfo.getTokenSecret());
       entry.setSessionHandle(tokenInfo.getSessionHandle() == null ? "" : tokenInfo.getSessionHandle());
-      entry.setTokenExpireMillis(tokenInfo.getTokenExpireMillis());
+      entry.setTokenExpireMillis(expirationTime);
       return entry.getToken();
    }
 }
diff --git a/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenEntry.java b/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenEntry.java
@@ -70,6 +70,6 @@ public BasicOAuthStoreTokenIndex getKey()
 
    public GadgetToken getToken()
    {
-      return new GadgetToken(getAccessToken(), getTokenSecret(), getServiceName(), getTokenExpireMillis());
+      return new GadgetToken(getAccessToken(), getTokenSecret(), getSessionHandle(), getTokenExpireMillis());
    }
 }
diff --git a/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenInfoService.java b/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenInfoService.java
@@ -30,7 +30,9 @@
 import org.exoplatform.web.security.security.AbstractTokenService;
 import org.gatein.wci.security.Credentials;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 public class GadgetTokenInfoService extends AbstractTokenService<GadgetToken, BasicOAuthStoreTokenIndex>
 {
@@ -51,7 +53,8 @@ public GadgetToken createToken(final BasicOAuthStoreTokenIndex key, final TokenI
          protected GadgetToken execute()
          {
             GadgetTokenContainer container = getGadgetTokenContainer();
-            return container.saveToken(key, tokenInfo);
+            long expirationTimeMillis = System.currentTimeMillis() + validityMillis;
+            return container.saveToken(key, tokenInfo, expirationTimeMillis);
          }
       }.executeWith(chromatticLifeCycle);
    }
@@ -91,13 +94,13 @@ public BasicOAuthStoreTokenIndex[] getAllTokens()
          protected BasicOAuthStoreTokenIndex[] execute()
          {
             GadgetTokenContainer container = getGadgetTokenContainer();
-            Collection<GadgetTokenEntry> tokens = container.getGadgetTokens().values();
-            BasicOAuthStoreTokenIndex[] gadgetTokens = new BasicOAuthStoreTokenIndex[9];
-            int count = 0;
-            for(GadgetTokenEntry tokenEntry : tokens) {
-               gadgetTokens[count++] = tokenEntry.getKey();
+            Collection<GadgetTokenEntry> tokenEntries = container.getGadgetTokens().values();
+            List<BasicOAuthStoreTokenIndex> tokenHolder = new ArrayList<BasicOAuthStoreTokenIndex>();
+            for (GadgetTokenEntry tokenEntry : tokenEntries)
+            {
+               tokenHolder.add(tokenEntry.getKey());
             }
-            return gadgetTokens;
+            return tokenHolder.toArray(new BasicOAuthStoreTokenIndex[tokenHolder.size()]);
          }
       }.executeWith(chromatticLifeCycle);
    }