Improve error messaging

packages/server/src/sdk/app/oauth2/tests/utils.spec.ts

@@ -52,5 +52,39 @@ describe("oauth2 utils", () => {
 
       expect(response).toEqual(expect.stringMatching(/^Bearer .+/))
     })
+
+    it("handles wrong secrets", async () => {
+      await expect(
+        config.doInContext(config.appId, async () => {
+          const oauthConfig = await sdk.oauth2.create({
+            name: generator.guid(),
+            url: `${keycloakUrl}/realms/myrealm/protocol/openid-connect/token`,
+            clientId: "my-client",
+            clientSecret: "wrong-secret",
+          })
+
+          await generateToken(oauthConfig.id)
+        })
+      ).rejects.toThrow(
+        "Error fetching oauth2 token: Invalid client or Invalid client credentials"
+      )
+    })
+
+    it("handles wrong client ids", async () => {
+      await expect(
+        config.doInContext(config.appId, async () => {
+          const oauthConfig = await sdk.oauth2.create({
+            name: generator.guid(),
+            url: `${keycloakUrl}/realms/myrealm/protocol/openid-connect/token`,
+            clientId: "wrong-client-id",
+            clientSecret: "my-secret",
+          })
+
+          await generateToken(oauthConfig.id)
+        })
+      ).rejects.toThrow(
+        "Error fetching oauth2 token: Invalid client or Invalid client credentials"
+      )
+    })
   })
 })

packages/server/src/sdk/app/oauth2/utils.ts

@@ -20,9 +20,13 @@ export async function generateToken(id: string) {
     }),
     redirect: "follow",
   })
-  if (resp.status !== 200) {
+
-    throw new Error(`Error fetching oauth2 token: ${resp.statusText}`)
-  }
   const jsonResponse = await resp.json()
+  if (!resp.ok) {
+    const message = jsonResponse.error_description ?? resp.statusText
+
+    throw new Error(`Error fetching oauth2 token: ${message}`)
+  }
+
   return `${jsonResponse.token_type} ${jsonResponse.access_token}`
 }