chore: kickoff release

Author: harsh62

AmplifyPlugins/Analytics/Sources/AWSPinpointAnalyticsPlugin/Dependency/Pinpoint/Analytics/PinpointEvent+PinpointClientTypes.swift

@@ -22,7 +22,7 @@ extension PinpointEvent {
                                          appTitle: Bundle.main.appName,
                                          appVersionCode: Bundle.main.appVersion,
                                          attributes: attributes,
-                                         clientSdkVersion: AmplifyAWSServiceConfiguration.version,
+                                         clientSdkVersion: AmplifyAWSServiceConfiguration.amplifyVersion,
                                          eventType: eventType,
                                          metrics: metrics,
                                          sdkName: AmplifyAWSServiceConfiguration.platformName,

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/SRPAuth/SRPSignInHelper.swift

@@ -27,20 +27,4 @@ struct SRPSignInHelper {
             throw error
         }
     }
-
-    static func clientSecretHash(
-        username: String,
-        userPoolClientId: String,
-        clientSecret: String
-    ) -> String {
-        let clientSecretData = clientSecret.data(using: .utf8)!
-        let clientSecretByteArray = [UInt8](clientSecretData)
-        let key = SymmetricKey(data: clientSecretByteArray)
-
-        let clientData = (username + userPoolClientId).data(using: .utf8)!
-
-        let mac = HMAC<SHA256>.authenticationCode(for: clientData, using: key)
-        let macBase64 = Data(mac).base64EncodedString()
-        return macBase64
-    }
 }

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Helpers/ClientSecretHelper.swift

@@ -0,0 +1,45 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import Foundation
+import CryptoKit
+
+enum ClientSecretHelper {
+
+    static func calculateSecretHash(
+        username: String,
+        userPoolConfiguration: UserPoolConfigurationData
+    ) -> String? {
+        let userPoolClientId = userPoolConfiguration.clientId
+        if let clientSecret = userPoolConfiguration.clientSecret {
+
+            return Self.clientSecretHash(
+                username: username,
+                userPoolClientId: userPoolClientId,
+                clientSecret: clientSecret
+            )
+        }
+        return nil
+    }
+
+    static func clientSecretHash(
+        username: String,
+        userPoolClientId: String,
+        clientSecret: String
+    ) -> String {
+        let clientSecretData = clientSecret.data(using: .utf8)!
+        let clientSecretByteArray = [UInt8](clientSecretData)
+        let key = SymmetricKey(data: clientSecretByteArray)
+
+        let clientData = (username + userPoolClientId).data(using: .utf8)!
+
+        let mac = HMAC<SHA256>.authenticationCode(for: clientData, using: key)
+        let macBase64 = Data(mac).base64EncodedString()
+        return macBase64
+    }
+
+}

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Utils/ConfirmSignUpInput+Amplify.swift

@@ -17,7 +17,7 @@ extension ConfirmSignUpInput {
     ) {
 
         let configuration = environment.userPoolConfiguration
-        let secretHash = Self.calculateSecretHash(
+        let secretHash = ClientSecretHelper.calculateSecretHash(
             username: username,
             userPoolConfiguration: configuration)
         var userContextData: CognitoIdentityProviderClientTypes.UserContextDataType?
@@ -40,19 +40,4 @@ extension ConfirmSignUpInput {
             secretHash: secretHash,
             userContextData: userContextData, username: username)
     }
-
-    private static func calculateSecretHash(
-        username: String,
-        userPoolConfiguration: UserPoolConfigurationData) -> String? {
-            let userPoolClientId = userPoolConfiguration.clientId
-            if let clientSecret = userPoolConfiguration.clientSecret {
-
-                return SRPSignInHelper.clientSecretHash(
-                    username: username,
-                    userPoolClientId: userPoolClientId,
-                    clientSecret: clientSecret
-                )
-            }
-            return nil
-        }
 }

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Utils/InitiateAuthInput+Amplify.swift

