Skip to content

Commit cc07d33

Browse files
committed
adding changes on code, for solving problems with tokens responses
1 parent 25925a5 commit cc07d33

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

database/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM postgres:10.3
22

3-
COPY up.sql /docker-entrypoint-initdb.d/1.sql
3+
COPY up.sql /docker-entrypoint-initdb.d/up.sql
44

55
CMD ["postgres"]

handlers/posts.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package handlers
22

33
import (
44
"encoding/json"
5-
"fmt"
65
"net/http"
76
"strings"
87

@@ -19,25 +18,26 @@ type InsertPostRequest struct {
1918
}
2019

2120
type PostResponse struct {
22-
Id string `json:"id"`
21+
Id string `json:"id"`
2322
PostContent string `json:"post_content"`
2423
}
2524

2625
func InsertPostHandler(s server.Server) http.HandlerFunc {
2726
return func(w http.ResponseWriter, r *http.Request) {
28-
tokenString := strings.TrimSpace(r.Header.Get("Autorization"))
27+
tokenString := strings.TrimSpace(r.Header.Get("Authorization"))
2928
token, err := jwt.ParseWithClaims(tokenString, &models.AppClaims{},
3029
func(token *jwt.Token) (interface{}, error) {
3130
return []byte(s.Config().JWTSecret), nil
3231
})
3332
if err != nil {
34-
http.Error(w, err.Error(), http.StatusInternalServerError)
33+
http.Error(w, err.Error(), http.StatusUnauthorized)
3534
return
3635
}
3736
if claims, ok := token.Claims.(*models.AppClaims); ok && token.Valid {
3837
var postRequest = InsertPostRequest{}
39-
if err := json.NewDecoder(r.Body).Decode(&postRequest); err != nil {
40-
http.Error(w, err.Error(), http.StatusInternalServerError)
38+
err := json.NewDecoder(r.Body).Decode(&postRequest);
39+
if err != nil {
40+
http.Error(w, err.Error(), http.StatusBadRequest)
4141
return
4242
}
4343
id, err := ksuid.NewRandom()

handlers/user.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ func LoginHandler(s server.Server) http.HandlerFunc{
114114

115115
func MeHandler(s server.Server) http.HandlerFunc {
116116
return func (w http.ResponseWriter, r *http.Request) {
117-
tokenString := strings.TrimSpace(r.Header.Get("Autorization"))
118-
token, err := jwt.ParseWithClaims(tokenString, &models.AppClaims{},
117+
tokenString := strings.TrimSpace(r.Header.Get("Authorization"))
118+
token, err := jwt.ParseWithClaims(tokenString, &models.AppClaims{},
119119
func(token *jwt.Token) (interface{}, error) {
120120
return []byte(s.Config().JWTSecret), nil
121121
})

main.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ func BindRoutes(s server.Server, r *mux.Router) {
4141
r.Use(middleware.CheckAuthMiddleware(s))
4242

4343
r.HandleFunc("/", handlers.HomeHandler(s)).Methods(http.MethodGet)
44+
4445
r.HandleFunc("/signup", handlers.SignUpHandler(s)).Methods(http.MethodPost)
4546
r.HandleFunc("/login", handlers.LoginHandler(s)).Methods(http.MethodPost)
4647
r.HandleFunc("/me", handlers.MeHandler(s)).Methods(http.MethodGet)
48+
4749
r.HandleFunc("/posts", handlers.InsertPostHandler(s)).Methods(http.MethodPost)
4850
}

middleware/auth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func CheckAuthMiddleware(s server.Server) func(h http.Handler) http.Handler {
3232
next.ServeHTTP(w, r)
3333
return
3434
}
35-
tokenString := strings.TrimSpace(r.Header.Get("Autorization"))
35+
tokenString := strings.TrimSpace(r.Header.Get("Authorization"))
3636
_, err := jwt.ParseWithClaims(tokenString, &models.AppClaims{},
3737
func(token *jwt.Token) (interface{}, error) {
3838
return []byte(s.Config().JWTSecret), nil
File renamed without changes.

0 commit comments

Comments
 (0)