Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

add missed fields on user (#213)

Browse Source 
* add missed fields

* check for nil on optional values first
This commit is contained in:
Victor Vrantchan
2016-09-20 14:54:20 -04:00
committed by GitHub
parent 6ef0c79592
commit 21944bcc29
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/endpoint_sessions.go
+1
View File
@@ -43,6 +43,7 @@ func makeLoginEndpoint(svc kolide.Service) endpoint.Endpoint {
Token: token,
ID: user.ID,
Username: user.Username,
Name: user.Name,
Email: user.Email,
Admin: user.Admin,
Enabled: user.Enabled,
server/endpoint_users.go
+5
View File
@@ -40,6 +40,7 @@ func makeCreateUserEndpoint(svc kolide.Service) endpoint.Endpoint {
return createUserResponse{
ID: user.ID,
Username: user.Username,
Name: user.Name,
Email: user.Email,
Admin: user.Admin,
Enabled: user.Enabled,
@@ -81,6 +82,7 @@ func makeGetUserEndpoint(svc kolide.Service) endpoint.Endpoint {
return getUserResponse{
ID: user.ID,
Username: user.Username,
Name: user.Name,
Email: user.Email,
Admin: user.Admin,
Enabled: user.Enabled,
@@ -99,6 +101,7 @@ func makeGetSessionUserEndpoint(svc kolide.Service) endpoint.Endpoint {
return getUserResponse{
ID: user.ID,
Username: user.Username,
Name: user.Name,
Email: user.Email,
Admin: user.Admin,
Enabled: user.Enabled,
@@ -131,6 +134,7 @@ func makeListUsersEndpoint(svc kolide.Service) endpoint.Endpoint {
resp.Users = append(resp.Users, getUserResponse{
ID: user.ID,
Username: user.Username,
Name: user.Name,
Email: user.Email,
Admin: user.Admin,
Enabled: user.Enabled,
@@ -199,6 +203,7 @@ func makeModifyUserEndpoint(svc kolide.Service) endpoint.Endpoint {
return modifyUserResponse{
ID: user.ID,
Username: user.Username,
Name: user.Name,
Email: user.Email,
Admin: user.Admin,
Enabled: user.Enabled,
server/service_users.go
+12 -2
View File
@@ -208,7 +208,7 @@ func userFromPayload(p kolide.UserPayload, keySize, cost int) (*kolide.User, err
return nil, err
}
return &kolide.User{
user := &kolide.User{
Username: *p.Username,
Email: *p.Email,
Admin: falseIfNil(p.Admin),
@@ -216,7 +216,17 @@ func userFromPayload(p kolide.UserPayload, keySize, cost int) (*kolide.User, err
Salt: salt,
Enabled: true,
Password: hashed,
}, nil
}
// add optional fields
if p.Name != nil {
user.Name = *p.Name
}
if p.Position != nil {
user.Position = *p.Position
}
return user, nil
}
func hashPassword(plaintext string, keySize, cost int) ([]byte, string, error) {