added fb auth type

SimplicityMobile · May 17, 2016 · abcad67 · abcad67
1 parent 376fbb1
commit abcad67
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/Simplicity/Helpers.swift b/Simplicity/Helpers.swift
@@ -20,8 +20,14 @@ class Helpers {
         return urlSchemes.flatMap({closure($0) ? $0 : nil})
     }
 
-    static func queryString(parts: [String: String]) -> String? {
-        return parts.map { $0 + "=" + $1 }.joinWithSeparator("&").stringByAddingPercentEncodingWithAllowedCharacters(NSCharacterSet.URLQueryAllowedCharacterSet())
+    static func queryString(parts: [String: String?]) -> String? {
+        return parts.flatMap { key, value -> String? in
+            if let value = value {
+                return key + "=" + value
+            } else {
+                return nil
+            }
+        }.joinWithSeparator("&").stringByAddingPercentEncodingWithAllowedCharacters(NSCharacterSet.URLQueryAllowedCharacterSet())
     }
 }
 

diff --git a/Simplicity/LoginProviders/Facebook.swift b/Simplicity/LoginProviders/Facebook.swift
@@ -15,7 +15,7 @@ public class Facebook: OAuth2LoginProvider {
     public var state = arc4random_uniform(10000000)
     public var clientId: String
     public var grantType: OAuth2GrantType = .Custom
-
+    public var authType: FacebookAuthType?
 
     public var authorizationURL: NSURL {
         // Auth_type is re-request since we need to ask for email scope again if
@@ -26,7 +26,7 @@ public class Facebook: OAuth2LoginProvider {
                      "redirect_uri": urlScheme + "://authorize",
                      "response_type": "token",
                      "scope": scopes.joinWithSeparator(" "),
-                     "auth_type": "rerequest",
+                     "auth_type": authType?.rawValue,
                      "state": String(state)]
 
         let queryString = Helpers.queryString(query)!
@@ -61,4 +61,9 @@ public class Facebook: OAuth2LoginProvider {
         self.urlScheme = urlScheme
         self.clientId = urlScheme.substringWithRange(range)
     }
+}
+
+public enum FacebookAuthType: String {
+    case Rerequest = "rerequest",
+    Reauthenticate = "reauthenticate"
 }