From bfe735fbc11e7d8ecee72ae5d45c3333a0a2313b Mon Sep 17 00:00:00 2001
From: pstruebi <struebin.patrick@gmail.com>
Date: Sun, 23 Jun 2024 22:50:10 +0200
Subject: [PATCH] Fix authentication problem

---
 .gitignore               |   1 -
 .vscode/launch.json      |   2 +-
 Dockerfile               |   6 +++---
 config.py                |   3 +--
 database/users.db        | Bin 0 -> 16384 bytes
 database/users.db-shm    | Bin 0 -> 32768 bytes
 database/users.db-wal    |   0
 docker-compose.yaml      |  21 ++++++++++++++++-----
 readme.md                |   6 +++++-
 run_production_server.sh |   3 +--
 10 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 database/users.db
 create mode 100644 database/users.db-shm
 create mode 100644 database/users.db-wal

diff --git a/.gitignore b/.gitignore
index 41eb62f..206dc00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -159,6 +159,5 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 # Database and venv
-users.db
 venv_planner
 .deployment
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 2fa8e7f..74f1e26 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -6,7 +6,7 @@
     "configurations": [
         {
             "name": "Python: Current File",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${file}",
             "console": "integratedTerminal",
diff --git a/Dockerfile b/Dockerfile
index fe0b486..efd3c67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /app
 COPY . /app
 
 # Install any needed packages specified in requirements.txt
-RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install -r requirements.txt
 
-# Make port 80 available to the world outside this container
-EXPOSE 8000
+# Make port available to the world outside this container
+EXPOSE 8001
diff --git a/config.py b/config.py
index d7ebd39..589ab30 100644
--- a/config.py
+++ b/config.py
@@ -11,7 +11,6 @@ class Config(DefaultConfig):
 class ProductionConfig(Config):
     SECRET_KEY = '\xacI4\x077\x16?Q\xb4")\xdb\x066\x95\x11i\x0b\x0c&\xb6rP\''
     SECURITY_PASSWORD_SALT = '>\xe3\x9bz\xfd\xbc[\xe22\xcfK\xca\x88!\xd8\xd5,\xd0\x95\x0c\x02\xad\xfa\x9d'
-    DATABASE_URI = './users.db' # For azure app services. The content under wwwroot is durable, unless you delete your app service.
 
 class DevelopmentConfig(Config):
     CONFIRMATATION_EMAIL_ADD= "struebin.patrick@gmail.com"
@@ -32,6 +31,6 @@ class MsalDefaulConfig():
 class MsalConfig(MsalDefaulConfig):
     AUTHORITY = "https://login.microsoftonline.com/propedal.at"
     CLIENT_ID = "52f192c4-875d-44a2-b28a-575e920225e5" # client public id (from azure web interface)
-    SECRET = "irj8Q~PliZzSe7JnXEaiWKQ6v0CAg1DTZOO~Ccsf" # api secret key (from azure web interface)
+    SECRET = "SHX8Q~4UnmeFzxaK2akoBouMuQBNXgFfDipeXbra" # api secret key (from azure web interface)
     USER_ID = "simone.profus@propedal.at"
     CALENDAR_ID = "AAMkADY0MDg1MTVjLTg5ZjItNGQxYS04MGQ3LWY2NjJmYjM0YmZhOQBGAAAAAADXD7SdVoWYQI4RYXbBumMEBwAf_ngZxs71RonY3GuLL8TVAAAAAAEGAAAf_ngZxs71RonY3GuLL8TVAADHFxN2AAA=" # calendar id -  determined by /users/id/calendars
diff --git a/database/users.db b/database/users.db
new file mode 100644
index 0000000000000000000000000000000000000000..431c2c2b4f7f40c0dcca54ec48a2fcac7c1fa29f
GIT binary patch
literal 16384
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
A$^ZZW

literal 0
HcmV?d00001

diff --git a/database/users.db-shm b/database/users.db-shm
new file mode 100644
index 0000000000000000000000000000000000000000..fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10
GIT binary patch
literal 32768
zcmeIuAr62r3<XeTSayS60=Z=O-0|kP2&fu@!6Du^ziFC^7w55MN)9hQYV3Wk79a2P
z)%8g3H30$y2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
w0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5cq?@4dk5`Qvd(}

literal 0
HcmV?d00001

diff --git a/database/users.db-wal b/database/users.db-wal
new file mode 100644
index 0000000..e69de29
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 10d2d72..7d0de64 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,14 +1,25 @@
 services:
   app:
     build: .
-    ports:
-      - "8000:8000"
-    network_mode: host
-
+    restart: unless-stopped
     volumes:
       - sqlite-database:/app/database
     working_dir: /app
     command: sh ./run_production_server.sh
+    environment:
+      - VIRTUAL_HOST=planner.propedal.duckdns.org
+      - LETSENCRYPT_HOST=planner.propedal.duckdns.org
+      - LETSENCRYPT_EMAIL=struebin.patrick@gmail.com
+      - VIRTUAL_PORT=8001
+      - NETWORK_ACCESS=external
+
+    networks:
+      - reverseproxy_default
+      - default
 
 volumes:
-  sqlite-database:
\ No newline at end of file
+  sqlite-database:
+
+networks:
+  reverseproxy_default:
+    external: true
diff --git a/readme.md b/readme.md
index 261755e..ad24910 100644
--- a/readme.md
+++ b/readme.md
@@ -1,5 +1,9 @@
-# Available calendar attributes are:
+# ms cert renewal
+cert needs renewal every 2 years.
+go to azure.com -> app registrations > propedal-planner > Certificates 
 
+
+# Available calendar attributes are:
 [
   "@odata.etag",
   "id",
diff --git a/run_production_server.sh b/run_production_server.sh
index b254ff7..12046c1 100644
--- a/run_production_server.sh
+++ b/run_production_server.sh
@@ -1,4 +1,3 @@
 export FLASK_ENV=production
 export CONFIG=config.ProductionConfig
-# equivalent to 'from hello import app'
-gunicorn 'app:app'
\ No newline at end of file
+gunicorn -w 1 -b :8001 'app:app'