Consolidate on single toAuthCodeDeliveryDetails function

Author: mattcreaser

aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/RealAWSCognitoAuthPlugin.kt

@@ -71,6 +71,7 @@ import com.amplifyframework.auth.cognito.result.GlobalSignOutError
 import com.amplifyframework.auth.cognito.result.HostedUIError
 import com.amplifyframework.auth.cognito.result.RevokeTokenError
 import com.amplifyframework.auth.cognito.usecases.ResetPasswordUseCase
+import com.amplifyframework.auth.cognito.util.toAuthCodeDeliveryDetails
 import com.amplifyframework.auth.exceptions.ConfigurationException
 import com.amplifyframework.auth.exceptions.InvalidStateException
 import com.amplifyframework.auth.exceptions.NotAuthorizedException
@@ -481,21 +482,7 @@ internal class RealAWSCognitoAuthPlugin(
                 encodedContextData?.let { this.userContextData { encodedData = it } }
             }
 
-            val deliveryDetails = response?.codeDeliveryDetails?.let { details ->
-                mapOf(
-                    "DESTINATION" to details.destination,
-                    "MEDIUM" to details.deliveryMedium?.value,
-                    "ATTRIBUTE" to details.attributeName
-                )
-            }
-
-            val codeDeliveryDetails = AuthCodeDeliveryDetails(
-                deliveryDetails?.getValue("DESTINATION") ?: "",
-                AuthCodeDeliveryDetails.DeliveryMedium.fromString(
-                    deliveryDetails?.getValue("MEDIUM")
-                ),
-                deliveryDetails?.getValue("ATTRIBUTE")
-            )
+            val codeDeliveryDetails = response?.codeDeliveryDetails.toAuthCodeDeliveryDetails()
             onSuccess.accept(codeDeliveryDetails)
             logger.verbose("ResendSignUpCode Execution complete")
         } catch (exception: Exception) {

aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/actions/SignUpCognitoActions.kt

@@ -19,9 +19,9 @@ import aws.sdk.kotlin.services.cognitoidentityprovider.confirmSignUp
 import aws.sdk.kotlin.services.cognitoidentityprovider.model.AnalyticsMetadataType
 import aws.sdk.kotlin.services.cognitoidentityprovider.model.AttributeType
 import aws.sdk.kotlin.services.cognitoidentityprovider.signUp
-import com.amplifyframework.auth.AuthCodeDeliveryDetails
 import com.amplifyframework.auth.cognito.AuthEnvironment
 import com.amplifyframework.auth.cognito.helpers.AuthHelper
+import com.amplifyframework.auth.cognito.util.toAuthCodeDeliveryDetails
 import com.amplifyframework.auth.result.AuthSignUpResult
 import com.amplifyframework.auth.result.step.AuthNextSignUpStep
 import com.amplifyframework.auth.result.step.AuthSignUpStep
@@ -68,13 +68,7 @@ internal object SignUpCognitoActions : SignUpActions {
                     }
                 }
 
-                val codeDeliveryDetails = AuthCodeDeliveryDetails(
-                    response?.codeDeliveryDetails?.destination ?: "",
-                    AuthCodeDeliveryDetails.DeliveryMedium.fromString(
-                        response?.codeDeliveryDetails?.deliveryMedium?.value
-                    ),
-                    response?.codeDeliveryDetails?.attributeName
-                )
+                val codeDeliveryDetails = response?.codeDeliveryDetails.toAuthCodeDeliveryDetails()
                 val signUpData = SignUpData(
                     username,
                     event.signUpData.validationData,

aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/usecases/ResendUserAttributeConfirmationUseCase.kt

@@ -24,6 +24,7 @@ import com.amplifyframework.auth.cognito.exceptions.service.CodeDeliveryFailureE
 import com.amplifyframework.auth.cognito.options.AWSCognitoAuthResendUserAttributeConfirmationCodeOptions
 import com.amplifyframework.auth.cognito.requireAccessToken
 import com.amplifyframework.auth.cognito.requireSignedInState
+import com.amplifyframework.auth.cognito.util.toAuthCodeDeliveryDetails
 import com.amplifyframework.auth.options.AuthResendUserAttributeConfirmationCodeOptions
 
 internal class ResendUserAttributeConfirmationUseCase(

aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/usecases/ResetPasswordUseCase.kt

@@ -18,13 +18,12 @@ package com.amplifyframework.auth.cognito.usecases
 import aws.sdk.kotlin.services.cognitoidentityprovider.CognitoIdentityProviderClient
 import aws.sdk.kotlin.services.cognitoidentityprovider.forgotPassword
 import aws.sdk.kotlin.services.cognitoidentityprovider.model.AnalyticsMetadataType
-import aws.sdk.kotlin.services.cognitoidentityprovider.model.CodeDeliveryDetailsType
 import com.amplifyframework.AmplifyException
-import com.amplifyframework.auth.AuthCodeDeliveryDetails
 import com.amplifyframework.auth.AuthException
 import com.amplifyframework.auth.cognito.CognitoAuthExceptionConverter
 import com.amplifyframework.auth.cognito.helpers.AuthHelper
 import com.amplifyframework.auth.cognito.options.AWSCognitoAuthResetPasswordOptions
+import com.amplifyframework.auth.cognito.util.toAuthCodeDeliveryDetails
 import com.amplifyframework.auth.options.AuthResetPasswordOptions
 import com.amplifyframework.auth.result.AuthResetPasswordResult
 import com.amplifyframework.auth.result.step.AuthNextResetPasswordStep
@@ -88,15 +87,3 @@ internal class ResetPasswordUseCase(
         }
     }
 }
