Merge branch 'develop' into release/5.5.0

Adyen · Nov 9, 2023 · b3d1a06 · b3d1a06
2 parents 224c8b0 + 8adacfc
commit b3d1a06
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 24 deletions.
diff --git a/Adyen/Core/Payment Methods/Abstract/AnyPaymentMethodDecoder.swift b/Adyen/Core/Payment Methods/Abstract/AnyPaymentMethodDecoder.swift
@@ -42,7 +42,8 @@ internal enum AnyPaymentMethodDecoder {
         .afterpay: UnsupportedPaymentMethodDecoder(),
         .androidPay: UnsupportedPaymentMethodDecoder(),
         .amazonPay: UnsupportedPaymentMethodDecoder(),
-
+        .bizum: UnsupportedPaymentMethodDecoder(),
+
         // Supported payment methods
         .card: CardPaymentMethodDecoder(),
         .scheme: CardPaymentMethodDecoder(),

diff --git a/Adyen/Core/Payment Methods/Abstract/PaymentMethodType.swift b/Adyen/Core/Payment Methods/Abstract/PaymentMethodType.swift
@@ -59,6 +59,7 @@ public enum PaymentMethodType: RawRepresentable, Hashable, Codable {
     case mealVoucherSodexo
     case upi
     case cashAppPay
+    case bizum
     case other(String)
 
     // swiftlint:disable cyclomatic_complexity function_body_length
@@ -117,6 +118,7 @@ public enum PaymentMethodType: RawRepresentable, Hashable, Codable {
         case "mealVoucher_FR_sodexo": self = .mealVoucherSodexo
         case "upi": self = .upi
         case "cashapp": self = .cashAppPay
+        case "bizum": self = .bizum
         default: self = .other(rawValue)
         }
     }
@@ -174,6 +176,7 @@ public enum PaymentMethodType: RawRepresentable, Hashable, Codable {
         case .mealVoucherSodexo: return "mealVoucher_FR_sodexo"
         case .upi: return "upi"
         case .cashAppPay: return "cashapp"
+        case .bizum: return "bizum"
         case let .other(value): return value
         }
     }
@@ -235,11 +238,10 @@ public enum PaymentMethodType: RawRepresentable, Hashable, Codable {
         case .mealVoucherSodexo: return "meal voucher sodexo"
         case .upi: return "UPI"
         case .cashAppPay: return "cash app"
+        case .bizum: return "bizum"
         case let .other(name): return name.replacingOccurrences(of: "_", with: " ")
         }
     }
-    // swiftlint:enable cyclomatic_complexity
-
     // swiftlint:enable cyclomatic_complexity function_body_length
 }
 

diff --git a/Adyen/Utilities/Localization.swift b/Adyen/Utilities/Localization.swift
@@ -34,10 +34,8 @@ public func localizedString(_ key: LocalizationKey, _ parameters: LocalizationPa
     switch parameters?.mode {
     case let .enforced(locale: enforcedLocale):
         translationAttempt = enforceLocalizedString(key: key.key, locale: enforcedLocale)
-    case .natural:
+    case .natural, .none:
         translationAttempt = attempt(buildPossibleInputs(key.key, parameters))
-    case .none:
-        break
     }
 
     // Use fallback in case attempt result is nil or empty

diff --git a/AdyenEncryption/JOSE/Encryption Algorithms/JSON Web Encryption/JSONWebEncryption.swift b/AdyenEncryption/JOSE/Encryption Algorithms/JSON Web Encryption/JSONWebEncryption.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2021 Adyen N.V.
+// Copyright (c) 2023 Adyen N.V.
 //
 // This file is open source and available under the MIT license. See the LICENSE file for more info.
 //
@@ -48,8 +48,6 @@ internal struct JSONWebEncryption {
         }
     }
 
-    internal let header: Header
-
     internal let encryptedKey: Data
 
     internal let encryptedPayload: Data
