Merge pull request #1206 from PixiEditor/better-40x-handling

Catch all cases for 40x status code

src/PixiEditor.PixiAuth/PixiAuthClient.cs

@@ -42,10 +42,6 @@ public class PixiAuthClient
                 return sessionId;
             }
         }
-        else if (response.StatusCode == HttpStatusCode.BadRequest)
-        {
-            throw new BadRequestException(await response.Content.ReadAsStringAsync());
-        }
         else if (response.StatusCode >= HttpStatusCode.InternalServerError)
         {
             throw new InternalServerErrorException("INTERNAL_SERVER_ERROR");
@@ -68,6 +64,10 @@ public class PixiAuthClient
         {
             throw new ForbiddenException("FORBIDDEN");
         }
+        else if (response.StatusCode >= HttpStatusCode.BadRequest)
+        {
+            throw new BadRequestException(await response.Content.ReadAsStringAsync());
+        }
 
         return null;
     }
@@ -97,10 +97,6 @@ public class PixiAuthClient
                 return (token, expirationDate);
             }
         }
-        else if (response.StatusCode == HttpStatusCode.BadRequest)
-        {
-            throw new BadRequestException(await response.Content.ReadAsStringAsync());
-        }
         else if (response.StatusCode >= HttpStatusCode.InternalServerError)
         {
             throw new InternalServerErrorException("INTERNAL_SERVER_ERROR");
@@ -113,6 +109,10 @@ public class PixiAuthClient
         {
             throw new ForbiddenException("FORBIDDEN");
         }
+        else if (response.StatusCode >= HttpStatusCode.BadRequest)
+        {
+            throw new BadRequestException(await response.Content.ReadAsStringAsync());
+        }
 
         return (null, null);
     }
@@ -157,18 +157,14 @@ public class PixiAuthClient
                 return (token, expirationDate);
             }
         }
-        else if (response.StatusCode == HttpStatusCode.Forbidden)
-        {
-            throw new ForbiddenException("SESSION_NOT_VALID");
-        }
-        else if (response.StatusCode == HttpStatusCode.BadRequest)
-        {
-            throw new BadRequestException(await response.Content.ReadAsStringAsync());
-        }
         else if ((int)response.StatusCode >= 500)
         {
             throw new InternalServerErrorException("INTERNAL_SERVER_ERROR");
         }
+        else if (response.StatusCode == HttpStatusCode.Forbidden)
+        {
+            throw new ForbiddenException("SESSION_NOT_VALID");
+        }
         else if (response.StatusCode == HttpStatusCode.Unauthorized)
         {
             throw new UnauthorizedAccessException("UNAUTHORIZED");
@@ -177,6 +173,10 @@ public class PixiAuthClient
         {
             throw new ForbiddenException("FORBIDDEN");
         }
+        else if (response.StatusCode >= HttpStatusCode.BadRequest)
+        {
+            throw new BadRequestException(await response.Content.ReadAsStringAsync());
+        }
 
         return (null, null);
     }
@@ -222,15 +222,14 @@ public class PixiAuthClient
 
         var response = await httpClient.SendAsync(request);
 
-        if (response.StatusCode == HttpStatusCode.BadRequest)
-        {
-            throw new BadRequestException(await response.Content.ReadAsStringAsync());
-        }
-
         if (response.StatusCode >= HttpStatusCode.InternalServerError)
         {
             throw new InternalServerErrorException("INTERNAL_SERVER_ERROR");
         }
+        if (response.StatusCode >= HttpStatusCode.BadRequest)
+        {
+            throw new BadRequestException(await response.Content.ReadAsStringAsync());
+        }
 
         if (response.StatusCode == HttpStatusCode.OK)
         {
@@ -256,15 +255,14 @@ public class PixiAuthClient
 
         var response = await httpClient.SendAsync(request);
 
-        if (response.StatusCode == HttpStatusCode.BadRequest)
-        {
-            throw new BadRequestException(await response.Content.ReadAsStringAsync());
-        }
-
         if (response.StatusCode >= HttpStatusCode.InternalServerError)
         {
             throw new InternalServerErrorException("INTERNAL_SERVER_ERROR");
         }
+        if (response.StatusCode >= HttpStatusCode.BadRequest)
+        {
+            throw new BadRequestException(await response.Content.ReadAsStringAsync());
+        }
 
         if (response.StatusCode == HttpStatusCode.OK)
         {
@@ -294,15 +292,14 @@ public class PixiAuthClient
 
         var response = await httpClient.SendAsync(request);
 
-        if (response.StatusCode == HttpStatusCode.BadRequest)
-        {
-            throw new BadRequestException(await response.Content.ReadAsStringAsync());
-        }
-
         if (response.StatusCode >= HttpStatusCode.InternalServerError)
         {
             throw new InternalServerErrorException("INTERNAL_SERVER_ERROR");
         }
+        if (response.StatusCode >= HttpStatusCode.BadRequest)
+        {
+            throw new BadRequestException(await response.Content.ReadAsStringAsync());
+        }
 
         if (response.StatusCode == HttpStatusCode.OK)
         {