fix(auth): Use inputUsername for device metadata lookup in rememberDevice/forgetDevice and add e2e tests (#4209)

* fix(auth): Use inputUsername for device metadata lookup during token refresh

* fix(auth): Use inputUsername for device metadata lookup during token refresh

* chore(auth): Add token refresh integration tests for device tracking

* chore(auth): Add alias-based token refresh integration tests for device tracking

* chore(auth): Update test comments to clarify non-alias vs alias test coverage

* fix(auth): Use inputUsername for device metadata lookup in rememberDevice/forgetDevice and add e2e tests (#4211)

---------

Co-authored-by: Harsh <6162866+harsh62@users.noreply.github.com>

Author: jvh-aws

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/DeviceTasks/AWSAuthForgetDeviceTask.swift

@@ -53,7 +53,7 @@ class AWSAuthForgetDeviceTask: AuthForgetDeviceTask, DefaultLogger {
         let authState = await authStateMachine.currentState
         if case .configured(let authenticationState, _, _) = authState,
            case .signedIn(let signInData) = authenticationState {
-           return signInData.username
+           return signInData.inputUsername ?? signInData.username
         }
         throw AuthError.unknown("Unable to get username for the signedIn user")
     }

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/DeviceTasks/AWSAuthRememberDeviceTask.swift

@@ -52,7 +52,7 @@ class AWSAuthRememberDeviceTask: AuthRememberDeviceTask, DefaultLogger {
         let authState = await authStateMachine.currentState
         if case .configured(let authenticationState, _, _) = authState,
            case .signedIn(let signInData) = authenticationState {
-           return signInData.username
+           return signInData.inputUsername ?? signInData.username
         }
         throw AuthError.unknown("Unable to get username for the signedIn user")
     }

AmplifyPlugins/Auth/Tests/AuthHostApp/AuthHostApp.xcodeproj/project.pbxproj

@@ -30,7 +30,6 @@
 		21F762B82BD6B1AA0048845A /* TOTPSetupWhenAuthenticatedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48916F372A412B2800E3E1B1 /* TOTPSetupWhenAuthenticatedTests.swift */; };
 		21F762B92BD6B1AA0048845A /* CredentialStoreConfigurationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484834BB27B6ED8700649D11 /* CredentialStoreConfigurationTests.swift */; };
 		21F762BA2BD6B1AA0048845A /* AuthRememberDeviceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737C74D287E208400DA0D2B /* AuthRememberDeviceTests.swift */; };
-		E9B56799769C60EAA3B3F1B7 /* DeviceKeyPersistenceIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DF106AB62BCE2F9D62D3CB0 /* DeviceKeyPersistenceIntegrationTests.swift */; };
 		21F762BB2BD6B1AA0048845A /* XCTestCase+AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFEAA28E747B80000C36A /* XCTestCase+AsyncTesting.swift */; };
 		21F762BC2BD6B1AA0048845A /* AuthResendSignUpCodeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B43C26C927BC9D54003F3BF7 /* AuthResendSignUpCodeTests.swift */; };
 		21F762BD2BD6B1AA0048845A /* AuthResetPasswordTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97829200286B802E000DE190 /* AuthResetPasswordTests.swift */; };
@@ -41,6 +40,7 @@
 		21F762C22BD6B1AA0048845A /* AuthConfirmResetPasswordTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97829202286E41FA000DE190 /* AuthConfirmResetPasswordTests.swift */; };
 		21F762C32BD6B1AA0048845A /* AuthDeleteUserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4821B2F1286B5F74000EC1D7 /* AuthDeleteUserTests.swift */; };
 		21F762C62BD6B1AA0048845A /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 485CB5AE27B61EAA006CCEC7 /* README.md */; };
+		3ECC1FC593B6E582A1A88856 /* DeviceKeyPersistenceIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DF106AB62BCE2F9D62D3CB0 /* DeviceKeyPersistenceIntegrationTests.swift */; };
 		4821B2F2286B5F74000EC1D7 /* AuthDeleteUserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4821B2F1286B5F74000EC1D7 /* AuthDeleteUserTests.swift */; };
 		4821B2F428737130000EC1D7 /* AuthCustomSignInTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4821B2F328737130000EC1D7 /* AuthCustomSignInTests.swift */; };
 		4834D7C128B0770800DD564B /* FederatedSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4834D7C028B0770800DD564B /* FederatedSessionTests.swift */; };
