From 4537bc9f28848e5e7efcf8d7f7ebef79c70c3d66 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Sat, 22 Jun 2024 20:28:58 +0800
Subject: [PATCH] :sparkles: Accepts token in querystring

---
 .idea/workspace.xml              | 11 +++++------
 pkg/hyper/auth_adaptor.go        |  6 +++++-
 pkg/internal/server/exts/auth.go |  3 +++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 12976d1..9e3f6d8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,9 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":recycle: Improve code structure and much easier to read&#10;:bug: Fix auth middleware">
-      <change beforePath="$PROJECT_DIR$/pkg/hyper/conn.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/hyper/conn.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/server/admin/index.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/admin/index.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/server/ui/index.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/ui/index.go" afterDir="false" />
+    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: FIx cannot resolve service">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/hyper/auth_adaptor.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/hyper/auth_adaptor.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -144,7 +143,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value=":bug: Bug fixes on E2EE" />
     <MESSAGE value=":bug: Fix key exchange cause echo" />
     <MESSAGE value=":bug: Fix notification push issue" />
     <MESSAGE value=":sparkles: Basis perm nodes feature" />
@@ -169,7 +167,8 @@
     <MESSAGE value=":sparkles: Drop direct connection and uses consul" />
     <MESSAGE value=":technologist: Add the server side Hyper SDK" />
     <MESSAGE value=":recycle: Improve code structure and much easier to read&#10;:bug: Fix auth middleware" />
-    <option name="LAST_COMMIT_MESSAGE" value=":recycle: Improve code structure and much easier to read&#10;:bug: Fix auth middleware" />
+    <MESSAGE value=":bug: FIx cannot resolve service" />
+    <option name="LAST_COMMIT_MESSAGE" value=":bug: FIx cannot resolve service" />
   </component>
   <component name="VgoProject">
     <settings-migrated>true</settings-migrated>
diff --git a/pkg/hyper/auth_adaptor.go b/pkg/hyper/auth_adaptor.go
index f483560..9ac43cf 100644
--- a/pkg/hyper/auth_adaptor.go
+++ b/pkg/hyper/auth_adaptor.go
@@ -20,10 +20,14 @@ func (v *HyperConn) AuthMiddleware(c *fiber.Ctx) error {
 		tk := strings.Replace(header, "Bearer", "", 1)
 		atk = strings.TrimSpace(tk)
 	}
+	if tk := c.Query("tk"); len(tk) > 0 {
+		atk = strings.TrimSpace(tk)
+	}
 
 	c.Locals("p_token", atk)
 
-	if user, newAtk, newRtk, err := v.DoAuthenticate(atk, c.Cookies(CookieRtk)); err == nil {
+	rtk := c.Cookies(CookieRtk)
+	if user, newAtk, newRtk, err := v.DoAuthenticate(atk, rtk); err == nil {
 		if newAtk != atk {
 			c.Cookie(&fiber.Cookie{
 				Name:     CookieAtk,
diff --git a/pkg/internal/server/exts/auth.go b/pkg/internal/server/exts/auth.go
index 5ebc09c..4d5241a 100644
--- a/pkg/internal/server/exts/auth.go
+++ b/pkg/internal/server/exts/auth.go
@@ -18,6 +18,9 @@ func AuthMiddleware(c *fiber.Ctx) error {
 		tk := strings.Replace(header, "Bearer", "", 1)
 		atk = strings.TrimSpace(tk)
 	}
+	if tk := c.Query("tk"); len(tk) > 0 {
+		atk = strings.TrimSpace(tk)
+	}
 
 	c.Locals("p_token", atk)