remove unused valid property, add id to session response

Author: IgorPolyakov

api/openapi.yaml

@@ -107,21 +107,7 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  valid:
-                    type: boolean
-                    description: Indicates if the current session is valid
-                  role:
-                    type: string
-                    example: "admin"
-                    description: The role of the current user
-                    nullable: true
-                  name:
-                    type: string
-                    example: "r00t"
-                    description: The name of the current user
-                    nullable: true
+                $ref: '#/components/schemas/SessionResponse'
   /api/v1/users:
     get:
       tags:
@@ -1137,6 +1123,23 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/UniversityResponse'
+    SessionResponse:
+      type: object
+      properties:
+        role:
+          type: string
+          example: "admin"
+          description: The role of the current user
+          nullable: true
+        name:
+          type: string
+          example: "r00t"
+          description: The name of the current user
+          nullable: true
+        id:
+          type: string
+          example: "a8a5d938-1bc7-4b69-942d-9c00fc166fb6"
+          format: uuid
   links: {}
   callbacks: {}
 security: []

internal/app/handlers/sessions.go

@@ -8,6 +8,7 @@ import (
 	"ctf01d/internal/app/repository"
 	"ctf01d/internal/app/server"
 	api_helpers "ctf01d/internal/app/utils"
+	"ctf01d/internal/app/view"
 
 	openapi_types "github.com/oapi-codegen/runtime/types"
 )
@@ -96,9 +97,5 @@ func (h *Handlers) ValidateSession(w http.ResponseWriter, r *http.Request) {
 		api_helpers.RespondWithJSON(w, http.StatusInternalServerError, map[string]string{"error": "Could not find user by user id"})
 		return
 	}
-	var res = make(map[string]string)
-	res["name"] = user.DisplayName
-	res["role"] = api_helpers.ConvertUserRequestRoleToString(user.Role)
-
-	api_helpers.RespondWithJSON(w, http.StatusOK, res)
+	api_helpers.RespondWithJSON(w, http.StatusOK, view.NewSessionFromModel(user))
 }

internal/app/server/server.gen.go

@@ -0,0 +1,17 @@
+package view
+
+import (
+	"ctf01d/internal/app/server"
+
+	"ctf01d/internal/app/db"
+	helpers "ctf01d/internal/app/utils"
+)
+
+func NewSessionFromModel(u *db.User) *server.SessionResponse {
+	userRole := helpers.ConvertUserRequestRoleToString(u.Role)
+	return &server.SessionResponse{
+		Id:   &u.Id,
+		Name: &u.Username,
+		Role: &userRole,
+	}
+}