sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow creating user without uidnumber and gidnumber

Browse Source
This commit is contained in:
Dipak Acharya
2020-08-10 14:51:14 +05:45
parent def5934702
commit 1cb7d26ece
2 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/service/v0/data/user.go
+2 -2
View File
@@ -14,8 +14,8 @@ type User struct {
DisplayName string `json:"displayname" xml:"displayname"`
Email string `json:"email" xml:"email"`
Quota *Quota `json:"quota" xml:"quota"`
UIDNumber int64 `json:"uidNumber" xml:"uidNumber"`
GIDNumber int64 `json:"gidNumber" xml:"gidNumber"`
UIDNumber int64 `json:"uidnumber" xml:"uidnumber"`
GIDNumber int64 `json:"gidnumber" xml:"gidnumber"`
}
// Quota holds quota information
pkg/service/v0/users.go
+42 -25
View File
@@ -84,20 +84,27 @@ func (o Ocs) AddUser(w http.ResponseWriter, r *http.Request) {
username := r.PostFormValue("username")
displayname := r.PostFormValue("displayname")
email := r.PostFormValue("email")
uid := r.PostFormValue("uidNumber")
gid := r.PostFormValue("gidNumber")
uid := r.PostFormValue("uidnumber")
gid := r.PostFormValue("gidnumber")
uidNumber, err := strconv.ParseInt(uid, 10, 64)
if err != nil {
render.Render(w, r, response.ErrRender(data.MetaBadRequest.StatusCode, "Cannot use the uidNumber provided"))
o.logger.Error().Err(err).Str("userid", userid).Msg("Cannot use the uidNumber provided")
return
var uidNumber, gidNumber int64
var err error
if uid != "" {
uidNumber, err = strconv.ParseInt(uid, 10, 64)
if err != nil {
render.Render(w, r, response.ErrRender(data.MetaBadRequest.StatusCode, "Cannot use the uidnumber provided"))
o.logger.Error().Err(err).Str("userid", userid).Msg("Cannot use the uidnumber provided")
return
}
}
gidNumber, err := strconv.ParseInt(gid, 10, 64)
if err != nil {
render.Render(w, r, response.ErrRender(data.MetaBadRequest.StatusCode, "Cannot use the gidNumber provided"))
o.logger.Error().Err(err).Str("userid", userid).Msg("Cannot use the gidNumber provided")
return
if gid != "" {
gidNumber, err = strconv.ParseInt(gid, 10, 64)
if err != nil {
render.Render(w, r, response.ErrRender(data.MetaBadRequest.StatusCode, "Cannot use the gidnumber provided"))
o.logger.Error().Err(err).Str("userid", userid).Msg("Cannot use the gidnumber provided")
return
}
}
// fallbacks
@@ -112,20 +119,28 @@ func (o Ocs) AddUser(w http.ResponseWriter, r *http.Request) {
}
*/
account, err := o.getAccountService().CreateAccount(r.Context(), &accounts.CreateAccountRequest{
Account: &accounts.Account{
DisplayName: displayname,
PreferredName: username,
OnPremisesSamAccountName: username,
UidNumber: uidNumber,
GidNumber: gidNumber,
PasswordProfile: &accounts.PasswordProfile{
Password: password,
},
Id: userid,
Mail: email,
AccountEnabled: true,
newAccount := &accounts.Account{
DisplayName: displayname,
PreferredName: username,
OnPremisesSamAccountName: username,
PasswordProfile: &accounts.PasswordProfile{
Password: password,
},
Id: userid,
Mail: email,
AccountEnabled: true,
}
if uidNumber != 0 {
newAccount.UidNumber = uidNumber
}
if gidNumber != 0 {
newAccount.GidNumber = gidNumber
}
account, err := o.getAccountService().CreateAccount(r.Context(), &accounts.CreateAccountRequest{
Account: newAccount,
})
if err != nil {
merr := merrors.FromError(err)
@@ -150,6 +165,8 @@ func (o Ocs) AddUser(w http.ResponseWriter, r *http.Request) {
Username: account.PreferredName,
DisplayName: account.DisplayName,
Email: account.Mail,
UIDNumber: account.UidNumber,
GIDNumber: account.UidNumber,
Enabled: account.AccountEnabled,
}))
}