From 71b3f8db31776d54ff4318b29e0c84929ca756e6 Mon Sep 17 00:00:00 2001
From: Jason Paige <j@jasonpaige.co.uk>
Date: Wed, 3 Dec 2025 10:45:41 +0000
Subject: [PATCH 1/3] Still run create/read for signup

---
 b2c/custom_policies/stg/B2C_1A_SignUpOrSignin.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/b2c/custom_policies/stg/B2C_1A_SignUpOrSignin.xml b/b2c/custom_policies/stg/B2C_1A_SignUpOrSignin.xml
index 9f80a134..070f803d 100644
--- a/b2c/custom_policies/stg/B2C_1A_SignUpOrSignin.xml
+++ b/b2c/custom_policies/stg/B2C_1A_SignUpOrSignin.xml
@@ -266,10 +266,6 @@
               <Value>isForgotPassword</Value>
               <Action>SkipThisOrchestrationStep</Action>
             </Precondition>
-            <Precondition Type="ClaimsExist" ExecuteActionsIf="true">
-              <Value>isSignUp</Value>
-              <Action>SkipThisOrchestrationStep</Action>
-            </Precondition>
             <Precondition Type="ClaimEquals" ExecuteActionsIf="false">
               <Value>otpVerified</Value>
               <Value>true</Value>

From 42204b5d4a19fd422602628a403d94b93b288e2f Mon Sep 17 00:00:00 2001
From: Jason Paige <j@jasonpaige.co.uk>
Date: Wed, 3 Dec 2025 10:53:14 +0000
Subject: [PATCH 2/3] test

---
 .../stg/B2C_1A_SignUpOrSignin.xml             | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/b2c/custom_policies/stg/B2C_1A_SignUpOrSignin.xml b/b2c/custom_policies/stg/B2C_1A_SignUpOrSignin.xml
index 070f803d..d8c4f583 100644
--- a/b2c/custom_policies/stg/B2C_1A_SignUpOrSignin.xml
+++ b/b2c/custom_policies/stg/B2C_1A_SignUpOrSignin.xml
@@ -266,6 +266,10 @@
               <Value>isForgotPassword</Value>
               <Action>SkipThisOrchestrationStep</Action>
             </Precondition>
+            <Precondition Type="ClaimsExist" ExecuteActionsIf="true">
+              <Value>isSignUp</Value>
+              <Action>SkipThisOrchestrationStep</Action>
+            </Precondition>
             <Precondition Type="ClaimEquals" ExecuteActionsIf="false">
               <Value>otpVerified</Value>
               <Value>true</Value>
@@ -277,8 +281,25 @@
           </ClaimsExchanges>
         </OrchestrationStep>
 
-        <!-- Step 6: Issue token -->
-        <OrchestrationStep Order="6" Type="SendClaims" CpimIssuerTechnicalProfileReferenceId="JwtIssuer" />
+        <!-- Step 5b: Read account from AAD after signup to populate signInNames.emailAddress -->
+        <OrchestrationStep Order="6" Type="ClaimsExchange">
+          <Preconditions>
+            <Precondition Type="ClaimsExist" ExecuteActionsIf="true">
+              <Value>isForgotPassword</Value>
+              <Action>SkipThisOrchestrationStep</Action>
+            </Precondition>
+            <Precondition Type="ClaimsExist" ExecuteActionsIf="false">
+              <Value>isSignUp</Value>
+              <Action>SkipThisOrchestrationStep</Action>
+            </Precondition>
+          </Preconditions>
+          <ClaimsExchanges>
+            <ClaimsExchange Id="AADUserReadAfterSignUp" TechnicalProfileReferenceId="AAD-UserReadUsingEmailAddress" />
+          </ClaimsExchanges>
+        </OrchestrationStep>
+
+        <!-- Step 7: Issue token -->
+        <OrchestrationStep Order="7" Type="SendClaims" CpimIssuerTechnicalProfileReferenceId="JwtIssuer" />
 
       </OrchestrationSteps>
     </UserJourney>
@@ -400,7 +421,6 @@
       <DisplayName>PolicyProfile</DisplayName>
       <Protocol Name="OpenIdConnect" />
       <OutputClaims>
-        <OutputClaim ClaimTypeReferenceId="email" />
         <OutputClaim ClaimTypeReferenceId="signInNames.emailAddress" PartnerClaimType="email" />
         <OutputClaim ClaimTypeReferenceId="objectId" PartnerClaimType="sub" />
         <OutputClaim ClaimTypeReferenceId="tenantId" AlwaysUseDefaultValue="true" DefaultValue="{Policy:TenantObjectId}" />

From 8ee2ca52caac896e1c2536ca8b107f8478acc6c4 Mon Sep 17 00:00:00 2001
From: Jason Paige <j@jasonpaige.co.uk>
Date: Wed, 3 Dec 2025 11:00:51 +0000
Subject: [PATCH 3/3] test

---
 b2c/custom_policies/stg/B2C_1A_SignUpOrSignin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2c/custom_policies/stg/B2C_1A_SignUpOrSignin.xml b/b2c/custom_policies/stg/B2C_1A_SignUpOrSignin.xml
index d8c4f583..0bf0209e 100644
--- a/b2c/custom_policies/stg/B2C_1A_SignUpOrSignin.xml
+++ b/b2c/custom_policies/stg/B2C_1A_SignUpOrSignin.xml
@@ -294,7 +294,7 @@
             </Precondition>
           </Preconditions>
           <ClaimsExchanges>
-            <ClaimsExchange Id="AADUserReadAfterSignUp" TechnicalProfileReferenceId="AAD-UserReadUsingEmailAddress" />
+            <ClaimsExchange Id="AADUserReadAfterSignUp" TechnicalProfileReferenceId="AAD-UserReadUsingObjectId" />
           </ClaimsExchanges>
         </OrchestrationStep>