chore: kickoff release

Author: thisisabhash

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ASF/ASFAppInfo.swift

@@ -5,6 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import AmplifyAvailability
 import Foundation
 
 struct ASFAppInfo: ASFAppInfoBehavior {
@@ -16,9 +17,9 @@ struct ASFAppInfo: ASFAppInfoBehavior {
     var targetSDK: String {
         var targetSDK: String = ""
 #if os(iOS) || os(watchOS) || os(tvOS)
-        targetSDK = "\(__IPHONE_OS_VERSION_MIN_REQUIRED)"
+        targetSDK = "\(getIOSVersionMinRequired())"
 #elseif os(macOS)
-        targetSDK = "\(__MAC_OS_X_VERSION_MIN_REQUIRED)"
+        targetSDK = "\(getMACOSXVersionMinRequired())"
 #else
         targetSDK = "Unknown"
 #endif

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/CredentialStorage/AWSCognitoAuthCredentialStore.swift

@@ -83,8 +83,9 @@ struct AWSCognitoAuthCredentialStore {
         let oldUserPoolConfiguration = oldAuthConfigData.getUserPoolConfiguration()
         let oldIdentityPoolConfiguration = oldAuthConfigData.getIdentityPoolConfiguration()
         let newIdentityConfigData = currentAuthConfig.getIdentityPoolConfiguration()
+        let newUserPoolConfiguration = currentAuthConfig.getUserPoolConfiguration()
 
-        /// Only migrate if
+        /// Migrate if
         ///  - Old User Pool Config didn't exist
         ///  - New Identity Config Data exists
         ///  - Old Identity Pool Config == New Identity Pool Config
@@ -95,6 +96,19 @@ struct AWSCognitoAuthCredentialStore {
             if let oldCognitoCredentialsData = try? keychain._getData(oldNameSpace) {
                 try? keychain._set(oldCognitoCredentialsData, key: newNameSpace)
             }
+        /// Migrate if
+        ///  - Old config and new config are different
+        ///  - Old Userpool Existed
+        ///  - Old and new user pool namespacing is the same
+        } else if oldAuthConfigData != currentAuthConfig &&
+                    oldUserPoolConfiguration != nil &&
+                    UserPoolConfigurationData.isNamespacingEqual(
+                        lhs: oldUserPoolConfiguration,
+                        rhs: newUserPoolConfiguration) {
+            // retrieve data from the old namespace and save with the new namespace
+            if let oldCognitoCredentialsData = try? keychain._getData(oldNameSpace) {
+                try? keychain._set(oldCognitoCredentialsData, key: newNameSpace)
+            }
         } else if oldAuthConfigData != currentAuthConfig &&
                     oldNameSpace != newNameSpace {
             // Clear the old credentials

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Data/UserPoolConfigurationData.swift

@@ -57,6 +57,14 @@ struct UserPoolConfigurationData: Equatable {
     func getIdentityProviderName() -> String {
         return "cognito-idp.\(region).amazonaws.com/\(poolId)"
     }
+
+    static func isNamespacingEqual(
+        lhs: UserPoolConfigurationData?,
+        rhs: UserPoolConfigurationData?) -> Bool {
+            return lhs?.poolId == rhs?.poolId
+            && lhs?.clientId == rhs?.clientId
+            && lhs?.region == rhs?.region
+        }
 }
 
 extension UserPoolConfigurationData: Codable { }

AmplifyPlugins/Auth/Sources/AmplifyAvailability/AmplityAvailability.c

@@ -0,0 +1,21 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#include "include/AmplifyAvailability.h"
+#include <Availability.h>
+
+#if TARGET_OS_IOS || TARGET_OS_WATCH || TARGET_OS_TV
+int getIOSVersionMinRequired(void) {
+    return __IPHONE_OS_VERSION_MIN_REQUIRED;
+}
+#endif
+
+#if TARGET_OS_OSX
+int getMACOSXVersionMinRequired(void) {
+    return __MAC_OS_X_VERSION_MIN_REQUIRED;
+}
+#endif

AmplifyPlugins/Auth/Sources/AmplifyAvailability/include/AmplifyAvailability.h

@@ -0,0 +1,21 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef AmplifyAvailability_h
+#define AmplifyAvailability_h
+
+#include <TargetConditionals.h>
+
+#if TARGET_OS_IOS || TARGET_OS_WATCH || TARGET_OS_TV
+int getIOSVersionMinRequired(void);
+#endif
+
+#if TARGET_OS_OSX
+int getMACOSXVersionMinRequired(void);
+#endif
+
+#endif /* AmplifyAvailability_h */

AmplifyPlugins/Auth/Sources/AmplifyAvailability/module.modulemap

@@ -0,0 +1,4 @@
+module AmplifyAvailability {
+    header "include/AmplifyAvailability.h"
+    export *
+}

MobileSDK_To_AmplifySwift_Guidance.md

@@ -179,6 +179,7 @@ let authTargets: [Target] = [
         name: "AWSCognitoAuthPlugin",
         dependencies: [
             .target(name: "Amplify"),
+            .target(name: "AmplifyAvailability"),
             .target(name: "AmplifySRP"),
             .target(name: "AWSPluginsCore"),
             .target(name: "InternalAmplifyCredentials"),
@@ -191,6 +192,11 @@ let authTargets: [Target] = [
             .copy("Resources/PrivacyInfo.xcprivacy")
         ]
     ),
+    .target(
+        name: "AmplifyAvailability",
+        path: "AmplifyPlugins/Auth/Sources/AmplifyAvailability",
+        publicHeadersPath: "include"
+    ),
     .target(
         name: "libtommathAmplify",
         path: "AmplifyPlugins/Auth/Sources/libtommath",