sem/Csharp-eindproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge Setup branch into develop #1

Merged
SemvdH merged 71 commits from setupBranch into master 2020-10-21 18:59:02 +00:00
Conversation 2 Commits 71 Files Changed 42 +6 -3
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0009393960 - Show all commits

2
Server/Models/ServerClient.cs
View File

@@ -93,7 +93,7 @@ namespace Server.Models
case JSONConvert.LOGIN:
// json log in username data
string uName = JSONConvert.GetUsernameLogin(message);
string uName = JSONConvert.GetUsernameLogin(payload);
if (uName != null)
{
User = new User(uName);

7
SharedClientServer/JSONConvert.cs
View File

@@ -25,9 +25,12 @@ namespace SharedClientServer
return payload.username;
}
public static byte[] GetUsernameMessage(string username)
public static byte[] GetUsernameMessage(string uName)
{
return GetMessageToSend(LOGIN, new
{
username = uName
});
}
/// <summary>