Merge pull request #7 from Favo02/authorization

Authorization
Favo02 · Apr 22, 2024 · d30e247 · d30e247
2 parents 34a7213 + 7179985
commit d30e247
Show file tree

Hide file tree

Showing 12 changed files with 368 additions and 77 deletions.
diff --git a/.env.template b/.env.template
@@ -1,3 +1,4 @@
 SIHL_ENV=production
 SIHL_SECRET=<secret>
 DATABASE_URL=postgresql://<username>:<password>@<host>:<port>/<database>
+CORS_ORIGIN=<frontend url>
diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ TL;DR: **Docker** 🐳 + **GitHub Actions** 🤖 for backend and **Cloudflare Pa
 
 ## Contributing
 
-Each contribution is **welcome**, especially building alteranive better frontends _(if you are brave enough to write JavaScript code)_ that uses the same API.
+Each contribution is **welcome**, especially building alteranive better frontends _(if you are brave enough to write JavaScript code)_.
 
 Please follow the [conventions](#conventions) below.
 

diff --git a/backend/src/common/middlewares.ml b/backend/src/common/middlewares.ml
@@ -31,4 +31,9 @@ let verify_expiration =
 
 let logger = Opium.Middleware.logger
 
-let allow_cors = Opium.Middleware.allow_cors ()
+let allow_cors =
+  let origin = match Sihl.Configuration.read_string "CORS_ORIGIN" with
+    | Some origin -> origin
+    | None -> "*" (* this will make the authorization (Set-Cookie headers) NOT work *)
+  in
+  Opium.Middleware.allow_cors ~origins: [ origin ] ()
diff --git a/frontend/.env.template b/frontend/.env.template
@@ -1,7 +1 @@
-# template for .env file
-
-# production (the default URL is already set)
-VITE_API_URL=https://cessadvisorapi.favo02.dev
-
-# development
-# VITE_API_URL=http://localhost:3000
+VITE_API_URL=<backend url>
diff --git a/frontend/src/components/checkAuth.js b/frontend/src/components/checkAuth.js
diff --git a/frontend/src/routes/+error.svelte b/frontend/src/routes/+error.svelte
diff --git a/frontend/src/routes/login/+page.svelte b/frontend/src/routes/login/+page.svelte
diff --git a/frontend/src/routes/logout/+page.svelte b/frontend/src/routes/logout/+page.svelte
diff --git a/frontend/src/routes/profile/+page.svelte b/frontend/src/routes/profile/+page.svelte