Merge branch '9.4' into feat/bulk-import-base

supertokens · Dec 19, 2024 · 4d972b1 · 4d972b1
2 parents b135066 + 038b5c8
commit 4d972b1
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,6 +47,10 @@ CREATE INDEX IF NOT EXISTS bulk_import_users_pagination_index1 ON bulk_import_us
 CREATE INDEX IF NOT EXISTS bulk_import_users_pagination_index2 ON bulk_import_users (app_id, created_at DESC, id DESC);
 ```
 
+## [9.3.1]
+
+- Includes exception class name in 500 error message
+
 ## [9.3.0]
 
 ### Changes

diff --git a/cli/jar/cli.jar b/cli/jar/cli.jar
diff --git a/downloader/jar/downloader.jar b/downloader/jar/downloader.jar
diff --git a/ee/jar/ee.jar b/ee/jar/ee.jar
diff --git a/jar/core-9.3.0.jar → jar/core-9.3.1.jar b/jar/core-9.3.0.jar → jar/core-9.3.1.jar
diff --git a/src/main/java/io/supertokens/webserver/WebserverAPI.java b/src/main/java/io/supertokens/webserver/WebserverAPI.java
@@ -532,10 +532,10 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
                 } else if (rootCause instanceof BadPermissionException) {
                     sendTextResponse(403, rootCause.getMessage(), resp);
                 } else {
-                    sendTextResponse(500, rootCause.getMessage(), resp);
+                    sendTextResponse(500, rootCause.toString(), resp);
                 }
             } else {
-                sendTextResponse(500, e.getMessage(), resp);
+                sendTextResponse(500, e.toString(), resp);
             }
         }
         Logging.info(main, tenantIdentifier, "API ended: " + req.getRequestURI() + ". Method: " + req.getMethod(),

diff --git a/src/test/java/io/supertokens/test/PathRouterTest.java b/src/test/java/io/supertokens/test/PathRouterTest.java
@@ -125,7 +125,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
                 fail();
             } catch (HttpResponseException e) {
                 assertEquals(500, e.statusCode);
-                assertEquals("Http error. Status Code: 500. Message: Test Exception", e.getMessage());
+                assertEquals("Http error. Status Code: 500. Message: java.lang.RuntimeException: Test Exception", e.getMessage());
             }
         }
 
@@ -137,7 +137,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
                 fail();
             } catch (HttpResponseException e) {
                 assertEquals(500, e.statusCode);
-                assertEquals("Http error. Status Code: 500. Message: Runtime Exception", e.getMessage());
+                assertEquals("Http error. Status Code: 500. Message: java.lang.RuntimeException: Runtime Exception", e.getMessage());
             }
         }
     }

diff --git a/src/test/java/io/supertokens/test/emailpassword/api/ImportUserWithPasswordHashAPITest.java b/src/test/java/io/supertokens/test/emailpassword/api/ImportUserWithPasswordHashAPITest.java
@@ -297,7 +297,7 @@ public void testImportingAUsesrFromFirebaseWithoutSettingTheSignerKey() throws E
             throw new Exception("Should not come here");
         } catch (io.supertokens.test.httpRequest.HttpResponseException e) {
             assertTrue(e.statusCode == 500
-                    && e.getMessage().equals("Http error. Status Code: 500. Message: 'firebase_password_hashing_signer_key' cannot be null"));
+                    && e.getMessage().equals("Http error. Status Code: 500. Message: java.lang.IllegalStateException: 'firebase_password_hashing_signer_key' cannot be null"));
         }
 
         process.kill();
@@ -388,7 +388,7 @@ public void testSigningInAUserWithFirebasePasswordHashWithoutSettingTheSignerKey
             throw new Exception("Should not come here");
         } catch (io.supertokens.test.httpRequest.HttpResponseException e) {
             assertTrue(e.statusCode == 500
-                    && e.getMessage().equals("Http error. Status Code: 500. Message: 'firebase_password_hashing_signer_key' cannot be null"));
+                    && e.getMessage().equals("Http error. Status Code: 500. Message: java.lang.IllegalStateException: 'firebase_password_hashing_signer_key' cannot be null"));
         }
 
         process.kill();