feat: add usertype to jwt

kossiitkgp · Nov 26, 2024 · 3afe040 · 3afe040
1 parent 6727ec1
commit 3afe040
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 19 deletions.
diff --git a/controllers/mentor.go b/controllers/mentor.go
@@ -70,7 +70,7 @@ func RegisterMentor(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Check if the JWT login username is the same as the mentor's given username
-	login_username := r.Context().Value(middleware.LOGIN_CTX_USERNAME_KEY).(string)
+	login_username := r.Context().Value(middleware.LOGIN_CTX_USERNAME_KEY).(utils.LoginJwtFields).Username
 
 	err = utils.DetectSessionHijackAndRespond(r, w, reqFields.Username, login_username, "Login username and given username do not match.")
 	if err != nil {
@@ -225,7 +225,7 @@ func FetchMentorDashboard(w http.ResponseWriter, r *http.Request) {
 
 	var modelMentor models.Mentor
 
-	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY))
+	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY)).(utils.LoginJwtFields).Username
 	tx := db.
 		Table("mentors").
 		Where("username = ?", login_username).
@@ -278,7 +278,7 @@ func UpdateMentorDetails(w http.ResponseWriter, r *http.Request) {
 
 	var modelMentor models.Mentor
 
-	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY))
+	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY)).(utils.LoginJwtFields).Username
 	tx := db.
 		Table("mentors").
 		Where("username = ?", login_username).
@@ -337,7 +337,7 @@ func GetMentorDetails(w http.ResponseWriter, r *http.Request) {
 	app := r.Context().Value(middleware.APP_CTX_KEY).(*middleware.App)
 	db := app.Db
 
-	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY))
+	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY)).(utils.LoginJwtFields).Username
 
 	mentor := models.Mentor{}
 	tx := db.

diff --git a/controllers/profile.go b/controllers/profile.go
@@ -35,7 +35,7 @@ func FetchProfile(w http.ResponseWriter, r *http.Request) {
 	app := r.Context().Value(middleware.APP_CTX_KEY).(*middleware.App)
 	db := app.Db
 
-	username := r.Context().Value(middleware.LOGIN_CTX_USERNAME_KEY).(string)
+	username := r.Context().Value(middleware.LOGIN_CTX_USERNAME_KEY).(utils.LoginJwtFields).Username
 
 	// Check if the student already exists in the db
 	student := models.Student{}

diff --git a/controllers/project_fetch.go b/controllers/project_fetch.go
@@ -127,7 +127,7 @@ func FetchProjectDetails(w http.ResponseWriter, r *http.Request) {
 	app := r.Context().Value(middleware.APP_CTX_KEY).(*middleware.App)
 	db := app.Db
 
-	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY))
+	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY)).(utils.LoginJwtFields).Username
 
 	project := models.Project{}
 	tx := db.
@@ -169,10 +169,10 @@ func FetchProjectDetails(w http.ResponseWriter, r *http.Request) {
 func OrgFetchAllProjectDetails(w http.ResponseWriter, r *http.Request) {
 	app := r.Context().Value(middleware.APP_CTX_KEY).(*middleware.App)
 	db := app.Db
-	username := r.Context().Value(middleware.LOGIN_CTX_USERNAME_KEY).(string)
+	user_details := r.Context().Value(middleware.LOGIN_CTX_USERNAME_KEY).(utils.LoginJwtFields)
 
-	if !strings.Contains(username, "organiser!") {
-		utils.LogErrAndRespond(r, w, nil, fmt.Sprintf("Error '%s' is not an organiser", username), 400)
+	if user_details.UserType != "organiser" {
+		utils.LogErrAndRespond(r, w, nil, fmt.Sprintf("Error '%s' is not an organiser", user_details.Username), 400)
 		return
 	}
 

diff --git a/controllers/project_reg.go b/controllers/project_reg.go
@@ -65,9 +65,9 @@ func RegisterProject(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY))
+	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY)).(utils.LoginJwtClaims).Username
 
