zaid.marzguioui/myeasycms-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor route handlers and CMS clients

Browse Source 
Refactored the route handlers to use a new `enhanceRouteHandler` function for better control over request handlers and user authentication. CMS clients are now created using factory functions for better encapsulation and control over instance creation. Renamed `client.ts` in 'keystatic' to `keystatic-client.ts`.
This commit is contained in:
giancarlo
2024-05-02 12:37:58 +07:00
parent be5c10f1c3
commit dbce7e38ae
8 changed files with 99 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
packages/next/src/routes/index.ts
View File

@@ -14,9 +14,19 @@ import { getSupabaseRouteHandlerClient } from '@kit/supabase/route-handler-clien
import { captureException, zodParseFactory } from '../utils';
interface HandlerParams<Body> {
interface Config<Schema> {
auth?: boolean;
captcha?: boolean;
captureException?: boolean;
schema?: Schema;
}
interface HandlerParams<
Body extends object,
RequireAuth extends boolean | undefined,
> {
request: NextRequest;
user: User;
user: RequireAuth extends false ? undefined : User;
body: Body;
}
@@ -41,22 +51,21 @@ interface HandlerParams<Body> {
*
*/
export const enhanceRouteHandler = <
Body,
Body extends object,
Schema extends z.ZodType<Body, z.ZodTypeDef>,
Params extends Config<Schema> = Config<Schema>,
>(
// Route handler function
handler:
| ((params: HandlerParams<z.infer<Schema>>) => NextResponse | Response)
| ((
params: HandlerParams<z.infer<Schema>>,
params: HandlerParams<z.infer<Schema>, Params['auth']>,
) => NextResponse | Response)
| ((
params: HandlerParams<z.infer<Schema>, Params['auth']>,
) => Promise<NextResponse | Response>),
// Parameters object
params?: {
captcha?: boolean;
captureException?: boolean;
schema?: Schema;
},
params?: Params,
) => {
/**
* Route handler function.
@@ -64,6 +73,10 @@ export const enhanceRouteHandler = <
* This function takes a request object as an argument and returns a response object.
*/
return async function routeHandler(request: NextRequest) {
type UserParam = Params['auth'] extends false ? undefined : User;
let user: UserParam = undefined as UserParam;
// Check if the captcha token should be verified
const shouldVerifyCaptcha = params?.captcha ?? false;
@@ -80,15 +93,22 @@ export const enhanceRouteHandler = <
}
const client = getSupabaseRouteHandlerClient();
const auth = await requireUser(client);
// If the user is not authenticated, redirect to the specified URL.
if (auth.error) {
return redirect(auth.redirectTo);
const shouldVerifyAuth = params?.auth ?? true;
// Check if the user should be authenticated
if (shouldVerifyAuth) {
// Get the authenticated user
const auth = await requireUser(client);
// If the user is not authenticated, redirect to the specified URL.
if (auth.error) {
return redirect(auth.redirectTo);
}
user = auth.data as UserParam;
}
const user = auth.data;
// clone the request to read the body
// so that we can pass it to the handler safely
let body = await request.clone().json();