Merge pull request #159 from ForgeRock/develop

ForgeRock iOS SDK 3.4.0 Release

Author: spetrov

.github/workflows/bitbar-prepare-artifacts.yaml

@@ -38,7 +38,7 @@ on:
         required: true
 jobs:
   prepare-device-farm-artifacts:
-    runs-on: macos-latest
+    runs-on: macos-12
 
     steps:
       # Clone the repo
@@ -85,10 +85,10 @@ jobs:
       # Set target Xcode version. For more details and options see: 
       # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md
       - name: Select Xcode
-        run: sudo xcode-select -switch /Applications/Xcode_13.2.1.app && /usr/bin/xcodebuild -version
+        run: sudo xcode-select -switch /Applications/Xcode_13.3.1.app && /usr/bin/xcodebuild -version
 
       - name: build-for-testing and sign
-        run: xcodebuild -scheme FRTestHostBitBar -sdk iphoneos15.2 -workspace SampleApps/FRExample.xcworkspace -configuration Debug clean build BUILD_DIR=~/build/ DEVELOPMENT_TEAM=JV6EC9KSN3 -allowProvisioningUpdates -destination generic/platform=iOS -derivedDataPath ~/build/derivedData/ build-for-testing
+        run: xcodebuild -scheme FRTestHostBitBar -sdk iphoneos15.4 -workspace SampleApps/FRExample.xcworkspace -configuration Debug clean build BUILD_DIR=~/build/ DEVELOPMENT_TEAM=JV6EC9KSN3 -allowProvisioningUpdates -destination generic/platform=iOS -derivedDataPath ~/build/derivedData/ build-for-testing
 
       # Prepare BitBar artifacts:
       - name: Prepare BitBar artifacts

.github/workflows/build-and-test.yaml

@@ -11,7 +11,7 @@ on:
         required: true
 jobs:
   build-and-test:
-    runs-on: macos-latest
+    runs-on: macos-12
     timeout-minutes: 20
 
     steps:
@@ -32,11 +32,11 @@ jobs:
       # Set target Xcode version. For more details and options see: 
       # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md
       - name: Select Xcode
-        run: sudo xcode-select -switch /Applications/Xcode_13.2.1.app && /usr/bin/xcodebuild -version
+        run: sudo xcode-select -switch /Applications/Xcode_13.3.1.app && /usr/bin/xcodebuild -version
 
       # Run all tests
       - name: Run tests
-        run: xcodebuild test -scheme FRTestHost -workspace SampleApps/FRExample.xcworkspace -configuration Debug -destination 'platform=iOS Simulator,name=iPhone 12,OS=15.2' -derivedDataPath DerivedData -enableCodeCoverage YES -resultBundlePath TestResults | xcpretty && exit ${PIPESTATUS[0]}
+        run: xcodebuild test -scheme FRTestHost -workspace SampleApps/FRExample.xcworkspace -configuration Debug -destination 'platform=iOS Simulator,name=iPhone 12,OS=15.4' -derivedDataPath DerivedData -enableCodeCoverage YES -resultBundlePath TestResults | xcpretty && exit ${PIPESTATUS[0]}
 
       # Publish test results
       - name: Publish test results

.github/workflows/run-live-tests.yaml

