update token page

Mari-W · Jul 6, 2023 · 619beeb · 619beeb
1 parent 4e2ea37
commit 619beeb
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,4 +12,4 @@ jobs:
         username: ${{ secrets.USERNAME }}
         key: ${{ secrets.KEY }}
         port: 22
-        script: echo "420" # cd /teaching-server/laurel/discord-bot && docker-compose down && docker-compose pull && docker-compose up -d
+        script: cd /teaching-server/laurel/discord-bot && docker-compose down && docker-compose pull && docker-compose up -d
diff --git a/src/auth.py b/src/auth.py
@@ -41,7 +41,9 @@ async def logout(request: Request):
     request.session.clear()
     # logging out by logging out of all laurel services and redirect to login here
     return RedirectResponse(
-        env.laurel_logout_url + "?redirect=" + str(request.url_for("auth_login")),
+        env.laurel_auth_url
+        + "auth/logout?redirect="
+        + str(request.url_for("auth_login")),
     )
 
 
@@ -62,5 +64,17 @@ async def remove_key():
     asyncio.create_task(remove_key())
 
     return templates.TemplateResponse(
-        "token.html", {"request": request, "token": token, "sub": user["sub"]}
+        "token.html",
+        {
+            "request": request,
+            "token": token,
+            "sub": user["sub"],
+            "name": user["name"],
+            "account_url": env.laurel_auth_url
+            + "?redirect="
+            + str(request.url_for("auth_login")),
+            "logout_url": env.laurel_auth_url
+            + "auth/logout?redirect="
+            + str(request.url_for("auth_login")),
+        },
     )
diff --git a/src/env.py b/src/env.py
@@ -7,7 +7,7 @@ class Env(BaseSettings):
     laurel_metadata_url: str  # open id connect config
     laurel_client_id: str  # oauth client id
     laurel_client_secret: str  # oauth client secret
-    laurel_logout_url: str  # logout url with ?redirect= parameter
+    laurel_auth_url: str  # logout url with ?redirect= parameter
     discord_bot_token: str  # discord bot secret token
     create_voice_channel_id: str  # the id of the create voice channel channel
 

diff --git a/templates/token.html b/templates/token.html
@@ -1,13 +1,15 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>UFR TF Discord Token Panel</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css">
-  </head>
-  <body>
-  <section class="section">
+
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>UFR TF Discord Token Panel</title>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css">
+</head>
+
+<body>
+  <!-- <section class="section">
     <div class="container">
       <h1 class="title">
         Authentication Token Panel
@@ -19,6 +21,35 @@ <h1 class="title">
         {{token}}
       </div>
     </div>
-  </section>
-  </body>
+  </section> -->
+  <div class="card">
+    <header class="card-header">
+      <p class="card-header-title">
+        Discord Authorization Token
+      </p>
+    </header>
+    <div class="card-content">
+      <div class="media">
+        <div class="media-content">
+          <p class="title is-4">{{name}}</p>
+          <p class="subtitle is-6">{{sub}}</p>
+        </div>
+      </div>
+      <div class="content">
+        <div class="notification is-success">
+          {{token}}
+        </div>
+        <time id="time">...</time>
+        <script>
+          document.getElementById("time").innerHTML = "token generated at " + Date().toLocaleLowerCase().split("gmt")[0]
+        </script>
+      </div>
+      <footer class="card-footer">
+        <a href="{{account_url}}" class="card-footer-item">Account</a>
+        <a href="{{logout_url}}" class="card-footer-item">Logout</a>
+      </footer>
+    </div>
+  </div>
+</body>
+
 </html>