fix: added static files to allowed paths (#24)

Author: eveffer

.gitignore

@@ -5,3 +5,4 @@ pgdata/
 debug.log
 .zed/
 .vscode/
+public/

.zed/tasks.json

@@ -1,7 +1,7 @@
 [
   {
     "command": "deno",
-    "args": ["run", "-A", "--watch", "--watch-exclude=.inspatial", "main.ts"],
+    "args": ["run", "-A", "main.ts"],
     "cwd": "$ZED_WORKTREE_ROOT/examples/basic",
     "label": "Example: Basic",
     "allow_concurrent_runs": false,

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@inspatial/cloud",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "license": "Apache-2.0",
   "exports": {
     ".": "./mod.ts",

extensions/auth/auth-handler.ts

@@ -12,10 +12,10 @@ export class AuthHandler {
     this.#inCloud = inCloud;
   }
 
-  #allowedPaths: Set<string> = new Set();
+  #allowedPaths: Set<RegExp> = new Set();
   #allowedActions: Map<string, Set<string>> = new Map();
 
-  get allowedPaths(): string[] {
+  get allowedPaths(): RegExp[] {
     return Array.from(this.#allowedPaths);
   }
 
@@ -31,8 +31,8 @@ export class AuthHandler {
     );
     return actions;
   }
-  allowPath(path: string): void {
-    this.#allowedPaths.add(path);
+  allowPath(match: RegExp): void {
+    this.#allowedPaths.add(match);
   }
   allowAction(group: string, action: string): void {
     if (!this.#allowedActions.has(group)) {
@@ -41,17 +41,19 @@ export class AuthHandler {
     this.#allowedActions.get(group)?.add(action);
   }
 
-  disallowPath(path: string): void {
-    this.#allowedPaths.delete(path);
+  disallowPath(match: RegExp): void {
+    this.#allowedPaths.delete(match);
   }
   disallowAction(group: string, action: string): void {
     if (this.#allowedActions.has(group)) {
       this.#allowedActions.get(group)?.delete(action);
     }
   }
   isPathAllowed(path: string): boolean {
-    if (this.#allowedPaths.has(path)) {
-      return true;
+    for (const match of this.#allowedPaths) {
+      if (match.test(path)) {
+        return true;
+      }
     }
     return false;
   }

extensions/auth/entry-types/user/user.type.ts

@@ -31,9 +31,9 @@ export interface User extends EntryBase {
   fullName?: string;
   /**
    * **Role** (ChoicesField)
-   * @type {'systemAdmin' | 'basic' | 'gedcomUser'}
+   * @type {'systemAdmin' | 'basic'}
    */
-  role?: "systemAdmin" | "basic" | "gedcomUser";
+  role?: "systemAdmin" | "basic";
   /**
    * **Profile Picture** (ImageField)
    * @description The user's profile picture

extensions/auth/mod.ts

@@ -8,13 +8,16 @@ import { authMiddleware } from "#extensions/auth/auth-middleware.ts";
 import { userSessionEntry } from "./entry-types/user-session/user-session-entry.ts";
 import { authSettings } from "./settings-types/auth-settings/auth-settings.ts";
 import { userEntry } from "./entry-types/user/user-entry.ts";
+import { staticFilesHandler } from "~/static/staticPathHandler.ts";
+import { apiPathHandler } from "~/api/api-handler.ts";
 
 export const authCloudExtension: CloudExtension = new CloudExtension("auth", {
   label: "Auth",
   description: "Auth extension",
   install(app, config) {
     const handler = new AuthHandler(app);
-    handler.allowPath("/api");
+    handler.allowPath(apiPathHandler.match);
+    handler.allowPath(staticFilesHandler.match);
 
     for (const group of app.actionGroups.values()) {
       for (const action of group.actions.values()) {

src/api/api-handler.ts

@@ -1,7 +1,7 @@
 import type { HandlerResponse, PathHandler } from "~/app/path-handler.ts";
 import { raiseServerException, Redirect } from "~/app/server-exception.ts";
 
-export const apiPathHandeler: PathHandler = {
+export const apiPathHandler: PathHandler = {
   name: "api",
   description: "api",
   match: /^\/api/,

src/base-extension/base-extension.ts

@@ -2,7 +2,7 @@ import { CloudExtension } from "~/app/cloud-extension.ts";
 import { corsMiddleware } from "~/base-extension/middleware/cors.ts";
 
 import { inLiveMiddleware } from "~/base-extension/middleware/inLive.ts";
-import { apiPathHandeler } from "~/api/api-handler.ts";
+import { apiPathHandler } from "~/api/api-handler.ts";
 import { systemSettings } from "~/base-extension/settings-types/systemSettings.ts";
 import { cloudActions } from "./actions/dev-actions.ts";
 import { inTask } from "~/in-queue/entry-types/in-task/in-task.ts";
@@ -19,6 +19,13 @@ export const baseExtension = new CloudExtension("cloud", {
       app.static.staticFilesRoot = normalizePath(path);
     } catch (e) {
       if (e instanceof Deno.errors.NotFound) {
+        if (config.publicRoot === "./public") {
+          Deno.mkdirSync(config.publicRoot, { recursive: true });
+          app.static.staticFilesRoot = normalizePath(
+            Deno.realPathSync(config.publicRoot),
+          );
+          return;
+        }
         raiseCloudException(
           `Public root directory not found: ${config.publicRoot}`,
         );
@@ -124,7 +131,7 @@ export const baseExtension = new CloudExtension("cloud", {
   settingsTypes: [systemSettings],
   entryTypes: [inTask],
   middleware: [corsMiddleware, inLiveMiddleware],
-  pathHandlers: [apiPathHandeler, staticFilesHandler],
+  pathHandlers: [apiPathHandler, staticFilesHandler],
   roles: [{
     roleName: "basic",
     label: "Basic User",