Improve authorizer

kneu-messenger-pigeon · Nov 8, 2023 · bf1f868 · bf1f868
1 parent efd7b7e
commit bf1f868
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 43 deletions.
diff --git a/ApiController.go b/ApiController.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"authorizer/dto"
 	"context"
 	"embed"
 	"encoding/json"
@@ -38,27 +39,6 @@ type ApiController struct {
 	countCache *countCache
 }
 
-type AuthOptionsClaims struct {
-	jwt.RegisteredClaims
-	Client       string `form:"client" json:"client" binding:"required"`
-	ClientUserId string `form:"client_user_id" json:"clientUserId"  binding:"required"`
-	RedirectUri  string `form:"redirect_uri" json:"redirectUri,omitempty"`
-	KneuUserId   uint   `form:"-" json:"userId,omitempty"`
-}
-
-type Student struct {
-	Id         uint
-	LastName   string
-	FirstName  string
-	MiddleName string
-	Gender     events.Gender
-}
-
-type GetAuthUrlResponse struct {
-	AuthUrl  string    `json:"authUrl" binding:"required"`
-	ExpireAt time.Time `json:"expire" binding:"required"`
-}
-
 func (controller *ApiController) setupRouter() *gin.Engine {
 	router := gin.New()
 
@@ -91,7 +71,7 @@ func (controller *ApiController) getAuthUrl(c *gin.Context) {
 	var err error
 	var state string
 
-	authOptionsClaims := AuthOptionsClaims{}
+	authOptionsClaims := dto.AuthOptionsClaims{}
 	err = c.Bind(&authOptionsClaims)
 	expireAt := time.Now().Add(stateLifetime).Truncate(jwt.TimePrecision)
 	if err == nil {
@@ -105,7 +85,7 @@ func (controller *ApiController) getAuthUrl(c *gin.Context) {
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "Wrong request data"})
 	} else {
-		response := GetAuthUrlResponse{
+		response := dto.GetAuthUrlResponse{
 			AuthUrl:  controller.oauthClient.GetOauthUrl(controller.oauthRedirectUrl, state),
 			ExpireAt: expireAt,
 		}
@@ -116,7 +96,7 @@ func (controller *ApiController) getAuthUrl(c *gin.Context) {
 
 func (controller *ApiController) completeAuth(c *gin.Context) {
 
-	var authOptionsClaims AuthOptionsClaims
+	var authOptionsClaims dto.AuthOptionsClaims
 	var tokenResponse kneu.OauthTokenResponse
 	var userMeResponse kneu.UserMeResponse
 
@@ -170,7 +150,7 @@ func (controller *ApiController) completeAuth(c *gin.Context) {
 		return
 	}
 
-	err = controller.finishAuthorization(authOptionsClaims, Student{
+	err = controller.finishAuthorization(authOptionsClaims, dto.Student{
 		Id:         userMeResponse.StudentId,
 		LastName:   userMeResponse.LastName,
 		FirstName:  userMeResponse.FirstName,
@@ -188,7 +168,7 @@ func (controller *ApiController) completeAuth(c *gin.Context) {
 	}
 }
 
-func (controller *ApiController) successRedirect(c *gin.Context, claims AuthOptionsClaims) {
+func (controller *ApiController) successRedirect(c *gin.Context, claims dto.AuthOptionsClaims) {
 	redirectUri := claims.RedirectUri
 	if redirectUri == "" {
 		redirectUri = controller.config.publicUrl + "/close.html"
@@ -223,7 +203,7 @@ func (controller *ApiController) completeAdminAuth(c *gin.Context) {
 
 		err = errors.New("not enough rights")
 		if adminUserid == authOptionsClaims.KneuUserId {
-			err = controller.finishAuthorization(authOptionsClaims, Student{
+			err = controller.finishAuthorization(authOptionsClaims, dto.Student{
 				Id:         uint(studentId),
 				LastName:   "Адмін",
 				FirstName:  "Адмін#" + strconv.FormatUint(studentId, 10),
@@ -240,7 +220,7 @@ func (controller *ApiController) completeAdminAuth(c *gin.Context) {
 	controller.errorResponse(c, err.Error())
 }
 
-func (controller *ApiController) finishAuthorization(claims AuthOptionsClaims, student Student) error {
+func (controller *ApiController) finishAuthorization(claims dto.AuthOptionsClaims, student dto.Student) error {
 	event := events.UserAuthorizedEvent{
 		Client:       claims.Client,
 		ClientUserId: claims.ClientUserId,
@@ -261,15 +241,15 @@ func (controller *ApiController) finishAuthorization(claims AuthOptionsClaims, s
 	)
 }
 
-func (controller *ApiController) buildState(authOptionsClaims AuthOptionsClaims) (state string, err error) {
+func (controller *ApiController) buildState(authOptionsClaims dto.AuthOptionsClaims) (state string, err error) {
 	token := jwt.NewWithClaims(jwt.SigningMethodHS512, &authOptionsClaims)
 	state, err = token.SignedString(controller.config.jwtSecretKey)
 	return
 }
 
 var jwtParser = jwt.NewParser(jwt.WithValidMethods([]string{"HS512"}))
 
-func (controller *ApiController) parseState(state string) (claims AuthOptionsClaims, err error) {
+func (controller *ApiController) parseState(state string) (claims dto.AuthOptionsClaims, err error) {
 	_, err = jwtParser.ParseWithClaims(
 		state, &claims,
 		func(token *jwt.Token) (interface{}, error) {

diff --git a/ApiController_test.go b/ApiController_test.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"authorizer/dto"
 	"bytes"
 	"context"
 	"encoding/json"
@@ -87,13 +88,13 @@ func TestGetAuthUrl(t *testing.T) {
 
 		assert.Equal(t, http.StatusOK, w.Code)
 
-		response := GetAuthUrlResponse{}
+		response := dto.GetAuthUrlResponse{}
 		err := json.NewDecoder(w.Body).Decode(&response)
 		assert.NoError(t, err)
 
 		assert.Equal(t, expectedOauthUrl, response.AuthUrl)
 
-		authOptionsClaims := AuthOptionsClaims{}
+		authOptionsClaims := dto.AuthOptionsClaims{}
 		_, err = jwtParser.ParseWithClaims(
 			receivedState, &authOptionsClaims,
 			func(token *jwt.Token) (interface{}, error) {
@@ -208,7 +209,7 @@ func TestCompleteAuth(t *testing.T) {
 
 			router := (controller).setupRouter()
 
-			authOptionsClaims := AuthOptionsClaims{
+			authOptionsClaims := dto.AuthOptionsClaims{
 				RegisteredClaims: jwt.RegisteredClaims{
 					Issuer:    "pigeonAuthorizer",
 					ExpiresAt: jwt.NewNumericDate(time.Now().Add(stateLifetime)),
@@ -297,7 +298,7 @@ func TestCompleteAuth(t *testing.T) {
 
 			router := (controller).setupRouter()
 
-			authOptionsClaims := AuthOptionsClaims{
+			authOptionsClaims := dto.AuthOptionsClaims{
 				RegisteredClaims: jwt.RegisteredClaims{
 					Issuer:    "pigeonAuthorizer",
 					ExpiresAt: jwt.NewNumericDate(time.Now().Add(stateLifetime)),
@@ -344,7 +345,7 @@ func TestCompleteAuth(t *testing.T) {
 
 			router := (controller).setupRouter()
 
-			authOptionsClaims := AuthOptionsClaims{
+			authOptionsClaims := dto.AuthOptionsClaims{
 				RegisteredClaims: jwt.RegisteredClaims{
 					Issuer:    "pigeonAuthorizer",
 					ExpiresAt: jwt.NewNumericDate(time.Now().Add(stateLifetime)),
@@ -423,7 +424,7 @@ func TestCompleteAuth(t *testing.T) {
 
 			router := (controller).setupRouter()
 
-			authOptionsClaims := AuthOptionsClaims{
+			authOptionsClaims := dto.AuthOptionsClaims{
 				RegisteredClaims: jwt.RegisteredClaims{
 					Issuer:    "pigeonAuthorizer",
 					ExpiresAt: jwt.NewNumericDate(time.Now().Add(stateLifetime)),
@@ -471,7 +472,7 @@ func TestCompleteAuth(t *testing.T) {
 
 			router := (controller).setupRouter()
 
-			authOptionsClaims := AuthOptionsClaims{
+			authOptionsClaims := dto.AuthOptionsClaims{
 				RegisteredClaims: jwt.RegisteredClaims{
 					Issuer:    "pigeonAuthorizer",
 					ExpiresAt: jwt.NewNumericDate(time.Now().Add(-time.Hour * 6)),
@@ -558,7 +559,7 @@ func TestCompleteAuth(t *testing.T) {
 
 			router := (controller).setupRouter()
 
-			authOptionsClaims := AuthOptionsClaims{
+			authOptionsClaims := dto.AuthOptionsClaims{
 				RegisteredClaims: jwt.RegisteredClaims{
 					Issuer:    "pigeonAuthorizer",
 					ExpiresAt: jwt.NewNumericDate(time.Now().Add(stateLifetime)),
@@ -619,7 +620,7 @@ func TestCompleteAuth(t *testing.T) {
 
 			router := (controller).setupRouter()
 
-			authOptionsClaims := AuthOptionsClaims{
+			authOptionsClaims := dto.AuthOptionsClaims{
 				RegisteredClaims: jwt.RegisteredClaims{
 					Issuer:    "pigeonAuthorizer",
 					ExpiresAt: jwt.NewNumericDate(time.Now().Add(stateLifetime)),
@@ -714,7 +715,7 @@ func TestCompleteAuth(t *testing.T) {
 
 			router := (controller).setupRouter()
 
-			authOptionsClaims := AuthOptionsClaims{
+			authOptionsClaims := dto.AuthOptionsClaims{
 				RegisteredClaims: jwt.RegisteredClaims{
 					Issuer:    "pigeonAuthorizer",
 					ExpiresAt: jwt.NewNumericDate(time.Now().Add(stateLifetime)),
@@ -763,7 +764,7 @@ func TestCompleteAuth(t *testing.T) {
 
 			router := (controller).setupRouter()
 
-			authOptionsClaims := AuthOptionsClaims{
+			authOptionsClaims := dto.AuthOptionsClaims{
 				RegisteredClaims: jwt.RegisteredClaims{
 					Issuer:    "pigeonAuthorizer",
 					ExpiresAt: jwt.NewNumericDate(time.Now().Add(stateLifetime)),
@@ -836,7 +837,7 @@ func TestCompleteAdminAuth(t *testing.T) {
 
 		router := (controller).setupRouter()
 
-		authOptionsClaims := AuthOptionsClaims{
+		authOptionsClaims := dto.AuthOptionsClaims{
 			RegisteredClaims: jwt.RegisteredClaims{
 				Issuer:    "pigeonAuthorizer",
 				ExpiresAt: jwt.NewNumericDate(time.Now().Add(stateLifetime)),
@@ -871,7 +872,7 @@ func TestCompleteAdminAuth(t *testing.T) {
 
 		router := (controller).setupRouter()
 
-		authOptionsClaims := AuthOptionsClaims{
+		authOptionsClaims := dto.AuthOptionsClaims{
 			RegisteredClaims: jwt.RegisteredClaims{
 				Issuer:    "pigeonAuthorizer",
 				ExpiresAt: jwt.NewNumericDate(time.Now().Add(stateLifetime)),

diff --git a/dto/AuthOptionsClaims.go b/dto/AuthOptionsClaims.go
@@ -0,0 +1,11 @@
+package dto
+
+import "github.com/golang-jwt/jwt/v5"
+
+type AuthOptionsClaims struct {
+	jwt.RegisteredClaims
+	Client       string `form:"client" json:"client" binding:"required"`
+	ClientUserId string `form:"client_user_id" json:"clientUserId"  binding:"required"`
+	RedirectUri  string `form:"redirect_uri" json:"redirectUri,omitempty"`
+	KneuUserId   uint   `form:"-" json:"userId,omitempty"`
+}
diff --git a/dto/GetAuthUrlResponse.go b/dto/GetAuthUrlResponse.go
@@ -0,0 +1,8 @@
+package dto
+
+import "time"
+
+type GetAuthUrlResponse struct {
+	AuthUrl  string    `json:"authUrl" binding:"required"`
+	ExpireAt time.Time `json:"expire" binding:"required"`
+}
diff --git a/dto/Student.go b/dto/Student.go
@@ -0,0 +1,11 @@
+package dto
+
+import "github.com/kneu-messenger-pigeon/events"
+
+type Student struct {
+	Id         uint
+	LastName   string
+	FirstName  string
+	MiddleName string
+	Gender     events.Gender
+}