Merge pull request #1250 from Esri/v.next

200.8 Release

Author: dfeinzimer

.gitignore

@@ -1,3 +1,6 @@
+## App Secrets
+.secrets
+
 .DS_Store
 /.build
 xcuserdata/

.swiftpm/xcode/xcshareddata/xcschemes/arcgis-runtime-toolkit-swift.xcscheme

@@ -1,4 +1,4 @@
-// Copyright 2022 Esri
+// Copyright 2025 Esri
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,6 @@
 import ArcGIS
 
 extension APIKey {
-    /// The default API key.
-    static let `default` = APIKey("<#API Key#>")
+    /// The API key for development of the package and projects in this repository.
+    static let development = APIKey("{{ ARCGIS_API_KEY_DEVELOPMENT }}")
 }

Tests/ArcGISToolkitTests/APIKey.swift renamed to AppSecrets.swift.masque

@@ -349,11 +349,12 @@
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 200.7.0;
+				MARKETING_VERSION = 200.8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.esri.Authentication;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
@@ -386,11 +387,12 @@
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 200.7.0;
+				MARKETING_VERSION = 200.8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.esri.Authentication;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";

AuthenticationExample/AuthenticationExample.xcodeproj/project.pbxproj

@@ -18,10 +18,7 @@ import SwiftUI
 
 @main
 struct AuthenticationApp: App {
-    @StateObject private var authenticator = Authenticator(
-        // If you want to use OAuth, uncomment this code:
-//      oAuthUserConfigurations: [.arcgisDotCom]
-    )
+    @StateObject private var authenticator = Authenticator()
 
     @State private var isSettingUp = true
 
@@ -43,6 +40,10 @@ struct AuthenticationApp: App {
             .authenticator(authenticator)
             .task {
                 isSettingUp = true
+                // If you want to use OAuth, uncomment this code:
+//                authenticator.oAuthUserConfigurations.append(.oAuthUserConfiguration)
+                // If you want to use Identity-Aware Proxy (IAP), uncomment this code:
+//                try? await authenticator.iapConfigurations.append(.iapConfiguration)
                 ArcGISEnvironment.authenticationManager.handleChallenges(using: authenticator)
                 // Here we setup credential stores to be persistent, which means that it will
                 // synchronize with the keychain for storing credentials.
@@ -58,7 +59,7 @@ struct AuthenticationApp: App {
 
 private extension OAuthUserConfiguration {
     // If you want to use OAuth, uncomment this code:
-//    static let arcgisDotCom = OAuthUserConfiguration(
+//    static let oAuthUserConfiguration = OAuthUserConfiguration(
 //        portalURL: .portal,
 //        clientID: "<#Your client ID goes here#>",
 //        // Note: You must have the same redirect URL used here
@@ -68,6 +69,17 @@ private extension OAuthUserConfiguration {
 //    )
 }
 
+private extension IAPConfiguration {
+    // If you want to use Identity-Aware Proxy (IAP), uncomment this code:
+//    static var iapConfiguration: IAPConfiguration {
+//        get async throws {
+//            try await .configuration(
+//                from: URL(filePath: "/path/to/IAP configuration/file.json")!
+//            )
+//        }
+//    }
+}
+
 extension URL {
     // If you want to use your own portal, provide your own URL here:
     static let portal = URL(string: "https://www.arcgis.com")!

AuthenticationExample/AuthenticationExample/AuthenticationApp.swift

@@ -37,6 +37,7 @@ struct HomeView: View {
                             .sheet(isPresented: $showProfile) {
                                 ProfileView(portal: portal) {
                                     self.portal = nil
+                                    self.showProfile = false
                                 }
                             }
                         }

AuthenticationExample/AuthenticationExample/HomeView.swift

@@ -72,8 +72,7 @@ struct ProfileView: View {
     func signOut() {
         isSigningOut = true
         Task {
-            await ArcGISEnvironment.authenticationManager.revokeOAuthTokens()
-            await ArcGISEnvironment.authenticationManager.clearCredentialStores()
+            await ArcGISEnvironment.authenticationManager.signOut()
             isSigningOut = false
             signOutAction()
         }

AuthenticationExample/AuthenticationExample/ProfileView.swift

@@ -0,0 +1,25 @@
+# Configure App Secrets
+
+As a best-practice principle, our project conceals app secrets from source code by generating and compiling an `AppSecrets.swift` source code file at build time using a custom build rule. The same pattern can be applied to your app development as well.
+
+This build rule looks for a secrets file stored in the toolkit's root directory, `/.secrets`.
+
+Note: License strings are not required for development. When no license or an invalid license key is applied, an app will fall back to Developer Mode (which will display a watermark on the map and scene views). Apply the license strings when your app is ready for deployment.
+
+1. Create a hidden secrets file in your project's root directory.
+
+  ```sh
+  touch .secrets
+  ```
+
+2. Add your **API Key** access token to the secrets file.
+
+  ```sh
+  echo ARCGIS_API_KEY_DEVELOPMENT=your-api-key >> .secrets
+  ```
+
+  > Replace 'your-api-key' with your keys.
+
+Visit the developer's website to learn more about [Deployment](https://developers.arcgis.com/swift/license-and-deployment/) and [Security and authentication](https://developers.arcgis.com/documentation/security-and-authentication/).
+
+To learn more about `masquerade`, consult the [documentation](https://github.com/Esri/data-collection-ios/tree/main/docs#masquerade) of Esri's Data Collection app.