From a9b09ce4da7bf18c4bbc6e0ef4d5bfaba72e3080 Mon Sep 17 00:00:00 2001
From: Asara <amarpreet@minhas.io>
Date: Sun, 14 Apr 2019 12:44:02 -0400
Subject: [PATCH] Add refresh

---
 packages/auth/auth.go   | 38 ++++++++++++++++++++++++++++++--------
 packages/users/users.go |  2 +-
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/packages/auth/auth.go b/packages/auth/auth.go
index 1b10da4..06a6cb0 100644
--- a/packages/auth/auth.go
+++ b/packages/auth/auth.go
@@ -40,7 +40,7 @@ type Claims struct {
 	jwt.StandardClaims
 }
 
-type ReturnToken struct {
+type JWT struct {
 	JWT string `json:"jwt"`
 }
 
@@ -49,13 +49,18 @@ func Init() {
 }
 
 func Routes() *chi.Mux {
-	router := chi.NewRouter()
-	router.Post("/signin", signin)
-	router.Post("/signup", signup)
-	return router
+	r := chi.NewRouter()
+	r.Post("/signin", signin)
+	r.Post("/register", register)
+	r.Group(func(r chi.Router) {
+		r.Use(jwtauth.Verifier(TokenAuth))
+		r.Use(jwtauth.Authenticator)
+		r.Post("/refresh", refresh)
+	})
+	return r
 }
 
-func signup(w http.ResponseWriter, r *http.Request) {
+func register(w http.ResponseWriter, r *http.Request) {
 	returnError := RegistrationError{}
 	creds := &SignUpCredentials{}
 	err := json.NewDecoder(r.Body).Decode(creds)
@@ -108,7 +113,7 @@ func signup(w http.ResponseWriter, r *http.Request) {
 		},
 	}
 	_, tokenString, _ := TokenAuth.Encode(claims)
-	token := ReturnToken{
+	token := JWT{
 		JWT: tokenString,
 	}
 	render.JSON(w, r, token)
@@ -148,7 +153,24 @@ func signin(w http.ResponseWriter, r *http.Request) {
 		},
 	}
 	_, tokenString, _ := TokenAuth.Encode(claims)
-	token := ReturnToken{
+	token := JWT{
+		JWT: tokenString,
+	}
+	render.JSON(w, r, token)
+}
+
+func refresh(w http.ResponseWriter, r *http.Request) {
+	_, claims, _ := jwtauth.FromContext(r.Context())
+	w.WriteHeader(http.StatusOK)
+	expirationTime := time.Now().Add(5 * time.Hour)
+    newClaims := &Claims{
+		Username: claims["username"].(string),
+		StandardClaims: jwt.StandardClaims{
+			ExpiresAt: expirationTime.Unix(),
+		},
+	}
+	_, tokenString, _ := TokenAuth.Encode(newClaims)
+	token := JWT{
 		JWT: tokenString,
 	}
 	render.JSON(w, r, token)
diff --git a/packages/users/users.go b/packages/users/users.go
index c65c157..fe2d45e 100644
--- a/packages/users/users.go
+++ b/packages/users/users.go
@@ -58,7 +58,7 @@ func getUser(w http.ResponseWriter, r *http.Request) {
 
 func updateUser(w http.ResponseWriter, r *http.Request) {
 	_, claims, _ := jwtauth.FromContext(r.Context())
-	username := claims["username"]
+	username := claims["username"].(string)
 	searchname := chi.URLParam(r, "username")
 	if username != searchname {
 		w.WriteHeader(http.StatusUnauthorized)