Created a BeamRequestDelegate to handle other JWT sources

mixer · Dec 14, 2016 · 64367f7 · 64367f7
1 parent e42b02c
commit 64367f7
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 8 deletions.
diff --git a/BeamAPI.podspec b/BeamAPI.podspec
@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name       = "BeamAPI"
-  s.version    = "1.4.3"
+  s.version    = "1.4.4"
   s.summary    = "An interface to communicate with Beam's backend."
   s.homepage   = "https://github.com/WatchBeam/beam-client-swift"
   s.license    = "MIT"
   s.author     = { "Jack Cook" => "jack@beam.pro" }
 
   s.requires_arc           = true
   s.ios.deployment_target  = "8.2"
-  s.source                 = { :git => "https://github.com/WatchBeam/beam-client-swift.git", :tag => "1.4.3" }
+  s.source                 = { :git => "https://github.com/WatchBeam/beam-client-swift.git", :tag => "1.4.4" }
   s.source_files           = "Pod/Classes/**/*"
 
   s.dependency "Starscream", "~> 2.0"

diff --git a/Pod/Classes/Utilities/BeamRequest.swift b/Pod/Classes/Utilities/BeamRequest.swift
@@ -12,6 +12,9 @@ import SwiftyJSON
 /// The most low-level class used to make requests to the Beam servers.
 public class BeamRequest {
 
+    /// A delegate for the BeamRequest class.
+    public static var delegate: BeamRequestDelegate?
+
     /// The version of the app, to be used in request user agents.
     public static var version = 0.1
 
@@ -185,13 +188,22 @@ public class BeamRequest {
                     }
                 case 401:
                     if json["message"] == "Invalid token" {
-                        BeamClient.sharedClient.jwt.generateJWTGrant { (error) in
-                            guard error == nil else {
-                                completion?(data, .invalidCredentials)
-                                return
+                        if UserDefaults.standard.object(forKey: "Cookies") != nil {
+                            BeamClient.sharedClient.jwt.generateJWTGrant { (error) in
+                                guard error == nil else {
+                                    completion?(data, .invalidCredentials)
+                                    return
+                                }
+
+                                dataRequest(baseURL, requestType: requestType, headers: headers, params: params, body: body, options: options, completion: completion)
+                            }
+                        } else {
+                            delegate?.requestNewJWT { token in
+                                if token != nil {
+                                    UserDefaults.standard.set(token, forKey: "JWT")
+                                    dataRequest(baseURL, requestType: requestType, headers: headers, params: params, body: body, options: options, completion: completion)
+                                }
                             }
-
-                            dataRequest(baseURL, requestType: requestType, headers: headers, params: params, body: body, options: options, completion: completion)
                         }
                     } else {
                         requestError = .invalidCredentials

diff --git a/Pod/Classes/Utilities/BeamRequestDelegate.swift b/Pod/Classes/Utilities/BeamRequestDelegate.swift
@@ -0,0 +1,14 @@
+//
+//  BeamRequestDelegate.swift
+//  Pods
+//
+//  Created by Jack Cook on 14/12/2016.
+//
+//
+
+/// A delegate that allows clients to provide details to the BeamRequest class.
+public protocol BeamRequestDelegate: class {
+
+    /// Provides the API client with a new JWT token to use in the event that one is needed.
+    func requestNewJWT(completion: (_ jwt: String?) -> Void)
+}