fix: Fix downscope token to use retrieveToken method for token retrieval (box/box-codegen#731)

.codegen.json

@@ -1 +1 @@
-{ "engineHash": "c6650a9", "specHash": "a8825be", "version": "0.6.1" }
+{ "engineHash": "20cb559", "specHash": "a8825be", "version": "0.6.1" }

Sources/Box/CcgAuth/BoxCCGAuth.swift

@@ -93,7 +93,7 @@ public class BoxCCGAuth: Authentication {
     /// - Returns: The `AccessToken`.
     /// - Throws: The `GeneralError`.
     public func downscopeToken(scopes: [String], resource: String? = nil, sharedLink: String? = nil, networkSession: NetworkSession? = nil) async throws -> AccessToken {
-        let token: AccessToken? = try await self.tokenStorage.get()
+        let token: AccessToken? = try await self.retrieveToken(networkSession: networkSession)
         if token == nil {
             throw BoxSDKError(message: "No access token is available. Make an API call to retrieve a token before calling this method.")
         }

Sources/Box/DeveloperTokenAuth/BoxDeveloperTokenAuth.swift

@@ -76,7 +76,7 @@ public class BoxDeveloperTokenAuth: Authentication {
     /// - Returns: The `AccessToken`.
     /// - Throws: The `GeneralError`.
     public func downscopeToken(scopes: [String], resource: String? = nil, sharedLink: String? = nil, networkSession: NetworkSession? = nil) async throws -> AccessToken {
-        let token: AccessToken? = try await self.tokenStorage.get()
+        let token: AccessToken? = try await self.retrieveToken(networkSession: networkSession)
         if token == nil || token!.accessToken == nil {
             throw BoxSDKError(message: "No access token is available.")
         }

Sources/Box/Oauth/BoxOAuth.swift

@@ -101,7 +101,7 @@ public class BoxOAuth: Authentication {
     /// - Returns: The `AccessToken`.
     /// - Throws: The `GeneralError`.
     public func downscopeToken(scopes: [String], resource: String? = nil, sharedLink: String? = nil, networkSession: NetworkSession? = nil) async throws -> AccessToken {
-        let token: AccessToken? = try await self.tokenStorage.get()
+        let token: AccessToken? = try await self.retrieveToken(networkSession: networkSession)
         if token == nil || token!.accessToken == nil {
             throw BoxSDKError(message: "No access token is available.")
         }

Sources/Internal/Utils.swift

@@ -87,6 +87,14 @@ public enum Utils {
         ///   - value: An instance of any type.
         /// - Returns: A string representation of the provided parameter, or nil when this is not possible.
         public static func toString(value: Any?) -> String? {
+            if let date = value as? Date {
+                if Utils.Dates.isDateOnly(date) {
+                    return Utils.Dates.dateToString(date: date)
+                } else {
+                    return Utils.Dates.dateTimeToString(dateTime: date)
+                }
+            }
+
             if let parameterConvertible = value as? ParameterConvertible {
                 return parameterConvertible.paramValue
             } else if let encodable = value as? Encodable {
@@ -170,6 +178,21 @@ public enum Utils {
         public static func  dateToString(date: Date) -> String {
             dateFormatter.string(from: date)
         }
+
+        /// Checks if the date is in date only format
+        /// - Parameters:
+        ///   - date: Date
+        /// - Returns: True if the date is in date only format, otherwise false.
+        public static func isDateOnly(_ date: Date) -> Bool {
+            var calendar = Calendar.current
+            calendar.timeZone = TimeZone(secondsFromGMT: 0)!
+            let components = calendar.dateComponents([.hour, .minute, .second, .nanosecond], from: date)
+
+            return (components.hour == 0 &&
+                    components.minute == 0 &&
+                    components.second == 0 &&
+                    components.nanosecond == 0)
+        }
     }
 
     /// Creates and returns a string created from the UUID

Sources/Networking/BoxNetworkClient.swift

@@ -292,6 +292,8 @@ public class BoxNetworkClient: NetworkClient {
         let nonNullQueryParams: [String: String] = params.compactMapValues { $0?.paramValue }
         var components = URLComponents(url: URL(string: url)!, resolvingAgainstBaseURL: true)!
         components.queryItems = nonNullQueryParams.map { URLQueryItem(name: $0.key, value: $0.value) }
+        components.percentEncodedQuery = components.percentEncodedQuery?
+            .replacingOccurrences(of: "+", with: "%2B")
 
         return components.url!
     }

Sources/Networking/DefaultNetworkClient.swift

@@ -298,6 +298,8 @@ public class DefaultNetworkClient: NetworkClient {
         let nonNullQueryParams: [String: String] = params.compactMapValues { $0?.paramValue }
         var components = URLComponents(url: URL(string: url)!, resolvingAgainstBaseURL: true)!
         components.queryItems = nonNullQueryParams.map { URLQueryItem(name: $0.key, value: $0.value) }
+        components.percentEncodedQuery = components.percentEncodedQuery?
+            .replacingOccurrences(of: "+", with: "%2B")
 
         return components.url!
     }

Sources/Schemas/AiAgentAllowedEntity/AiAgentAllowedEntity.swift

@@ -26,8 +26,7 @@ public enum AiAgentAllowedEntity: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(AiAgentAllowedEntity.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/AiAgentAskOrAiAgentExtractOrAiAgentExtractStructuredOrAiAgentTextGen/AiAgentAskOrAiAgentExtractOrAiAgentExtractStructuredOrAiAgentTextGen.swift

@@ -39,8 +39,7 @@ public enum AiAgentAskOrAiAgentExtractOrAiAgentExtractStructuredOrAiAgentTextGen
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(AiAgentAskOrAiAgentExtractOrAiAgentExtractStructuredOrAiAgentTextGen.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/AiAgentAskOrAiAgentReference/AiAgentAskOrAiAgentReference.swift

@@ -25,8 +25,7 @@ public enum AiAgentAskOrAiAgentReference: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(AiAgentAskOrAiAgentReference.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/AiAgentExtractOrAiAgentReference/AiAgentExtractOrAiAgentReference.swift

@@ -25,8 +25,7 @@ public enum AiAgentExtractOrAiAgentReference: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(AiAgentExtractOrAiAgentReference.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/AiAgentExtractStructuredOrAiAgentReference/AiAgentExtractStructuredOrAiAgentReference.swift

@@ -25,8 +25,7 @@ public enum AiAgentExtractStructuredOrAiAgentReference: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(AiAgentExtractStructuredOrAiAgentReference.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/AiAgentReferenceOrAiAgentTextGen/AiAgentReferenceOrAiAgentTextGen.swift

@@ -25,8 +25,7 @@ public enum AiAgentReferenceOrAiAgentTextGen: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(AiAgentReferenceOrAiAgentTextGen.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/AiLlmEndpointParams/AiLlmEndpointParams.swift

@@ -40,8 +40,7 @@ public enum AiLlmEndpointParams: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(AiLlmEndpointParams.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/AppItemEventSourceOrEventSourceOrFileOrFolderOrGenericSourceOrUser/AppItemEventSourceOrEventSourceOrFileOrFolderOrGenericSourceOrUser.swift

@@ -42,8 +42,7 @@ public enum AppItemEventSourceOrEventSourceOrFileOrFolderOrGenericSourceOrUser:
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(AppItemEventSourceOrEventSourceOrFileOrFolderOrGenericSourceOrUser.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 
@@ -62,8 +61,7 @@ public enum AppItemEventSourceOrEventSourceOrFileOrFolderOrGenericSourceOrUser:
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(AppItemEventSourceOrEventSourceOrFileOrFolderOrGenericSourceOrUser.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key itemType"))
-
+                    break
                 }
             }
 

Sources/Schemas/FileBaseOrFolderBaseOrWebLinkBase/FileBaseOrFolderBaseOrWebLinkBase.swift

@@ -32,8 +32,7 @@ public enum FileBaseOrFolderBaseOrWebLinkBase: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(FileBaseOrFolderBaseOrWebLinkBase.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/FileFullOrFolderFull/FileFullOrFolderFull.swift

@@ -25,8 +25,7 @@ public enum FileFullOrFolderFull: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(FileFullOrFolderFull.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/FileFullOrFolderFullOrWebLink/FileFullOrFolderFullOrWebLink.swift

@@ -32,8 +32,7 @@ public enum FileFullOrFolderFullOrWebLink: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(FileFullOrFolderFullOrWebLink.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/FileFullOrFolderMiniOrWebLink/FileFullOrFolderMiniOrWebLink.swift

@@ -32,8 +32,7 @@ public enum FileFullOrFolderMiniOrWebLink: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(FileFullOrFolderMiniOrWebLink.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/FileMiniOrFolderMini/FileMiniOrFolderMini.swift

@@ -25,8 +25,7 @@ public enum FileMiniOrFolderMini: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(FileMiniOrFolderMini.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/FileOrFolder/FileOrFolder.swift

@@ -25,8 +25,7 @@ public enum FileOrFolder: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(FileOrFolder.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/FileOrFolderOrWebLink/FileOrFolderOrWebLink.swift

@@ -32,8 +32,7 @@ public enum FileOrFolderOrWebLink: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(FileOrFolderOrWebLink.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/GroupMiniOrUserCollaborations/GroupMiniOrUserCollaborations.swift

@@ -25,8 +25,7 @@ public enum GroupMiniOrUserCollaborations: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(GroupMiniOrUserCollaborations.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/IntegrationMappingPartnerItemSlackUnion/IntegrationMappingPartnerItemSlackUnion.swift

@@ -18,8 +18,7 @@ public enum IntegrationMappingPartnerItemSlackUnion: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(IntegrationMappingPartnerItemSlackUnion.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/IntegrationMappingPartnerItemTeamsUnion/IntegrationMappingPartnerItemTeamsUnion.swift

@@ -24,8 +24,7 @@ public enum IntegrationMappingPartnerItemTeamsUnion: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(IntegrationMappingPartnerItemTeamsUnion.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }
 

Sources/Schemas/KeywordSkillCardOrStatusSkillCardOrTimelineSkillCardOrTranscriptSkillCard/KeywordSkillCardOrStatusSkillCardOrTimelineSkillCardOrTranscriptSkillCard.swift

@@ -39,8 +39,7 @@ public enum KeywordSkillCardOrStatusSkillCardOrTimelineSkillCardOrTranscriptSkil
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(KeywordSkillCardOrStatusSkillCardOrTimelineSkillCardOrTranscriptSkillCard.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key skillCardType"))
-
+                    break
                 }
             }
 

Sources/Schemas/SearchResultsOrSearchResultsWithSharedLinks/SearchResultsOrSearchResultsWithSharedLinks.swift

@@ -25,8 +25,7 @@ public enum SearchResultsOrSearchResultsWithSharedLinks: Codable {
                     }
 
                 default:
-                    throw DecodingError.typeMismatch(SearchResultsOrSearchResultsWithSharedLinks.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "The Decoded object contains an unexpected value for key type"))
-
+                    break
                 }
             }