Merge branch 'main' of gitlab.informatika.org:k-01-11/graduit-be

src/handler/server.go

@@ -59,7 +59,7 @@ func (s *Service) InitializeRoutes() *echo.Echo {
 	s.DosbingBimbinganLogHandler.MountDosbing(dosbingGroup)
 
 	TIMTAGroup := e.Group("api/TIMTA")
-	TIMTAGroup.Use(middleware.Validator("TIM_TA"))
+	TIMTAGroup.Use(middleware.Validator("S1_TIM_TA"))
 	s.TIMTASchedulingHandler.MountTIMTA(TIMTAGroup)
 	s.TIMTAPendaftaranSidSemHandler.MountTIMTA(TIMTAGroup)
 	return e

src/middleware/validator.go

 package middleware
 
 import (
+	"encoding/json"
 	"net/http"
 	"os"
 
@@ -8,8 +9,6 @@ import (
 	"gitlab.informatika.org/k-01-11/graduit-be/src/utils"
 )
 
-// masih mentah baru raba2
-
 func Validator(expectedRole string) echo.MiddlewareFunc {
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
@@ -37,10 +36,21 @@ func Validator(expectedRole string) echo.MiddlewareFunc {
 			}
 			defer resp.Body.Close()
 
+			var payload utils.Payload
+			if err := json.NewDecoder(resp.Body).Decode(&payload); err != nil {
+				return c.JSON(http.StatusInternalServerError, utils.ResponseDetailOutput(false, http.StatusInternalServerError, "Failed to decode response body", err))
+			}
+
+			if payload.Roles[0] != expectedRole {
+				return c.JSON(http.StatusForbidden, utils.ResponseDetailOutput(false, http.StatusForbidden, "Forbidden", err))
+			}
+
 			if resp.StatusCode != http.StatusOK {
 				return c.JSON(resp.StatusCode, utils.ResponseDetailOutput(false, resp.StatusCode, "Unauthorized", resp.Body))
 			}
 
+			c.Set("authPayload", payload)
+
 			return next(c)
 		}
 	}

src/utils/helper.go

@@ -18,13 +18,22 @@ type ResponseDetail struct {
 }
 
 type PageLimitSearchID struct {
-	Page int
-	Limit int
-	Search string
-	ID string
+	Page    int
+	Limit   int
+	Search  string
+	ID      string
 	Periode string
 }
 
+type Payload struct {
+	ID     string
+	Nama   string
+	Email  string
+	NIM    string
+	Roles  []string
+	Kontak string
+}
+
 func ResponseDetailOutput(success bool, code int, message string, data interface{}) ResponseDetail {
 	res := ResponseDetail{
 		Success: success,
@@ -107,4 +116,4 @@ func GetPageLimitSearchID(urlValues url.Values) (output PageLimitSearchID, err e
 	}
 
 	return *param, nil
-}
+}
\ No newline at end of file