Merge pull request #28 from devtron-labs/email-casesensitive-handling

fix: adding email in auth verification

Author: kripanshdevtron

middleware/AuthMiddleware.go

@@ -31,7 +31,7 @@ const tokenHeaderKey = "token"
 const argocdTokenHeaderKey = "argocd.token"
 
 // Authorizer is a middleware for authorization
-func Authorizer(sessionManager *SessionManager, whitelistChecker func(url string) bool, userStatusCheckInDb func(token string) (bool, int32, error)) func(next http.Handler) http.Handler {
+func Authorizer(sessionManager *SessionManager, whitelistChecker func(url string) bool, userStatusCheckInDb func(token string) (bool, int32, string, error)) func(next http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		fn := func(w http.ResponseWriter, r *http.Request) {
 			token := ""
@@ -72,18 +72,18 @@ func Authorizer(sessionManager *SessionManager, whitelistChecker func(url string
 				if userStatusCheckInDb != nil {
 
 					// checking user status in db
-					isInactive, userId, err := userStatusCheckInDb(token)
+					isInactive, userId, emailId, err := userStatusCheckInDb(token)
 					if err != nil {
 						writeResponse(http.StatusUnauthorized, "Invalid User", w, err)
 						return
 					} else if isInactive {
 						writeResponse(http.StatusUnauthorized, "Inactive User", w, fmt.Errorf("inactive User"))
 						return
 					}
-
 					// setting user id in context
 					ctx := context.WithValue(r.Context(), "userId", userId)
 					ctx = context.WithValue(ctx, "token", token)
+					ctx = context.WithValue(ctx, "emailId", emailId)
 					r = r.WithContext(ctx)
 				}
 			}