From ca9675341f16b2b205cfb195ca2590e427a3eacf Mon Sep 17 00:00:00 2001
From: Frederico Gendorf <fred@esss.com>
Date: Mon, 26 Aug 2024 16:23:07 +0000
Subject: [PATCH 1/3] allow to add users to private proxy channels

---
 environment.yml | 2 --
 quetz/main.py   | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/environment.yml b/environment.yml
index 7c2e78c7..16bc0854 100644
--- a/environment.yml
+++ b/environment.yml
@@ -52,5 +52,3 @@ dependencies:
   - pytest-asyncio
   - pytest-timeout
   - pydantic >=2
-  - pip:
-      - git+https://github.com/jupyter-server/jupyter_releaser.git@v2
diff --git a/quetz/main.py b/quetz/main.py
index db1a36be..11413d84 100644
--- a/quetz/main.py
+++ b/quetz/main.py
@@ -1035,7 +1035,7 @@ def copy_package(
     tags=["channels"],
 )
 def get_channel_members(
-    channel: db_models.Channel = Depends(get_channel_or_fail),
+    channel: db_models.Channel = Depends(get_channel_allow_proxy),
     dao: Dao = Depends(get_dao),
     auth: authorization.Rules = Depends(get_rules),
 ):
@@ -1048,7 +1048,7 @@ def get_channel_members(
 @api_router.post("/channels/{channel_name}/members", status_code=201, tags=["channels"])
 def post_channel_member(
     new_member: rest_models.PostMember,
-    channel: db_models.Channel = Depends(get_channel_or_fail),
+    channel: db_models.Channel = Depends(get_channel_allow_proxy),
     dao: Dao = Depends(get_dao),
     db=Depends(get_db),
     auth: authorization.Rules = Depends(get_rules),
@@ -1074,7 +1074,7 @@ def post_channel_member(
 @api_router.delete("/channels/{channel_name}/members", tags=["channels"])
 def delete_channel_member(
     username: str,
-    channel: db_models.Channel = Depends(get_channel_or_fail),
+    channel: db_models.Channel = Depends(get_channel_allow_proxy),
     dao: Dao = Depends(get_dao),
     db=Depends(get_db),
     auth: authorization.Rules = Depends(get_rules),

From 497195f1837b8ad60a10114f1b6b4d76b88256a5 Mon Sep 17 00:00:00 2001
From: Frederico Gendorf <fred@esss.com>
Date: Tue, 27 Aug 2024 13:41:58 +0000
Subject: [PATCH 2/3] fix some links on default frontend

---
 quetz/basic_frontend/index.html | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/quetz/basic_frontend/index.html b/quetz/basic_frontend/index.html
index 33e9914e..08e90a06 100644
--- a/quetz/basic_frontend/index.html
+++ b/quetz/basic_frontend/index.html
@@ -52,28 +52,8 @@ <h1>Quetz</h1>
     <a href="/auth/github/login" style="margin-right: 100px" id="github_login"
       >login with github</a
     >
-    <a href="/auth/gitlab/login" style="margin-right: 100px" id="gitlab_login"
-      >login with gitlab</a
-    >
-    <a href="/auth/google/login" style="margin-right: 100px" id="google_login"
-      >login with google</a
-    >
-    <a href="/auth/azuread/login" style="margin-right: 100px" id="azuread_login"
-      >login with AzureAD</a
-    >
-    <a href="/auth/github/revoke" style="margin-right: 100px" id="revoke"
-      >revoke github</a
-    >
-    <a href="/auth/gitlab/revoke" style="margin-right: 100px" id="revoke"
-      >revoke gitlab</a
-    >
-    <a href="/auth/google/revoke" style="margin-right: 100px" id="revoke"
-      >revoke google</a
-    >
-    <a href="/auth/azuread/revoke" style="margin-right: 100px" id="revoke"
-      >revoke AzureAD</a
-    >
-
+    <a href="/auth/github/revoke" style="margin-right: 100px" id="revoke">revoke github</a>
+    <a href="/docs" style="margin-right: 100px" id="docs">swagger</a>
     <div class="modal">
       <div class="modal-content">
         <span class="close-button">&times;</span>

From 737b2913df6fad100af93fb90c8ee82989816c7e Mon Sep 17 00:00:00 2001
From: Frederico Gendorf <fred@esss.com>
Date: Mon, 2 Sep 2024 17:57:45 +0000
Subject: [PATCH 3/3] script utils to run quetz as service systemd

---
 utils/quetz.service  | 12 ++++++++++++
 utils/start_quetz.sh |  5 +++++
 2 files changed, 17 insertions(+)
 create mode 100644 utils/quetz.service
 create mode 100755 utils/start_quetz.sh

diff --git a/utils/quetz.service b/utils/quetz.service
new file mode 100644
index 00000000..bfb18519
--- /dev/null
+++ b/utils/quetz.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=quetz service
+[Service]
+WorkingDirectory=/home/user
+Type=simple
+User=user
+RestartSec=10
+ExecStart=/home/user/start_quetz.sh
+Restart=on-failure
+[Install]
+WantedBy=multi-user.target
+
diff --git a/utils/start_quetz.sh b/utils/start_quetz.sh
new file mode 100755
index 00000000..64ee4ca4
--- /dev/null
+++ b/utils/start_quetz.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+source $HOME/mambaforge/etc/profile.d/conda.sh
+conda activate quetz
+export FORWARDED_ALLOW_IPS='*'
+quetz start quetz_server --host 0.0.0.0 --reload --proxy-headers