Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-09-28 21:37:31 +02:00
Code Issues Projects Releases Wiki Activity

update /api/users to parse json data

Browse Source
This commit is contained in:
wy65701436 2016-04-05 02:30:23 -07:00
parent fca2838b33
commit be0d71d61d
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
api/user.go
View File

@ -19,7 +19,7 @@ import (
"fmt"
"net/http"
"strconv"
"strings"
// "strings"
"github.com/vmware/harbor/dao"
"github.com/vmware/harbor/models"
@ -33,6 +33,14 @@ type UserAPI struct {
userID int
}
type userReq struct {
UserName string `json:"username"`
Password string `json:"password"`
Realname string `json:"realname"`
Email string `json:"email"`
Comment string `json:"comment"`
}
const userNameMaxLen int = 20
const passwordMaxLen int = 20
const realNameMaxLen int = 20
@ -130,20 +138,17 @@ func (ua *UserAPI) Put() { //currently only for toggle admin, so no request body
// Post ...
func (ua *UserAPI) Post() {
username := strings.TrimSpace(ua.GetString("username"))
password := strings.TrimSpace(ua.GetString("password"))
email := strings.TrimSpace(ua.GetString("email"))
realname := strings.TrimSpace(ua.GetString("realname"))
comment := strings.TrimSpace(ua.GetString("comment"))
var req userReq
ua.DecodeJSONReq(&req)
err := validateUserReq(ua)
err := validateUserReq(req)
if err != nil {
log.Errorf("Invalid user request, error: %v", err)
ua.RenderError(http.StatusBadRequest, "Invalid request for creating user")
return
}
user := models.User{Username: username, Email: email, Realname: realname, Password: password, Comment: comment}
user := models.User{Username: req.UserName, Email: req.Email, Realname: req.Realname, Password: req.Password, Comment: req.Comment}
exist, err := dao.UserExists(user, "email")
if err != nil {
log.Errorf("Error occurred in UserExists:", err)
@ -186,8 +191,8 @@ func (ua *UserAPI) Delete() {
}
}
func validateUserReq(ua *UserAPI) error {
userName := ua.GetString("username")
func validateUserReq(req userReq) error {
userName := req.UserName
if len(userName) == 0 {
return fmt.Errorf("User name can not be empty")
}
@ -195,7 +200,7 @@ func validateUserReq(ua *UserAPI) error {
return fmt.Errorf("User name is too long")
}
password := ua.GetString("password")
password := req.Password
if len(password) == 0 {
return fmt.Errorf("Password can not be empty")
}
@ -203,7 +208,7 @@ func validateUserReq(ua *UserAPI) error {
return fmt.Errorf("Password can is too long")
}
realName := ua.GetString("realname")
realName := req.Realname
if len(realName) == 0 {
return fmt.Errorf("Real name can not be empty")
}
@ -211,16 +216,10 @@ func validateUserReq(ua *UserAPI) error {
return fmt.Errorf("Real name is too long")
}
email := ua.GetString("email")
email := req.Email
if len(email) == 0 {
return fmt.Errorf("Email can not be empty")
}
comments := ua.GetString("comment")
if len(comments) != 0 {
if len(comments) >= commentsMaxLen {
return fmt.Errorf("Comments is too long")
}
}
return nil
}

5
static/resources/js/register.js
View File

@ -38,8 +38,9 @@ jQuery(function(){
var comment = $.trim($("#Comment").val());
$.ajax({
url : "/api/users",
data:{username: username, password: password, realname: realname, comment: comment, email: email},
data: JSON.stringify({username: username, password: password, realname: realname, comment: comment, email: email}),
type: "POST",
contentType: "application/json; charset=UTF-8",
beforeSend: function(e){
$("#btnPageSignUp").prop("disabled", true);
},
@ -55,7 +56,7 @@ jQuery(function(){
});
}
},
error:function(jqxhr, status, error){
error:function(xhr, status, error){
$("#dlgModal")
.dialogModal({
"title": i18n.getMessage("title_sign_up"),