zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-11 03:32:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

removed debugging println

Browse Source
This commit is contained in:
Matthew R Kasun
2021-10-14 11:27:04 -04:00
parent 4356aea65a
commit 2bf2e65736
1 changed files with 29 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
controllers/userHttpController.go
View File

@@ -79,7 +79,6 @@ func authenticateUser(response http.ResponseWriter, request *http.Request) {
response.Write(successJSONResponse) response.Write(successJSONResponse)
} }
// VerifyAuthRequest - verifies an auth request
func VerifyAuthRequest(authRequest models.UserAuthParams) (string, error) { func VerifyAuthRequest(authRequest models.UserAuthParams) (string, error) {
var result models.User var result models.User
if authRequest.UserName == "" { if authRequest.UserName == "" {
@@ -87,7 +86,7 @@ func VerifyAuthRequest(authRequest models.UserAuthParams) (string, error) {
} else if authRequest.Password == "" { } else if authRequest.Password == "" {
return "", errors.New("password can't be empty") return "", errors.New("password can't be empty")
} }
//Search DB for node with Mac Address. Ignore pending nodes (they should not be able to authenticate with API until approved). //Search DB for node with Mac Address. Ignore pending nodes (they should not be able to authenticate with API untill approved).
record, err := database.FetchRecord(database.USERS_TABLE_NAME, authRequest.UserName) record, err := database.FetchRecord(database.USERS_TABLE_NAME, authRequest.UserName)
if err != nil { if err != nil {
return "", errors.New("incorrect credentials") return "", errors.New("incorrect credentials")
@@ -151,7 +150,6 @@ func authorizeUserAdm(next http.Handler) http.HandlerFunc {
} }
} }
// ValidateUserToken - self explained
func ValidateUserToken(token string, user string, adminonly bool) error { func ValidateUserToken(token string, user string, adminonly bool) error {
var tokenSplit = strings.Split(token, " ") var tokenSplit = strings.Split(token, " ")
//I put this in in case the user doesn't put in a token at all (in which case it's empty) //I put this in in case the user doesn't put in a token at all (in which case it's empty)
@@ -181,7 +179,6 @@ func ValidateUserToken(token string, user string, adminonly bool) error {
return nil return nil
} }
// HasAdmin - checks if server has an admin
func HasAdmin() (bool, error) { func HasAdmin() (bool, error) {
collection, err := database.FetchRecords(database.USERS_TABLE_NAME) collection, err := database.FetchRecords(database.USERS_TABLE_NAME)
@@ -221,7 +218,6 @@ func hasAdmin(w http.ResponseWriter, r *http.Request) {
} }
// GetUser - gets a user
func GetUser(username string) (models.ReturnUser, error) { func GetUser(username string) (models.ReturnUser, error) {
var user models.ReturnUser var user models.ReturnUser
@@ -235,7 +231,6 @@ func GetUser(username string) (models.ReturnUser, error) {
return user, err return user, err
} }
// GetUserInternal - gets an internal user
func GetUserInternal(username string) (models.User, error) { func GetUserInternal(username string) (models.User, error) {
var user models.User var user models.User
@@ -249,7 +244,6 @@ func GetUserInternal(username string) (models.User, error) {
return user, err return user, err
} }
// GetUsers - gets users
func GetUsers() ([]models.ReturnUser, error) { func GetUsers() ([]models.ReturnUser, error) {
var users []models.ReturnUser var users []models.ReturnUser
@@ -306,7 +300,6 @@ func getUsers(w http.ResponseWriter, r *http.Request) {
json.NewEncoder(w).Encode(users) json.NewEncoder(w).Encode(users)
} }
// CreateUser - creates a user
func CreateUser(user models.User) (models.User, error) { func CreateUser(user models.User) (models.User, error) {
//check if user exists //check if user exists
if _, err := GetUser(user.UserName); err == nil { if _, err := GetUser(user.UserName); err == nil {
@@ -358,7 +351,6 @@ func createAdmin(w http.ResponseWriter, r *http.Request) {
return return
} }
admin.IsAdmin = true admin.IsAdmin = true
fmt.Println(admin)
admin, err = CreateUser(admin) admin, err = CreateUser(admin)
if err != nil { if err != nil {
@@ -386,7 +378,6 @@ func createUser(w http.ResponseWriter, r *http.Request) {
json.NewEncoder(w).Encode(user) json.NewEncoder(w).Encode(user)
} }
// UpdateUser - updates a given user
func UpdateUser(userchange models.User, user models.User) (models.User, error) { func UpdateUser(userchange models.User, user models.User) (models.User, error) {
//check if user exists //check if user exists
if _, err := GetUser(user.UserName); err != nil { if _, err := GetUser(user.UserName); err != nil {
@@ -487,7 +478,6 @@ func updateUserAdm(w http.ResponseWriter, r *http.Request) {
json.NewEncoder(w).Encode(user) json.NewEncoder(w).Encode(user)
} }
// DeleteUser - deletes a given user
func DeleteUser(user string) (bool, error) { func DeleteUser(user string) (bool, error) {
if userRecord, err := database.FetchRecord(database.USERS_TABLE_NAME, user); err != nil || len(userRecord) == 0 { if userRecord, err := database.FetchRecord(database.USERS_TABLE_NAME, user); err != nil || len(userRecord) == 0 {
@@ -523,7 +513,6 @@ func deleteUser(w http.ResponseWriter, r *http.Request) {
json.NewEncoder(w).Encode(params["username"] + " deleted.") json.NewEncoder(w).Encode(params["username"] + " deleted.")
} }
// ValidateUser - validates a user model
func ValidateUser(operation string, user models.User) error { func ValidateUser(operation string, user models.User) error {
v := validator.New() v := validator.New()