revert changes to comments before functions

This commit is contained in:
Matthew R Kasun
2021-10-16 08:01:38 -04:00
parent 1c1637b75e
commit f7d8281d65

View File

@@ -79,6 +79,7 @@ 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 == "" {
@@ -86,7 +87,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 untill approved). //Search DB for node with Mac Address. Ignore pending nodes (they should not be able to authenticate with API until 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")
@@ -150,6 +151,7 @@ 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)
@@ -179,6 +181,7 @@ 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)
@@ -218,6 +221,7 @@ 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
@@ -231,6 +235,7 @@ 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
@@ -244,6 +249,7 @@ 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
@@ -300,6 +306,7 @@ 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 {
@@ -381,6 +388,7 @@ 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 {
@@ -481,6 +489,7 @@ 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 {
@@ -516,6 +525,7 @@ 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()