Sfoglia il codice sorgente

dont set token on failed login

Axel Nordh 5 anni fa
parent
commit
8777ca3ef2

+ 13 - 0
Assets/Scripts/Database/OnlineDatabase.cs

@@ -68,6 +68,7 @@ public class OnlineDatabase : MonoBehaviour {
             return newGameId; 
         } else {
             Debug.Log("Failed to get new game id with response " + response);
+            return -1;
         }
 
     }
@@ -622,4 +623,16 @@ public class OnlineDatabase : MonoBehaviour {
         form.AddField("type", "InviteMessage");
         CallDatabase("FCMMessage.php", form);
     }
+
+    
+    internal void UpdatePlayerToken(int userId, string myToken)
+    {
+        WWWForm form = new WWWForm();
+        form.AddField("userId", userId);
+        form.AddField("token", myToken);
+        form.AddField("f", "UpdatePlayerToken");
+
+        CallDatabase("OnlineGames.php", form);
+    }
+
 }

+ 2 - 8
Assets/Scripts/Login/Login.cs

@@ -111,17 +111,11 @@ public class Login : MonoBehaviour {
 
 
     IEnumerator loginCall() {
-        string postUrl = loginUrl + "name=" + UnityWebRequest.EscapeURL(Username)+"&t=";
+        string postUrl = loginUrl + "name=" + UnityWebRequest.EscapeURL(Username);
         StringBuilder sb = new StringBuilder(postUrl);
 
         FirebaseStart fs = firebaseController.GetComponent<FirebaseStart>();
 
-        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();
 
@@ -144,7 +138,7 @@ public class Login : MonoBehaviour {
                 errorText.color = errorColor;
                 Int32.TryParse(u.userId, out int userId);
                 Database.Instance.KeepSignedIn(Username, userId, keepSignedIn.isOn);
-                
+                OnlineDatabase.Instance.UpdatePlayerToken(userId, fs.MyToken);
                 SceneManager.LoadScene("MainMenu");
             } else {
                 errorText.text = LocalizationManager.Instance.GetText("LOGIN_WRONG_USERNAME_PASSWORD");

+ 1 - 1
Assets/Scripts/NewGameScene/NewOnlineGame.cs

@@ -50,7 +50,7 @@ public class NewOnlineGame : MonoBehaviour
         int newGameId = OnlineDatabase.Instance.SetupNewOnlineGame(timeLimitQuestion, timeLimitPlayer, correctToWin, inviteUsers);
         List<String> invitePlayerNames = new List<String>();
         foreach (InviteSearchResult isr in inviteUsers) {
-            invitePlayerNames.Add(isr.GetName())
+            invitePlayerNames.Add(isr.GetName());
         }
         OnlineDatabase.Instance.SendInviteForNewGame(newGameId, invitePlayerNames, Database.Instance.GetSignedInUser().Value);
     }

+ 0 - 4
dbFiles/Login.php

@@ -25,10 +25,6 @@
 		$conn->query($updateLastLoginSql);
 		$returnArray = array('userId' => $data['id'], 'pass' => $data['password'], 'salt' => $data['salt']);
 
-		$messageToken = $_GET['t'];
-		$updateTokenSql = "UPDATE users SET messageToken = '$messageToken' WHERE id = " . $data['id'];
-		$conn->query($updateTokenSql);
-
 		echo json_encode($returnArray);
 	} else {
 		echo "";

+ 5 - 0
dbFiles/OnlineGames.php

@@ -210,6 +210,11 @@
 		
 		$sql = "UPDATE gamePlayers SET userLockedQuestions = (SELECT count(*) FROM usersLockedQuestions WHERE gameId = $gameId AND playerId = '$userId') WHERE playerId = (SELECT id FROM users WHERE username = '$userName' AND gameId = $gameId)";
 		$conn->query($sql);
+	} else if ($callFunction === "UpdatePlayerToken") {
+		
+		$messageToken = $_POST['token'];
+		$updateTokenSql = "UPDATE users SET messageToken = '$messageToken' WHERE id = " . $userId;
+		$conn->query($updateTokenSql);
 	}