Updated auth middleware, added air support

.air.toml

@@ -0,0 +1,51 @@
+root = "."
+testdata_dir = "testdata"
+tmp_dir = "tmp"
+
+[build]
+ args_bin = []
+ bin = "./build/tasknet"
+ cmd = "make build"
+ delay = 1000
+ exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+ exclude_file = []
+ exclude_regex = ["_test.go"]
+ exclude_unchanged = false
+ follow_symlink = false
+ full_bin = ""
+ include_dir = []
+ include_ext = ["go", "tpl", "tmpl", "html"]
+ include_file = []
+ kill_delay = "0s"
+ log = "build-errors.log"
+ poll = false
+ poll_interval = 0
+ post_cmd = []
+ pre_cmd = []
+ rerun = false
+ rerun_delay = 500
+ send_interrupt = false
+ stop_on_error = false
+
+[color]
+ app = ""
+ build = "yellow"
+ main = "magenta"
+ runner = "green"
+ watcher = "cyan"
+
+[log]
+ main_only = false
+ time = false
+
+[misc]
+ clean_on_exit = false
+
+[proxy]
+ app_port = 0
+ enabled = false
+ proxy_port = 0
+
+[screen]
+ clear_on_rebuild = false
+ keep_scroll = true

.gitignore

@@ -29,4 +29,9 @@ build/
 
 # Log files
 
-*.log
+*.log
+*.zip
+
+# Air 
+
+/tmp

pkg/handlers/auth/auth.go

