improve: api require app sign move into /v1/app router group

ncuhome · Apr 5, 2024 · 54cd487 · 54cd487
1 parent c18148d
commit 54cd487
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 20 deletions.
diff --git a/internal/api/controllers/public/token.go → internal/api/controllers/app/token.go b/internal/api/controllers/public/token.go → internal/api/controllers/app/token.go
diff --git a/internal/api/controllers/public/user.go → internal/api/controllers/app/user.go b/internal/api/controllers/public/user.go → internal/api/controllers/app/user.go
diff --git a/internal/api/router/app/init.go b/internal/api/router/app/init.go
@@ -4,6 +4,8 @@ import (
 	"github.com/gin-gonic/gin"
 	controllers "github.com/ncuhome/GeniusAuthoritarian/internal/api/controllers/app"
 	"github.com/ncuhome/GeniusAuthoritarian/internal/api/middlewares"
+	"github.com/ncuhome/GeniusAuthoritarian/internal/api/router/app/token"
+	"github.com/ncuhome/GeniusAuthoritarian/internal/api/router/app/user"
 )
 
 func Router(G *gin.RouterGroup) {
@@ -12,4 +14,7 @@ func Router(G *gin.RouterGroup) {
 	keypair := G.Group("keypair")
 	keypair.GET("server", controllers.ServerPublicKeys)
 	keypair.POST("rpc", controllers.RpcClientCredential)
+
+	user.Router(G.Group("user"))
+	token.Router(G.Group("token"))
 }
diff --git a/internal/api/router/public/token.go → internal/api/router/app/token/token.go b/internal/api/router/public/token.go → internal/api/router/app/token/token.go
@@ -1,14 +1,12 @@
-package public
+package token
 
 import (
 	"github.com/gin-gonic/gin"
-	controllers "github.com/ncuhome/GeniusAuthoritarian/internal/api/controllers/public"
+	"github.com/ncuhome/GeniusAuthoritarian/internal/api/controllers/app"
 	"github.com/ncuhome/GeniusAuthoritarian/internal/api/middlewares"
 )
 
-func routerToken(G *gin.RouterGroup) {
-	G.Use(middlewares.RequireAppSignature)
-
+func Router(G *gin.RouterGroup) {
 	refresh := G.Group("refresh")
 	refresh.POST("/", controllers.RefreshToken)
 	refresh.PATCH("/", controllers.ModifyRefreshPayload)

diff --git a/internal/api/router/app/user/user.go b/internal/api/router/app/user/user.go
@@ -0,0 +1,10 @@
+package user
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/ncuhome/GeniusAuthoritarian/internal/api/controllers/app"
+)
+
+func Router(G *gin.RouterGroup) {
+	G.GET("info", controllers.GetUserPublicInfo)
+}
diff --git a/internal/api/router/public/init.go b/internal/api/router/public/init.go
@@ -2,12 +2,17 @@ package public
 
 import (
 	"github.com/gin-gonic/gin"
+	"github.com/ncuhome/GeniusAuthoritarian/internal/api/middlewares"
+	"github.com/ncuhome/GeniusAuthoritarian/internal/api/router/app/token"
+	"github.com/ncuhome/GeniusAuthoritarian/internal/api/router/app/user"
 	"github.com/ncuhome/GeniusAuthoritarian/internal/api/router/public/login"
 )
 
 func Router(G *gin.RouterGroup) {
 	routerApp(G.Group("app"))
-	routerToken(G.Group("token"))
-	routerUser(G.Group("user"))
 	login.Router(G.Group("login"))
+
+	// Deprecated, keep for compatibility
+	token.Router(G.Group("token", middlewares.RequireAppSignature))
+	user.Router(G.Group("user", middlewares.RequireAppSignature))
 }
diff --git a/internal/api/router/public/user.go b/internal/api/router/public/user.go