[PP-694] Use token auth for annotations (#370)

* Update project.pbxproj

* Use token for annotations calls

* In progress token improvements

* Update project.pbxproj

* Update TPPAnnotations.swift

* Update NYPLNetworkExecutorMock.swift

* Clean up

* Resolve login failure when attempting to update tokens

* Update project.pbxproj

* Update project.pbxproj

* Update project.pbxproj

* Update NYPLNetworkExecutorMock.swift

Author: mauricecarrier7

Palace.xcodeproj/project.pbxproj

@@ -4782,7 +4782,7 @@
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 224;
+				CURRENT_PROJECT_VERSION = 225;
 				DEVELOPMENT_TEAM = 88CBA74T8K;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;
@@ -4840,7 +4840,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES_ERROR;
 				CODE_SIGN_ENTITLEMENTS = Palace/SimplyE.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 224;
+				CURRENT_PROJECT_VERSION = 225;
 				DEVELOPMENT_TEAM = 88CBA74T8K;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;
@@ -5024,7 +5024,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 224;
+				CURRENT_PROJECT_VERSION = 225;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;
@@ -5084,7 +5084,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES_ERROR;
 				CODE_SIGN_ENTITLEMENTS = Palace/SimplyE.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 224;
+				CURRENT_PROJECT_VERSION = 225;
 				DEVELOPMENT_TEAM = 88CBA74T8K;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;

Palace/Accounts/User/TPPUserAccount.swift

@@ -263,7 +263,7 @@ private enum StorageKey: String {
     let isTokenExpired = hasAuthToken() && authTokenHasExpired
     let isTokenAuthAndMissing = (authDefinition?.isToken ?? false) && !hasAuthToken()
 
-    return isTokenExpired || isTokenAuthAndMissing
+    return isSignedIn() && (isTokenExpired || isTokenAuthAndMissing)
   }
 
   func hasAdobeToken() -> Bool {

Palace/Network/TPPNetworkExecutor.swift

@@ -78,7 +78,7 @@ extension TPPNetworkExecutor: TPPRequestExecuting {
   /// the network or from the cache.
   /// - Returns: The task issueing the given request.
   @discardableResult
-  func executeRequest(_ req: URLRequest, completion: @escaping (_: NYPLResult<Data>) -> Void) -> URLSessionDataTask {
+  func executeRequest(_ req: URLRequest, completion: @escaping (_: NYPLResult<Data>) -> Void) -> URLSessionDataTask? {
     let userAccount = TPPUserAccount.sharedAccount()
 
     if let authDefinition = userAccount.authDefinition, authDefinition.isSaml {
@@ -87,13 +87,13 @@ extension TPPNetworkExecutor: TPPRequestExecuting {
 
     if userAccount.isTokenRefreshRequired() {
       handleTokenRefresh(for: req, completion: completion)
-      return URLSessionDataTask()
+      return nil
     }
 
     if req.hasRetried {
       let error = createErrorForRetryFailure()
       completion(NYPLResult.failure(error, nil))
-      return URLSessionDataTask()
+      return nil
     }
 
     return performDataTask(with: req, completion: completion)

Palace/Network/TPPRequestExecuting.swift

@@ -19,7 +19,7 @@ protocol TPPRequestExecuting {
   /// - Returns: The task issueing the given request.
   @discardableResult
   func executeRequest(_ req: URLRequest,
-                      completion: @escaping (_: NYPLResult<Data>) -> Void) -> URLSessionDataTask
+                      completion: @escaping (_: NYPLResult<Data>) -> Void) -> URLSessionDataTask?
 
   var requestTimeout: TimeInterval {get}
 

PalaceTests/Mocks/NYPLNetworkExecutorMock.swift

@@ -22,7 +22,7 @@ class TPPRequestExecutorMock: TPPRequestExecuting {
   }
 
   func executeRequest(_ req: URLRequest,
-                      completion: @escaping (NYPLResult<Data>) -> Void) -> URLSessionDataTask {
+                      completion: @escaping (NYPLResult<Data>) -> Void) -> URLSessionDataTask? {
 
     DispatchQueue.main.async {
       guard let url = req.url else {