Skip to content

Commit fb4e6ca

Browse files
chore: full restructure of the unity sample app
1 parent 152cc0d commit fb4e6ca

File tree

23 files changed

+82
-58
lines changed

23 files changed

+82
-58
lines changed

sample/Assets/Scenes/Passport/SelectAuthMethod.unity

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1367,8 +1367,8 @@ MonoBehaviour:
13671367
m_TargetGraphic: {fileID: 167431872}
13681368
m_HandleRect: {fileID: 167431871}
13691369
m_Direction: 2
1370-
m_Value: 0
1371-
m_Size: 1
1370+
m_Value: 1
1371+
m_Size: 0.99999994
13721372
m_NumberOfSteps: 0
13731373
m_OnValueChanged:
13741374
m_PersistentCalls:
@@ -1717,8 +1717,8 @@ RectTransform:
17171717
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17181718
m_AnchorMin: {x: 0, y: 0}
17191719
m_AnchorMax: {x: 0, y: 0}
1720-
m_AnchoredPosition: {x: 845.9838, y: 0}
1721-
m_SizeDelta: {x: 1651.9677, y: 0}
1720+
m_AnchoredPosition: {x: 797.1642, y: 0}
1721+
m_SizeDelta: {x: 1554.3284, y: 0}
17221722
m_Pivot: {x: 0.5, y: 0.5}
17231723
--- !u!114 &1661390145
17241724
MonoBehaviour:
@@ -1812,8 +1812,8 @@ RectTransform:
18121812
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
18131813
m_AnchorMin: {x: 0, y: 0}
18141814
m_AnchorMax: {x: 0, y: 0}
1815-
m_AnchoredPosition: {x: 845.9838, y: 0}
1816-
m_SizeDelta: {x: 1651.9677, y: 0}
1815+
m_AnchoredPosition: {x: 797.1642, y: 0}
1816+
m_SizeDelta: {x: 1554.3284, y: 0}
18171817
m_Pivot: {x: 0.5, y: 0.5}
18181818
--- !u!114 &1688502349
18191819
MonoBehaviour:

sample/Assets/Scenes/Passport/UnauthenticatedScene.unity

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -765,10 +765,9 @@ MonoBehaviour:
765765
m_OnClick:
766766
m_PersistentCalls:
767767
m_Calls:
768-
- m_Target: {fileID: 333006419}
769-
m_TargetAssemblyTypeName: Immutable.Passport.Sample.PassportFeatures.ZkEvmConnectScript,
770-
Assembly-CSharp
771-
m_MethodName: ConnectZkEvm
768+
- m_Target: {fileID: 333006421}
769+
m_TargetAssemblyTypeName: ImxConnectScript, Assembly-CSharp
770+
m_MethodName: ConnectImx
772771
m_Mode: 1
773772
m_Arguments:
774773
m_ObjectArgument: {fileID: 0}
@@ -924,28 +923,14 @@ GameObject:
924923
serializedVersion: 6
925924
m_Component:
926925
- component: {fileID: 333006420}
927-
- component: {fileID: 333006419}
926+
- component: {fileID: 333006421}
928927
m_Layer: 0
929928
m_Name: Connect
930929
m_TagString: Untagged
931930
m_Icon: {fileID: 0}
932931
m_NavMeshLayer: 0
933932
m_StaticEditorFlags: 0
934933
m_IsActive: 1
935-
--- !u!114 &333006419
936-
MonoBehaviour:
937-
m_ObjectHideFlags: 0
938-
m_CorrespondingSourceObject: {fileID: 0}
939-
m_PrefabInstance: {fileID: 0}
940-
m_PrefabAsset: {fileID: 0}
941-
m_GameObject: {fileID: 333006418}
942-
m_Enabled: 1
943-
m_EditorHideFlags: 0
944-
m_Script: {fileID: 11500000, guid: 033bac63c98e94dbd8324bca7d37ed2b, type: 3}
945-
m_Name:
946-
m_EditorClassIdentifier:
947-
connectButton: {fileID: 291915222}
948-
output: {fileID: 1615533291}
949934
--- !u!4 &333006420
950935
Transform:
951936
m_ObjectHideFlags: 0
@@ -961,6 +946,19 @@ Transform:
961946
m_Father: {fileID: 0}
962947
m_RootOrder: 8
963948
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
949+
--- !u!114 &333006421
950+
MonoBehaviour:
951+
m_ObjectHideFlags: 0
952+
m_CorrespondingSourceObject: {fileID: 0}
953+
m_PrefabInstance: {fileID: 0}
954+
m_PrefabAsset: {fileID: 0}
955+
m_GameObject: {fileID: 333006418}
956+
m_Enabled: 1
957+
m_EditorHideFlags: 0
958+
m_Script: {fileID: 11500000, guid: 8f90530ca8e134504b30c2444bf20a66, type: 3}
959+
m_Name:
960+
m_EditorClassIdentifier:
961+
Output: {fileID: 1615533291}
964962
--- !u!1 &495074501
965963
GameObject:
966964
m_ObjectHideFlags: 0
@@ -1045,7 +1043,7 @@ MonoBehaviour:
10451043
m_TargetGraphic: {fileID: 1541372192}
10461044
m_HandleRect: {fileID: 1541372191}
10471045
m_Direction: 0
1048-
m_Value: 0
1046+
m_Value: 1
10491047
m_Size: 1
10501048
m_NumberOfSteps: 0
10511049
m_OnValueChanged:
@@ -2679,8 +2677,8 @@ MonoBehaviour:
26792677
m_TargetGraphic: {fileID: 1495172582}
26802678
m_HandleRect: {fileID: 1495172581}
26812679
m_Direction: 2
2682-
m_Value: 0
2683-
m_Size: 1
2680+
m_Value: 1
2681+
m_Size: 0.99999994
26842682
m_NumberOfSteps: 0
26852683
m_OnValueChanged:
26862684
m_PersistentCalls:

