Dev (#7)

fix: root app.py to serve bump authlib 1.2

.github/workflows/publish-pages.yml

@@ -14,5 +14,5 @@ jobs:
  - uses: actions/setup-python@v2
  with:
  python-version: 3.x
- - run: pip install mkdocs-material 
+ - run: pip install -r requirements.mkdocs.txt
  - run: mkdocs gh-deploy --force

Dockerfile

@@ -9,17 +9,18 @@ ENV PYTHONDONTWRITEBYTECODE=1
 # Turns off buffering for easier container logging
 ENV PYTHONUNBUFFERED=1
 
+WORKDIR /app
+
+RUN adduser -u 5678 --disabled-password --gecos "" appuser && chown -R appuser /app
+
 # Install pip requirements
 COPY requirements.txt .
 RUN python -m pip install --no-cache-dir -r requirements.txt
 
-WORKDIR /app
-COPY . /app
-
+USER appuser
+COPY broker /app
 # Creates a non-root user with an explicit UID and adds permission to access the /app folder
 # For more info, please refer to https://aka.ms/vscode-docker-python-configure-containers
-RUN adduser -u 5678 --disabled-password --gecos "" appuser && chown -R appuser /app
-USER appuser
 
 # During debugging, this entry point will be overridden. For more information, please refer to https://aka.ms/vscode-docker-python-debug
-CMD ["gunicorn", "--bind", "0.0.0.0:5000", "app:app"]
+CMD ["gunicorn", "--bind", "0.0.0.0:5000", "routes:app"]

broker/routes.py

@@ -1,9 +1,17 @@
-from flask import request, session, url_for, redirect, jsonify, render_template
-from .aws import sts
-from . import app, keycloak_oidc, title
-from .utils import msg
+"""
+Main routes file for running server, to start server 
+run: python routes.py 
+"""
+
+import os
 import json
 
+from flask import request, session, url_for, redirect, jsonify, render_template
+
+from aws import sts
+from serve import app, keycloak_oidc, title
+from utils import msg
+
 # flask cors import
 # from flask_cors import CORS
 
@@ -106,3 +114,11 @@ def aws_auth():
  return jsonify(sts_role["cli"])
  elif type == "console":
  return redirect(sts_role["console"])
+
+
+if __name__ == "__main__":
+ env = os.environ.get("FLASK_ENV")
+ if isinstance(env, str) and env.lower() in ["main", "master"]:
+ app.run()
+ else:
+ app.run(debug=True)

broker/__init__.py → broker/serve.py

@@ -3,11 +3,11 @@
 
 ref: https://github.com/authlib/demo-oauth-client/tree/master/flask-google-login
 """
-
 from flask import Flask
 from authlib.integrations.flask_client import OAuth, FlaskOAuth2App
-from .data import KeyCloakOpenIdconfig
-from .utils import obj_annotations, load_or_read_env
+
+from data import KeyCloakOpenIdconfig
+from utils import obj_annotations, load_or_read_env
 
 app = Flask(
  __name__,
@@ -29,7 +29,7 @@
 PROVIDER = "keycloak"
 
 
-def oidc_conf(provider: str, config_path: str = ".env"):
+def oidc_conf(provider: str, config_path: str = "../.env"):
  """Read oidc config from dotenv file"""
 
  if provider.lower() == "keycloak":
@@ -53,5 +53,3 @@ def oidc_conf(provider: str, config_path: str = ".env"):
 )
 
 keycloak_oidc: FlaskOAuth2App = oauth.create_client(PROVIDER)
-
-from broker import routes

broker/utils.py

@@ -27,8 +27,6 @@ def obj_annotations(obj: object):
 
 def load_or_read_env(items: list[str], env_path: str):
 
- env_path = os.path.abspath(".") + "/" + env_path
-
  conf = {}
 
  if os.path.isfile(env_path):

requirements.txt

@@ -1,5 +1,5 @@
 boto3
-authlib==1.1.0
+authlib==1.2.0
 flask
 python-dotenv
 requests