diff --git a/Gemfile b/Gemfile index 642d7616..607bf6aa 100644 --- a/Gemfile +++ b/Gemfile @@ -2,3 +2,4 @@ ci_gems_path = File.join(File.dirname(__FILE__), "Submodules/WeTransfer-iOS-CI/Gemfile") eval_gemfile(ci_gems_path) if File.exist?(ci_gems_path) +gem "fastlane" \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index e7597ba9..024e1798 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,219 @@ GEM remote: https://rubygems.org/ specs: + CFPropertyList (3.0.6) + rexml + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + artifactory (3.0.15) + atomos (0.1.3) + aws-eventstream (1.2.0) + aws-partitions (1.829.0) + aws-sdk-core (3.184.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.72.0) + aws-sdk-core (~> 3, >= 3.184.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.136.0) + aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.6) + aws-sigv4 (1.6.0) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + claide (1.1.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + declarative (0.0.20) + digest-crc (0.6.5) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.103.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) + fastimage (2.2.7) + fastlane (2.216.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (~> 0.1.1) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.3) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (~> 3) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.50.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.1) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + webrick + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.19.0) + google-apis-core (>= 0.9.0, < 2.a) + google-cloud-core (1.6.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.3.1) + google-cloud-storage (1.44.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.19.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.5) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.6.2) + json (2.6.3) + jwt (2.7.1) + mini_magick (4.12.0) + mini_mime (1.1.5) + multi_json (1.15.0) + multipart-post (2.3.0) + nanaimo (0.3.0) + naturally (2.2.1) + optparse (0.1.1) + os (1.1.4) + plist (3.7.0) + public_suffix (5.0.3) + rake (13.0.6) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.6) + rouge (2.0.7) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + security (0.1.3) + signet (0.18.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + terminal-notifier (2.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.1) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + unicode-display_width (2.4.2) + webrick (1.8.1) + word_wrap (1.0.0) + xcodeproj (1.23.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) PLATFORMS + arm64-darwin-23 universal-darwin-22 DEPENDENCIES dotenv + fastlane BUNDLED WITH 2.2.8 diff --git a/README.md b/README.md index 1bc0c70d..70e14f57 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,15 @@ To help with the development of this repository you need to follow the next step - download the submodules dependencies ```bash git submodule update --init --recursive +bundle install +``` +- if you get permission errors when running `bundle install`, it's possible that you have to install a newer version of Ruby along the default one shipped with macOS (instead of `3.2.2` used below, use the version number that is output at the end of the `ruby-install ruby` command): +```bash +brew install chruby ruby-install +ruby-install ruby +chruby 3.2.2 +gem update --system +gem install bundler ``` - you should be able to run the tests ```bash diff --git a/Sources/Extensions/ErrorResponseExtensions.swift b/Sources/Extensions/ErrorResponseExtensions.swift index 384222cd..cb4e4b90 100644 --- a/Sources/Extensions/ErrorResponseExtensions.swift +++ b/Sources/Extensions/ErrorResponseExtensions.swift @@ -14,7 +14,7 @@ extension ErrorResponse: CustomStringConvertible { errorString.append(""" \n\nThe request failed with response code \(error.status) \(error.code) - \(error.title). \(error.detail ?? "") + \(error.title). \(error.detail) """) }) return errorString diff --git a/Sources/JWT/JWTRequestsAuthenticator.swift b/Sources/JWT/JWTRequestsAuthenticator.swift index 7cea4728..e3c60084 100644 --- a/Sources/JWT/JWTRequestsAuthenticator.swift +++ b/Sources/JWT/JWTRequestsAuthenticator.swift @@ -13,6 +13,7 @@ import FoundationNetworking /// An Authenticator for URL Requests which makes use of the RequestAdapter from Alamofire. final class JWTRequestsAuthenticator { + private let dispatchQueue = DispatchQueue(label: "JWTRequestsAuthenticator") private var cachedToken: JWT.Token? private let apiConfiguration: APIConfiguration @@ -26,13 +27,15 @@ final class JWTRequestsAuthenticator { /// Generates a new JWT Token, but only if the in memory cached one is not expired. private func createToken() throws -> JWT.Token { - if let cachedToken = cachedToken, !cachedToken.isExpired { - return cachedToken + return try dispatchQueue.sync { + if let cachedToken = cachedToken, !cachedToken.isExpired { + return cachedToken + } + + let token = try jwtCreator.signedToken(using: apiConfiguration.privateKey) + cachedToken = token + return token } - - let token = try jwtCreator.signedToken(using: apiConfiguration.privateKey) - cachedToken = token - return token } func adapt(_ urlRequest: URLRequest) throws -> URLRequest { diff --git a/Sources/OpenAPI/Generated/Entities/Platform.swift b/Sources/OpenAPI/Generated/Entities/Platform.swift index b50ac199..8a2a6496 100644 --- a/Sources/OpenAPI/Generated/Entities/Platform.swift +++ b/Sources/OpenAPI/Generated/Entities/Platform.swift @@ -9,4 +9,5 @@ public enum Platform: String, Codable, CaseIterable { case ios = "IOS" case macOs = "MAC_OS" case tvOs = "TV_OS" + case visionOs = "VISION_OS" // VisionOS manually added since version 3.0 of Apple's OpenAPI spec fails to include it. Reported in FB13208526 27/9/2023. }