From 91ce5dbeb4b1a8d6e342ad8f26b43d1eec0f6854 Mon Sep 17 00:00:00 2001
From: Martin Heidegger <martin.heidegger@jiw.co.jp>
Date: Fri, 27 Jun 2025 12:26:50 +0900
Subject: [PATCH] feat(ui): adding services.handleForceChangePassword

---
 .changeset/seven-flies-judge.md                           | 5 +++++
 packages/ui/src/machines/authenticator/actors/signIn.ts   | 3 +--
 packages/ui/src/machines/authenticator/defaultServices.ts | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/seven-flies-judge.md

diff --git a/.changeset/seven-flies-judge.md b/.changeset/seven-flies-judge.md
new file mode 100644
index 00000000000..e4581b3083c
--- /dev/null
+++ b/.changeset/seven-flies-judge.md
@@ -0,0 +1,5 @@
+---
+'@aws-amplify/ui': minor
+---
+
+Added services.handleForceChangePassword hook
diff --git a/packages/ui/src/machines/authenticator/actors/signIn.ts b/packages/ui/src/machines/authenticator/actors/signIn.ts
index c9249c0fa3b..c9a7249632a 100644
--- a/packages/ui/src/machines/authenticator/actors/signIn.ts
+++ b/packages/ui/src/machines/authenticator/actors/signIn.ts
@@ -1,7 +1,6 @@
 import { createMachine, sendUpdate } from 'xstate';
 import type { ConfirmSignInInput } from 'aws-amplify/auth';
 import {
-  confirmSignIn,
   fetchUserAttributes,
   resetPassword,
   signInWithRedirect,
@@ -345,7 +344,7 @@ export function signInActor({ services }: SignInMachineOptions) {
             options: { userAttributes },
           };
 
-          return confirmSignIn(input);
+          return services.handleForceChangePassword(input);
         },
         signInWithRedirect(_, { data }) {
           return signInWithRedirect(data);
diff --git a/packages/ui/src/machines/authenticator/defaultServices.ts b/packages/ui/src/machines/authenticator/defaultServices.ts
index d045e006f7a..57e86510e33 100644
--- a/packages/ui/src/machines/authenticator/defaultServices.ts
+++ b/packages/ui/src/machines/authenticator/defaultServices.ts
@@ -92,6 +92,7 @@ export const defaultServices = {
   handleForgotPasswordSubmit: confirmResetPassword,
   handleForgotPassword: resetPassword,
   handleResendSignUpCode: resendSignUpCode,
+  handleForceChangePassword: confirmSignIn,
 
   // Validation hooks for overriding
   async validateCustomSignUp(