feat: add better error handling

Author: stepaniukm

apps/api/src/auth/edgedb.ts

@@ -3,6 +3,10 @@ import { Effect, Config } from 'effect';
 import { EdgedbAuthResponseSchema } from './schema';
 import e, { createClient } from '../../dbschema/edgeql-js';
 
+export class CreateUserError extends Error {
+  _tag = 'CreateUserError';
+}
+
 export const getTokenResponse = ({
   code,
   verifier,
@@ -54,8 +58,7 @@ export const createUser = (user: {
 
       return await insertQuery.run(client);
     },
-    catch(e) {
-      console.log(e);
-      return null;
+    catch(error) {
+      return new CreateUserError('Failed to create user.', { cause: error });
     },
   });

apps/api/src/auth/oauth.ts

@@ -4,6 +4,10 @@ import { google } from 'googleapis';
 import { Octokit } from 'octokit';
 import { assertUnreachable } from '../utils/assert';
 
+export class OAuthError extends Error {
+  _tag = 'OAuthError';
+}
+
 export const getUserFromOauth = ({
   provider,
   providerToken,
@@ -12,7 +16,7 @@ export const getUserFromOauth = ({
   providerToken: string;
 }) =>
   Effect.gen(function* () {
-    if (provider === OAuthProvider.github) {
+    if (provider === OAuthProvider.GitHub) {
       return yield* Effect.tryPromise({
         async try() {
           const octokit = new Octokit({ auth: providerToken });
@@ -25,12 +29,12 @@ export const getUserFromOauth = ({
           };
         },
         catch(error) {
-          console.log('Error getting info about user from GitHub');
-
-          return Effect.fail(error);
+          return new OAuthError("Couldn't get user info from GitHub.", {
+            cause: error,
+          });
         },
       });
-    } else if (provider === OAuthProvider.google) {
+    } else if (provider === OAuthProvider.Google) {
       return yield* Effect.tryPromise({
         async try(signal) {
           const googleReponse = await google.oauth2('v2').userinfo.get(
@@ -45,9 +49,9 @@ export const getUserFromOauth = ({
           };
         },
         catch(error) {
-          console.log('Error getting info about user from Google');
-
-          return Effect.fail(error);
+          return new OAuthError("Couldn't get user info from Google.", {
+            cause: error,
+          });
         },
       });
     }

apps/api/src/auth/router.ts

@@ -15,10 +15,11 @@ import { createUser, getTokenResponse } from './edgedb';
 import { getUserFromOauth } from './oauth';
 
 export const AuthRouter = HttpServer.router.empty.pipe(
-  HttpServer.router.get('/auth/ui/signin', handleAuthUi('signin')),
-  HttpServer.router.get('/auth/ui/signup', handleAuthUi('signup')),
-  HttpServer.router.get('/auth/signout', handleSignout()),
-  HttpServer.router.get('/auth/callback', handleCallback()),
+  HttpServer.router.get('/ui/signin', handleAuthUi('signin')),
+  HttpServer.router.get('/ui/signup', handleAuthUi('signup')),
+  HttpServer.router.get('/signout', handleSignout()),
+  HttpServer.router.get('/callback', handleCallback()),
+  HttpServer.router.prefixAll('/auth'),
 );
 
 function handleAuthUi(method: 'signin' | 'signup') {

apps/api/src/auth/schema.ts

@@ -18,8 +18,8 @@ export const GoogleUserSchema = Schema.Struct({
 });
 
 export enum OAuthProvider {
-  google = 'builtin::oauth_google',
-  github = 'builtin::oauth_github',
+  Google = 'builtin::oauth_google',
+  GitHub = 'builtin::oauth_github',
 }
 
 export const OAuthProviderSchema = Schema.Enums(OAuthProvider);

apps/api/src/index.ts

@@ -6,6 +6,7 @@ import { AuthRouter } from './auth/router';
 import { corsMiddleware } from './cors';
 import { HealthRouter } from './health/router';
 import { LogLevelLive } from './logging';
+import { statusCodes } from './utils/response';
 
 const ServerLive = BunHttpServer.server.layerConfig({
   port: Config.number('PORT').pipe(Config.withDefault(3001)),
@@ -40,13 +41,17 @@ const runnable = WholeRouter.pipe(
   Effect.catchAll((error) =>
     Effect.gen(function* () {
       yield* Console.error('Error', error);
-      return HttpServer.response.text('Error', { status: 500 });
+      return HttpServer.response.text('Error', {
+        status: statusCodes.INTERNAL_SERVER_ERROR,
+      });
     }),
   ),
   Effect.catchAllDefect((defect) =>
     Effect.gen(function* () {
       yield* Console.error('Defect', defect);
-      return HttpServer.response.text('Defect', { status: 500 });
+      return HttpServer.response.text('Defect', {
+        status: statusCodes.INTERNAL_SERVER_ERROR,
+      });
     }),
   ),
   HttpServer.server.serve(HttpServer.middleware.logger),