From 68629768cbb7c86fd4b118e7d555450297f3fb8a Mon Sep 17 00:00:00 2001 From: Vidhu Kant Sharma Date: Sun, 29 Jan 2023 20:45:43 +0530 Subject: moved refresh mechanism to package auth --- auth/router.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'auth/router.go') diff --git a/auth/router.go b/auth/router.go index 9fa03b7..9782915 100644 --- a/auth/router.go +++ b/auth/router.go @@ -19,6 +19,7 @@ package auth import ( "github.com/MikunoNaka/OpenBills-server/user" + "github.com/MikunoNaka/OpenBills-server/util" "github.com/gin-gonic/gin" "log" "net/http" @@ -27,16 +28,16 @@ import ( func Routes(route *gin.Engine) { r := route.Group("/auth") { - r.POST("/login", user.checkPassword(), func(ctx *gin.Context) { + r.POST("/login", user.CheckPassword(), func(ctx *gin.Context) { user := ctx.MustGet("user").(user.User) - accessToken, err := user.newAccessToken(user.Id.Hex()) + accessToken, err := util.NewAccessToken(user.Id.Hex()) if err != nil { log.Printf("Error while generating new access token: %v", err) ctx.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"message": "Internal Server Error (cannot login)"}) } - refreshToken, expiresAt, err := user.newRefreshToken(user.Id.Hex()) + refreshToken, expiresAt, err := newRefreshToken(user.Id.Hex()) if err != nil { log.Printf("Error while generating new refresh token: %v", err) ctx.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"message": "Internal Server Error (cannot login)"}) @@ -46,9 +47,9 @@ func Routes(route *gin.Engine) { ctx.JSON(http.StatusOK, gin.H{"accessToken": accessToken}) }) - r.POST("/refresh", user.verifyRefreshToken(), func(ctx *gin.Context) { + r.POST("/refresh", verifyRefreshToken(), func(ctx *gin.Context) { u := ctx.MustGet("user").(user.User) - accessToken, err := util.newAccessToken(u.Id.Hex()) + accessToken, err := util.NewAccessToken(u.Id.Hex()) if err != nil { log.Printf("Error while generating new access token: %v", err) ctx.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"message": "Internal Server Error (cannot refresh session)"}) -- cgit v1.2.3