Merge branch 'develop'

Author: william26

Dist/OAuthiOS.framework/Versions/A/OAuthiOS

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "OAuth.io"
-  s.version      = "1.2.0"
+  s.version      = "1.2.1"
   s.summary      = "OAuth that just works!"
 
   s.description  = <<-DESC
@@ -71,7 +71,7 @@ Pod::Spec.new do |s|
   #  Supports git, hg, bzr, svn and HTTP.
   #
 
-  s.source       = { :git => "https://github.com/oauth-io/oauth-ios.git", :tag => "1.2.0" }
+  s.source       = { :git => "https://github.com/oauth-io/oauth-ios.git", :tag => "1.2.1" }
 
 
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

OAuth.io.podspec

@@ -12,7 +12,7 @@
 		<key>OAuthiOS.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

OAuthiOS.xcodeproj/xcuserdata/antoine.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -351,8 +351,17 @@ - (void)showWithProvider:(NSString *)provider options:(NSDictionary*)options
             NSDictionary *json_d = [NSJSONSerialization JSONObjectWithData:[json dataUsingEncoding:NSUTF8StringEncoding] options: NSJSONReadingMutableContainers error:nil];
             NSNumber *expires = [[json_d objectForKey:@"data"] objectForKey:@"expires"];
             NSTimeInterval interval = [expires doubleValue];
-            NSDate *expiring_date = [[NSDate alloc] initWithTimeIntervalSince1970:interval];
             NSDate *now = [[NSDate alloc] init];
+            NSDate *expiring_date;
+            
+            if (expires != nil) {
+                expiring_date = [[NSDate alloc] initWithTimeIntervalSince1970:interval];
+            } else {
+                // If no expiry date is available, defaults to one hour
+                interval = 3600;
+                expiring_date = [[NSDate alloc] initWithTimeIntervalSinceNow:interval];
+            }
+
             if ([now compare:expiring_date] == NSOrderedAscending)
             {
                 @try {