Do not return internal error when SMS send fails.

[perso/Immae/Projets/Cryptomonnaies/Cryptoportfolio/Front.git] / api / user.go

diff --git a/api/user.go b/api/user.go
index 28486961da0b7757e16533f96bac7c183ce5c6ab..9fca34c98dd585cc19f6a62adc20996b5bf07a46 100644 (file)
--- a/api/user.go
+++ b/api/user.go
@@ -9,13 +9,47 @@ import (
        "github.com/dchest/passwordreset"
        "github.com/gin-gonic/gin"
 
-       "immae.eu/Immae/Projets/Cryptomonnaies/Cryptoportfolio/Front/db"
+       "git.immae.eu/Cryptoportfolio/Front.git/db"
 )
 
 const (
        VALID_EMAIL_REGEX = `(?i)^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$`
 )
 
+func UserConfirmed(c *gin.Context) *Error {
+       user, exists := c.Get("user")
+
+       if !exists {
+               return &Error{NotAuthorized, "not authorized", fmt.Errorf("no user key in context")}
+       }
+
+       if user.(db.User).Status != db.Confirmed {
+               return &Error{UserNotConfirmed, "user awaiting admin validation", fmt.Errorf("user '%v' not confirmed", user)}
+       }
+
+       return nil
+}
+
+func UserIsAdmin(c *gin.Context) *Error {
+       user, exists := c.Get("user")
+
+       if !exists {
+               return &Error{NotAuthorized, "not authorized", fmt.Errorf("no user key in context")}
+       }
+
+       if user.(db.User).Role != db.RoleAdmin {
+               return &Error{NotAuthorized, "not authorized", fmt.Errorf("user '%v' is not admin", user)}
+       }
+
+       return nil
+}
+
+func GetUser(c *gin.Context) db.User {
+       user, _ := c.Get("user")
+
+       return user.(db.User)
+}
+
 func IsValidEmailAddress(email string) bool {
        r := regexp.MustCompile(VALID_EMAIL_REGEX)
 
@@ -28,7 +62,8 @@ type SignParams struct {
 }
 
 type SignResult struct {
-       Token string `json:"token"`
+       Token   string `json:"token"`
+       IsAdmin bool   `json:"isAdmin"`
 }
 
 func (s SignParams) Validate() *Error {
@@ -80,7 +115,7 @@ func (q SignupQuery) Run() (interface{}, *Error) {
        if CONFIG.FreeSMSUser != "" {
                err := SendSMS(CONFIG.FreeSMSUser, CONFIG.FreeSMSPass, fmt.Sprintf("New user signup '%v'", q.In.Email))
                if err != nil {
-                       return nil, NewInternalError(err)
+                       log.Error(err)
                }
        }
 
@@ -101,14 +136,7 @@ func (q SignupQuery) Run() (interface{}, *Error) {
                }
        }
 
-       if CONFIG.FreeSMSUser != "" {
-               err := SendSMS(CONFIG.FreeSMSUser, CONFIG.FreeSMSPass, fmt.Sprintf("'%v' request a password reset. Token '/change-password?token=%v'", q.In.Email, token))
-               if err != nil {
-                       return nil, NewInternalError(err)
-               }
-       }
-
-       return SignResult{token}, nil
+       return SignResult{token, newUser.Role == db.RoleAdmin}, nil
 }
 
 type SigninQuery struct {
@@ -139,27 +167,7 @@ func (q SigninQuery) Run() (interface{}, *Error) {
                return nil, NewInternalError(err)
        }
 
-       return SignResult{token}, nil
-}
-
-func UserConfirmed(c *gin.Context) *Error {
-       user, exists := c.Get("user")
-
-       if !exists {
-               return &Error{NotAuthorized, "not authorized", fmt.Errorf("no user key in context")}
-       }
-
-       if user.(db.User).Status != db.Confirmed {
-               return &Error{UserNotConfirmed, "user awaiting admin validation", fmt.Errorf("user '%v' not confirmed", user)}
-       }
-
-       return nil
-}
-
-func GetUser(c *gin.Context) db.User {
-       user, _ := c.Get("user")
-
-       return user.(db.User)
+       return SignResult{token, user.Role == db.RoleAdmin}, nil
 }
 
 type ConfirmEmailQuery struct {
@@ -214,3 +222,22 @@ func (q ConfirmEmailQuery) Run() (interface{}, *Error) {
 
        return nil, nil
 }
+
+type UserAccountQuery struct {
+       In struct {
+               User db.User
+       }
+       Out struct {
+               Email string `json:"email"`
+       }
+}
+
+func (q UserAccountQuery) ValidateParams() *Error {
+       return nil
+}
+
+func (q UserAccountQuery) Run() (interface{}, *Error) {
+       q.Out.Email = q.In.User.Email
+
+       return q.Out, nil
+}