@@ -0,0 +1,70 @@
+name: Run Live Tests
+on:
+  workflow_dispatch:
+    inputs:
+      am-url:
+        description: The AM url to run live test cases against
+        type: string
+        required: true
+        default: https://openam-forgerrock-sdksteanant.forgeblocks.com/am
+      realm:
+        description: The AM realm to use
+        type: string
+        required: true
+        default: alpha
+      cookie-name:
+        description: The AM session cookie name
+        type: string
+        required: true
+        default: iPlanetDirectoryPro
+  
+jobs:
+  run-live-tests:
+    runs-on: macos-12
+
+    steps:
+      # Clone the repo
+      - name: Clone the repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      # Replace forgerock_url, forgerock_realm, and forgerock_cookie_name values in config-live-01.json
+      - name: Setup values in config-live-01.json
+        run: |
+          amURL=$(echo ${{ inputs.am-url }} | sed 's/\//\\\//g')
+          echo $amURL
+          sed -i -r "s/\(\"forgerock_url\":\).*/\1 \"$amURL\",/" "FRTestHost/FRTestHost/SharedTestFiles/TestConfig/Config-live-01.json"
+          sed -i -r "s/\(\"forgerock_oauth_url\":\).*/\1 \"$amURL\",/" "FRTestHost/FRTestHost/SharedTestFiles/TestConfig/Config-live-01.json"
+          sed -i -r "s/\(\"forgerock_cookie_name\":\).*/\1 \"${{ inputs.cookie-name }}\",/" "FRTestHost/FRTestHost/SharedTestFiles/TestConfig/Config-live-01.json"
+          sed -i -r "s/\(\"forgerock_realm\":\).*/\1 \"${{ inputs.realm }}\",/" "FRTestHost/FRTestHost/SharedTestFiles/TestConfig/Config-live-01.json"
+          sed -i -r "s/\(\"password\":\).*/\1 \"${{ secrets.SDKUSER_PASSWORD }}\",/" "FRTestHost/FRTestHost/SharedTestFiles/TestConfig/Config-live-01.json"
+          rm -rf FRTestHost/FRTestHost/SharedTestFiles/TestConfig/Config-live-01.json-r
+
+      # Set target Xcode version. For more details and options see: 
+      # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md
+      - name: Select Xcode
+        run: sudo xcode-select -switch /Applications/Xcode_13.3.1.app && /usr/bin/xcodebuild -version
+
+      # Run all e2e tests
+      - name: Run e2e tests
+        run: xcodebuild test -scheme FRTestHostE2E -workspace SampleApps/FRExample.xcworkspace -configuration Debug -destination 'platform=iOS Simulator,name=iPhone 12,OS=15.4' -derivedDataPath DerivedData -enableCodeCoverage YES -resultBundlePath TestResultsE2E | xcpretty && exit ${PIPESTATUS[0]}
+
+      # Publish test results
+      - name: Publish test results
+        uses: kishikawakatsumi/xcresulttool@v1
+        with:
+          path: TestResultsE2E.xcresult
+          show-passed-tests: true
+        if: success() || failure()
+
+      # Send slack notification with result status
+      - uses: 8398a7/action-slack@v3
+        with:
+          mention: 'stoyan.petrov'
+          if_mention: 'failure,cancelled'
+          fields: repo,author,eventName,message,job,took
+          status: ${{ job.status }}
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        if: always()

.whitesource

@@ -0,0 +1,22 @@
+{
+  "scanSettings": {
+    "configMode": "AUTO",
+    "configExternalURL": "",
+    "projectToken": "",
+    "baseBranches": []
+  },
+  "checkRunSettings": {
+    "vulnerableCheckRunConclusionLevel": "failure",
+    "displayMode": "diff",
+    "useMendCheckNames": true
+  },
+  "issueSettings": {
+    "minSeverityLevel": "LOW",
+    "issueType": "DEPENDENCY"
+  },
+  "remediateSettings": {
+    "workflowRules": {
+      "enabled": true
+    }
+  }
+}

CHANGELOG.md

@@ -1,3 +1,13 @@
+# Version 3.4.0
+## [3.4.0]
+#### Added
+- Dynamic SDK Configuration [SDKS-1760]
+- iOS 16 Support [SDKS-1932]
+
+#### Changed
+- Fixed build errors on Xcode 14 [SDKS-2073]
+- Fixed bug where the `state` parameter value was not verified upon calling the `Authorize` endpoint [SDKS-2077]
+
 # Version 3.3.2
 ## [3.3.2]
 #### Added

FRAuth.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FRAuth'
-  s.version          = '3.3.2'
+  s.version          = '3.4.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.
@@ -25,9 +25,9 @@ Pod::Spec.new do |s|
   s.module_name   = 'FRAuth'
   s.swift_versions = ['5.0', '5.1']
 
-  s.ios.deployment_target = '11.0'
+  s.ios.deployment_target = '12.0'
 
   base_dir = "FRAuth/FRAuth"
   s.source_files = base_dir + '/**/*.swift', base_dir + '/**/*.c', base_dir + '/**/*.h'
-  s.ios.dependency 'FRCore', '~> 3.3.2'
+  s.ios.dependency 'FRCore', '~> 3.4.0'
 end

FRAuth/FRAuth.xcodeproj/project.pbxproj

@@ -278,6 +278,8 @@
 		D5F3E10324D20FBF00536EA0 /* SuspendedTextOutputCallback.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F3E10224D20FBF00536EA0 /* SuspendedTextOutputCallback.swift */; };
 		D5F8F9EE24B7D50600EC9AEB /* BooleanAttributeInputCallback.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F8F9ED24B7D50600EC9AEB /* BooleanAttributeInputCallback.swift */; };
 		D5F8F9F024B7D85600EC9AEB /* NumberAttributeInputCallback.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F8F9EF24B7D85600EC9AEB /* NumberAttributeInputCallback.swift */; };
+		EC0BA2E7285B8F8F00F8326E /* FROptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0BA2E6285B8F8F00F8326E /* FROptions.swift */; };
+		EC0BA2FA2863325B00F8326E /* FROptionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0BA2F92863325B00F8326E /* FROptionsTests.swift */; };
 		EC7EA0F427D10FA70003F878 /* AppleSignInUserStructs.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC7EA0F327D10FA70003F878 /* AppleSignInUserStructs.swift */; };
 		EC8BCAFF273C3EC100C3B2D8 /* FRHTTPCookie.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC8BCAFD273C3EC100C3B2D8 /* FRHTTPCookie.swift */; };
 /* End PBXBuildFile section */
