Fix authentication problem

This commit is contained in:
2024-06-23 22:50:10 +02:00
parent 2dfd6fbbc8
commit bfe735fbc1
10 changed files with 27 additions and 15 deletions

1
.gitignore vendored
View File

@@ -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

2
.vscode/launch.json vendored
View File

@@ -6,7 +6,7 @@
"configurations": [
{
"name": "Python: Current File",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${file}",
"console": "integratedTerminal",

View File

@@ -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

View File

@@ -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

BIN
database/users.db Normal file

Binary file not shown.

BIN
database/users.db-shm Normal file

Binary file not shown.

0
database/users.db-wal Normal file
View File

View File

@@ -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:
networks:
reverseproxy_default:
external: true

View File

@@ -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",

View File

@@ -1,4 +1,3 @@
export FLASK_ENV=production
export CONFIG=config.ProductionConfig
# equivalent to 'from hello import app'
gunicorn 'app:app'
gunicorn -w 1 -b :8001 'app:app'