feat(server): providing layers

apps/server/src/api/apis.ts

@@ -77,6 +77,8 @@ const ApiDemoLive = HttpApiBuilder.group(api, 'demo', handlers =>
 				return new ResponseProtected({ userId: user.id })
 			}),
 		),
+).pipe(
+	Layer.provide(AuthMiddlewareLive)
 )
 
 const ApiUsersLive = HttpApiBuilder.group(api, 'users', handlers =>
@@ -102,8 +104,10 @@ const ApiUsersLive = HttpApiBuilder.group(api, 'users', handlers =>
 			})
 		}),
 	),
+).pipe(
+	Layer.provide(AuthMiddlewareLive)
 )
 
 export const ApiLive = HttpApiBuilder.api(api).pipe(
-	Layer.provide([ApiDemoLive, ApiUsersLive, AuthMiddlewareLive]),
+	Layer.provide([ApiDemoLive, ApiUsersLive]),
 )

apps/server/src/api/auth_middleware.ts

@@ -1,5 +1,4 @@
-import { HttpApiMiddleware } from '@effect/platform'
-import * as ServerRequest from '@effect/platform/HttpServerRequest'
+import { HttpApiMiddleware, HttpServerRequest } from '@effect/platform'
 import * as ServerResponse from '@effect/platform/HttpServerResponse'
 import { Effect, Layer, Schema } from 'effect'
 import {
@@ -9,7 +8,7 @@ import {
 } from 'supertokens-node/framework/custom'
 import SupertokensSession from 'supertokens-node/recipe/session'
 
-import { Forbidden, Unauthorized } from './types.js'
+import { CurrentUser, Forbidden, Unauthorized } from './types.js'
 
 type NextFunction = (err?: any) => void
 
@@ -28,7 +27,7 @@ export class AuthMiddleware extends HttpApiMiddleware.Tag<AuthMiddleware>()(
 export const AuthMiddlewareLive = Layer.effect(
 	AuthMiddleware,
 	Effect.gen(function* () {
-		const request = yield* ServerRequest.HttpServerRequest
+		const request = yield* HttpServerRequest.HttpServerRequest
 
 		// Create PreParsedRequest for Supertokens
 		const preParsedRequest = new PreParsedRequest({
@@ -57,7 +56,7 @@ export const AuthMiddlewareLive = Layer.effect(
 		)
 
 		if (error) {
-			throw error
+			return yield* new MiddlewareError()
 		}
 
 		// handled is valid for these cases:
@@ -80,42 +79,40 @@ export const AuthMiddlewareLive = Layer.effect(
 		// 1. Regular application endpoints
 		// 2. API routes that need session verification
 		// 3. Any non-auth related requests
-		try {
-			const session = yield* Effect.promise(() =>
-				SupertokensSession.getSession(preParsedRequest, baseResponse, {
-					sessionRequired: false,
-				}),
-			)
-
-			// if (session) {
-			// 	const userId = session?.getUserId()
-			// 	// return yield* app.pipe(
-			// 	//   Effect.provideService(CurrentUser, { id: userId })
-			// 	// );
-			// }
+		const session: SupertokensSession.SessionContainer | undefined =
+			yield* Effect.tryPromise({
+				try: () =>
+					SupertokensSession.getSession(preParsedRequest, baseResponse, {
+						sessionRequired: false,
+					}),
+				catch: err => {
+					// Docs: https://github.com/supertokens/supertokens-node/blob/7e33a06f4283a150600a5eabda31615fc5827023/lib/ts/recipe/session/error.ts
+					if (SupertokensSession.Error.isErrorFromSuperTokens(err)) {
+						switch (err.type) {
+							case SupertokensSession.Error.TRY_REFRESH_TOKEN:
+							case SupertokensSession.Error.UNAUTHORISED:
+								return new Unauthorized()
+							case SupertokensSession.Error.INVALID_CLAIMS:
+								return new Forbidden()
+							case SupertokensSession.Error.TOKEN_THEFT_DETECTED:
+								// You might want to handle this case differently, perhaps logging the incident
+								return new Unauthorized()
+							case SupertokensSession.Error.CLEAR_DUPLICATE_SESSION_COOKIES:
+								// Handle duplicate session cookies - usually means clearing them
+								return new Unauthorized()
+							default:
+								throw err
+						}
+					}
+				},
+			})
 
+		if (!session) {
 			return yield* new Unauthorized()
-		} catch (err) {
-			// Docs: https://github.com/supertokens/supertokens-node/blob/7e33a06f4283a150600a5eabda31615fc5827023/lib/ts/recipe/session/error.ts
-			if (SupertokensSession.Error.isErrorFromSuperTokens(err)) {
-				switch (err.type) {
-					case SupertokensSession.Error.TRY_REFRESH_TOKEN:
-					case SupertokensSession.Error.UNAUTHORISED:
-						return yield* new Unauthorized()
-					case SupertokensSession.Error.INVALID_CLAIMS:
-						return yield* new Forbidden()
-					case SupertokensSession.Error.TOKEN_THEFT_DETECTED:
-						// You might want to handle this case differently, perhaps logging the incident
-						return yield* new Unauthorized()
-					case SupertokensSession.Error.CLEAR_DUPLICATE_SESSION_COOKIES:
-						// Handle duplicate session cookies - usually means clearing them
-						return yield* new Unauthorized()
-					default:
-						throw err
-				}
-			}
-			throw err
 		}
+
+		const userId = session.getUserId()
+		return yield* new CurrentUser(userId)
 	}),
 )
 

apps/server/src/index.ts

@@ -1,12 +1,12 @@
-import { createServer } from 'node:http'
 import {
 	HttpApiBuilder,
 	HttpApiSwagger,
 	HttpMiddleware,
 	HttpServer,
 } from '@effect/platform'
 import { NodeHttpServer, NodeRuntime } from '@effect/platform-node'
-import { Config, Layer } from 'effect'
+import { Layer } from 'effect'
+import { createServer } from 'node:http'
 
 import { ApiLive } from './api/apis.js'
 import { MiddlewareCorsLive } from './api/cors.js'
@@ -25,14 +25,10 @@ const ServerLive = NodeHttpServer.layer(() => createServer(), {
 // Register API with HTTP server
 const HttpLive = HttpApiBuilder.serve(HttpMiddleware.logger)
 	.pipe(
-		Layer.provide(MiddlewareCorsLive),
-		Layer.provide(SupertokensService.layer),
-		Layer.provide(ApiLive),
-		Layer.provide(ServerLive),
 		HttpServer.withLogAddress, // Log server address
-		Layer.provide(HttpApiSwagger.layer({ path: '/docs' })),
-	)
-	.pipe(Layer.provide(ServerLive))
+		Layer.provide([MiddlewareCorsLive, SupertokensService.layer, ApiLive, ServerLive, HttpApiSwagger.layer({ path: '/docs' }).pipe(
+			Layer.provide(ApiLive)
+		)]))
 
 // Run server
 NodeRuntime.runMain(Layer.launch(HttpLive))

apps/web/package.json

@@ -30,7 +30,11 @@
 		"vite-plugin-pwa": "^0.21.1"
 	},
 	"browserslist": {
-		"production": [">0.2%", "not dead", "not op_mini all"],
+		"production": [
+			">0.2%",
+			"not dead",
+			"not op_mini all"
+		],
 		"development": [
 			"last 1 chrome version",
 			"last 1 firefox version",

package.json

@@ -7,7 +7,9 @@
 		"yarn": ">=4.1.0"
 	},
 	"type": "module",
-	"workspaces": ["apps/*"],
+	"workspaces": [
+		"apps/*"
+	],
 	"scripts": {
 		"lint": "yarn lint:syncpack && yarn lint:biome",
 		"lint:biome": "biome check --write --no-errors-on-unmatched",