feature: various additions

api/router/middleware.go

@@ -24,6 +24,7 @@ func AuthenticationMiddleware(next http.Handler) http.Handler {
 		accessClaims, err := ValidateAccessToken(accessTokenString)
 		if err != nil {
 			if _, ok := err.(*ErrExpiredToken); ok {
+				w.WriteHeader(http.StatusUnauthorized)
 				w.Write([]byte(`{
 	"data": {},
 	"errors": [

api/router/models.go

@@ -30,3 +30,8 @@ type LogoutResponseData struct {
 type RefreshTokenResponseData struct {
 	AccessToken string `json:"accessToken"`
 }
+
+type AvatarUploadResponseData struct {
+	UserID string `json:"userID"`
+	URL    string `json:"url"`
+}

api/router/router.go

@@ -1,12 +1,16 @@
 package router
 
 import (
+	"database/sql"
+	"encoding/json"
+	"io/ioutil"
 	"net/http"
 	"time"
 
 	"github.com/go-chi/chi"
 	"github.com/go-chi/chi/middleware"
 	"github.com/go-chi/cors"
+	"github.com/google/uuid"
 	"github.com/jmoiron/sqlx"
 	log "github.com/sirupsen/logrus"
 
@@ -18,6 +22,45 @@ func (h *CitadelHandler) PingHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write([]byte("pong"))
 }
 
+func (h *CitadelHandler) ProfileImageUpload(w http.ResponseWriter, r *http.Request) {
+	log.Info("preparing to upload file")
+	userID, ok := r.Context().Value("userID").(uuid.UUID)
+	if !ok {
+		log.Error("not a valid uuid")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	// Parse our multipart form, 10 << 20 specifies a maximum
+	// upload of 10 MB files.
+	r.ParseMultipartForm(10 << 20)
+
+	file, handler, err := r.FormFile("file")
+	if err != nil {
+		log.WithError(err).Error("issue while uploading file")
+		return
+	}
+	defer file.Close()
+	log.WithFields(log.Fields{"filename": handler.Filename, "size": handler.Size, "header": handler.Header}).Info("file metadata")
+
+	fileBytes, err := ioutil.ReadAll(file)
+	if err != nil {
+		log.WithError(err).Error("while reading file")
+		return
+	}
+	err = ioutil.WriteFile("uploads/"+handler.Filename, fileBytes, 0644)
+	if err != nil {
+		log.WithError(err).Error("while reading file")
+		return
+	}
+
+	h.repo.UpdateUserAccountProfileAvatarURL(r.Context(), pg.UpdateUserAccountProfileAvatarURLParams{UserID: userID, ProfileAvatarUrl: sql.NullString{String: "http://localhost:3333/uploads/" + handler.Filename, Valid: true}})
+	// return that we have successfully uploaded our file!
+	log.Info("file uploaded")
+	json.NewEncoder(w).Encode(AvatarUploadResponseData{URL: "http://localhost:3333/uploads/" + handler.Filename, UserID: userID.String()})
+
+}
+
 func NewRouter(db *sqlx.DB) (chi.Router, error) {
 	formatter := new(log.TextFormatter)
 	formatter.TimestampFormat = "02-01-2006 15:04:05"
@@ -50,9 +93,13 @@ func NewRouter(db *sqlx.DB) (chi.Router, error) {
 	r.Group(func(mux chi.Router) {
 		mux.Mount("/auth", authResource{}.Routes(citadelHandler))
 		mux.Handle("/__graphql", graph.NewPlaygroundHandler("/graphql"))
+		var imgServer = http.FileServer(http.Dir("./uploads/"))
+		mux.Mount("/uploads/", http.StripPrefix("/uploads/", imgServer))
+
 	})
 	r.Group(func(mux chi.Router) {
 		mux.Use(AuthenticationMiddleware)
+		mux.Post("/users/me/avatar", citadelHandler.ProfileImageUpload)
 		mux.Get("/ping", citadelHandler.PingHandler)
 		mux.Handle("/graphql", graph.NewHandler(repository))
 	})

api/router/tokens.go

@@ -43,6 +43,10 @@ func ValidateAccessToken(accessTokenString string) (AccessTokenClaims, error) {
 		return jwtKey, nil
 	})
 
+	if err != nil {
+		return *accessClaims, nil
+	}
+
 	if accessToken.Valid {
 		log.WithFields(log.Fields{
 			"token":        accessTokenString,