Force push

Reviewed-on: https://git.minhas.io/Asara/sudoscientist-go-backend/pulls/5

README.md

@@ -4,7 +4,7 @@
 
 ### Setup
 
-Install steps are for Debian 9 (stretch)
+Install steps are for Debian 11 (bullseye)
 
 1. Install docker-ce
     ```
@@ -20,18 +20,16 @@ Install steps are for Debian 9 (stretch)
         Key fingerprint = 9DC8 5822 9FC7 DD38 854A  E2D8 8D81 803C 0EBF CD88
         Docker Release (CE deb) <docker@docker.com>
         sub   4096R/F273FCD8 2017-02-22
-        # ----------
+    # ----------
     sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
     sudo apt-get update
     sudo apt-get install docker-ce docker-ce-cli containerd.io
     ```
 
-2. Install golang 1.11
+2. Install golang
     ```
-    # stretch doesn't have the latest golang so we install backports
-    sudo add-apt-repository "deb http://deb.debian.org/debian stretch-backports main"
     sudo apt-get update
-    sudo apt-get -t stretch-backports install golang
+    sudo apt-get install golang
     # set the gopath manually for the rest of the setup
     export GOPATH=${HOME}/go
    ```
@@ -57,10 +55,12 @@ Install steps are for Debian 9 (stretch)
     ```
     # make sure your user is in the docker group
     sudo usermod -aG docker $(whoami)
+
     # make sure you have some postgres client installed
     sudo apt-get install postgres-client
     docker pull postgres
-    docker run --name sudosci-db -e POSTGRES_PASWORD=${DB_ADMIN_PW} -d postgres # please set the db admin pw manually
+    docker run -e POSTGRES_PASSWORD=${DB_ADMIN_PW} --name sudosci-db -d postgres
+
     # Initalize the postgres DB
     cd ${GOPATH}/src/git.minhas.io/asara/sudoscientist
     for i in settings/*; do source $i; done

main.go

@@ -1,12 +1,15 @@
 package main
 
+// force pushing
 import (
+	"compress/flate"
 	"fmt"
-	_ "github.com/lib/pq"
 	"log"
 	"net/http"
 	"os"
 
+	_ "github.com/lib/pq"
+
 	"git.minhas.io/asara/sudoscientist-go-backend/packages/auth"
 	"git.minhas.io/asara/sudoscientist-go-backend/packages/blog"
 	"git.minhas.io/asara/sudoscientist-go-backend/packages/database"
@@ -61,11 +64,13 @@ func Routes() *chi.Mux {
 		MaxAge:           360,
 	})
 
+	compressor := middleware.NewCompressor(flate.DefaultCompression)
+
 	router.Use(
+		compressor.Handler,
 		cors.Handler,
 		render.SetContentType(render.ContentTypeJSON),
 		middleware.Logger,
-		middleware.DefaultCompress,
 		middleware.RedirectSlashes,
 		middleware.Recoverer,
 	)

packages/auth/auth.go

@@ -8,7 +8,6 @@ import (
 	"git.minhas.io/asara/sudoscientist-go-backend/packages/middleware"
 	"git.minhas.io/asara/sudoscientist-go-backend/packages/users"
 	"github.com/badoux/checkmail"
-	"github.com/dgrijalva/jwt-go"
 	"github.com/go-chi/chi"
 	"github.com/go-chi/jwtauth"
 	"github.com/go-chi/render"
@@ -66,7 +65,6 @@ type Claims struct {
 	Username string `json:"username", db:"username"`
 	Admin    bool   `json:"admin", db:"admin"`
 	Verified bool   `json:"verified", db:"verified"`
-	jwt.StandardClaims
 }
 
 type JWT struct {
@@ -175,14 +173,12 @@ func register(w http.ResponseWriter, r *http.Request) {
 	}
 	users.CreateProfile(creds.Username, creds.Email)
 	expirationTime := time.Now().Add(24 * time.Hour)
-	claims := &Claims{
-		Username: creds.Username,
-		Admin:    false,
-		Verified: false,
-		StandardClaims: jwt.StandardClaims{
-			ExpiresAt: expirationTime.Unix(),
-		},
+	claims := map[string]interface{}{
+		"username": creds.Username,
+		"admin":    false,
+		"verified": false,
 	}
+	jwtauth.SetExpiry(claims, expirationTime)
 	if PostalEnabled {
 		_, emailToken, _ := EmailAuth.Encode(claims)
 		returnMessage, ok := sendEmailToken(w, emailToken, creds.Username, creds.Email)
@@ -227,14 +223,12 @@ func signin(w http.ResponseWriter, r *http.Request) {
 	user_claims := &Claims{}
 	user_claims_query := DB.QueryRow("SELECT username, admin, verified FROM users WHERE username=$1", creds.Username)
 	err = user_claims_query.Scan(&user_claims.Username, &user_claims.Admin, &user_claims.Verified)
-	claims := &Claims{
-		Username: user_claims.Username,
-		Admin:    user_claims.Admin,
-		Verified: user_claims.Verified,
-		StandardClaims: jwt.StandardClaims{
-			ExpiresAt: expirationTime.Unix(),
-		},
+	claims := map[string]interface{}{
+		"username": user_claims.Username,
+		"admin":    user_claims.Admin,
+		"verified": user_claims.Verified,
 	}
+	jwtauth.SetExpiry(claims, expirationTime)
 	_, tokenString, _ := TokenAuth.Encode(claims)
 	setCookies(w, tokenString, expirationTime)
 	w.WriteHeader(http.StatusOK)
@@ -258,14 +252,12 @@ func refresh(w http.ResponseWriter, r *http.Request) {
 		render.JSON(w, r, returnMessage)
 		return
 	}
-	newClaims := &Claims{
-		Username: user_claims.Username,
-		Admin:    user_claims.Admin,
-		Verified: user_claims.Verified,
-		StandardClaims: jwt.StandardClaims{
-			ExpiresAt: expirationTime.Unix(),
-		},
+	newClaims := map[string]interface{}{
+		"username": user_claims.Username,
+		"admin":    user_claims.Admin,
+		"verified": user_claims.Verified,
 	}
+	jwtauth.SetExpiry(newClaims, expirationTime)
 	_, tokenString, _ := TokenAuth.Encode(newClaims)
 	setCookies(w, tokenString, expirationTime)
 	w.WriteHeader(http.StatusOK)