fix(GIST-32): token creation replacement (#11)

Author: Courtcircuits

organizations/model.go

@@ -85,7 +85,7 @@ func (o *OrganizationSQL) GetByMember(user_id string) ([]Organization, error) {
 }
 
 func (o *OrganizationSQL) GetByID(user_id string, org_id string) (*Organization, error) {
-	query := "SELECT o.org_id, o.name, gists.gist_id FROM organization o JOIN gists ON o.org_id = gists.org_id WHERE o.org_id=$1 AND owner=$2"
+	query := "SELECT o.org_id, o.name, gists.gist_id FROM organization o JOIN gists ON o.org_id = gists.org_id WHERE o.org_id=$1 AND gists.owner=$2"
 	log.Info("user is ", user_id)
 
 	rows, err := storage.Database.Query(query, org_id, user_id)

user/auth_service.go

@@ -49,7 +49,27 @@ func (a *AuthServiceImpl) LocalAuth(email string) (TokenSQL, error) {
 	_, err := token_model.Save()
 
 	if err != nil {
-		return token_model, err
+		log.Info(err.Error())
+		if strings.Contains(err.Error(), "token_keyword_key") {
+			token, err := token_model.GetByType(LocalAuth)
+			log.Info(token)
+
+			if err != nil {
+				return token_model, err
+			}
+
+			err = token.Delete()
+
+			if err != nil {
+				return token_model, err
+			}
+
+			_, err = token_model.Save()
+
+			if err != nil {
+				return token_model, err
+			}
+		}
 	}
 
 	err = utils.SendEmail("Gistapp: Local Auth", "Your token is: "+token_val, email)

user/token_model.go

@@ -31,8 +31,7 @@ type Token struct {
 func (t *TokenSQL) Save() (*Token, error) {
 	row, err := storage.Database.Query("INSERT INTO token(type, value, keyword) VALUES ($1, $2, $3) RETURNING token_id, type, value, keyword", t.Type.String, t.Value.String, t.Keyword.String)
 	if err != nil {
-		log.Error(err)
-		return nil, errors.New("couldn't create token")
+		return nil, err
 	}
 	var token Token
 	row.Next()
@@ -60,6 +59,22 @@ func (t *TokenSQL) Get() (*Token, error) {
 	return &token, nil
 }
 
+func (t *TokenSQL) GetByType(_type TokenType) (*Token, error) {
+	row, err := storage.Database.Query("SELECT token_id, type, value, keyword FROM token WHERE type = $1", string(_type))
+	if err != nil {
+		log.Error(err)
+		return nil, errors.New("couldn't find token")
+	}
+	var token Token
+	row.Next()
+	err = row.Scan(&token.ID, &token.Type, &token.Value, &token.Keyword)
+	if err != nil {
+		log.Error(err)
+		return nil, errors.New("couldn't find token")
+	}
+	return &token, nil
+}
+
 func (t *Token) Delete() error {
 	_, err := storage.Database.Query("DELETE FROM token WHERE value = $1 and keyword = $2 and type = $3", t.Value, t.Keyword, t.Type)
 	if err != nil {