@@ -88,6 +88,7 @@
 		48DEF59B2CDB1FF500BDB995 /* PasswordlessSignInTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48DEF5992CDB1FF500BDB995 /* PasswordlessSignInTests.swift */; };
 		48DEF59C2CDB1FF500BDB995 /* PasswordlessSignInTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48DEF5992CDB1FF500BDB995 /* PasswordlessSignInTests.swift */; };
 		48E3AB3128E52590004EE395 /* GetCurrentUserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48E3AB3028E52590004EE395 /* GetCurrentUserTests.swift */; };
+		4BF81384CA84205BCBC3A1DE /* DeviceKeyPersistenceIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DF106AB62BCE2F9D62D3CB0 /* DeviceKeyPersistenceIntegrationTests.swift */; };
 		681B76952A3CB8DA004B59D9 /* AuthHostAppApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485CB53D27B614CE006CCEC7 /* AuthHostAppApp.swift */; };
 		681B76962A3CB8DD004B59D9 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485CB53F27B614CE006CCEC7 /* ContentView.swift */; };
 		681B769A2A3CBA97004B59D9 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 681B76992A3CBA97004B59D9 /* Amplify */; };
@@ -110,7 +111,6 @@
 		681B76B22A3CBBAE004B59D9 /* AuthEnvironmentHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484834BD27B6FD9B00649D11 /* AuthEnvironmentHelper.swift */; };
 		681B76B32A3CBBAE004B59D9 /* CredentialStoreConfigurationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484834BB27B6ED8700649D11 /* CredentialStoreConfigurationTests.swift */; };
 		681B76B42A3CBBAE004B59D9 /* AuthRememberDeviceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737C74D287E208400DA0D2B /* AuthRememberDeviceTests.swift */; };
-		4BF81384CA84205BCBC3A1DE /* DeviceKeyPersistenceIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DF106AB62BCE2F9D62D3CB0 /* DeviceKeyPersistenceIntegrationTests.swift */; };
 		681B76B52A3CBBAE004B59D9 /* XCTestCase+AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFEAA28E747B80000C36A /* XCTestCase+AsyncTesting.swift */; };
 		681B76B62A3CBBAE004B59D9 /* AuthResendSignUpCodeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B43C26C927BC9D54003F3BF7 /* AuthResendSignUpCodeTests.swift */; };
 		681B76B72A3CBBAE004B59D9 /* AuthResetPasswordTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97829200286B802E000DE190 /* AuthResetPasswordTests.swift */; };
@@ -125,7 +125,6 @@
 		681DFEAD28E747B80000C36A /* XCTestCase+AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFEAA28E747B80000C36A /* XCTestCase+AsyncTesting.swift */; };
 		970333F0295D793B0019981E /* AuthStressBaseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970333EF295D793B0019981E /* AuthStressBaseTest.swift */; };
 		9737C74E287E208400DA0D2B /* AuthRememberDeviceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737C74D287E208400DA0D2B /* AuthRememberDeviceTests.swift */; };
-		3ECC1FC593B6E582A1A88856 /* DeviceKeyPersistenceIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DF106AB62BCE2F9D62D3CB0 /* DeviceKeyPersistenceIntegrationTests.swift */; };
 		9737C7502880BFD600DA0D2B /* AuthForgetDeviceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737C74F2880BFD600DA0D2B /* AuthForgetDeviceTests.swift */; };
 		97829201286B802E000DE190 /* AuthResetPasswordTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97829200286B802E000DE190 /* AuthResetPasswordTests.swift */; };
 		97829203286E41FA000DE190 /* AuthConfirmResetPasswordTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97829202286E41FA000DE190 /* AuthConfirmResetPasswordTests.swift */; };
@@ -145,6 +144,8 @@
 		B43C26CC27BC9D54003F3BF7 /* AuthResendSignUpCodeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B43C26C927BC9D54003F3BF7 /* AuthResendSignUpCodeTests.swift */; };
 		B4B9F45828F47C0A004F346F /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = B4B9F45728F47C0A004F346F /* Amplify */; };
 		B4B9F45A28F47C0A004F346F /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = B4B9F45928F47C0A004F346F /* AWSCognitoAuthPlugin */; };
