Fix cors

* Fix cors to debug local instance * Format config json
K0IN · Jul 22, 2023 · 7d5f982 · 7d5f982
1 parent 83b64af
commit 7d5f982
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 24 deletions.
diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml
@@ -19,7 +19,7 @@ jobs:
 
         strategy:
             matrix:
-                platform: [linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64/v8]
+                platform: [linux/amd64, linux/arm64/v8] #  linux/arm/v6, linux/arm/v7, 
 
         steps:
             - name: Checkout repository

diff --git a/app/backend/.vscode/launch.json b/app/backend/.vscode/launch.json
@@ -10,18 +10,19 @@
             "runtimeExecutable": "deno",
             "runtimeArgs": [
                 "run",
-                // "--unstable",
-                // "--inspect"
-                // "--allow-all"
+                "--unstable",
+                "--inspect-brk",
+                "--allow-all"
             ],
-            "args": [                
+            "args": [
                 "run",
                 "--sub",
                 "mailto:a@a.com",
                 "--vapidkey",
-                "eyJrdHkiOiJFQyIsImNydiI6IlAtMjU2IiwiYWxnIjoiRVMyNTYiLCJ4IjoiUV92WlVXUExOUlFMRnU5QWRNaGRDQlFpY1FKamxYajVHZ2lwY19BS1E5USIsInkiOiJILXlDUF9hZ3FzRmpGMmgtZ2dNTTdVT1UxdktJN1JTcU1XSVhfZjBJekhnIiwiZCI6IjVXdzg1TnFxN09lY0pyaDN5MDl6a1JLWWR3TEhUVTVObjlNZUNqMkh6Y2MiLCJrZXlfb3BzIjpbInNpZ24iXSwiZXh0Ijp0cnVlfQ=="
+                "eyJrdHkiOiJFQyIsImNydiI6IlAtMjU2IiwiYWxnIjoiRVMyNTYiLCJ4IjoiUV92WlVXUExOUlFMRnU5QWRNaGRDQlFpY1FKamxYajVHZ2lwY19BS1E5USIsInkiOiJILXlDUF9hZ3FzRmpGMmgtZ2dNTTdVT1UxdktJN1JTcU1XSVhfZjBJekhnIiwiZCI6IjVXdzg1TnFxN09lY0pyaDN5MDl6a1JLWWR3TEhUVTVObjlNZUNqMkh6Y2MiLCJrZXlfb3BzIjpbInNpZ24iXSwiZXh0Ijp0cnVlfQ==",
+                "--cors"
             ],
-            // "attachSimplePort": 9229
+            "attachSimplePort": 9229
         }
     ]
 }
diff --git a/app/backend/.vscode/tasks.json b/app/backend/.vscode/tasks.json
@@ -2,11 +2,16 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "runOptions": { "runOn": "folderOpen" },
+            "runOptions": {
+                "runOn": "folderOpen"
+            },
             "label": "prepare",
             "type": "process",
             "command": "deno",
-            "args": ["cache", "main.ts"]
+            "args": [
+                "cache",
+                "main.ts"
+            ]
         }
     ]
 }
diff --git a/app/backend/mod.ts b/app/backend/mod.ts
@@ -22,6 +22,11 @@ export async function serve(params: AppParameters, listen = true): Promise<Appli
     const { port, vapidKey, sub, frontend, cors, sendkey, loginkey } = parsed.data;
 
     const app = new Application();
+
+    if (cors) {
+        app.use(oakCors());
+    }
+
     app.use(logger.logger, logger.responseTime);
     app.use(apiRouter.routes(), apiRouter.allowedMethods());
 
@@ -37,10 +42,6 @@ export async function serve(params: AppParameters, listen = true): Promise<Appli
     app.state.sendkey = sendkey;
     app.state.loginkey = loginkey;
 
-    if (cors) {
-        app.use(oakCors());
-    }
-
     console.log(`Listening on http://localhost:${port}/ Config: ${JSON.stringify(params)}`);
 
     if (listen) {

diff --git a/app/backend/types/apiresponse.ts b/app/backend/types/apiresponse.ts
@@ -3,21 +3,13 @@ import { ApiError } from "./failures.ts";
 export function success<T>(data: T, additions?: unknown): Response {
     const responseMetaData = Object.assign({
         status: 200,
-        headers: {
-            'Content-Type': 'application/json',
-            'Cache-Control': 'no-cache'
-        }
     }, additions);
     return new Response(JSON.stringify({ successful: true, data }), responseMetaData);
 }
 
 export function failure(error: ApiError, additions?: unknown): Response {
     const responseMetaData = Object.assign({
         status: 500,
-        headers: {
-            'Content-Type': 'application/json',
-            'Cache-Control': 'no-cache'
-        }
     }, additions);
     return new Response(JSON.stringify({ successful: false, error }), responseMetaData);
 }
diff --git a/app/backend/util/commandvalidator.ts b/app/backend/util/commandvalidator.ts
@@ -1,4 +1,3 @@
-
 export function validatePort(port: string) {
     const portNumber = parseInt(port);
     if (portNumber < 1 || portNumber > 65535) {

diff --git a/app/backend/util/oakreturn.ts b/app/backend/util/oakreturn.ts
@@ -4,9 +4,14 @@ import { failure } from "../types/apiresponse.ts";
 
 
 export function responseToContext(context: RouterContext<any, any, any>, response: Response) {
-    context.response.body = response.body;
+    context.response.body = response.body ?? {};
     context.response.status = response.status;
-    context.response.headers = response.headers;
+    if (!context.response.headers) {
+        context.response.headers = new Headers();
+    }
+
+    context.response.headers.set('Content-Type', 'application/json');
+    context.response.headers.set('Cache-Control', 'no-cache');
 }
 
 export function toReturn(fn: (ctx: RouterContext<any, any, any>) => Promise<Response>) {