updated labels

SimplicityMobile · May 17, 2016 · f4909be · f4909be
1 parent cb0330e
commit f4909be
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Simplicity/LoginProviders/Facebook.swift b/Simplicity/LoginProviders/Facebook.swift
@@ -44,11 +44,11 @@ public class Facebook: OAuth2LoginProvider {
 
         // Get the access token, and check that the state is the same
         guard let accessToken = url.fragmentDictionary["access_token"] where url.fragmentDictionary["state"] == "\(state)" else {
-            callback?(authToken: nil, error: nil)
+            callback?(accessToken: nil, error: nil)
             return
         }
 
-        callback?(authToken: accessToken, error: nil)
+        callback?(accessToken: accessToken, error: nil)
     }
 
     public init() {

diff --git a/Simplicity/OAuth2LoginProvider.swift b/Simplicity/OAuth2LoginProvider.swift
@@ -25,6 +25,8 @@ public extension OAuth2Scopes {
     }
 }
 
-public enum OAuth2GrantType {
-    case AuthorizationCode, Implicit, Custom
+public enum OAuth2GrantType: String {
+    case AuthorizationCode = "authorization_code",
+    Implicit = "implicit",
+    Custom = ""
 }
diff --git a/Simplicity/Simplicity.swift b/Simplicity/Simplicity.swift
@@ -9,7 +9,7 @@
 import UIKit
 import SafariServices
 
-public typealias ExternalLoginCallback = (authToken: String?, error: NSError?) -> Void
+public typealias ExternalLoginCallback = (accessToken: String?, error: NSError?) -> Void
 
 public class Simplicity: NSObject {
     static var currentLoginProvider: LoginProvider?