Merge pull request #307 from ForgeRock/SDKS-3362-4.6-release-preparation

Update versions, changelog

CHANGELOG.md

@@ -1,3 +1,15 @@
+## [4.6.0]
+#### Added
+- Support PingOne Protect Marketplace Nodes [SDKS-3296]
+- Support new ReCaptcha Enterprise node [SDKS-3324]
+- Expose realm, Success and Failure URL in SessionToken [SDKS-3352]
+#### Fixed
+- Missing UIKit import issue for SPM [SDKS-3348]
+- SSL pinning not working with root certificates [SDKS-3334]
+- Build failed because FRCore.swiftmodule is not built for arm64 [SDKS-3347]
+- Skip Type 4 TextOutputCallback [SDKS-3226]
+- Make PolicyAdviceCreator public [SDKS-3349]
+
 ## [4.5.0]
 #### Added
 - Added SDK support for deleting registered WebAuthn devices from the server. [SDKS-1753]

FRAuth.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FRAuth'
-  s.version          = '4.5.0'
+  s.version          = '4.6.0'
   s.summary          = 'ForgeRock Auth SDK for iOS'
   s.description      = <<-DESC
   FRAuth is a SDK that allows you easily and quickly develop an application with ForgeRock Platform or ForgeRock Identity Cloud. FRAuth SDK provides interfaces and functionalities of user authentication, registration, and identity and access management against ForgeRock solutions.
@@ -32,5 +32,5 @@ Pod::Spec.new do |s|
   s.resource_bundles = {
     'FRAuth' => [base_dir + '/*.xcprivacy']
   }
-  s.ios.dependency 'FRCore', '~> 4.5.0'
+  s.ios.dependency 'FRCore', '~> 4.6.0'
 end

FRAuth/FRAuth.xcodeproj/project.pbxproj

@@ -2170,7 +2170,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				MODULEMAP_FILE = "";
 				OTHER_CFLAGS = "-DXCODE_FRAMEWORK=1";
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRAuth;
@@ -2207,7 +2207,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				MODULEMAP_FILE = "";
 				OTHER_CFLAGS = "-DXCODE_FRAMEWORK=1";
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRAuth;

FRAuth/FRAuthTests/FRAuthSwiftTests/E2ETests/Callback-Live/AA_12_ReCaptchaEnterpriseCallbackTest.swift

