Split services into core and request

express/basic/logout.ts

@@ -1,13 +1,13 @@
 import { SESSION_COOKIE_NAME } from "../auth/token";
-import { services } from "../services";
-import type { Call, Result, Route } from "../types";
+import { request } from "../request";
 import { redirect } from "../request/util";
+import type { Call, Result, Route } from "../types";
 
 const logoutHandler = async (call: Call): Promise<Result> => {
     // Extract token from cookie and invalidate the session
-    const token = services.auth.extractToken(call.request);
+    const token = request.auth.extractToken(call.request);
     if (token) {
-        await services.auth.logout(token);
+        await request.auth.logout(token);
     }
 
     // Clear the cookie and redirect to login