Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Fix Web3Auth login on WebGL #197

Merged
merged 1 commit into from
Nov 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Packages/Solana.Unity.Rpc.dll
Binary file not shown.
9 changes: 6 additions & 3 deletions Runtime/Plugins/Web3AuthSDK/Api/Models/StoreApiResponse.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using System;
using UnityEngine.Scripting;

[Preserve]
[Serializable]
public class StoreApiResponse {
[Preserve]
public string message { get; set; }
[Preserve]
public bool success { get; set; }
}
11 changes: 10 additions & 1 deletion Runtime/Plugins/Web3AuthSDK/Types/LoginParams.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
using System;
using UnityEngine.Scripting;

[Preserve]
[Serializable]
public class LoginParams
{
[Preserve]
public Provider loginProvider { get; set; }
[Preserve]
public string dappShare { get; set; }
[Preserve]
public ExtraLoginOptions extraLoginOptions { get; set; }
[Preserve]
public Uri redirectUrl { get; set; }
[Preserve]
public string appState { get; set; }
[Preserve]
public MFALevel mfaLevel { get; set; }

[Preserve]
public Curve curve { get; set; }
}
19 changes: 18 additions & 1 deletion Runtime/Plugins/Web3AuthSDK/Types/UserInfo.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,32 @@
public class UserInfo
using System;
using UnityEngine.Scripting;

[Serializable]
[Preserve]
public class UserInfo
{
[Preserve]
public string email { get; set; }
[Preserve]
public string name { get; set; }
[Preserve]
public string profileImage { get; set; }
[Preserve]
public string aggregateVerifier { get; set; }
[Preserve]
public string verifier { get; set; }
[Preserve]
public string verifierId { get; set; }
[Preserve]
public string typeOfLogin { get; set; }
[Preserve]
public string dappShare { get; set; }
[Preserve]
public string idToken { get; set; }
[Preserve]
public string oAuthIdToken { get; set; }
[Preserve]
public string oAuthAccessToken { get; set; }
[Preserve]
public bool isMfaEnabled { get; set; }
}
14 changes: 13 additions & 1 deletion Runtime/Plugins/Web3AuthSDK/Types/Web3AuthResponse.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
public class Web3AuthResponse
using System;
using UnityEngine.Scripting;

[Serializable]
[Preserve]
public class Web3AuthResponse
{
[Preserve]
public string privKey { get; set; }
[Preserve]
public string ed25519PrivKey { get; set; }
[Preserve]
public UserInfo userInfo { get; set; }
[Preserve]
public string error { get; set; }
[Preserve]
public string sessionId { get; set; }
[Preserve]
public string coreKitKey { get; set; }
[Preserve]
public string coreKitEd25519PrivKey { get; set; }
}
2 changes: 0 additions & 2 deletions Runtime/Plugins/Web3AuthSDK/Web3Auth.cs
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,6 @@ private async Task<string> createSession(string data, long sessionTime)
{
TaskCompletionSource<string> createSessionResponse = new TaskCompletionSource<string>();
var newSessionKey = KeyStoreManagerUtils.generateRandomSessionKey();
// Debug.Log("newSessionKey =>" + newSessionKey);
var ephemKey = KeyStoreManagerUtils.getPubKey(newSessionKey);
var ivKey = KeyStoreManagerUtils.generateRandomBytes();

Expand Down Expand Up @@ -523,7 +522,6 @@ private async Task<string> createSession(string data, long sessionTime)
{
try
{
// Debug.Log("newSessionKey before saving into keystore =>" + newSessionKey);
this.Enqueue(() => KeyStoreManagerUtils.savePreferenceData(KeyStoreManagerUtils.SESSION_ID, newSessionKey));
createSessionResponse.SetResult(newSessionKey);
}
Expand Down
1 change: 0 additions & 1 deletion Runtime/codebase/Web3.cs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ private void Start()
{
if(w == null) return;
WalletBase = _web3AuthWallet;
OnLogin?.Invoke(w);
OnWalletChangeStateInternal?.Invoke();
SubscribeToWalletEvents().Forget();
};
Expand Down
6 changes: 4 additions & 2 deletions Runtime/codebase/Web3AuthWallet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,10 @@ protected override Task<Account> _Login(string password = null)
{
loginProvider = _loginProvider
};
if(_loginParameters != null)
options = _loginParameters;
if (_loginParameters != null)
{
options = _loginParameters;
}
_web3Auth.login(options);
_loginTaskCompletionSource = new TaskCompletionSource<Account>();
return _loginTaskCompletionSource.Task;
Expand Down