fix token encoding issue where expiretime was getting truncated

Author: aoberoi

build.gradle

@@ -9,7 +9,7 @@ archivesBaseName = 'opentok'
 // TODO: how do we increment this before/after a release for deployment and development?
 version = '2.2.0-pre'
 
-sourceCompatibility = 1.5
+sourceCompatibility = 1.6
 
 task javadocJar(type: Jar) {
     classifier = 'javadoc'

src/main/java/com/opentok/Session.java

@@ -124,8 +124,8 @@ public String generateToken(TokenOptions tokenOptions) throws OpenTokException {
             throw new InvalidArgumentException(
                     "Expire time must be in the next 30 days. too large by "+ (expireTime - (now + (60*60*24*30))));
         }
-        dataStringBuilder.append("&expire_time=");
-        dataStringBuilder.append(expireTime);
+        // NOTE: Double.toString() would print the value with scientific notation
+        dataStringBuilder.append(String.format("&expire_time=%.0f", expireTime));
 
         if (data != null) {
             if(data.length() > 1000) {
@@ -156,7 +156,13 @@ public String generateToken(TokenOptions tokenOptions) throws OpenTokException {
             innerBuilder.append(":");
             innerBuilder.append(dataStringBuilder.toString());
 
-            tokenStringBuilder.append(Base64.encodeBase64URLSafeString(innerBuilder.toString().getBytes("UTF-8")));
+            tokenStringBuilder.append(
+                    Base64.encodeBase64String(
+                            innerBuilder.toString().getBytes("UTF-8")
+                    )
+                    .replace("+", "-")
+                    .replace("/", "_")
+            );
 
         // if we only wanted Java 7 and above, we could DRY this into one catch clause
         } catch (SignatureException e) {

src/test/java/com/opentok/test/OpenTokTest.java

@@ -243,9 +243,9 @@ public void testTokenExpireTime() throws
         assertTrue(Helpers.verifyTokenSignature(oneHourToken, apiSecret));
 
         Map<String, String> defaultTokenData = Helpers.decodeToken(defaultToken);
-        assertEquals(Double.toString(inOneDay), defaultTokenData.get("expire_time"));
+        assertEquals(Long.toString(inOneDay), defaultTokenData.get("expire_time"));
         Map<String, String> oneHourTokenData = Helpers.decodeToken(oneHourToken);
-        assertEquals(Double.toString(inOneHour), oneHourTokenData.get("expire_time"));
+        assertEquals(Long.toString(inOneHour), oneHourTokenData.get("expire_time"));
         assertEquals(2, exceptions.size());
         for (Exception e : exceptions) {
             assertEquals(InvalidArgumentException.class, e.getClass());