Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-23 23:29:42 +02:00
Code Releases Activity

Implement User API support

Browse source 
Direct User API usage impacted UI usage of API.

Moved setting of new user permissions up the call chain.
This commit is contained in:
McMatts 2018-04-25 12:19:14 +01:00
parent e47c5e61fc
commit 08557c369c
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
domain/user/endpoint.go
View file

@ -45,7 +45,7 @@ type Handler struct {
Store *domain.Store Store *domain.Store
} }
// Add is the endpoint that enables an administrator to add a new user for their orgaisation. // Add is the endpoint that enables an administrator to add a new user for their organization.
func (h *Handler) Add(w http.ResponseWriter, r *http.Request) { func (h *Handler) Add(w http.ResponseWriter, r *http.Request) {
method := "user.Add" method := "user.Add"
ctx := domain.GetRequestContext(r) ctx := domain.GetRequestContext(r)
@ -159,10 +159,11 @@ func (h *Handler) Add(w http.ResponseWriter, r *http.Request) {
a.RefID = uniqueid.Generate() a.RefID = uniqueid.Generate()
a.UserID = userID a.UserID = userID
a.OrgID = ctx.OrgID a.OrgID = ctx.OrgID
a.Editor = true a.Editor = userModel.Editor
a.Admin = false a.Admin = false
a.Active = true a.Active = true
a.Analytics = false a.Analytics = userModel.Analytics
a.Users = userModel.ViewUsers
err = h.Store.Account.Add(ctx, a) err = h.Store.Account.Add(ctx, a)
if err != nil { if err != nil {
@ -191,6 +192,15 @@ func (h *Handler) Add(w http.ResponseWriter, r *http.Request) {
return return
} }
// Get back newly created user.
newUser, err := h.Store.User.Get(ctx, userID)
if err != nil {
response.WriteServerError(w, method, err)
h.Runtime.Log.Error(method, err)
return
}
AttachUserAccounts(ctx, *h.Store, ctx.OrgID, &newUser)
// Invite new user // Invite new user
inviter, err := h.Store.User.Get(ctx, ctx.UserID) inviter, err := h.Store.User.Get(ctx, ctx.UserID)
if err != nil { if err != nil {
@ -218,10 +228,10 @@ func (h *Handler) Add(w http.ResponseWriter, r *http.Request) {
h.Runtime.Log.Info(fmt.Sprintf("%s is giving access to an existing user %s", inviter.Email, userModel.Email)) h.Runtime.Log.Info(fmt.Sprintf("%s is giving access to an existing user %s", inviter.Email, userModel.Email))
} }
response.WriteJSON(w, userModel) response.WriteJSON(w, newUser)
} }
// GetOrganizationUsers is the endpoint that allows administrators to view the users in their organisation. // GetOrganizationUsers is the endpoint that allows administrators to view the users in their organization.
func (h *Handler) GetOrganizationUsers(w http.ResponseWriter, r *http.Request) { func (h *Handler) GetOrganizationUsers(w http.ResponseWriter, r *http.Request) {
method := "user.GetOrganizationUsers" method := "user.GetOrganizationUsers"
ctx := domain.GetRequestContext(r) ctx := domain.GetRequestContext(r)

4
gui/app/components/customize/user-admin.js
View file

@ -20,9 +20,9 @@ export default Component.extend(AuthProvider, ModalMixin, {
init() { init() {
this._super(...arguments); this._super(...arguments);
this.set('newUser', { firstname: '', lastname: '', email: '', active: true }); this.set('newUser', { firstname: '', lastname: '', email: '', editor: true, viewUsers: true, active: true });
}, },
actions: { actions: {
onOpenUserModal() { onOpenUserModal() {
this.modalOpen("#add-user-modal", {"show": true}, '#newUserFirstname'); this.modalOpen("#add-user-modal", {"show": true}, '#newUserFirstname');