Merge branch 'main' into cleanup-ui-tests

# Conflicts: # Demo/Application/DemoAppDelegate.swift # Demo/Application/DemoContainerViewController.swift # Demo/Application/Settings/DemoSettings.swift
braintree · Nov 6, 2023 · c6446a3 · c6446a3
2 parents e623d78 + 1928bdc
commit c6446a3
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 6 deletions.
diff --git a/Demo/Application/DemoAppDelegate.swift b/Demo/Application/DemoAppDelegate.swift
@@ -62,8 +62,6 @@ class DemoAppDelegate: UIResponder, UIApplicationDelegate {
             UserDefaults.standard.setValue(DemoAuthType.tokenizationKey.rawValue, forKey: DemoSettings.AuthorizationTypeDefaultsKey)
         } else if testArguments.contains("-MockedPayPalTokenizationKey") {
             UserDefaults.standard.setValue(DemoAuthType.mockedPayPalTokenizationKey.rawValue, forKey: DemoSettings.AuthorizationTypeDefaultsKey)
-        } else if testArguments.contains("-UITestHardcodedClientTokenWithCustomerID") {
-            UserDefaults.standard.setValue(DemoAuthType.uiTestHardcodedClientTokenWithCustomerID.rawValue, forKey: DemoSettings.AuthorizationTypeDefaultsKey)
         } else if testArguments.contains("-UITestHardcodedClientTokenWithoutCustomerID") {
             UserDefaults.standard.setValue(DemoAuthType.uiTestHardcodedClientTokenWithoutCustomerID.rawValue, forKey: DemoSettings.AuthorizationTypeDefaultsKey)
         } else if testArguments.contains("-UITestHardcodedClientTokenWithCVVValidationEnabled") {

diff --git a/Demo/Application/DemoContainerViewController.swift b/Demo/Application/DemoContainerViewController.swift
@@ -122,9 +122,6 @@ class DemoContainerViewController: UIViewController {
 
             tokenizationKey = "sandbox_q7v35n9n_555d2htrfsnnmfb3"
             currentViewController = instantiateCurrentViewController(with: tokenizationKey)
-        case .uiTestHardcodedClientTokenWithCustomerID:
-            let uiTestClientTokenWithCustomerID = "eyJ2ZXJzaW9uIjoyLCJhdXRob3JpemF0aW9uRmluZ2VycHJpbnQiOiJleUowZVhBaU9pSktWMVFpTENKaGJHY2lPaUpGVXpJMU5pSXNJbXRwWkNJNklqSXdNVGd3TkRJMk1UWXRjMkZ1WkdKdmVDSXNJbWx6Y3lJNkltaDBkSEJ6T2k4dllYQnBMbk5oYm1SaWIzZ3VZbkpoYVc1MGNtVmxaMkYwWlhkaGVTNWpiMjBpZlEuZXlKbGVIQWlPakUyT1RneE56ZzBNamtzSW1wMGFTSTZJamcxTVdKaU9XSmxMV05sT1RRdE5EZG1OeTFoWlRObExUSTBOekk1WlRObE1qazBNeUlzSW5OMVlpSTZJbVJqY0hOd2VUSmljbmRrYW5JemNXNGlMQ0pwYzNNaU9pSm9kSFJ3Y3pvdkwyRndhUzV6WVc1a1ltOTRMbUp5WVdsdWRISmxaV2RoZEdWM1lYa3VZMjl0SWl3aWJXVnlZMmhoYm5RaU9uc2ljSFZpYkdsalgybGtJam9pWkdOd2MzQjVNbUp5ZDJScWNqTnhiaUlzSW5abGNtbG1lVjlqWVhKa1gySjVYMlJsWm1GMWJIUWlPblJ5ZFdWOUxDSnlhV2RvZEhNaU9sc2liV0Z1WVdkbFgzWmhkV3gwSWwwc0luTmpiM0JsSWpwYklrSnlZV2x1ZEhKbFpUcFdZWFZzZENKZExDSnZjSFJwYjI1eklqcDdJbU4xYzNSdmJXVnlYMmxrSWpvaU1TSjlmUS5BRS1CVGJ2bnBaN0lnLUExRmt3V2tUaEsxLVhlX0NCUE9Mc0puTlEyVjgyQ0NIUVBscnRtd0RVcnZQbjdxcksxXzhnZ2VZQ0VaTU1rREh6c2twanB2dz9jdXN0b21lcl9pZD0iLCJjb25maWdVcmwiOiJodHRwczovL2FwaS5zYW5kYm94LmJyYWludHJlZWdhdGV3YXkuY29tOjQ0My9tZXJjaGFudHMvZGNwc3B5MmJyd2RqcjNxbi9jbGllbnRfYXBpL3YxL2NvbmZpZ3VyYXRpb24iLCJncmFwaFFMIjp7InVybCI6Imh0dHBzOi8vcGF5bWVudHMuc2FuZGJveC5icmFpbnRyZWUtYXBpLmNvbS9ncmFwaHFsIiwiZGF0ZSI6IjIwMTgtMDUtMDgiLCJmZWF0dXJlcyI6WyJ0b2tlbml6ZV9jcmVkaXRfY2FyZHMiXX0sImhhc0N1c3RvbWVyIjp0cnVlLCJjbGllbnRBcGlVcmwiOiJodHRwczovL2FwaS5zYW5kYm94LmJyYWludHJlZWdhdGV3YXkuY29tOjQ0My9tZXJjaGFudHMvZGNwc3B5MmJyd2RqcjNxbi9jbGllbnRfYXBpIiwiZW52aXJvbm1lbnQiOiJzYW5kYm94IiwibWVyY2hhbnRJZCI6ImRjcHNweTJicndkanIzcW4iLCJhc3NldHNVcmwiOiJodHRwczovL2Fzc2V0cy5icmFpbnRyZWVnYXRld2F5LmNvbSIsImF1dGhVcmwiOiJodHRwczovL2F1dGgudmVubW8uc2FuZGJveC5icmFpbnRyZWVnYXRld2F5LmNvbSIsInZlbm1vIjoib2ZmbGluZSIsImNoYWxsZW5nZXMiOlsiY3Z2IiwicG9zdGFsX2NvZGUiXSwidGhyZWVEU2VjdXJlRW5hYmxlZCI6dHJ1ZSwiYW5hbHl0aWNzIjp7InVybCI6Imh0dHBzOi8vb3JpZ2luLWFuYWx5dGljcy1zYW5kLnNhbmRib3guYnJhaW50cmVlLWFwaS5jb20vZGNwc3B5MmJyd2RqcjNxbiJ9LCJhcHBsZVBheSI6eyJjb3VudHJ5Q29kZSI6IlVTIiwiY3VycmVuY3lDb2RlIjoiVVNEIiwibWVyY2hhbnRJZGVudGlmaWVyIjoibWVyY2hhbnQuY29tLmJyYWludHJlZXBheW1lbnRzLmFwcGxlLXBheS1kZW1vLkJyYWludHJlZS1EZW1vIiwic3RhdHVzIjoibW9jayIsInN1cHBvcnRlZE5ldHdvcmtzIjpbInZpc2EiLCJtYXN0ZXJjYXJkIiwiYW1leCIsImRpc2NvdmVyIiwibWFlc3RybyJdfSwicGF5cGFsRW5hYmxlZCI6dHJ1ZSwiYnJhaW50cmVlX2FwaSI6eyJ1cmwiOiJodHRwczovL3BheW1lbnRzLnNhbmRib3guYnJhaW50cmVlLWFwaS5jb20iLCJhY2Nlc3NfdG9rZW4iOiJleUowZVhBaU9pSktWMVFpTENKaGJHY2lPaUpGVXpJMU5pSXNJbXRwWkNJNklqSXdNVGd3TkRJMk1UWXRjMkZ1WkdKdmVDSXNJbWx6Y3lJNkltaDBkSEJ6T2k4dllYQnBMbk5oYm1SaWIzZ3VZbkpoYVc1MGNtVmxaMkYwWlhkaGVTNWpiMjBpZlEuZXlKbGVIQWlPakUyT1RneE56ZzBNekFzSW1wMGFTSTZJakJsT0dKbU1UaGlMV0prTUdVdE5EZzVZeTA0T0dVM0xUZ3hOemczTWpBME16ZGtaaUlzSW5OMVlpSTZJbVJqY0hOd2VUSmljbmRrYW5JemNXNGlMQ0pwYzNNaU9pSm9kSFJ3Y3pvdkwyRndhUzV6WVc1a1ltOTRMbUp5WVdsdWRISmxaV2RoZEdWM1lYa3VZMjl0SWl3aWJXVnlZMmhoYm5RaU9uc2ljSFZpYkdsalgybGtJam9pWkdOd2MzQjVNbUp5ZDJScWNqTnhiaUlzSW5abGNtbG1lVjlqWVhKa1gySjVYMlJsWm1GMWJIUWlPblJ5ZFdWOUxDSnlhV2RvZEhNaU9sc2lkRzlyWlc1cGVtVWlMQ0p0WVc1aFoyVmZkbUYxYkhRaVhTd2ljMk52Y0dVaU9sc2lRbkpoYVc1MGNtVmxPbFpoZFd4MElsMHNJbTl3ZEdsdmJuTWlPbnQ5ZlEuMlk0OHdOTk05RmN0ZDdYTjdrSVdBNEYzZVYxNW13bUJIRFczVzZZVk1OVmRxSW1VVEZqcEhqUnFQWnhQdUZMMGVSSUYyeDFaNTh2OEtPLXV3MjMwNEEifSwicGF5cGFsIjp7ImJpbGxpbmdBZ3JlZW1lbnRzRW5hYmxlZCI6dHJ1ZSwiZW52aXJvbm1lbnROb05ldHdvcmsiOnRydWUsInVudmV0dGVkTWVyY2hhbnQiOmZhbHNlLCJhbGxvd0h0dHAiOnRydWUsImRpc3BsYXlOYW1lIjoiQWNtZSBXaWRnZXRzLCBMdGQuIChTYW5kYm94KSIsImNsaWVudElkIjoiQWI0VGpySElyNmoxaElVY1RhWlpCYmZMZUFaOXFfUUFSalBhRVU1dnpNMVBSYl9kRTNHTjNaT0tITG9yX2VJZ1pFazNXTzNLMVdUMTlUWDYiLCJiYXNlVXJsIjoiaHR0cHM6Ly9hc3NldHMuYnJhaW50cmVlZ2F0ZXdheS5jb20iLCJhc3NldHNVcmwiOiJodHRwczovL2NoZWNrb3V0LnBheXBhbC5jb20iLCJkaXJlY3RCYXNlVXJsIjpudWxsLCJlbnZpcm9ubWVudCI6Im9mZmxpbmUiLCJicmFpbnRyZWVDbGllbnRJZCI6Im1hc3RlcmNsaWVudDMiLCJtZXJjaGFudEFjY291bnRJZCI6InN0Y2gybmZkZndzenl0dzUiLCJjdXJyZW5jeUlzb0NvZGUiOiJVU0QifX0="
-            currentViewController = instantiateCurrentViewController(with: uiTestClientTokenWithCustomerID)
         case .uiTestHardcodedClientTokenWithoutCustomerID:
             let uiTestClientTokenWithoutCustomerID = "eyJ2ZXJzaW9uIjozLCJhdXRob3JpemF0aW9uRmluZ2VycHJpbnQiOiIxYzM5N2E5OGZmZGRkNDQwM2VjNzEzYWRjZTI3NTNiMzJlODc2MzBiY2YyN2M3NmM2OWVmZjlkMTE5MjljOTVkfGNyZWF0ZWRfYXQ9MjAxNy0wNC0wNVQwNjowNzowOC44MTUwOTkzMjUrMDAwMFx1MDAyNm1lcmNoYW50X2lkPWRjcHNweTJicndkanIzcW5cdTAwMjZwdWJsaWNfa2V5PTl3d3J6cWszdnIzdDRuYzgiLCJjb25maWdVcmwiOiJodHRwczovL2FwaS5zYW5kYm94LmJyYWludHJlZWdhdGV3YXkuY29tOjQ0My9tZXJjaGFudHMvZGNwc3B5MmJyd2RqcjNxbi9jbGllbnRfYXBpL3YxL2NvbmZpZ3VyYXRpb24ifQ=="
             currentViewController = instantiateCurrentViewController(with: uiTestClientTokenWithoutCustomerID)

diff --git a/Demo/Application/Settings/DemoSettings.swift b/Demo/Application/Settings/DemoSettings.swift
@@ -21,7 +21,6 @@ enum DemoAuthType: Int {
     case clientToken
     case tokenizationKey
     case mockedPayPalTokenizationKey
-    case uiTestHardcodedClientTokenWithCustomerID
     case uiTestHardcodedClientTokenWithoutCustomerID
     case uiTestHardcodedClientTokenwithCVVValidationEnabled
 }