-	err = utils.DetectSessionHijackAndRespond(r, w, reqFields.MentorUsername, login_username.(string), "Login username and mentor username do not match.")
+	err = utils.DetectSessionHijackAndRespond(r, w, reqFields.MentorUsername, login_username, "Login username and mentor username do not match.")
 	if err != nil {
 		return
 	}

diff --git a/controllers/project_update.go b/controllers/project_update.go
@@ -67,9 +67,9 @@ func UpdateProject(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY))
+	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY)).(utils.LoginJwtFields).Username
 
-	err = utils.DetectSessionHijackAndRespond(r, w, reqFields.MentorUsername, login_username.(string), "Login username and mentor username do not match.")
+	err = utils.DetectSessionHijackAndRespond(r, w, reqFields.MentorUsername, login_username, "Login username and mentor username do not match.")
 	if err != nil {
 		return
 	}

diff --git a/controllers/student.go b/controllers/student.go
@@ -78,7 +78,7 @@ func RegisterStudent(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Check if the JWT login username is the same as the student's given username
-	login_username := r.Context().Value(middleware.LOGIN_CTX_USERNAME_KEY).(string)
+	login_username := r.Context().Value(middleware.LOGIN_CTX_USERNAME_KEY).(utils.LoginJwtFields).Username
 
 	err = utils.DetectSessionHijackAndRespond(r, w, reqFields.Username, login_username, "Login username and given username do not match.")
 	if err != nil {
@@ -174,7 +174,7 @@ func StudentBlogLink(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Check if the JWT login username is the same as the student's given username
-	login_username := r.Context().Value(middleware.LOGIN_CTX_USERNAME_KEY).(string)
+	login_username := r.Context().Value(middleware.LOGIN_CTX_USERNAME_KEY).(utils.LoginJwtFields).Username
 
 	err = utils.DetectSessionHijackAndRespond(r, w, reqFields.Username, login_username, "Login username and given username do not match.")
 	if err != nil {
@@ -287,7 +287,7 @@ func FetchStudentDashboard(w http.ResponseWriter, r *http.Request) {
 
 	var modelStudent models.Student
 
-	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY))
+	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY)).(utils.LoginJwtFields).Username
 	tx := db.
 		Table("students").
 		Where("username = ?", login_username).
@@ -323,7 +323,7 @@ func UpdateStudentDetails(w http.ResponseWriter, r *http.Request) {
 
 	var modelStudent models.Student
 
-	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY))
+	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY)).(utils.LoginJwtFields).Username
 	tx := db.
 		Table("students").
 		Where("username = ?", login_username).
@@ -373,7 +373,7 @@ func GetStudentDetails(w http.ResponseWriter, r *http.Request) {
 	app := r.Context().Value(middleware.APP_CTX_KEY).(*middleware.App)
 	db := app.Db
 
-	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY))
+	login_username := r.Context().Value(middleware.LoginCtxKey(middleware.LOGIN_CTX_USERNAME_KEY)).(utils.LoginJwtFields).Username
 
 	student := models.Student{}
 	tx := db.

diff --git a/middleware/login.go b/middleware/login.go
@@ -39,7 +39,7 @@ func WithLogin(inner http.HandlerFunc) http.HandlerFunc {
 		}
 
 		reqContext := r.Context()
-		newContext := context.WithValue(reqContext, LoginCtxKey(LOGIN_CTX_USERNAME_KEY), claims.LoginJwtFields.Username)
+		newContext := context.WithValue(reqContext, LoginCtxKey(LOGIN_CTX_USERNAME_KEY), claims.LoginJwtFields)
 
 		inner.ServeHTTP(w, r.WithContext(newContext))
 	})

diff --git a/utils/jwt.go b/utils/jwt.go
@@ -37,6 +37,7 @@ func jwtKeyFunc(*jwt.Token) (interface{}, error) {
 
 type LoginJwtFields struct {
 	Username string `json:"username"`
+	UserType string `json:"type"`
 }
 
 type LoginJwtClaims struct {