Merge pull request #139 from immutable/feat/connect-imx-use-saved-credentials

[DX-2505] feat: connect imx use saved credentials if they exist so device flow is not triggered again

Author: nattb8

sample/Assets/Scripts/AuthenticatedScript.cs

@@ -83,8 +83,8 @@ public async void Connect()
         {
             // Use existing credentials to connect to Passport
             ShowOutput("Connecting into Passport using saved credentials...");
-            ConnectButton.gameObject.SetActive(false);
-            bool connected = await passport.ConnectImx(useCachedSession: true);
+            ConnectButton.gameObject.SetActive(false);
+            bool connected = await passport.ConnectImx();
             if (connected)
             {
                 IsRegisteredOffchainButton.gameObject.SetActive(true);
@@ -96,13 +96,13 @@ public async void Connect()
             else
             {
                 ShowOutput($"Could not connect using saved credentials");
-                ConnectButton.gameObject.SetActive(true);
+                ConnectButton.gameObject.SetActive(true);
             }
         }
         catch (Exception ex)
         {
             ShowOutput($"Connect() error: {ex.Message}");
-            ConnectButton.gameObject.SetActive(true);
+            ConnectButton.gameObject.SetActive(true);
         }
     }
 
@@ -135,7 +135,7 @@ public async void RegisterOffchain()
                 ShowOutput($"Registered {response.tx_hash}");
             }
             else
-            {
+            {
                 ShowOutput($"Not registered");
             }
         }

sample/ProjectSettings/ProjectSettings.asset

@@ -771,6 +771,7 @@ PlayerSettings:
   platformArchitecture: {}
   scriptingBackend:
     Android: 1
+    Standalone: 0
   il2cppCompilerConfiguration: {}
   managedStrippingLevel:
     EmbeddedLinux: 1

src/Packages/Passport/Runtime/Scripts/Private/PassportImpl.cs

@@ -144,6 +144,19 @@ public async UniTask<bool> ConnectImx(bool useCachedSession = false, Nullable<lo
             }
             else
             {
+                // If the user called Login before and then ConnectImx, there is no point triggering device flow again
+                bool hasCredsSaved = await HasCredentialsSaved();
+                if (hasCredsSaved)
+                {
+                    bool reconnected = await Reconnect();
+                    if (reconnected)
+                    {
+                        // Successfully reconnected
+                        return reconnected;
+                    }
+                    // Otherwise fallback to device code flow
+                }
+
                 ConnectResponse connectResponse = await InitialiseDeviceCodeAuth(functionName);
                 if (connectResponse != null)
                 {