Fix: ARTDefault.ttl in seconds

ably · Jan 16, 2016 · 1e330a7 · 1e330a7
1 parent 0e003cd
commit 1e330a7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/ably-ios/ARTAuthTokenParams.m b/ably-ios/ARTAuthTokenParams.m
@@ -20,8 +20,8 @@ @implementation ARTAuthTokenParams
 
 - (instancetype)init {
     if (self = [super init]) {
-        _ttl = [ARTDefault ttl] * 60; //seconds
         _timestamp = [NSDate date];
+        _ttl = [ARTDefault ttl];
         _capability = @"{\"*\":[\"*\"]}"; // allow all
         _clientId = nil;
     }

diff --git a/ably-ios/ARTDefault.h b/ably-ios/ARTDefault.h
@@ -16,9 +16,9 @@
 + (int)TLSPort;
 
 /**
- Default in minutes of requested time to live for the token.
+ Default in seconds of requested time to live for the token.
  */
-+ (double)ttl;
++ (NSTimeInterval)ttl;
 
 + (NSTimeInterval)connectTimeout; //Realtime
 

diff --git a/ably-ios/ARTDefault.m b/ably-ios/ARTDefault.m
@@ -29,8 +29,8 @@ + (int)TLSPort {
     return 443;
 }
 
-+ (double)ttl {
-    return 60.0; //minutes
++ (NSTimeInterval)ttl {
+    return 60 * 60;
 }
 
 + (NSTimeInterval)connectTimeout {

diff --git a/ablySpec/Auth.swift b/ablySpec/Auth.swift
@@ -742,11 +742,11 @@ class Auth : QuickSpec {
 
                 rest.auth.createTokenRequest(nil, options: nil, callback: { tokenRequest, error in
                     //In Seconds because TTL property is a NSTimeInterval but further it does the conversion to milliseconds
-                    expect(tokenRequest?.ttl).to(equal(ARTDefault.ttl() * 60.0))
+                    expect(tokenRequest?.ttl).to(equal(ARTDefault.ttl()))
                 })
 
                 let tokenParams = ARTAuthTokenParams()
-                expect(tokenParams.ttl).to(equal(ARTDefault.ttl() * 60.0))
+                expect(tokenParams.ttl).to(equal(ARTDefault.ttl()))
 
                 let expectedTtl = 10.0
                 tokenParams.ttl = expectedTtl