directly login after registration + comments

Author: bstaijen

profile-service/app/http/controllers/controllers.go

@@ -46,7 +46,12 @@ func CreateUserHandler(connection *sql.DB, cnf config.Config) negroni.HandlerFun
 					util.SendBadRequest(w, err)
 					return
 				}
-				createdUser, _ := db.GetUserByID(connection, createdID)
+				createdUser, err := db.GetUserByID(connection, createdID)
+				if err != nil {
+					util.SendBadRequest(w, err)
+					return
+				}
+
 				// create JWT object with claims
 				expiration := time.Now().Add(time.Hour * 24 * 31).Unix()
 				token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
@@ -64,15 +69,15 @@ func CreateUserHandler(connection *sql.DB, cnf config.Config) negroni.HandlerFun
 				}
 
 				type Token struct {
-					Token     string              `json:"token"`
-					ExpiresOn string              `json:"expires_on"`
-					User      models.UserResponse `json:"user"`
+					Token     string               `json:"token"`
+					ExpiresOn string               `json:"expires_on"`
+					User      *models.UserResponse `json:"user"`
 				}
 
 				util.SendOK(w, &Token{
 					Token:     tokenString,
 					ExpiresOn: strconv.Itoa(int(expiration)),
-					User:      createdUser,
+					User:      &createdUser,
 				})
 
 			} else {

profile-service/database/db.go

@@ -56,9 +56,8 @@ func GetUserByID(db *sql.DB, ID int) (models.UserResponse, error) {
 		var id int
 		var username string
 		var createdAt time.Time
-		var password string
 		var email string
-		err = rows.Scan(&id, &username, &createdAt, &password, &email)
+		err = rows.Scan(&id, &username, &createdAt, &email)
 		if err != nil {
 			return models.UserResponse{}, err
 		}

vote-service/app/http/controllers/controllers.go

@@ -23,18 +23,17 @@ import (
 func CreateHandler(connection *sql.DB, cnf config.Config) negroni.HandlerFunc {
 	return negroni.HandlerFunc(func(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
 
+		// Get the tokenstring from the request
 		var queryToken = r.URL.Query().Get("token")
-
 		if len(queryToken) < 1 {
 			queryToken = r.Header.Get("token")
 		}
-
 		if len(queryToken) < 1 {
-			w.WriteHeader(http.StatusBadRequest)
-			w.Write([]byte(string("token is mandatory")))
+			util.SendErrorMessage(w, "token is mandatory")
 			return
 		}
 
+		// Parse the tokenstring to a Token object through the jwt parser
 		secretKey := cnf.SecretKey
 		tok, err := jwt.Parse(queryToken, func(t *jwt.Token) (interface{}, error) {
 			return []byte(secretKey), nil
@@ -45,19 +44,18 @@ func CreateHandler(connection *sql.DB, cnf config.Config) negroni.HandlerFunc {
 			return
 		}
 
+		// Get the user from the token object
 		claims := tok.Claims.(jwt.MapClaims)
 		var ID = claims["sub"].(float64) // gets the ID
 
-		// 1.parse body
+		// STEP 1 : parse body
 		voteCreateObject := &sharedModels.VoteCreateRequest{}
-		voteCreateObject.UserID = int(ID)
-
 		err = util.RequestToJSON(r, voteCreateObject)
 		if err != nil {
 			util.SendErrorMessage(w, "bad json")
 			return
 		}
-
+		voteCreateObject.UserID = int(ID)
 		if voteCreateObject.Upvote == voteCreateObject.Downvote {
 			util.SendErrorMessage(w, "can not vote for none or both")
 			return
@@ -118,6 +116,7 @@ func GetVotesFromAUser(connection *sql.DB, cnf config.Config) negroni.HandlerFun
 
 		photos := getPhotos(cnf, photoIDs)
 
+		// merge
 		t := make([]*sharedModels.HasVotedRequest, 0)
 		g := make([]*sharedModels.VoteCountRequest, 0)
 		for _, v := range photos {

webserver/webapp/controllers/RegisterController.js

@@ -11,15 +11,20 @@ app.controller('RegisterController', function ($scope, $window, ApiService, Loca
                 $scope.successMessages.push("Registration successful");
                 emptyFields();
 
-                LocalStorage.setToken(data.token);
+
 
                 if (data.user) {
                     //console.info(data.user);
-                    LocalStorage.setUser(data.user);
-                }
-
+                    var user = data.user;
+                    if (user.id && user.email && user.username) {
+                        LocalStorage.setToken(data.token);
+                        LocalStorage.setUser(data.user);
 
-                $window.location.href = '#/';
+                        $window.location.href = '#/';
+                        return;
+                    }
+                }
+                $scope.errorMessages.push("Something went wrong. Please try again.");
 
             }, function (response) {
                 console.log(response);