-
-internal fun CodeDeliveryDetailsType?.toAuthCodeDeliveryDetails(): AuthCodeDeliveryDetails? {
-    if (this == null) return this
-
-    requireNotNull(destination)
-
-    return AuthCodeDeliveryDetails(
-        destination.toString(),
-        AuthCodeDeliveryDetails.DeliveryMedium.fromString(deliveryMedium.toString()),
-        attributeName
-    )
-}

aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/usecases/UpdateUserAttributesUseCase.kt

@@ -26,6 +26,7 @@ import com.amplifyframework.auth.cognito.options.AWSCognitoAuthUpdateUserAttribu
 import com.amplifyframework.auth.cognito.options.AWSCognitoAuthUpdateUserAttributesOptions
 import com.amplifyframework.auth.cognito.requireAccessToken
 import com.amplifyframework.auth.cognito.requireSignedInState
+import com.amplifyframework.auth.cognito.util.toAuthCodeDeliveryDetails
 import com.amplifyframework.auth.options.AuthUpdateUserAttributeOptions
 import com.amplifyframework.auth.options.AuthUpdateUserAttributesOptions
 import com.amplifyframework.auth.result.AuthUpdateAttributeResult

aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoExtensions.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amplifyframework.auth.cognito.util
+
+import aws.sdk.kotlin.services.cognitoidentityprovider.model.CodeDeliveryDetailsType
+import com.amplifyframework.auth.AuthCodeDeliveryDetails
+
+/**
+ * Always returns an [AuthCodeDeliveryDetails]. If this type is null then the delivery details will be empty.
+ */
+internal fun CodeDeliveryDetailsType?.toAuthCodeDeliveryDetails(): AuthCodeDeliveryDetails = AuthCodeDeliveryDetails(
+    this?.destination ?: "",
+    AuthCodeDeliveryDetails.DeliveryMedium.fromString(this?.deliveryMedium?.value),
+    this?.attributeName
+)

aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/actions/SignUpCognitoActionsTest.kt

@@ -24,7 +24,7 @@ import com.amplifyframework.auth.cognito.AWSCognitoAuthService
 import com.amplifyframework.auth.cognito.AuthConfiguration
 import com.amplifyframework.auth.cognito.AuthEnvironment
 import com.amplifyframework.auth.cognito.StoreClientBehavior
-import com.amplifyframework.auth.cognito.usecases.toAuthCodeDeliveryDetails
+import com.amplifyframework.auth.cognito.util.toAuthCodeDeliveryDetails
 import com.amplifyframework.auth.result.step.AuthSignUpStep
 import com.amplifyframework.logging.Logger
 import com.amplifyframework.statemachine.EventDispatcher

aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/usecases/CodeDeliveryDetailsTypeExtensionTest.kt

@@ -18,6 +18,7 @@ package com.amplifyframework.auth.cognito.usecases
 import aws.sdk.kotlin.services.cognitoidentityprovider.model.CodeDeliveryDetailsType
 import aws.sdk.kotlin.services.cognitoidentityprovider.model.DeliveryMediumType
 import com.amplifyframework.auth.AuthCodeDeliveryDetails
+import com.amplifyframework.auth.cognito.util.toAuthCodeDeliveryDetails
 import kotlin.test.assertEquals
 import org.junit.Test
 

aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/usecases/ResetPasswordUseCaseTest.kt

@@ -24,6 +24,7 @@ import aws.sdk.kotlin.services.cognitoidentityprovider.model.ForgotPasswordReque
 import aws.sdk.kotlin.services.cognitoidentityprovider.model.ForgotPasswordResponse
 import com.amplifyframework.auth.AuthException
 import com.amplifyframework.auth.cognito.helpers.AuthHelper
+import com.amplifyframework.auth.cognito.util.toAuthCodeDeliveryDetails
 import com.amplifyframework.auth.options.AuthResetPasswordOptions
 import com.amplifyframework.auth.result.AuthResetPasswordResult
 import com.amplifyframework.auth.result.step.AuthNextResetPasswordStep