+		E9B56799769C60EAA3B3F1B7 /* DeviceKeyPersistenceIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DF106AB62BCE2F9D62D3CB0 /* DeviceKeyPersistenceIntegrationTests.swift */; };
+		EA3EEAF12FAA492B0011EF4D /* DeviceAliasTokenRefreshIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3EEAF02FAA492B0011EF4D /* DeviceAliasTokenRefreshIntegrationTests.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -193,6 +194,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		0DF106AB62BCE2F9D62D3CB0 /* DeviceKeyPersistenceIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceKeyPersistenceIntegrationTests.swift; sourceTree = "<group>"; };
 		21CFD7C52C7524570071C70F /* AppSyncSignerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSyncSignerTests.swift; sourceTree = "<group>"; };
 		21F762CB2BD6B1AA0048845A /* AuthGen2IntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AuthGen2IntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		21F762CC2BD6B1CD0048845A /* AuthGen2IntegrationTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = AuthGen2IntegrationTests.xctestplan; sourceTree = "<group>"; };
@@ -231,10 +233,8 @@
 		681DFEA828E747B80000C36A /* AsyncTesting.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AsyncTesting.swift; sourceTree = "<group>"; };
 		681DFEA928E747B80000C36A /* AsyncExpectation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AsyncExpectation.swift; sourceTree = "<group>"; };
 		681DFEAA28E747B80000C36A /* XCTestCase+AsyncTesting.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "XCTestCase+AsyncTesting.swift"; sourceTree = "<group>"; };
-		907EA7602A4B6F56005E3AA8 /* AuthHostApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AuthHostApp.entitlements; sourceTree = "<group>"; };
 		970333EF295D793B0019981E /* AuthStressBaseTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthStressBaseTest.swift; sourceTree = "<group>"; };
 		9737C74D287E208400DA0D2B /* AuthRememberDeviceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthRememberDeviceTests.swift; sourceTree = "<group>"; };
-		0DF106AB62BCE2F9D62D3CB0 /* DeviceKeyPersistenceIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceKeyPersistenceIntegrationTests.swift; sourceTree = "<group>"; };
 		9737C74F2880BFD600DA0D2B /* AuthForgetDeviceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthForgetDeviceTests.swift; sourceTree = "<group>"; };
 		97829200286B802E000DE190 /* AuthResetPasswordTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthResetPasswordTests.swift; sourceTree = "<group>"; };
 		97829202286E41FA000DE190 /* AuthConfirmResetPasswordTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthConfirmResetPasswordTests.swift; sourceTree = "<group>"; };
@@ -251,6 +251,7 @@
 		B4B9F45628F47B7B004F346F /* amplify-ios */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "amplify-ios"; path = ../../../..; sourceTree = "<group>"; };
 		E2A7D1732C5D76CB00B06999 /* AuthHostApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AuthHostApp.entitlements; sourceTree = "<group>"; };
 		E2A7D1742C5D774200B06999 /* AuthWatchApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AuthWatchApp.entitlements; sourceTree = "<group>"; };
+		EA3EEAF02FAA492B0011EF4D /* DeviceAliasTokenRefreshIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceAliasTokenRefreshIntegrationTests.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -535,6 +536,7 @@
 		97B370C32878DA3500F1C088 /* DeviceTests */ = {
 			isa = PBXGroup;
 			children = (
+				EA3EEAF02FAA492B0011EF4D /* DeviceAliasTokenRefreshIntegrationTests.swift */,
 				97B370C42878DA5A00F1C088 /* AuthFetchDeviceTests.swift */,
 				9737C74D287E208400DA0D2B /* AuthRememberDeviceTests.swift */,
 				9737C74F2880BFD600DA0D2B /* AuthForgetDeviceTests.swift */,
@@ -878,6 +880,7 @@
 				21F762AC2BD6B1AA0048845A /* AuthFetchDeviceTests.swift in Sources */,
 				21F762AD2BD6B1AA0048845A /* TOTPSetupWhenUnauthenticatedTests.swift in Sources */,
 				21F762AE2BD6B1AA0048845A /* AsyncExpectation.swift in Sources */,
+				EA3EEAF12FAA492B0011EF4D /* DeviceAliasTokenRefreshIntegrationTests.swift in Sources */,
 				21F762AF2BD6B1AA0048845A /* GetCurrentUserTests.swift in Sources */,
 				21F762B02BD6B1AA0048845A /* TOTPHelper.swift in Sources */,
 				21F762B12BD6B1AA0048845A /* AWSAuthBaseTest.swift in Sources */,