sample/Assets/Scripts/Passport/AuthenticatedSceneManager.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using UnityEngine;
22
using UnityEngine.UI;
3+
using System;
34

45
public class AuthenticatedSceneManager : MonoBehaviour
56
{
@@ -18,6 +19,13 @@ public class AuthenticatedSceneManager : MonoBehaviour
1819
[SerializeField] private Button GetTransactionReceiptButton;
1920
[SerializeField] private Button SignTypedDataButton;
2021

22+
public Action OnImxConnected;
23+
24+
void Awake()
25+
{
26+
OnImxConnected = () => { UpdateImxButtonStates(); };
27+
}
28+
2129
void Start()
2230
{
2331
UpdateImxButtonStates();

sample/Assets/Scripts/Passport/DeviceCodeLogin/DeviceCodeLoginScript.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void StartDeviceCodeLogin()
2323
Debug.LogWarning("[DeviceCodeLoginScript] Passport.Instance is null. Initialization must complete before device code login.");
2424
return;
2525
}
26-
StartDeviceCodeLoginAsync().Forget();
26+
StartDeviceCodeLoginAsync();
2727
}
2828

2929
private async UniTaskVoid StartDeviceCodeLoginAsync()

sample/Assets/Scripts/Passport/GetAccessToken/GetAccessTokenScript.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class GetAccessTokenScript : MonoBehaviour
1212
/// </summary>
1313
public void GetAccessToken()
1414
{
15-
GetAccessTokenAsync().Forget();
15+
GetAccessTokenAsync();
1616
}
1717

1818
private async UniTaskVoid GetAccessTokenAsync()

sample/Assets/Scripts/Passport/GetIdToken/GetIdTokenScript.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class GetIdTokenScript : MonoBehaviour
1212
/// </summary>
1313
public void GetIdToken()
1414
{
15-
GetIdTokenAsync().Forget();
15+
GetIdTokenAsync();
1616
}
1717

1818
private async UniTaskVoid GetIdTokenAsync()

sample/Assets/Scripts/Passport/GetLinkedAddresses/GetLinkedAddressesScript.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,26 @@ public class GetLinkedAddressesScript : MonoBehaviour
1313
/// </summary>
1414
public void GetLinkedAddresses()
1515
{
16-
GetLinkedAddressesAsync().Forget();
16+
Debug.Log("E2E TEST DEBUG: GetLinkedAddresses() called (public method)");
17+
GetLinkedAddressesAsync();
1718
}
1819

