Merge branch 'main' into login-validation

fedeya · Jun 28, 2023 · c533a71 · c533a71
2 parents d5251ce + cdf5b93
commit c533a71
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/client.ts b/src/client.ts
@@ -12,10 +12,20 @@ export const signUp = async (payload: SignUpPayload): Promise<User> => {
  method: 'POST',
  body: JSON.stringify(payload),
  headers: {
- 'Content-Type': 'application/json'
+ 'Content-Type': 'application/json; charset=UTF-8'
  }
  });
 
+ if (!res.ok) {
+ const isJson = res.headers
+ .get('Content-Type')
+ ?.includes('application/json');
+
+ const data = isJson ? await res.json() : await res.text();
+
+ throw new Error(data);
+ }
+
  const user = await res.json();
 
  return user;

diff --git a/src/credentials.ts b/src/credentials.ts
@@ -20,7 +20,18 @@ export const signUpHandler =
  });
 
  if (user) {
- res.json({ error: 'User already exist' });
+ const response = { error: 'User already exist' };
+
+ if (isEdge) {
+ return new Response(JSON.stringify(response), {
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ status: 400
+ });
+ }
+
+ res.json(response);
  return;
  }