@@ -35,8 +35,9 @@ func (h *Handler) RegisterRoutes() *chi.Mux {
  r.Post("/login", h.login)
 
  r.Group(func(r chi.Router) {
+ authMiddleware := auth_middleware.New(h.userService)
  r.Use(jwtauth.Verifier(utils.AccessTokenAuth))
- r.Use(jwtauth.Authenticator(utils.AccessTokenAuth))
+ r.Use(authMiddleware.VerifyAccessToken)
  r.Post("/logout", h.logout)
  })
 
@@ -53,7 +54,7 @@ func (h *Handler) registerUser(w http.ResponseWriter, r *http.Request) {
  var payload validations.RegisterUserSchema
 
  if err := utils.ParseJSON(r, &payload); err != nil {
- utils.SendAPIErrorResponse(w, http.StatusBadRequest, fmt.Sprintf("please provide all the required fields"))
+ utils.SendAPIErrorResponse(w, http.StatusBadRequest, "please provide all the required fields")
  return
  }
 
@@ -80,7 +81,7 @@ func (h *Handler) registerUser(w http.ResponseWriter, r *http.Request) {
  hashedPassword, err := utils.HashPassword(payload.Password)
 
  if err != nil {
- utils.SendAPIErrorResponse(w, http.StatusInternalServerError, fmt.Sprintf("an error occured while processing your password"))
+ utils.SendAPIErrorResponse(w, http.StatusInternalServerError, "an error occured while processing your password")
  return
  }
 
@@ -102,7 +103,7 @@ func (h *Handler) login(w http.ResponseWriter, r *http.Request) {
  var payload validations.LoginUserSchema
 
  if err := utils.ParseJSON(r, &payload); err != nil {
- utils.SendAPIErrorResponse(w, http.StatusBadRequest, fmt.Sprintf("please provide all the required fields"))
+ utils.SendAPIErrorResponse(w, http.StatusBadRequest, "please provide all the required fields")
  return
  }
 
@@ -115,26 +116,26 @@ func (h *Handler) login(w http.ResponseWriter, r *http.Request) {
  u, err := h.userService.GetUserByUsername(payload.Username)
 
  if err != nil {
- utils.SendAPIErrorResponse(w, http.StatusUnauthorized, fmt.Sprintf("invalid username please check your username and try again"))
+ utils.SendAPIErrorResponse(w, http.StatusUnauthorized, "invalid username please check your username and try again")
  return
  }
 
  if !utils.ComparePassword(payload.Password, u.Password) {
- utils.SendAPIErrorResponse(w, http.StatusUnauthorized, fmt.Sprintf("invalid password please check your password and try again"))
+ utils.SendAPIErrorResponse(w, http.StatusUnauthorized, "invalid password please check your password and try again")
  return
  }
 
  accessToken, err := utils.SignAccessToken(r, u.Id)
 
  if err != nil {
- utils.SendAPIErrorResponse(w, http.StatusUnauthorized, fmt.Sprintf("an error occured while processing your credentials"))
+ utils.SendAPIErrorResponse(w, http.StatusUnauthorized, "an error occured while processing your credentials")
  return
  }
 
  refreshToken, err := utils.SignRefreshToken(r, u.Id)
 
  if err != nil {
- utils.SendAPIErrorResponse(w, http.StatusUnauthorized, fmt.Sprintf("an error occured while processing your credentials"))
+ utils.SendAPIErrorResponse(w, http.StatusUnauthorized, "an error occured while processing your credentials")
  return
  }
 
@@ -221,14 +222,14 @@ func (h *Handler) refresh(w http.ResponseWriter, r *http.Request) {
  accessToken, err := utils.SignAccessToken(r, u.Id)
 
  if err != nil {
- utils.SendAPIErrorResponse(w, http.StatusUnauthorized, fmt.Sprintf("an error occured while processing your credentials"))
+ utils.SendAPIErrorResponse(w, http.StatusUnauthorized, "an error occured while processing your credentials")
  return
  }
 
  refreshToken, err = utils.SignRefreshToken(r, u.Id)
 
  if err != nil {
- utils.SendAPIErrorResponse(w, http.StatusUnauthorized, fmt.Sprintf("an error occured while processing your credentials"))
+ utils.SendAPIErrorResponse(w, http.StatusUnauthorized, "an error occured while processing your credentials")
  return
  }
 

pkg/handlers/task/task.go

@@ -5,6 +5,7 @@ import (
  "net/http"
 
  "github.com/blackmamoth/tasknet/pkg/config"
+ auth_middleware "github.com/blackmamoth/tasknet/pkg/middlewares/auth"
  upload_middleware "github.com/blackmamoth/tasknet/pkg/middlewares/upload"
  script_model "github.com/blackmamoth/tasknet/pkg/models/script"
  "github.com/blackmamoth/tasknet/pkg/types"
@@ -32,8 +33,10 @@ func New(taskService types.TaskService, userService types.UserService, scriptSer
 func (h *Handler) RegisterRoutes() *chi.Mux {
  r := chi.NewRouter()
 
+ authMiddleware := auth_middleware.New(h.userService)
+
  r.Use(jwtauth.Verifier(utils.AccessTokenAuth))
- r.Use(jwtauth.Authenticator(utils.AccessTokenAuth))
+ r.Use(authMiddleware.VerifyAccessToken)
 
  r.Post("/create", h.createTask)
  r.Group(func(r chi.Router) {
@@ -179,13 +182,15 @@ func (h *Handler) getTasks(w http.ResponseWriter, r *http.Request) {
  utils.SendAPIErrorResponse(w, http.StatusUnauthorized, fmt.Errorf("an error occured while authorizing user claims"))
  return
  }
+ fmt.Println(claims["user_id"])
 
  tasks, err := h.taskService.GetTasks(payload, claims["user_id"].(string))
 
  if err != nil {
  utils.SendAPIErrorResponse(w, http.StatusUnprocessableEntity, fmt.Errorf("an error occured while fetching your tasks: %v", err))
  return
  }
+ // fmt.Println(tasks)
 
  data := map[string]interface{}{
  "tasks": tasks,

pkg/middlewares/auth/auth.go

@@ -3,6 +3,7 @@ package auth_middleware
 import (
  "fmt"
  "net/http"
+ "strings"
 
  "github.com/blackmamoth/tasknet/pkg/config"
  "github.com/blackmamoth/tasknet/pkg/types"
@@ -20,6 +21,41 @@ func New(service types.UserService) *Middleware {
  }
 }
 
+func (m *Middleware) VerifyAccessToken(next http.Handler) http.Handler {
+ return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ bearer := r.Header.Get("Authorization")
+ var accessToken string
+ if len(bearer) > 7 && strings.ToUpper(bearer[0:6]) == "BEARER" {
+ accessToken = bearer[7:]
+ } else {
+ utils.SendAPIErrorResponse(w, http.StatusUnauthorized, fmt.Errorf("unauthorized, no token"))
+ return
+ }
+
+ token, err := jwtauth.VerifyToken(utils.AccessTokenAuth, accessToken)
+
+ if err != nil {
+ utils.SendAPIErrorResponse(w, http.StatusUnauthorized, fmt.Errorf("invalid access token"))
+ return
+ }
+
+ userId, ok := token.Get("user_id")
+ if !ok {
+ utils.SendAPIErrorResponse(w, http.StatusUnauthorized, fmt.Errorf("invalid access token"))
+ return
+ }
+
+ _, err = m.service.GetUserById(userId.(string))
+
+ if err != nil {
+ utils.SendAPIErrorResponse(w, http.StatusUnauthorized, fmt.Errorf("invalid refresh token, user not found"))
+ return
+ }
+
+ next.ServeHTTP(w, r)
+ })
+}
+
 func (m *Middleware) VerifyRefreshToken(next http.Handler) http.Handler {
  return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
  cookies := r.Cookies()