Skip to content

Commit aeb1322

Browse files
Merge pull request #635 from immutable/chore/update-game-bridge-2.12.3
chore: update game bridge to 2.12.3
2 parents 2207149 + f168b7f commit aeb1322

6 files changed

Lines changed: 370 additions & 56 deletions

File tree

sample/Assets/Scripts/Passport/ImxRegister/ImxRegisterScript.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ private void ShowOutput(string message)
5858
Output.text = message;
5959
}
6060
}
61-
}
61+
}

sample/Tests/test/test.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,17 @@ def test_2_imx_functions(self):
114114
print(f"RegisterOffchainBtn output: {text}")
115115
self.assertEqual("Registering off-chain...", text)
116116
time.sleep(20)
117-
if "Passport account already registered" in output.get_text():
117+
output_text = output.get_text()
118+
# Accept either success message or 409 error (account already registered)
119+
if "Successfully registered" in output_text or ("409" in output_text and "USER_REGISTRATION_ERROR" in output_text):
118120
break
119121
attempts += 1
120122

121-
# Assert that the desired text is found after waiting
123+
# Assert that registration completed (either success or 409 error for already registered)
124+
output_text = output.get_text()
122125
self.assertTrue(
123-
"Passport account already registered" in output.get_text(),
124-
f"Expected 'Passport account already registered' not found. Actual output: '{output.get_text()}'"
126+
"Successfully registered" in output_text or ("409" in output_text and "USER_REGISTRATION_ERROR" in output_text),
127+
f"Expected 'Successfully registered' or '409 (USER_REGISTRATION_ERROR)' not found. Actual output: '{output_text}'"
125128
)
126129

127130
# Get address

src/Packages/Passport/Runtime/Resources/index.html

Lines changed: 356 additions & 50 deletions
Large diffs are not rendered by default.

src/Packages/Passport/Runtime/Scripts/Private/Model/MarketingConsentStatus.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ namespace Immutable.Passport.Model
99
public enum MarketingConsentStatus
1010
{
1111
OptedIn,
12+
Subscribed,
1213
Unsubscribed
1314
}
1415

@@ -27,6 +28,7 @@ public static string ToApiString(this MarketingConsentStatus status)
2728
return status switch
2829
{
2930
MarketingConsentStatus.OptedIn => "opted_in",
31+
MarketingConsentStatus.Subscribed => "subscribed",
3032
MarketingConsentStatus.Unsubscribed => "unsubscribed",
3133
_ => throw new ArgumentOutOfRangeException(nameof(status), status, "Unknown MarketingConsentStatus value")
3234
};

src/Packages/Passport/Runtime/Scripts/Public/PassportUI.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,9 @@ private async void HandleLoginData(string jsonData)
547547
case "opted_in":
548548
loginOptions.marketingConsentStatus = MarketingConsentStatus.OptedIn;
549549
break;
550+
case "subscribed":
551+
loginOptions.marketingConsentStatus = MarketingConsentStatus.Subscribed;
552+
break;
550553
case "unsubscribed":
551554
loginOptions.marketingConsentStatus = MarketingConsentStatus.Unsubscribed;
552555
break;

src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ImxRegister/ImxRegisterScript.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ private void ShowOutput(string message)
5858
Output.text = message;
5959
}
6060
}
61-
}
61+
}

0 commit comments

Comments
 (0)