|
|
@@ -9,6 +9,7 @@ using System;
|
|
|
using System.Security.Cryptography;
|
|
|
using System.Text;
|
|
|
using UnityEngine.Events;
|
|
|
+using Firebase;
|
|
|
|
|
|
public class Login : MonoBehaviour {
|
|
|
|
|
|
@@ -29,6 +30,8 @@ public class Login : MonoBehaviour {
|
|
|
private Color errorColor;
|
|
|
private EventSystem system;
|
|
|
|
|
|
+ [SerializeField] GameObject firebaseController;
|
|
|
+
|
|
|
[Serializable]
|
|
|
public class User {
|
|
|
public string userId;
|
|
|
@@ -37,7 +40,6 @@ public class Login : MonoBehaviour {
|
|
|
}
|
|
|
|
|
|
private void Start() {
|
|
|
- // CheckFirebaseGoogleDependencies();
|
|
|
if (Database.Instance.IsKeepSignedIn()) {
|
|
|
SceneManager.LoadScene("MainMenu");
|
|
|
}
|
|
|
@@ -107,15 +109,19 @@ public class Login : MonoBehaviour {
|
|
|
errorText.color = errorColor;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
IEnumerator loginCall() {
|
|
|
- string postUrl = loginUrl + "name=" + UnityWebRequest.EscapeURL(Username);
|
|
|
+ string postUrl = loginUrl + "name=" + UnityWebRequest.EscapeURL(Username)+"&t=";
|
|
|
+ StringBuilder sb = new StringBuilder(postUrl);
|
|
|
+
|
|
|
+ FirebaseStart fs = firebaseController.GetComponent<FirebaseStart>();
|
|
|
|
|
|
- string token = FirebaseStart.MyToken;
|
|
|
- if (token.Length > 0) {
|
|
|
- StringBuilder sb = new StringBuilder(loginUrl);
|
|
|
- sb.Append("&t=" + token);
|
|
|
+ if (fs.MyToken != null && fs.MyToken.Length > 0) {
|
|
|
+ sb.Append(UnityWebRequest.EscapeURL(fs.MyToken));
|
|
|
postUrl = sb.ToString();
|
|
|
- }
|
|
|
+ } else {
|
|
|
+ sb.Append("");
|
|
|
+ }
|
|
|
UnityWebRequest www = UnityWebRequest.Get(postUrl);
|
|
|
yield return www.SendWebRequest();
|
|
|
|