@@ -606,6 +608,8 @@
 		D5F8F9EF24B7D85600EC9AEB /* NumberAttributeInputCallback.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberAttributeInputCallback.swift; sourceTree = "<group>"; };
 		D5FBD8A224B930E30005DD0F /* BooleanAttributeInputCallbackTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BooleanAttributeInputCallbackTests.swift; sourceTree = "<group>"; };
 		D5FBD8A524B930F00005DD0F /* NumberAttributeInputCallbackTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberAttributeInputCallbackTests.swift; sourceTree = "<group>"; };
+		EC0BA2E6285B8F8F00F8326E /* FROptions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FROptions.swift; sourceTree = "<group>"; };
+		EC0BA2F92863325B00F8326E /* FROptionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FROptionsTests.swift; sourceTree = "<group>"; };
 		EC7EA0F327D10FA70003F878 /* AppleSignInUserStructs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppleSignInUserStructs.swift; sourceTree = "<group>"; };
 		EC8BCAFD273C3EC100C3B2D8 /* FRHTTPCookie.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FRHTTPCookie.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -661,6 +665,7 @@
 		D52D1637231484D60095905A /* FRAuth */ = {
 			isa = PBXGroup;
 			children = (
+				EC0BA2F72863323A00F8326E /* FROptions */,
 				A5950A2827EA200200EDEFE4 /* SSL Pinning */,
 				D53A806126278A410093B1CA /* WebAuthn */,
 				D58BC39D2602FB6A00254654 /* SocialLogin */,
@@ -1100,6 +1105,7 @@
 			children = (
 				D586CF5B23358EE0007A2194 /* OAuth2Client.swift */,
 				D586CF5C23358EE0007A2194 /* ServerConfig.swift */,
+				EC0BA2E6285B8F8F00F8326E /* FROptions.swift */,
 			);
 			path = Config;
 			sourceTree = "<group>";
@@ -1526,6 +1532,14 @@
 			path = Log;
 			sourceTree = "<group>";
 		};
+		EC0BA2F72863323A00F8326E /* FROptions */ = {
+			isa = PBXGroup;
+			children = (
+				EC0BA2F92863325B00F8326E /* FROptionsTests.swift */,
+			);
+			path = FROptions;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -1808,6 +1822,7 @@
 				D586CF9423358EE0007A2194 /* PasswordCallback.swift in Sources */,
 				D586CFBF23358EE0007A2194 /* TokenManager.swift in Sources */,
 				D586CFA923358EE0007A2194 /* OAuth2Client.swift in Sources */,
+				EC0BA2E7285B8F8F00F8326E /* FROptions.swift in Sources */,
 				D5B2060C25FFDDC800DABB9B /* IdPValue.swift in Sources */,
 				D586CFAF23358EE0007A2194 /* OAuth2.swift in Sources */,
 				D586CF9E23358EE0007A2194 /* ValidatedCreateUsernameCallback.swift in Sources */,
@@ -1874,6 +1889,7 @@
 				D5791BA125F87DE7004B487A /* AA_04_BooleanAttributeInputCallbackTest.swift in Sources */,
 				D5791BA225F87DE7004B487A /* AA_04_ConfirmationCallbackTest.swift in Sources */,
 				A5950A2A27EA205B00EDEFE4 /* SSLPinningTests.swift in Sources */,
+				EC0BA2FA2863325B00F8326E /* FROptionsTests.swift in Sources */,
 				D5791BA325F87DE7004B487A /* AA_04_DeviceProfileCallbackTest.swift in Sources */,
 				D5791BA425F87DE7004B487A /* AA_04_StringAttributeInputCallbackTest.swift in Sources */,
 				D5791BA525F87DE7004B487A /* AA_04_PollingWaitCallbackTest.swift in Sources */,
@@ -2026,7 +2042,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -2084,7 +2100,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -2110,13 +2126,13 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = FRAuth/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.2;
+				MARKETING_VERSION = 3.4.0;
 				MODULEMAP_FILE = "${PROJECT_DIR}/FRAuth/SharedC/FRAuth.modulemap";
 				OTHER_CFLAGS = "-DXCODE_FRAMEWORK=1";
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRAuth;
@@ -2144,13 +2160,13 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = FRAuth/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.2;
+				MARKETING_VERSION = 3.4.0;
 				MODULEMAP_FILE = "${PROJECT_DIR}/FRAuth/SharedC/FRAuth.modulemap";
 				OTHER_CFLAGS = "-DXCODE_FRAMEWORK=1";
 				PRODUCT_BUNDLE_IDENTIFIER = com.forgerock.ios.FRAuth;
@@ -2171,7 +2187,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = FRAuthTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2198,7 +2214,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = FRAuthTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",