new fix
All checks were successful
Deploy on Master Change / deploy (push) Successful in 1m8s

This commit is contained in:
2026-07-06 09:12:35 +07:00
parent 99aacb5d81
commit 83018639fa
2 changed files with 17 additions and 0 deletions

View File

@@ -6,6 +6,7 @@ import (
"time" "time"
internalDb "server/internal/db" internalDb "server/internal/db"
"server/internal/auth"
"server/internal/models" "server/internal/models"
"server/internal/util" "server/internal/util"
internalWs "server/internal/websocket" internalWs "server/internal/websocket"
@@ -343,6 +344,22 @@ func GetAllowedAppsHandler(db *gorm.DB) fiber.Handler {
errApp := db.Where("class_rk_id = ?", rkID).First(&appConfig).Error errApp := db.Where("class_rk_id = ?", rkID).First(&appConfig).Error
hasAppsConfigured := (errApp == nil && strings.TrimSpace(appConfig.Keywords) != "") hasAppsConfigured := (errApp == nil && strings.TrimSpace(appConfig.Keywords) != "")
// Nếu là request từ Staff (có Authorization Bearer token hợp lệ), trả về trực tiếp danh sách keywords đã lưu
authHeader := c.Get("Authorization")
if authHeader != "" && strings.HasPrefix(authHeader, "Bearer ") {
token := strings.TrimSpace(strings.TrimPrefix(authHeader, "Bearer "))
if _, err := auth.ParseToken(token); err == nil {
keywords := ""
if errApp == nil {
keywords = appConfig.Keywords
}
return c.JSON(fiber.Map{
"classRkId": rkID,
"keywords": keywords,
})
}
}
// 2. Kiểm tra xem có trong giờ học không // 2. Kiểm tra xem có trong giờ học không
var schedules []models.ClassSchedule var schedules []models.ClassSchedule
errSched := db.Where("class_rk_id = ?", rkID).Find(&schedules).Error errSched := db.Where("class_rk_id = ?", rkID).Find(&schedules).Error

Binary file not shown.