@@ -60,21 +58,20 @@ internal struct JSONWebEncryption {
 
     internal let compactRepresentation: String
 
-    internal init(header: Header,
+    internal init(encodedHeader: Data,
                   encryptedKey: Data,
                   encryptedPayload: Data,
                   initializationVector: Data,
-                  authenticationTag: Data) throws {
-        self.header = header
+                  authenticationTag: Data) {
         self.encryptedKey = encryptedKey
         self.encryptedPayload = encryptedPayload
         self.initializationVector = initializationVector
         self.authenticationTag = authenticationTag
-        self.compactRepresentation = try [AdyenCoder.encode(header).base64URLString(),
-                                          encryptedKey.base64URLString(),
-                                          initializationVector.base64URLString(),
-                                          encryptedPayload.base64URLString(),
-                                          authenticationTag.base64URLString()].joined(separator: ".")
+        self.compactRepresentation = [encodedHeader.base64URLString(),
+                                      encryptedKey.base64URLString(),
+                                      initializationVector.base64URLString(),
+                                      encryptedPayload.base64URLString(),
+                                      authenticationTag.base64URLString()].joined(separator: ".")
     }
 
 }
diff --git a/...ncryption/JOSE/Encryption Algorithms/JSON Web Encryption/JSONWebEncryptionGenerator.swift b/...ncryption/JOSE/Encryption Algorithms/JSON Web Encryption/JSONWebEncryptionGenerator.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2021 Adyen N.V.
+// Copyright (c) 2023 Adyen N.V.
 //
 // This file is open source and available under the MIT license. See the LICENSE file for more info.
 //
@@ -36,10 +36,10 @@ internal struct JSONWebEncryptionGenerator: AnyJSONWebEncryptionGenerator {
                                               additionalAuthenticationData: additionalAuthenticationData)
         let contentEncryptionOutput = try contentEncryptionAlgorithm.encrypt(input: contentEncryptionInput)
 
-        return try JSONWebEncryption(header: header,
-                                     encryptedKey: encryptedKey,
-                                     encryptedPayload: contentEncryptionOutput.encryptedPayload,
-                                     initializationVector: initializationVector,
-                                     authenticationTag: contentEncryptionOutput.authenticationTag)
+        return JSONWebEncryption(encodedHeader: encodedHeader,
+                                 encryptedKey: encryptedKey,
+                                 encryptedPayload: contentEncryptionOutput.encryptedPayload,
+                                 initializationVector: initializationVector,
+                                 authenticationTag: contentEncryptionOutput.authenticationTag)
     }
 }
diff --git a/Tests/Adyen Tests/Core/PaymentMethodTests.swift b/Tests/Adyen Tests/Core/PaymentMethodTests.swift
@@ -74,7 +74,8 @@ class PaymentMethodTests: XCTestCase {
                 bacsDirectDebit,
                 giftCard1,
                 givexGiftCard,
-                mealVoucherSodexo
+                mealVoucherSodexo,
+                bizum
             ]
         ]
         return try AdyenCoder.decode(dictionary) as PaymentMethods

diff --git a/Tests/DummyData/DummyPaymentMethods.swift b/Tests/DummyData/DummyPaymentMethods.swift
@@ -549,3 +549,8 @@ let cashAppPay: [String: Any] = [
         "clientId": "testClient"
     ]
 ]
+
+let bizum: [String: Any] = [
+    "type": "bizum",
+    "name": "Bizum",
+]
diff --git a/spell-check-word-allow-list.yaml b/spell-check-word-allow-list.yaml
@@ -188,4 +188,5 @@ whiteList:
   - domainname
   - appname
   - mapkit
+  - bizum
   - alipay
-Original file line number
+Diff line change
@@ Expand Up / @@ -188,4 +188,5 @@ whiteList: @@
       - domainname
       - appname
       - mapkit
+      - bizum
       - alipay