@@ -294,7 +294,7 @@ class AA_12_ReCaptchaEnterpriseCallbackTest: CallbackBaseTest {
         // Note: Upon failure the test tree returns CaptchaEnterpriseNode.FAILURE in a TextOutput callback...
         for callback in currentNode.callbacks {
             if callback is TextOutputCallback, let textOutputCallback = callback as? TextOutputCallback {
-                XCTAssertEqual(textOutputCallback.message, "\"VALIDATION_ERROR:CAPTCHA validation failed\"")
+                XCTAssertTrue(textOutputCallback.message.contains("VALIDATION_ERROR:CAPTCHA validation failed"))
             }
             else {
                 XCTFail("Received unexpected callback \(callback)")
@@ -357,7 +357,7 @@ class AA_12_ReCaptchaEnterpriseCallbackTest: CallbackBaseTest {
         // Note: Upon failure the test tree returns CaptchaEnterpriseNode.FAILURE in a TextOutput callback...
         for callback in currentNode.callbacks {
             if callback is TextOutputCallback, let textOutputCallback = callback as? TextOutputCallback {
-                XCTAssertEqual(textOutputCallback.message, "\"CLIENT_ERROR:CUSTOM_CLIENT_ERROR\"")
+                XCTAssertTrue(textOutputCallback.message.contains("CLIENT_ERROR:CUSTOM_CLIENT_ERROR"))
             }
             else {
                 XCTFail("Received unexpected callback \(callback)")

FRAuthenticator.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FRAuthenticator'
-  s.version          = '4.5.0'
+  s.version          = '4.6.0'
   s.summary          = 'ForgeRock OTP/Push Authentication SDK for iOS'
   s.description      = <<-DESC
   FRAuthenticator is a SDK that allows you easily and quickly develop an application with ForgeRock Platform for OATH and Push Authentication with AM. FRAuthenticator SDK provides interfaces and functionalities of HMAC-based OTP, Time-based OTP, Push Registration and Authentication with AM.
@@ -32,5 +32,5 @@ Pod::Spec.new do |s|
   s.resource_bundles = {
     'FRAuthenticator' => [base_dir + '/*.xcprivacy']
   }
-  s.ios.dependency 'FRCore', '~> 4.5.0'
+  s.ios.dependency 'FRCore', '~> 4.6.0'
 end

FRAuthenticator/FRAuthenticator.xcodeproj/project.pbxproj

@@ -1336,7 +1336,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				MODULEMAP_FILE = "${PROJECT_DIR}/FRAuthenticator/SharedC/FRAuthenticator.modulemap";
 				OTHER_CFLAGS = "-DXCODE_FRAMEWORK=1";
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRAuthenticator;
@@ -1368,7 +1368,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				MODULEMAP_FILE = "${PROJECT_DIR}/FRAuthenticator/SharedC/FRAuthenticator.modulemap";
 				OTHER_CFLAGS = "-DXCODE_FRAMEWORK=1";
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRAuthenticator;

FRCaptchaEnterprise.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FRCaptchaEnterprise'
-  s.version          = '4.5.0'
+  s.version          = '4.6.0'
   s.summary          = 'ForgeRock Captcha Enterprise SDK for iOS'
   s.description      = <<-DESC
     FRCaptchaEnterprise is a SDK that adds support for the Captcha Enterprise feature. FRCaptchaEnterprise depends on RecaptchaEnterprise.
@@ -32,6 +32,6 @@ Pod::Spec.new do |s|
   s.resource_bundles = {
     'FRCaptchaEnterprise' => [base_dir + '/*.xcprivacy']
   }
-  s.ios.dependency 'FRAuth', '~> 4.5.0'
+  s.ios.dependency 'FRAuth', '~> 4.6.0'
   s.ios.dependency 'RecaptchaEnterprise', '~> 18.1.0'
 end

FRCaptchaEnterprise/FRCaptchaEnterprise.xcodeproj/project.pbxproj

@@ -898,7 +898,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = JV6EC9KSN3;
 				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 4.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRCaptchaEnterpriseTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
@@ -916,7 +916,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = JV6EC9KSN3;
 				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 4.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRCaptchaEnterpriseTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;

FRCore.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FRCore'
-  s.version          = '4.5.0'
+  s.version          = '4.6.0'
   s.summary          = 'ForgeRock Core SDK for iOS'
   s.description      = <<-DESC
   FRCore is a SDK that allows you to consume some of core functionalities and security features built for FRAuth SDK.

FRCore/FRCore.xcodeproj/project.pbxproj

@@ -955,7 +955,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				MODULEMAP_FILE = "${PROJECT_DIR}/FRCore/SharedC/FRCore.modulemap";
 				OTHER_CFLAGS = "-DXCODE_FRAMEWORK=1";
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRCore;
@@ -989,7 +989,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				MODULEMAP_FILE = "${PROJECT_DIR}/FRCore/SharedC/FRCore.modulemap";
 				OTHER_CFLAGS = "-DXCODE_FRAMEWORK=1";
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRCore;

FRCore/FRCore/Log/Log.swift

@@ -129,7 +129,7 @@ public class Log: NSObject {
     //  MARK: - Property
 
     /// Current SDK version. We hard code it here as currently there is no other way to get it dinamically when used with SPM
-    public static let sdkVersion = "4.5.0"
+    public static let sdkVersion = "4.6.0"
     /// Current LogLevel
     static var logLevel: LogLevel = .none
     /// Current Loggers to handle log entries

FRDeviceBinding.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FRDeviceBinding'
-  s.version          = '4.5.0'
+  s.version          = '4.6.0'
   s.summary          = 'ForgeRock Device Binding SDK for iOS'
   s.description      = <<-DESC
     FRDeviceBinding is a SDK that adds support for the Device Binding feature. FRDeviceBinding depends on JOSESwift.
@@ -32,6 +32,6 @@ Pod::Spec.new do |s|
   s.resource_bundles = {
     'FRDeviceBinding' => [base_dir + '/*.xcprivacy']
   }
-  s.ios.dependency 'FRAuth', '~> 4.5.0'
+  s.ios.dependency 'FRAuth', '~> 4.6.0'
   s.ios.dependency 'JOSESwift', '~> 2.4.0'
 end

FRDeviceBinding/FRDeviceBinding.xcodeproj/project.pbxproj

@@ -819,7 +819,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20";
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRDeviceBinding;
@@ -852,7 +852,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20";
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRDeviceBinding;

FRFacebookSignIn.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FRFacebookSignIn'
-  s.version          = '4.5.0'
+  s.version          = '4.6.0'
   s.summary          = 'ForgeRock Auth Facebook Sign-in SDK for iOS'
   s.description      = <<-DESC
   FRFacebookSignIn is a SDK that allows a user to sign-in through Facebook. FRFacebookSignIn depends on FBSDKLoginKit, and uses Facebook's SDK to perform authorization following Facebook's protocol.
@@ -32,6 +32,6 @@ Pod::Spec.new do |s|
   s.resource_bundles = {
     'FRFacebookSignIn' => [base_dir + '/*.xcprivacy']
   }
-  s.ios.dependency 'FRAuth', '~> 4.5.0'
+  s.ios.dependency 'FRAuth', '~> 4.6.0'
   s.ios.dependency 'FBSDKLoginKit', '~> 16.0.1'
 end

FRFacebookSignIn/FRFacebookSignIn.xcodeproj/project.pbxproj

@@ -446,7 +446,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRFacebookSignIn;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -478,7 +478,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRFacebookSignIn;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

FRGoogleSignIn.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FRGoogleSignIn'
-  s.version          = '4.5.0'
+  s.version          = '4.6.0'
   s.summary          = 'ForgeRock Auth Google Sign-in SDK for iOS'
   s.description      = <<-DESC
   FRGoogleSignIn is a SDK that allows a user to sign-in through Google. FRGoogleSignIn depends on GoogleSignIn, and uses Google's SDK to perform authorization following Google's protocol.
@@ -34,6 +34,6 @@ Pod::Spec.new do |s|
     'FRGoogleSignIn' => [base_dir + '/*.xcprivacy']
   }
 
-  s.ios.dependency 'FRAuth', '~> 4.5.0'
+  s.ios.dependency 'FRAuth', '~> 4.6.0'
   s.ios.dependency 'GoogleSignIn', '~> 7.1.0'
 end

FRGoogleSignIn/FRGoogleSignIn.xcodeproj/project.pbxproj

@@ -457,7 +457,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRGoogleSignIn;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -492,7 +492,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRGoogleSignIn;

FRProximity.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FRProximity'
-  s.version          = '4.5.0'
+  s.version          = '4.6.0'
   s.summary          = 'ForgeRock Auth Proximity SDK for iOS'
   s.description      = <<-DESC
   FRProximity is a SDK that allows you to additionally collect device information with FRDeviceCollector in FRAuth. FRProximity SDK leverages functionalities in iOS that requires user's consent. You must properly set privacy consent in the application's Info.plist.
@@ -32,5 +32,5 @@ Pod::Spec.new do |s|
   s.resource_bundles = {
     'FRProximity' => [base_dir + '/*.xcprivacy']
   }
-  s.ios.dependency 'FRAuth', '~> 4.5.0'
+  s.ios.dependency 'FRAuth', '~> 4.6.0'
 end

FRProximity/FRProximity.xcodeproj/project.pbxproj

@@ -899,7 +899,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRProximity;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -934,7 +934,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRProximity;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

FRUI.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FRUI'
-  s.version          = '4.5.0'
+  s.version          = '4.6.0'
   s.summary          = 'ForgeRock UI SDK for FRAuth iOS'
   s.description      = <<-DESC
   FRUI is a SDK that allows you easily and quickly develop an application with ForgeRock Platform or ForgeRock Identity Cloud, and FRAuth SDK with pre-built UI components. FRUI SDK demonstrates most of functionalities available in FRAuth SDK which includes user authentication, registration, and identity and access management against ForgeRock solutions.
@@ -33,5 +33,5 @@ Pod::Spec.new do |s|
     'FRUI' => [base_dir + '/*.xcprivacy']
   }
   s.resources = [base_dir + '/**/*.xib', base_dir + '/Assets/*']
-  s.ios.dependency 'FRDeviceBinding', '~> 4.5.0'
+  s.ios.dependency 'FRDeviceBinding', '~> 4.6.0'
 end

FRUI/FRUI.xcodeproj/project.pbxproj

@@ -724,7 +724,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRUI;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -761,7 +761,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.5.0;
+				MARKETING_VERSION = 4.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRUI;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Package.resolved

@@ -46,6 +46,15 @@
           "version": "4.1.1"
         }
       },
+      {
+        "package": "InteropForGoogle",
+        "repositoryURL": "https://github.com/google/interop-ios-for-google-sdks.git",
+        "state": {
+          "branch": null,
+          "revision": "2d12673670417654f08f5f90fdd62926dc3a2648",
+          "version": "100.0.0"
+        }
+      },
       {
         "package": "JOSESwift",
         "repositoryURL": "https://github.com/airsidemobile/JOSESwift.git",
@@ -60,8 +69,17 @@
         "repositoryURL": "https://github.com/pingidentity/pingone-signals-sdk-ios.git",
         "state": {
           "branch": null,
-          "revision": "88951ad71c37853fb86cee0bf48cf447ded5b268",
-          "version": "5.2.3"
+          "revision": "59fde21ecebaaf1b20046e79f55f05f4beb7a74d",
+          "version": "5.2.7"
+        }
+      },
+      {
+        "package": "RecaptchaEnterprise",
+        "repositoryURL": "https://github.com/GoogleCloudPlatform/recaptcha-enterprise-mobile-sdk.git",
+        "state": {
+          "branch": null,
+          "revision": "e1890d87d0aa0780baa38f46bf09db3630bd0beb",
+          "version": "18.6.0"
         }
       }
     ]

Package.swift

@@ -22,7 +22,7 @@ let package = Package (
         .package(name: "Facebook", url: "https://github.com/facebook/facebook-ios-sdk.git", .upToNextMinor(from: "16.0.1")),
         .package(name: "GoogleSignIn", url: "https://github.com/google/GoogleSignIn-iOS.git", .upToNextMinor(from: "7.1.0")),
         .package(name: "JOSESwift", url: "https://github.com/airsidemobile/JOSESwift.git", .upToNextMinor(from: "2.4.0")),
-        .package(name: "PingOneSignals", url: "https://github.com/pingidentity/pingone-signals-sdk-ios.git", .upToNextMinor(from: "5.2.3")),
+        .package(name: "PingOneSignals", url: "https://github.com/pingidentity/pingone-signals-sdk-ios.git", .upToNextMinor(from: "5.2.7")),
         .package(name: "RecaptchaEnterprise", url: "https://github.com/GoogleCloudPlatform/recaptcha-enterprise-mobile-sdk.git", .upToNextMinor(from: "18.6.0"))
     ],
     targets: [