1920
private async UniTaskVoid GetLinkedAddressesAsync()
2021
{
22+
Debug.Log("E2E TEST DEBUG: GetLinkedAddressesAsync() started");
2123
if (Passport.Instance == null)
2224
{
25+
Debug.Log("E2E TEST DEBUG: Passport instance is null in GetLinkedAddressesAsync");
2326
ShowOutput("Passport instance is null");
2427
return;
2528
}
2629
try
2730
{
31+
Debug.Log("E2E TEST DEBUG: About to await Passport.Instance.GetLinkedAddresses()");
2832
List<string> addresses = await Passport.Instance.GetLinkedAddresses();
29-
ShowOutput(addresses.Count > 0 ? string.Join(", ", addresses) : "No linked addresses");
33+
string outputMessage = addresses.Count > 0 ? string.Join(", ", addresses) : "No linked addresses";
34+
Debug.Log($"E2E TEST DEBUG: Got addresses, output will be: {outputMessage}");
35+
ShowOutput(outputMessage);
3036
}
3137
catch (System.Exception ex)
3238
{

sample/Assets/Scripts/Passport/GetUserInfo/GetUserInfoScript.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class GetUserInfoScript : MonoBehaviour
1212
/// </summary>
1313
public void GetEmail()
1414
{
15-
GetEmailAsync().Forget();
15+
GetEmailAsync();
1616
}
1717

1818
private async UniTaskVoid GetEmailAsync()
@@ -38,7 +38,7 @@ private async UniTaskVoid GetEmailAsync()
3838
/// </summary>
3939
public void GetPassportId()
4040
{
41-
GetPassportIdAsync().Forget();
41+
GetPassportIdAsync();
4242
}
4343

4444
private async UniTaskVoid GetPassportIdAsync()

sample/Assets/Scripts/Passport/ImxConnect/ImxConnectScript.cs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class ImxConnectScript : MonoBehaviour
1212
/// </summary>
1313
public void ConnectImx()
1414
{
15-
ConnectImxAsync().Forget();
15+
ConnectImxAsync();
1616
}
1717

1818
private async UniTaskVoid ConnectImxAsync()
@@ -29,20 +29,24 @@ private async UniTaskVoid ConnectImxAsync()
2929
{
3030
await Passport.Instance.ConnectImx();
3131

32-
// Add these lines to update connection state and refresh UI
3332
SampleAppManager.IsConnectedToImx = true;
34-
var sceneManager = FindObjectOfType<AuthenticatedSceneManager>();
35-
if (sceneManager != null)
33+
ShowOutput("Connected to IMX"); // Show success early
34+
35+
// Try to find UnauthenticatedSceneManager first
36+
var unauthSceneManager = FindObjectOfType<UnauthenticatedSceneManager>();
37+
if (unauthSceneManager != null)
3638
{
37-
sceneManager.UpdateImxButtonStates();
38-
Debug.Log("Updated IMX button states after connection");
39+
unauthSceneManager.OnImxConnected?.Invoke();
40+
return;
3941
}
40-
else
42+
43+
var authSceneManager = FindObjectOfType<AuthenticatedSceneManager>();
44+
if (authSceneManager != null)
4145
{
42-
Debug.LogWarning("Could not find AuthenticatedSceneManager to update button states");
46+
authSceneManager.UpdateImxButtonStates();
47+
authSceneManager.OnImxConnected?.Invoke();
48+
return;
4349
}
44-
45-
ShowOutput("Connected to IMX");
4650
}
4751
catch (System.Exception ex)
4852
{

sample/Assets/Scripts/Passport/ImxIsRegisteredOffchain/ImxIsRegisteredOffchainScript.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class ImxIsRegisteredOffchainScript : MonoBehaviour
1414

1515
public void CheckIsRegisteredOffchain()
1616
{
17-
CheckIsRegisteredOffchainAsync().Forget();
17+
CheckIsRegisteredOffchainAsync();
1818
}
1919

2020
private async UniTaskVoid CheckIsRegisteredOffchainAsync()

0 commit comments

Comments
 (0)