Skip to content

update HttpHandler to use UTF8 instead of ASCII #33

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.

Sign up for GitHub

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

Open
dlorddd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update HttpHandler to use UTF8 instead of ASCII #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions Assets/graphQl-client/Scripts/Core/HttpHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class HttpHandler

public static async Task<UnityWebRequest> PostAsync(string url, string details, string authToken = null){
string jsonData = JsonConvert.SerializeObject(new{query = details});
byte[] postData = Encoding.ASCII.GetBytes(jsonData);
byte[] postData = Encoding.UTF8.GetBytes(jsonData);
UnityWebRequest request = UnityWebRequest.Post(url, UnityWebRequest.kHttpVerbPOST);
request.uploadHandler = new UploadHandlerRaw(postData);
request.SetRequestHeader("Content-Type", "application/json");
Expand All @@ -44,7 +44,7 @@ public static async Task<UnityWebRequest> PostAsync(string url, string details,

public static async Task<UnityWebRequest> PostAsync(UnityWebRequest request, string details){
string jsonData = JsonConvert.SerializeObject(new{query = details});
byte[] postData = Encoding.ASCII.GetBytes(jsonData);
byte[] postData = Encoding.UTF8.GetBytes(jsonData);
request.uploadHandler = new UploadHandlerRaw(postData);
OnRequestBegin requestBegin = new OnRequestBegin();
requestBegin.FireEvent();
Expand Down Expand Up @@ -130,14 +130,14 @@ public static async Task<ClientWebSocket> WebsocketConnect(ClientWebSocket cws,

static async Task WebsocketInit(ClientWebSocket cws){
string jsonData = "{\"type\":\"connection_init\"}";
ArraySegment<byte> b = new ArraySegment<byte>(Encoding.ASCII.GetBytes(jsonData));
ArraySegment<byte> b = new ArraySegment<byte>(Encoding.UTF8.GetBytes(jsonData));
await cws.SendAsync(b, WebSocketMessageType.Text, true, CancellationToken.None);
GetWsReturn(cws);
}

static async Task WebsocketSend(ClientWebSocket cws, string id, string details){
string jsonData = JsonConvert.SerializeObject(new {id = $"{id}", type = "start", payload = new{query = details}});
ArraySegment<byte> b = new ArraySegment<byte>(Encoding.ASCII.GetBytes(jsonData));
ArraySegment<byte> b = new ArraySegment<byte>(Encoding.UTF8.GetBytes(jsonData));
await cws.SendAsync(b, WebSocketMessageType.Text, true, CancellationToken.None);
}

Expand Down Expand Up @@ -204,7 +204,7 @@ static async void GetWsReturn(ClientWebSocket cws){

public static async Task WebsocketDisconnect(ClientWebSocket cws, string socketId = "1"){
string jsonData = $"{{\"type\":\"stop\",\"id\":\"{socketId}\"}}";
ArraySegment<byte> b = new ArraySegment<byte>(Encoding.ASCII.GetBytes(jsonData));
ArraySegment<byte> b = new ArraySegment<byte>(Encoding.UTF8.GetBytes(jsonData));
await cws.SendAsync(b, WebSocketMessageType.Text, true, CancellationToken.None);
await cws.CloseAsync(WebSocketCloseStatus.NormalClosure, "Closed", CancellationToken.None);
OnSubscriptionCanceled subscriptionCanceled = new OnSubscriptionCanceled();
Expand Down