Feat/spotify register

controllers/auth.controller.go

@@ -2,51 +2,63 @@ package controllers
 
 import (
 	"encoding/json"
-	"github.com/listmera/frank/env"
 	"github.com/listmera/frank/models"
+	"github.com/listmera/frank/structs"
 	"github.com/listmera/frank/utils"
 	"github.com/naoina/denco"
 	"net/http"
-	"net/url"
-	"strings"
 )
 
 func Login (w http.ResponseWriter, r *http.Request, params denco.Params) {
 	w.WriteHeader(http.StatusOK)
 	//w.Header().Set("Content-Type", "application/json; charset=UTF-8")
 }
 
-type registerReq struct {
-	Code string `json: "code"`
-}
-
 func Register (w http.ResponseWriter, r *http.Request, params denco.Params) {
 	decoder := json.NewDecoder(r.Body)
 
-	var req registerReq
-	err := decoder.Decode(&req)
+	var reqBody structs.RegisterReq
+	err := decoder.Decode(&reqBody)
 	utils.CheckErr(err)
 
-	models.GetTokens(req.Code) // from here on, everything should be a goroutine
-}
+	spotifyRes, err := models.GetTokens(reqBody.Code)
+	defer spotifyRes.Body.Close()
+	utils.CheckErr(err)
+
+	var tokens structs.TokenRes
+	decoder = json.NewDecoder(spotifyRes.Body)
+	err = decoder.Decode(&tokens)
+	utils.CheckErr(err)
+
+	userRes, err := models.GetMe(tokens)
+	defer userRes.Body.Close()
+	utils.CheckErr(err)
 
-type redirectRes struct {
-	Redirect string `json:"redirect"`
+	var spotifyUser structs.SpotifyUser
+	decoder = json.NewDecoder(userRes.Body)
+	err = decoder.Decode(&spotifyUser)
+	utils.CheckErr(err)
+
+	//TODO: we use upsert in mongo to create new user/update existing one
+	user := structs.NewListmeraUser(spotifyUser)
+	id, err := models.InsertUser(user, tokens)
+	utils.CheckErr(err)
+
+	user.Id = id.InsertedID
+
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusCreated)
+	err = json.NewEncoder(w).Encode(user)
+	utils.CheckErr(err)
+	//TODO: add in the response a flag saying if its a new user or an old one
 }
 
 func Redirect (w http.ResponseWriter, r *http.Request, params denco.Params) {
-	scopes := strings.Join(models.ListmeraScopes, " ")
-	id := env.GetOr("SPOTIFY_ID", "test")
-	uri := env.GetOr("SPOTIFY_REDIRECT_URI", "test2")
-
-	redirect := redirectRes{
-		"https://accounts.spotify.com/authorize?response_type=code&client_id=" + id + "&scope=" +
-			url.QueryEscape(scopes) + "&redirect_uri=" + url.QueryEscape(uri),
-	}
+	resBody := models.GenRedirect()
 
 	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
 	w.WriteHeader(http.StatusOK)
 
-	err := json.NewEncoder(w).Encode(redirect)
+	err := json.NewEncoder(w).Encode(resBody)
 	utils.CheckErr(err)
 }

go.mod

@@ -0,0 +1,15 @@
+module github.com/listmera/frank
+
+require (
+	github.com/go-stack/stack v1.8.0
+	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db
+	github.com/joho/godotenv v1.3.0
+	github.com/mongodb/mongo-go-driver v0.0.16
+	github.com/naoina/denco v0.0.0-20180930074809-8475105a6b4c
+	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c
+	github.com/xdg/stringprep v1.0.0
+	golang.org/x/crypto v0.0.0-20181012144002-a92615f3c490
+	golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1
+	golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f
+	golang.org/x/text v0.3.0
+)

main.go

@@ -14,7 +14,7 @@ func main() {
 	defer models.Disconnect()
 	r := router.NewRouter()
 	handler := middleware.ApplyMiddleware(r)
-	log.Printf("Frank running in %s%s", env.GetOr("FRANK_HOST", "localhost"), env.GetOr("FRANK_PORT", ":3000"))
+	log.Printf("Frank running in %s%s", env.GetOr("FRANK_HOST", "localhost"), env.GetOr("FRANK_PORT", ":1212"))
 	err := http.ListenAndServe(env.GetOr("FRANK_PORT", ":1212"), handler)
 	utils.CheckErr(err)
 }

middleware/logger.go

@@ -29,9 +29,11 @@ func logger(h http.Handler) http.Handler {
 			w.Header()[k] = v
 		}
 
-		// grab the captured response body
 		body := rw.Body.Bytes()
-
+		for key := range rw.HeaderMap {
+			w.Header().Set(key, w.Header().Get(key))
+		}
+		w.WriteHeader(rw.Result().StatusCode)
 		w.Write(body)
 	})
 }