@@ -109,7 +109,7 @@ extension InitiateAuthInput {
         let userPoolClientId = configuration.clientId
 
         if let clientSecret = configuration.clientSecret {
-            let clientSecretHash = SRPSignInHelper.clientSecretHash(
+            let clientSecretHash = ClientSecretHelper.clientSecretHash(
                 username: username,
                 userPoolClientId: userPoolClientId,
                 clientSecret: clientSecret

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Utils/RespondToAuthChallengeInput+Amplify.swift

@@ -116,7 +116,7 @@ extension RespondToAuthChallengeInput {
             let userPoolClientId = environment.userPoolConfiguration.clientId
             if let clientSecret = environment.userPoolConfiguration.clientSecret {
 
-                let clientSecretHash = SRPSignInHelper.clientSecretHash(
+                let clientSecretHash = ClientSecretHelper.clientSecretHash(
                     username: username,
                     userPoolClientId: userPoolClientId,
                     clientSecret: clientSecret

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Utils/SignUpInput+Amplify.swift

@@ -22,7 +22,7 @@ extension SignUpInput {
          environment: UserPoolEnvironment) {
 
         let configuration = environment.userPoolConfiguration
-        let secretHash = Self.calculateSecretHash(username: username,
+        let secretHash = ClientSecretHelper.calculateSecretHash(username: username,
                                                   userPoolConfiguration: configuration)
         let validationData = Self.getValidationData(with: validationData)
         let convertedAttributes = Self.convertAttributes(attributes)
@@ -49,21 +49,6 @@ extension SignUpInput {
                   validationData: validationData)
     }
 
-    private static func calculateSecretHash(
-        username: String,
-        userPoolConfiguration: UserPoolConfigurationData) -> String? {
-            let userPoolClientId = userPoolConfiguration.clientId
-            if let clientSecret = userPoolConfiguration.clientSecret {
-
-                return SRPSignInHelper.clientSecretHash(
-                    username: username,
-                    userPoolClientId: userPoolClientId,
-                    clientSecret: clientSecret
-                )
-            }
-            return nil
-        }
-
     private static func getValidationData(with devProvidedData: [String: String]?)
     -> [CognitoIdentityProviderClientTypes.AttributeType]? {
 

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmResetPasswordTask.swift

@@ -74,12 +74,18 @@ class AWSAuthConfirmResetPasswordTask: AuthConfirmResetPasswordTask {
         let analyticsMetadata = userPoolEnvironment
             .cognitoUserPoolAnalyticsHandlerFactory()
             .analyticsMetadata()
+        let secretHash = ClientSecretHelper.calculateSecretHash(
+            username: request.username,
+            userPoolConfiguration: userPoolConfigurationData
+        )
         let input = ConfirmForgotPasswordInput(
             analyticsMetadata: analyticsMetadata,
             clientId: userPoolConfigurationData.clientId,
             clientMetadata: clientMetaData,
             confirmationCode: request.confirmationCode,
-            password: request.newPassword, userContextData: userContextData,
+            password: request.newPassword,
+            secretHash: secretHash,
+            userContextData: userContextData,
             username: request.username)
 
         _ = try await userPoolService.confirmForgotPassword(input: input)

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthResendSignUpCodeTask.swift

@@ -73,10 +73,15 @@ class AWSAuthResendSignUpCodeTask: AuthResendSignUpCodeTask {
         let analyticsMetadata = userPoolEnvironment
             .cognitoUserPoolAnalyticsHandlerFactory()
             .analyticsMetadata()
+        let secretHash = ClientSecretHelper.calculateSecretHash(
+            username: request.username,
+            userPoolConfiguration: userPoolConfigurationData
+        )
         let input = ResendConfirmationCodeInput(
             analyticsMetadata: analyticsMetadata,
             clientId: userPoolConfigurationData.clientId,
             clientMetadata: clientMetaData,
+            secretHash: secretHash,
             userContextData: userContextData,
             username: request.username)
 

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthResetPasswordTask.swift

@@ -72,10 +72,15 @@ class AWSAuthResetPasswordTask: AuthResetPasswordTask {
         let analyticsMetadata = userPoolEnvironment
             .cognitoUserPoolAnalyticsHandlerFactory()
             .analyticsMetadata()
+        let secretHash = ClientSecretHelper.calculateSecretHash(
+            username: request.username,
+            userPoolConfiguration: userPoolConfigurationData
+        )
         let input = ForgotPasswordInput(
             analyticsMetadata: analyticsMetadata,
             clientId: userPoolConfigurationData.clientId,
             clientMetadata: clientMetaData,
+            secretHash: secretHash,
             userContextData: userContextData,
             username: request.username)