From 3d2512b4257cc84f146a3315106d3b2df2d451ec Mon Sep 17 00:00:00 2001 From: AtalayKT <145040489+SuperSharkBoiii@users.noreply.github.com> Date: Tue, 20 Jan 2026 15:59:01 -0800 Subject: [PATCH 1/9] Create docker-image.yml made a docker image --- .github/workflows/docker-image.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..577e0f9 --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,21 @@ +name: Docker Image CI + +on: + push: + branches: [ "main" ] + paths: + - "Dockerfile" + - "**/*.py" + - "requirements.txt" + - ".github/workflows/**" + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) From 68538dd4224c32d6b39bfe95fa65c40784c37907 Mon Sep 17 00:00:00 2001 From: AtalayKT <145040489+SuperSharkBoiii@users.noreply.github.com> Date: Tue, 20 Jan 2026 16:28:24 -0800 Subject: [PATCH 2/9] Updated docker-image.yml fixed up the pushing process --- .github/workflows/docker-image.yml | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 577e0f9..b1ebeda 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -5,17 +5,33 @@ on: branches: [ "main" ] paths: - "Dockerfile" - - "**/*.py" - "requirements.txt" - ".github/workflows/**" -jobs: +#jobs: - build: +# build: - runs-on: ubuntu-latest +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v4 +# - name: Build the Docker image +# run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) +jobs: + build: + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Build the Docker image - run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) + - uses: actions/checkout@v4 + - name: Log in to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build Docker image + run: docker build . --file Dockerfile --tag ghcr.io/SuperSharkBoiii/epstudio:latest + + - name: Push Docker image + run: docker push ghcr.io/SuperSharkBoiii/epstudio:latest From abf52651a1f84c6dd5e3c8a0e5e8f496cd8da02e Mon Sep 17 00:00:00 2001 From: AtalayKT <145040489+SuperSharkBoiii@users.noreply.github.com> Date: Tue, 20 Jan 2026 16:33:15 -0800 Subject: [PATCH 3/9] lowercased the letters --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index b1ebeda..1f69245 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -31,7 +31,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build Docker image - run: docker build . --file Dockerfile --tag ghcr.io/SuperSharkBoiii/epstudio:latest + run: docker build . --file Dockerfile --tag ghcr.io/supersharkboiii/epstudio:latest - name: Push Docker image - run: docker push ghcr.io/SuperSharkBoiii/epstudio:latest + run: docker push ghcr.io/supersharkboiii/epstudio:latest From fadda3b2641fa14e7ce2eaf5ce55830e7ba990b8 Mon Sep 17 00:00:00 2001 From: AtalayKT <145040489+SuperSharkBoiii@users.noreply.github.com> Date: Thu, 22 Jan 2026 16:07:15 -0800 Subject: [PATCH 4/9] Update docker-image.yml --- .github/workflows/docker-image.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 1f69245..f0123c0 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -8,6 +8,10 @@ on: - "requirements.txt" - ".github/workflows/**" +permissions: + contents: read + packages: write + #jobs: # build: From acea86e0481931747b096dbfbf5956fb1614bd59 Mon Sep 17 00:00:00 2001 From: AtalayKT <145040489+SuperSharkBoiii@users.noreply.github.com> Date: Tue, 27 Jan 2026 15:40:32 -0800 Subject: [PATCH 5/9] fixing jinja error --- app.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app.py b/app.py index 22b9f1d..1f0aa6b 100644 --- a/app.py +++ b/app.py @@ -147,7 +147,8 @@ def auth_response(): if "error" in result: print("error") flash("Authentication error: " + result["error"], "error") - return render_template("auth_error.html", result=result) + #return render_template("auth_error.html", result=result) + return result, 400 user_info = auth.get_user() print(user_info) @@ -375,4 +376,4 @@ def delete_creation(creation_id): db.session.commit() flash("Creation deleted", "success") - return redirect(url_for("user_profile", user_id=current_user.id)) \ No newline at end of file + return redirect(url_for("user_profile", user_id=current_user.id)) From bea28b10d45f5ed62a44537eccda6acea9c0b6d5 Mon Sep 17 00:00:00 2001 From: AtalayKT <145040489+SuperSharkBoiii@users.noreply.github.com> Date: Tue, 27 Jan 2026 16:04:29 -0800 Subject: [PATCH 6/9] config multi tenant --- app_config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app_config.py b/app_config.py index 27ed2e8..7868df1 100644 --- a/app_config.py +++ b/app_config.py @@ -5,8 +5,8 @@ # Application's generated client secret: never check this into source control! CLIENT_SECRET = os.getenv("CLIENT_SECRET") -# AUTHORITY = "https://login.microsoftonline.com/common" # For multi-tenant app -AUTHORITY = f"https://login.microsoftonline.com/{os.getenv('TENANT_ID', 'common')}" +AUTHORITY = "https://login.microsoftonline.com/common" # For multi-tenant app +# AUTHORITY = f"https://login.microsoftonline.com/{os.getenv('TENANT_ID', 'common')}" REDIRECT_PATH = "/callback" # Used for forming an absolute URL to your redirect URI. # The absolute URL must match the redirect URI you set From 6dd6c5dd79a22ca8b966586750d4413e907d4803 Mon Sep 17 00:00:00 2001 From: AtalayKT <145040489+SuperSharkBoiii@users.noreply.github.com> Date: Tue, 27 Jan 2026 16:42:11 -0800 Subject: [PATCH 7/9] going back to single-tenant --- app_config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app_config.py b/app_config.py index 7868df1..d97a3f1 100644 --- a/app_config.py +++ b/app_config.py @@ -5,8 +5,9 @@ # Application's generated client secret: never check this into source control! CLIENT_SECRET = os.getenv("CLIENT_SECRET") -AUTHORITY = "https://login.microsoftonline.com/common" # For multi-tenant app +# AUTHORITY = "https://login.microsoftonline.com/common" # For multi-tenant app # AUTHORITY = f"https://login.microsoftonline.com/{os.getenv('TENANT_ID', 'common')}" +AUTHORITY = f"https://login.microsoftonline.com/{os.getenv('TENANT_ID')}" REDIRECT_PATH = "/callback" # Used for forming an absolute URL to your redirect URI. # The absolute URL must match the redirect URI you set From 8cd517866bc2cb2a67b7c02b1ec10d90c3322660 Mon Sep 17 00:00:00 2001 From: AtalayKT <145040489+SuperSharkBoiii@users.noreply.github.com> Date: Thu, 29 Jan 2026 16:16:23 -0800 Subject: [PATCH 8/9] back to old version of single tenant --- app_config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app_config.py b/app_config.py index d97a3f1..69f12d8 100644 --- a/app_config.py +++ b/app_config.py @@ -6,8 +6,8 @@ CLIENT_SECRET = os.getenv("CLIENT_SECRET") # AUTHORITY = "https://login.microsoftonline.com/common" # For multi-tenant app -# AUTHORITY = f"https://login.microsoftonline.com/{os.getenv('TENANT_ID', 'common')}" -AUTHORITY = f"https://login.microsoftonline.com/{os.getenv('TENANT_ID')}" +AUTHORITY = f"https://login.microsoftonline.com/{os.getenv('TENANT_ID', 'common')}" +# AUTHORITY = f"https://login.microsoftonline.com/{os.getenv('TENANT_ID')}" REDIRECT_PATH = "/callback" # Used for forming an absolute URL to your redirect URI. # The absolute URL must match the redirect URI you set From b0a38bf7c2c05e2e72507e965dd1ceb521b05d9c Mon Sep 17 00:00:00 2001 From: AtalayKT <145040489+SuperSharkBoiii@users.noreply.github.com> Date: Tue, 17 Mar 2026 16:00:02 -0700 Subject: [PATCH 9/9] adding the bug report to this branch as well --- templates/base.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/base.html b/templates/base.html index 961759a..ef6c99b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -23,6 +23,9 @@ + + +