Added activity durable object

Author: nora-soderlund

src/domains/router.ts

@@ -73,7 +73,7 @@ export default function createRouter() {
 
     router.post("/api/user/avatar", withAuth, withContent, withSchema(uploadUserImageRequestSchema), handleUploadUserAvatarRequest);
 
-    router.get("/api/ping", withContent, async (request: Request, env: Env) => {
+    router.get("/api/ping", withContent, async (request: RequestWithKey, env: Env) => {
         return Response.json({
             ping: "pong",
             success: true
@@ -83,11 +83,11 @@ export default function createRouter() {
     router.post("/staging/register", withStaging, withContent, handleStagingDeleteUserRequest);
     router.post("/staging/verification", withStaging, withContent, handleStagingVerificationRequest);
 
-    router.get("/staging/github", withStaging, async (request: Request, env: Env) => {
+    router.get("/staging/github", withStaging, async (request: RequestWithKey, env: Env) => {
         return Response.json({ sha: env.GITHUB_SHA });
     });
 
-    router.get("/api/auth/random", withStaging, async (request: Request, env: Env) => {
+    router.get("/api/auth/random", withStaging, async (request: RequestWithKey, env: Env) => {
         return Response.json({
             success: true,
             key: await env.DATABASE.prepare("SELECT * FROM tokens WHERE user IS NOT NULL").first<string>("key")

src/global.d.ts

@@ -3,6 +3,7 @@ declare type Env = {
 
     DATABASE: D1Database;
     BUCKET: R2Bucket;
+    ACTIVITY_DURABLE_OBJECT: DurableObjectNamespace;
 
     ENVIRONMENT: "production" | "staging" | "dev";
     CLOUDFLARE_ACCOUNT_ID: string;
@@ -16,8 +17,8 @@ declare type Env = {
     GITHUB_SHA: string | undefined;
 };
 
-declare type Request = {
-    [key: string]: any | undefined;
+declare type RequestWithKey = Request & {
+    [key: string]: any;
 
     key: {
         id: string;

src/index.ts

@@ -58,3 +58,27 @@ export default {
         }
     }
 };
+
+export class ActivityDurableObject {
+    state: DurableObjectState;
+
+    constructor(state: DurableObjectState, env: Env) {
+        this.state = state;
+    };
+
+    async fetch(request: Request) {
+        const body = await request.json() as {
+            id?: string;
+        };
+
+        if(!body.id)
+            return Response.json({ success: false });
+
+        console.log("recieved id: " + body.id);
+
+        return Response.json({
+            hello: "world",
+            activity: body.id
+        });
+    };
+};

src/middlewares/auth.ts

@@ -1,6 +1,6 @@
 import { getTokenByKey } from "../controllers/tokens/getTokenByKey";
 
-export async function withAuth(request: Request, env: Env, context: any) {
+export async function withAuth(request: RequestWithKey, env: Env, context: any) {
     const authorization = request.headers.get("Authorization").split(' ');
 
     if(authorization[0] !== "Bearer" || authorization.length !== 2)

src/middlewares/schema.ts

@@ -1,7 +1,7 @@
 export function withSchema(schema: any) {
     const entries = Object.keys(schema);
 
-    return (request: Request) => {
+    return (request: RequestWithKey) => {
         for(let key of entries) {
             if(request[key] == undefined)
                 return Response.json({ message: `Bad schema validation, missing ${key} body.` }, { status: 400 });

src/middlewares/staging.ts

@@ -1,4 +1,4 @@
-export async function withStaging(request: Request, env: Env, context: any) {
+export async function withStaging(request: RequestWithKey, env: Env, context: any) {
     if(env.ENVIRONMENT === "production")
         return new Response(null, { status: 404, statusText: "File Not Found" });
 };

src/routes/activities/[activityId]/summary.ts

@@ -17,7 +17,7 @@ export const activitySummaryRequestSchema = {
     }
 };
 
-export async function handleActivitySummaryRequest(request: Request, env: Env) {
+export async function handleActivitySummaryRequest(request: RequestWithKey, env: Env) {
     const { activityId } = request.params;
 
     const activity = await getActivityById(env.DATABASE, activityId);

src/routes/activities/comments.ts

@@ -8,7 +8,7 @@ import { getBikeSummaryById } from "../../controllers/bikes/summary/getBikeSumma
 import { getUserById } from "../../controllers/users/getUserById";
 import { User } from "../../models/user";
 
-export async function handleActivityCommentsRequest(request: Request, env: Env) {
+export async function handleActivityCommentsRequest(request: RequestWithKey, env: Env) {
     const { id } = request.params;
 
     const comments = await getActivityComments(env.DATABASE, id);

src/routes/activities/comments/create.ts

@@ -30,7 +30,7 @@ export const activityCreateCommentRequestSchema = {
     }
 };
 
-export async function handleActivityCreateCommentRequest(request: Request, env: Env) {
+export async function handleActivityCreateCommentRequest(request: RequestWithKey, env: Env) {
     const { id } = request.params;
     const { parent, message } = request.content;
 

src/routes/activities/comments/delete.ts

@@ -18,7 +18,7 @@ export const activityDeleteCommentRequestSchema = {
     }
 };
 
-export async function handleActivityDeleteCommentRequest(request: Request, env: Env) {
+export async function handleActivityDeleteCommentRequest(request: RequestWithKey, env: Env) {
     const { activityId, commentId } = request.params;
 
     const activity = await getActivityById(env.DATABASE, activityId);