From 7388d43e4c901a552e72143d208c8c201166d169 Mon Sep 17 00:00:00 2001 From: Create or Update Pull Request Action Date: Mon, 30 Jun 2025 23:34:47 +0000 Subject: [PATCH] chore: update version --- src/Packages/Marketplace/package.json | 2 +- .../Private/Helpers/SdkVersionInfoHelpers.cs | 2 +- .../Scenes/Passport/AuthenticatedScene.unity | 4 +- ...tAuthMethod.unity => Initialisation.unity} | 786 +----------------- .../Passport/UnauthenticatedScene.unity | 341 +------- .../ImxGetAddress/ImxGetAddressScript.cs | 2 +- .../ImxIsRegisteredOffchainScript.cs | 2 - .../Scripts/Passport/Login/LoginScript.cs | 32 +- .../Scripts/Passport/Logout/LogoutScript.cs | 9 +- .../PassportInitialisationScript.cs | 64 +- .../Passport/Reconnect/ReconnectScript.cs | 1 - .../Scripts/Passport/SampleAppManager.cs | 5 - .../Passport/UnauthenticatedSceneManager.cs | 10 +- .../ZkEvm/ZkEvmConnect/ZkEvmConnectScript.cs | 2 - .../ZkEvmSendTransactionScript.cs | 1 - src/Packages/Passport/package.json | 2 +- 16 files changed, 58 insertions(+), 1207 deletions(-) rename src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/Passport/{SelectAuthMethod.unity => Initialisation.unity} (68%) diff --git a/src/Packages/Marketplace/package.json b/src/Packages/Marketplace/package.json index b7c18dfd4..c81287dcf 100644 --- a/src/Packages/Marketplace/package.json +++ b/src/Packages/Marketplace/package.json @@ -1,6 +1,6 @@ { "name": "com.immutable.marketplace", - "version": "1.34.0", + "version": "1.35.0", "description": "Marketplace package for the Immutable SDK for Unity", "displayName": "Immutable Marketplace", "author": { diff --git a/src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs b/src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs index 51d8d8c67..eb40d5d7d 100644 --- a/src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs +++ b/src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs @@ -4,7 +4,7 @@ public class SdkVersionInfoHelpers { public static string GetSdkVersionInfo() { - return "1.34.0"; + return "1.35.0"; } } } diff --git a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/Passport/AuthenticatedScene.unity b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/Passport/AuthenticatedScene.unity index 8f0560dd1..35e0666e1 100644 --- a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/Passport/AuthenticatedScene.unity +++ b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/Passport/AuthenticatedScene.unity @@ -1218,7 +1218,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 66309839} m_HandleRect: {fileID: 66309838} m_Direction: 0 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -3092,7 +3092,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1741513413} m_Direction: 2 m_Value: 1 - m_Size: 0.99999994 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: diff --git a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/Passport/SelectAuthMethod.unity b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/Passport/Initialisation.unity similarity index 68% rename from src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/Passport/SelectAuthMethod.unity rename to src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/Passport/Initialisation.unity index 17596d416..998b81f0b 100644 --- a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/Passport/SelectAuthMethod.unity +++ b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/Passport/Initialisation.unity @@ -206,8 +206,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 416242725} m_HandleRect: {fileID: 416242724} m_Direction: 0 - m_Value: 1 - m_Size: 0.99999994 + m_Value: 0 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -549,86 +549,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 416242723} m_CullTransparentMesh: 1 ---- !u!1 &458414018 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 458414019} - - component: {fileID: 458414021} - - component: {fileID: 458414020} - m_Layer: 5 - m_Name: Text (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &458414019 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 458414018} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1744191471} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &458414020 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 458414018} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: PKCE (Recommended) ---- !u!222 &458414021 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 458414018} - m_CullTransparentMesh: 1 --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -713,161 +633,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &717484782 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 717484783} - - component: {fileID: 717484786} - - component: {fileID: 717484785} - - component: {fileID: 717484784} - - component: {fileID: 717484787} - m_Layer: 5 - m_Name: DeviceCodeAuth - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &717484783 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 717484782} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2131905290} - m_Father: {fileID: 1915378375} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &717484784 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 717484782} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 717484785} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1314882729} - m_TargetAssemblyTypeName: PassportInitialisationScript, Assembly-CSharp - m_MethodName: UseDeviceCodeAuth - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &717484785 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 717484782} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &717484786 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 717484782} - m_CullTransparentMesh: 1 ---- !u!114 &717484787 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 717484782} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: 260 - m_PreferredHeight: 60 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &854433808 GameObject: m_ObjectHideFlags: 0 @@ -1129,8 +894,6 @@ RectTransform: m_Children: - {fileID: 854433809} - {fileID: 1661390144} - - {fileID: 1688502348} - - {fileID: 1915378375} - {fileID: 1311161409} - {fileID: 1508764521} m_Father: {fileID: 1850628784} @@ -1209,7 +972,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1238552242} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1267,8 +1030,6 @@ MonoBehaviour: m_EditorClassIdentifier: TopPadding: {fileID: 0} Output: {fileID: 1690937182} - UseDeviceCodeAuthButton: {fileID: 717484784} - UsePKCEButton: {fileID: 1744191472} --- !u!4 &1314882730 Transform: m_ObjectHideFlags: 0 @@ -1367,8 +1128,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 167431872} m_HandleRect: {fileID: 167431871} m_Direction: 2 - m_Value: 1 - m_Size: 0.99999994 + m_Value: 0 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1480,7 +1241,7 @@ RectTransform: m_Children: - {fileID: 172384059} m_Father: {fileID: 1238552242} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1533,86 +1294,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &1523853785 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1523853786} - - component: {fileID: 1523853788} - - component: {fileID: 1523853787} - m_Layer: 5 - m_Name: SelectLoginMethod - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1523853786 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1523853785} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1915378375} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1523853787 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1523853785} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 3} - m_FontSize: 24 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 224 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Login method ---- !u!222 &1523853788 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1523853785} - m_CullTransparentMesh: 1 --- !u!1 &1557497261 GameObject: m_ObjectHideFlags: 0 @@ -1717,8 +1398,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 841.85657, y: 0} - m_SizeDelta: {x: 1643.7131, y: 0} + m_AnchoredPosition: {x: 1801.0891, y: 0} + m_SizeDelta: {x: 3562.1782, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1661390145 MonoBehaviour: @@ -1753,7 +1434,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Authentication methods + m_Text: Passport initialisation --- !u!222 &1661390146 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1776,7 +1457,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &1688502347 +--- !u!1 &1690937179 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1784,136 +1465,24 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1688502348} - - component: {fileID: 1688502351} - - component: {fileID: 1688502350} - - component: {fileID: 1688502349} + - component: {fileID: 1690937180} + - component: {fileID: 1690937181} + - component: {fileID: 1690937182} m_Layer: 5 - m_Name: Description + m_Name: Output m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1688502348 +--- !u!224 &1690937180 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1688502347} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1238552242} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 841.85657, y: 0} - m_SizeDelta: {x: 1643.7131, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1688502349 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1688502347} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &1688502350 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1688502347} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'There are two methods to authenticate and authorise players into Passport: - - - 1. - Authorisation Code Flow with Proof Key for Code Exchange (PKCE): This method provides - a seamless and secure authentication experience by opening a pop-up window on - desktop or an in-app browser on mobile devices. Players are automatically redirected - back to the game once authenticated, eliminating manual switching. - - - 2. Device - Code Authorisation: This method - opens the player''s default browser and guides them through the authentication - flow. - - - Recommendation: Whenever possible, use the PKCE flow as it is the - most secure and seamless method for authentication.' ---- !u!222 &1688502351 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1688502347} - m_CullTransparentMesh: 1 ---- !u!1 &1690937179 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1690937180} - - component: {fileID: 1690937181} - - component: {fileID: 1690937182} - m_Layer: 5 - m_Name: Output - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1690937180 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1690937179} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1690937179} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1968,161 +1537,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: ---- !u!1 &1744191470 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1744191471} - - component: {fileID: 1744191474} - - component: {fileID: 1744191473} - - component: {fileID: 1744191472} - - component: {fileID: 1744191475} - m_Layer: 5 - m_Name: PKCE - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1744191471 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1744191470} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 458414019} - m_Father: {fileID: 1915378375} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1744191472 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1744191470} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1744191473} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1314882729} - m_TargetAssemblyTypeName: PassportInitialisationScript, Assembly-CSharp - m_MethodName: UsePKCE - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1744191473 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1744191470} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1744191474 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1744191470} - m_CullTransparentMesh: 1 ---- !u!114 &1744191475 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1744191470} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: 260 - m_PreferredHeight: 60 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &1850628783 GameObject: m_ObjectHideFlags: 0 @@ -2279,169 +1693,3 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1850628783} m_CullTransparentMesh: 1 ---- !u!1 &1915378374 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1915378375} - - component: {fileID: 1915378376} - - component: {fileID: 1915378377} - m_Layer: 5 - m_Name: Method - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1915378375 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1915378374} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1523853786} - - {fileID: 1744191471} - - {fileID: 717484783} - m_Father: {fileID: 1238552242} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1915378376 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1915378374} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: 60 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &1915378377 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1915378374} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 558b109da67a27b4686138b955f3a7e8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 3 - SpacingX: 16 - SpacingY: 16 - ExpandHorizontalSpacing: 0 - ChildForceExpandWidth: 0 - ChildForceExpandHeight: 0 - invertOrder: 0 - m_StartAxis: 0 ---- !u!1 &2131905289 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2131905290} - - component: {fileID: 2131905292} - - component: {fileID: 2131905291} - m_Layer: 5 - m_Name: Text (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2131905290 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2131905289} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 717484783} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2131905291 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2131905289} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Device Code Auth ---- !u!222 &2131905292 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2131905289} - m_CullTransparentMesh: 1 diff --git a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/Passport/UnauthenticatedScene.unity b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/Passport/UnauthenticatedScene.unity index 53c084774..1350ad71e 100644 --- a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/Passport/UnauthenticatedScene.unity +++ b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/Passport/UnauthenticatedScene.unity @@ -203,254 +203,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 415205} m_CullTransparentMesh: 1 ---- !u!1 &160623835 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 160623836} - - component: {fileID: 160623838} - - component: {fileID: 160623837} - m_Layer: 5 - m_Name: Text (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &160623836 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 160623835} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 233062548} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.5} - m_SizeDelta: {x: -20, y: -13} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &160623837 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 160623835} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: ---- !u!222 &160623838 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 160623835} - m_CullTransparentMesh: 1 ---- !u!1 &233062547 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 233062548} - - component: {fileID: 233062551} - - component: {fileID: 233062550} - - component: {fileID: 233062549} - - component: {fileID: 233062552} - m_Layer: 5 - m_Name: DeviceCodeTimeoutMs - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &233062548 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 233062547} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2127039960} - - {fileID: 160623836} - m_Father: {fileID: 1349788404} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 777, y: -30} - m_SizeDelta: {x: 450, y: 60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &233062549 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 233062547} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 233062550} - m_TextComponent: {fileID: 160623837} - m_Placeholder: {fileID: 2127039961} - m_ContentType: 0 - m_InputType: 0 - m_AsteriskChar: 42 - m_KeyboardType: 0 - m_LineType: 0 - m_HideMobileInput: 0 - m_CharacterValidation: 0 - m_CharacterLimit: 0 - m_OnSubmit: - m_PersistentCalls: - m_Calls: [] - m_OnDidEndEdit: - m_PersistentCalls: - m_Calls: [] - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_CustomCaretColor: 0 - m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} - m_Text: - m_CaretBlinkRate: 0.85 - m_CaretWidth: 1 - m_ReadOnly: 0 - m_ShouldActivateOnSelect: 1 ---- !u!114 &233062550 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 233062547} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &233062551 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 233062547} - m_CullTransparentMesh: 1 ---- !u!114 &233062552 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 233062547} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: 450 - m_PreferredHeight: 60 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &270318904 GameObject: m_ObjectHideFlags: 0 @@ -958,7 +710,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1541372192} m_HandleRect: {fileID: 1541372191} m_Direction: 0 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -2383,7 +2135,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1495172581} m_Direction: 2 m_Value: 1 - m_Size: 0.99999994 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -2589,7 +2341,7 @@ MonoBehaviour: m_EditorClassIdentifier: LoginButtons: {fileID: 1349788403} ReloginButtons: {fileID: 756533207} - DeviceCodeTimeoutMs: {fileID: 233062549} + DeviceCodeTimeoutMs: {fileID: 0} --- !u!1 &1173574366 GameObject: m_ObjectHideFlags: 0 @@ -2702,14 +2454,13 @@ RectTransform: m_Children: - {fileID: 892906553} - {fileID: 291915219} - - {fileID: 233062548} m_Father: {fileID: 997036539} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 852.55914, y: -130} - m_SizeDelta: {x: 1665.1183, y: 60} + m_AnchoredPosition: {x: 1108.9248, y: -130} + m_SizeDelta: {x: 2177.8496, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1349788406 MonoBehaviour: @@ -3514,7 +3265,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Output: {fileID: 1615533291} - DeviceCodeTimeoutMs: {fileID: 233062549} + DeviceCodeTimeoutMs: {fileID: 0} --- !u!4 &1883395345 Transform: m_ObjectHideFlags: 0 @@ -3567,83 +3318,3 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &2127039959 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2127039960} - - component: {fileID: 2127039962} - - component: {fileID: 2127039961} - m_Layer: 5 - m_Name: Placeholder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2127039960 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2127039959} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 233062548} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.5} - m_SizeDelta: {x: -20, y: -13} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2127039961 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2127039959} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 - m_FontStyle: 2 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Timeout in ms (leave blank for no timeout) ---- !u!222 &2127039962 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2127039959} - m_CullTransparentMesh: 1 diff --git a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ImxGetAddress/ImxGetAddressScript.cs b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ImxGetAddress/ImxGetAddressScript.cs index e346a9807..364d23747 100644 --- a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ImxGetAddress/ImxGetAddressScript.cs +++ b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ImxGetAddress/ImxGetAddressScript.cs @@ -31,7 +31,7 @@ public async void GetAddress() ShowOutput("Retrieving wallet address..."); try { - string address = await Passport.GetAddress(); + var address = await Passport.GetAddress(); ShowOutput(string.IsNullOrEmpty(address) ? "No address found" : address); } catch (PassportException e) diff --git a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ImxIsRegisteredOffchain/ImxIsRegisteredOffchainScript.cs b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ImxIsRegisteredOffchain/ImxIsRegisteredOffchainScript.cs index a0761d581..a7c31eb9e 100644 --- a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ImxIsRegisteredOffchain/ImxIsRegisteredOffchainScript.cs +++ b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ImxIsRegisteredOffchain/ImxIsRegisteredOffchainScript.cs @@ -1,8 +1,6 @@ using UnityEngine; using UnityEngine.UI; using Cysharp.Threading.Tasks; -using Immutable.Passport; -using System; namespace Immutable.Passport.Sample.PassportFeatures { diff --git a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/Login/LoginScript.cs b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/Login/LoginScript.cs index 831b4c030..f14b53a82 100644 --- a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/Login/LoginScript.cs +++ b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/Login/LoginScript.cs @@ -1,5 +1,4 @@ using System; -using Cysharp.Threading.Tasks; using UnityEngine; using UnityEngine.UI; using UnityEngine.SceneManagement; @@ -9,11 +8,10 @@ public class LoginScript : MonoBehaviour { #pragma warning disable CS8618 [SerializeField] private Text Output; - [SerializeField] private InputField DeviceCodeTimeoutMs; private Passport Passport; #pragma warning restore CS8618 - async void Start() + void Start() { if (Passport.Instance != null) { @@ -30,24 +28,14 @@ async void Start() /// public async void Login() { - var timeoutMs = GetDeviceCodeTimeoutMs(); - string formattedTimeout = timeoutMs != null ? $"{timeoutMs} ms" : "none"; - ShowOutput($"Logging in (timeout: {formattedTimeout})..."); try { - if (SampleAppManager.UsePKCE) - { - await Passport.LoginPKCE(); - } - else - { - await Passport.Login(timeoutMs: timeoutMs); - } - NavigateToAuthenticatedScene(); + await Passport.Login(); + SceneManager.LoadScene("AuthenticatedScene"); } - catch (OperationCanceledException) + catch (OperationCanceledException ex) { - ShowOutput("Failed to login: cancelled"); + ShowOutput($"Failed to login: cancelled {ex.Message}\\n{ex.StackTrace}"); } catch (Exception ex) { @@ -55,16 +43,6 @@ public async void Login() } } - private long? GetDeviceCodeTimeoutMs() - { - return string.IsNullOrEmpty(DeviceCodeTimeoutMs.text) ? null : long.Parse(DeviceCodeTimeoutMs.text); - } - - private void NavigateToAuthenticatedScene() - { - SceneManager.LoadScene("AuthenticatedScene"); - } - private void ShowOutput(string message) { if (Output != null) diff --git a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/Logout/LogoutScript.cs b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/Logout/LogoutScript.cs index d30023957..8aba609a2 100644 --- a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/Logout/LogoutScript.cs +++ b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/Logout/LogoutScript.cs @@ -22,14 +22,7 @@ private async UniTaskVoid LogoutAsync() } try { - if (SampleAppManager.UsePKCE) - { - await Passport.Instance.LogoutPKCE(); - } - else - { - await Passport.Instance.Logout(); - } + await Passport.Instance.Logout(); SampleAppManager.IsConnectedToImx = false; SampleAppManager.IsConnectedToZkEvm = false; AuthenticatedSceneManager.NavigateToUnauthenticatedScene(); diff --git a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/PassportInitialisation/PassportInitialisationScript.cs b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/PassportInitialisation/PassportInitialisationScript.cs index 7bf70927a..a6663ec68 100644 --- a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/PassportInitialisation/PassportInitialisationScript.cs +++ b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/PassportInitialisation/PassportInitialisationScript.cs @@ -10,59 +10,35 @@ public class PassportInitialisationScript : MonoBehaviour #pragma warning disable CS8618 [SerializeField] private GameObject TopPadding; [SerializeField] private Text Output; - [SerializeField] private Button UseDeviceCodeAuthButton; - [SerializeField] private Button UsePKCEButton; #pragma warning restore CS8618 void Start() { - // WebGL does not support Device Code Auth, so we'll use PKCE by default instead. -#if UNITY_WEBGL - UsePKCE(); -#endif + InitialisePassport(); } - /// - /// Initialises Passport to use Device Code Auth - /// - public void UseDeviceCodeAuth() + private async void InitialisePassport() { - SampleAppManager.UsePKCE = false; - InitialisePassport(logoutRedirectUri: "https://www.immutable.com"); - } + ShowOutput("Initialising Passport..."); + + string redirectUri; + string logoutRedirectUri; - /// - /// Initialises Passport to use PKCE with the specified redirect URIs. - /// - public void UsePKCE() - { - SampleAppManager.UsePKCE = true; #if UNITY_WEBGL - string url = Application.absoluteURL; - Uri uri = new Uri(url); - string scheme = uri.Scheme; - string hostWithPort = uri.IsDefaultPort ? uri.Host : $"{uri.Host}:{uri.Port}"; - string fullPath = uri.AbsolutePath.EndsWith("/") ? uri.AbsolutePath : uri.AbsolutePath.Substring(0, uri.AbsolutePath.LastIndexOf('/') + 1); + var url = Application.absoluteURL; + var uri = new Uri(url); + var scheme = uri.Scheme; + var hostWithPort = uri.IsDefaultPort ? uri.Host : $"{uri.Host}:{uri.Port}"; + var fullPath = uri.AbsolutePath.EndsWith("/") + ? uri.AbsolutePath + : uri.AbsolutePath.Substring(0, uri.AbsolutePath.LastIndexOf('/') + 1); - string redirectUri = $"{scheme}://{hostWithPort}{fullPath}callback.html"; - string logoutRedirectUri = $"{scheme}://{hostWithPort}{fullPath}logout.html"; - - InitialisePassport(redirectUri: redirectUri, logoutRedirectUri: logoutRedirectUri); + redirectUri = $"{scheme}://{hostWithPort}{fullPath}callback.html"; + logoutRedirectUri = $"{scheme}://{hostWithPort}{fullPath}logout.html"; #else - InitialisePassport(redirectUri: "immutablerunner://callback", logoutRedirectUri: "immutablerunner://logout"); + redirectUri = "immutablerunner://callback"; + logoutRedirectUri = "immutablerunner://logout"; #endif - } - - /// - /// Initialises Passport. - /// - /// The URL to which auth will redirect the browser after - /// authorisation has been granted by the user - /// The URL to which auth will redirect the browser - /// after log out is complete - private async void InitialisePassport(string? redirectUri = null, string? logoutRedirectUri = null) - { - ShowOutput("Initialising Passport..."); try { @@ -73,9 +49,9 @@ private async void InitialisePassport(string? redirectUri = null, string? logout Passport.RedactTokensInLogs = false; // Initialise Passport - string environment = Immutable.Passport.Model.Environment.SANDBOX; - string clientId = "mp6rxfMDwwZDogcdgNrAaHnG0qMlXuMK"; - Passport passport = await Passport.Init(clientId, environment, redirectUri, logoutRedirectUri); + const string environment = Immutable.Passport.Model.Environment.SANDBOX; + const string clientId = "mp6rxfMDwwZDogcdgNrAaHnG0qMlXuMK"; + var passport = await Passport.Init(clientId, environment, redirectUri, logoutRedirectUri); SampleAppManager.PassportInstance = passport; // Navigate to the unauthenticated scene after initialising Passport diff --git a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/Reconnect/ReconnectScript.cs b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/Reconnect/ReconnectScript.cs index cb5ceeaa8..1f5f10284 100644 --- a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/Reconnect/ReconnectScript.cs +++ b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/Reconnect/ReconnectScript.cs @@ -1,6 +1,5 @@ using UnityEngine; using UnityEngine.UI; -using UnityEngine.SceneManagement; using Cysharp.Threading.Tasks; using Immutable.Passport; diff --git a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/SampleAppManager.cs b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/SampleAppManager.cs index f8c0a76dc..e2100bda7 100644 --- a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/SampleAppManager.cs +++ b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/SampleAppManager.cs @@ -1,10 +1,5 @@ public static class SampleAppManager { - /// - /// Indicates whether the selected authentication method is PKCE. - /// - public static bool UsePKCE { get; set; } - /// /// Indicates whether the user is connected to IMX. /// diff --git a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/UnauthenticatedSceneManager.cs b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/UnauthenticatedSceneManager.cs index d815d1e20..1aa6fd64f 100644 --- a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/UnauthenticatedSceneManager.cs +++ b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/UnauthenticatedSceneManager.cs @@ -1,6 +1,4 @@ using UnityEngine; -using UnityEngine.UI; -using Cysharp.Threading.Tasks; using Immutable.Passport; using System; @@ -8,7 +6,6 @@ public class UnauthenticatedSceneManager : MonoBehaviour { [SerializeField] private GameObject LoginButtons; [SerializeField] private GameObject ReloginButtons; - [SerializeField] private InputField DeviceCodeTimeoutMs; public Action OnImxConnected; @@ -16,10 +13,9 @@ private async void Start() { if (Passport.Instance != null) { - bool hasCredsSaved = await Passport.Instance.HasCredentialsSaved(); - ReloginButtons.SetActive(hasCredsSaved); - LoginButtons.SetActive(!hasCredsSaved); - DeviceCodeTimeoutMs.gameObject.SetActive(!hasCredsSaved && !SampleAppManager.UsePKCE); + var hasCredentialsSaved = await Passport.Instance.HasCredentialsSaved(); + ReloginButtons.SetActive(hasCredentialsSaved); + LoginButtons.SetActive(!hasCredentialsSaved); } else { diff --git a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ZkEvm/ZkEvmConnect/ZkEvmConnectScript.cs b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ZkEvm/ZkEvmConnect/ZkEvmConnectScript.cs index e3ad3264c..0326b80ee 100644 --- a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ZkEvm/ZkEvmConnect/ZkEvmConnectScript.cs +++ b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ZkEvm/ZkEvmConnect/ZkEvmConnectScript.cs @@ -1,8 +1,6 @@ -using System; using UnityEngine; using UnityEngine.UI; using Cysharp.Threading.Tasks; -using Immutable.Passport; namespace Immutable.Passport.Sample.PassportFeatures { diff --git a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ZkEvm/ZkEvmSendTransaction/ZkEvmSendTransactionScript.cs b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ZkEvm/ZkEvmSendTransaction/ZkEvmSendTransactionScript.cs index c881d11b6..30683a1b4 100644 --- a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ZkEvm/ZkEvmSendTransaction/ZkEvmSendTransactionScript.cs +++ b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ZkEvm/ZkEvmSendTransaction/ZkEvmSendTransactionScript.cs @@ -3,7 +3,6 @@ using UnityEngine; using UnityEngine.UI; using UnityEngine.SceneManagement; -using Immutable.Passport; using Immutable.Passport.Model; using Cysharp.Threading.Tasks; diff --git a/src/Packages/Passport/package.json b/src/Packages/Passport/package.json index f3526e667..3022240ae 100644 --- a/src/Packages/Passport/package.json +++ b/src/Packages/Passport/package.json @@ -1,6 +1,6 @@ { "name": "com.immutable.passport", - "version": "1.34.0", + "version": "1.35.0", "description": "The Immutable SDK for Unity helps you integrate your game with Immutable Passport.\n\nFor a complete working example, please visit https://github.com/immutable/unity-immutable-sdk/tree/main/sample.", "displayName": "Immutable Passport", "author": {