DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

Add list of roles to internal auth rsp

Browse Source
This commit is contained in:
Denis Arh 2020-03-05 11:16:09 +01:00
parent 0c9c67e34c
commit 76c15ca84f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
system/rest/auth_internal.go
View File

@ -17,8 +17,8 @@ var _ = errors.Wrap
type (
authInternalValidUserResponse struct {
JWT string `json:"jwt"`
User *outgoing.User `json:"user"`
JWT string `json:"jwt"`
User *authUserPayload `json:"user"`
}
authPasswordResetTokenExchangeResponse struct {
@ -66,7 +66,7 @@ func (ctrl *AuthInternal) Signup(ctx context.Context, r *request.AuthInternalSig
if !u.EmailConfirmed {
// When email is not confirmed, do not send back JWT
return authInternalValidUserResponse{User: payload.User(u)}, nil
return authInternalValidUserResponse{User: &authUserPayload{User: payload.User(u)}}, nil
}
if err = svc.LoadRoleMemberships(u); err != nil {
@ -140,7 +140,10 @@ func (ctrl AuthInternal) authInternalValidUserResponse(svc interface{ LoadRoleMe
}
return &authInternalValidUserResponse{
JWT: ctrl.tokenEncoder.Encode(u),
User: payload.User(u),
JWT: ctrl.tokenEncoder.Encode(u),
User: &authUserPayload{
User: payload.User(u),
Roles: payload.Uint64stoa(u.Roles()),
},
}, nil
}