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

implemented view users permission

Browse source
This commit is contained in:
Harvey Kandola 2017-10-04 12:27:56 -04:00
parent f5f30d2322
commit 30321781c2
13 changed files with 423 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

2
domain/auth/endpoint.go
View file

@ -110,7 +110,7 @@ func (h *Handler) Login(w http.ResponseWriter, r *http.Request) {
return
}
h.Runtime.Log.Info("login " + email + " @ " + dom)
h.Runtime.Log.Info("logged in " + email + " @ " + dom)
authModel := auth.AuthenticationModel{}
authModel.Token = GenerateJWT(h.Runtime, u.RefID, org.RefID, dom)

14
gui/app/pods/customize/folders/template.hbs
View file

@ -1,6 +1,7 @@
{{#if folders}}
<div class="page-customize">
<div class="space-admin">
<div class="global-folder-settings">
{{#if folders}}
<div class="form-header">
<div class="title">{{folders.length}} shared {{label}}</div>
<div class="tip">View and change shared space ownership</div>
@ -18,7 +19,6 @@
<div class="clearfix" />
{{/each}}
</div>
</div>
<div class="dropdown-dialog delete-space-dialog">
<div class="content">
@ -39,13 +39,13 @@
<div class="clearfix"></div>
</div>
{{else}}
{{else}}
<div class="global-folder-settings">
<div class="form-header">
<div class="title">{{folders.length}} shared {{label}}</div>
<div class="tip">There are no spaces to maintain</div>
</div>
</div>
{{/if}}
{{/if}}
</div>
</div>

2
gui/app/pods/customize/users/template.hbs
View file

@ -1,5 +1,3 @@
{{customize/user-settings add=(action 'add')}}
<div class="clearfix" />
{{customize/user-admin users=model onDelete=(action "onDelete") onSave=(action "onSave") onPassword=(action "onPassword")}}

2
gui/app/pods/folder/settings/route.js
View file

@ -15,7 +15,7 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout
export default Ember.Route.extend(AuthenticatedRouteMixin, {
beforeModel: function (transition) {
if (is.equal(transition.targetName, 'folder.settings.index')) {
this.transitionTo('folder.settings.invitation');
this.transitionTo('folder.settings.security');
}
},

2
gui/app/services/ajax.js
View file

@ -42,7 +42,7 @@ export default AjaxService.extend({
if (is.not.empty(userUpdate)) {
let latest = JSON.parse(userUpdate);
if (!latest.active || user.editor !== latest.editor || user.admin !== latest.admin) {
if (!latest.active || user.editor !== latest.editor || user.admin !== latest.admin || user.viewUsers !== latest.viewUsers) {
window.location.href = 'auth/login';
}
}

7
gui/app/services/session.js
View file

@ -26,12 +26,15 @@ export default SimpleAuthSession.extend({
currentFolder: null,
isMac: false,
isMobile: false,
hasAccounts: computed('isAuthenticated', 'session.content.authenticated.user', function() {
return this.get('session.authenticator') !== 'authenticator:anonymous' && this.get('session.content.authenticated.user.accounts').length > 0;
}),
accounts: computed('hasAccounts', function() {
return this.get('session.content.authenticated.user.accounts');
}),
user: computed('isAuthenticated', 'session.content.authenticated.user', function () {
if (this.get('isAuthenticated')) {
let user = this.get('session.content.authenticated.user') || { id: '0' };
@ -39,19 +42,23 @@ export default SimpleAuthSession.extend({
return this.get('store').push(data);
}
}),
authenticated: computed('session.content.authenticated.user', function () {
return this.get('session.authenticator') !== 'authenticator:anonymous' && this.get('session.content.authenticated.user.id') !== '0';
}),
isAdmin: computed('session.content.authenticated.user', function () {
return this.get('session.authenticator') !== 'authenticator:anonymous' &&
this.get('session.content.authenticated.user.id') !== '0' &&
this.get('session.content.authenticated.user.admin') === true;
}),
isEditor: computed('session.content.authenticated.user', function () {
return this.get('session.authenticator') !== 'authenticator:anonymous' &&
this.get('session.content.authenticated.user.id') !== '0' &&
this.get('session.content.authenticated.user.editor') === true;
}),
isGlobalAdmin: computed('session.content.authenticated.user', function () {
return this.get('session.authenticator') !== 'authenticator:anonymous' &&
this.get('session.content.authenticated.user.id') !== '0' &&

13
gui/app/styles/view/page-customize.scss
View file

@ -1,7 +1,16 @@
.page-customize {
@include content-container();
.user-admin {
> .auth-admin, > .general-admin, > .license-admin, > .smtp-admin, > .space-admin {
@include content-container();
}
> .add-user {
@include content-container();
margin-bottom: 50px;
}
> .user-admin {
@include content-container();
margin: 30px 0;
> .heading {

8
gui/app/templates/components/customize/auth-settings.hbs
View file

@ -1,4 +1,6 @@
<form class=>
<div class="page-customize">
<div class="auth-admin">
<form>
<div class="form-header">
<div class="title">Authentication</div>
<div class="tip">Determine the method for user authentication</div>
@ -69,4 +71,6 @@
{{/if}}
<div class="regular-button button-blue" {{action 'onSave'}}>save</div>
</form>
</form>
</div>
</div>

8
gui/app/templates/components/customize/general-settings.hbs
View file

@ -1,4 +1,6 @@
<form>
<div class="page-customize">
<div class="general-admin">
<form>
<div class="form-header">
<div class="title">Instance Settings</div>
<div class="tip">Settings applicable to your Documize instance</div>
@ -27,4 +29,6 @@
{{focus-input id="conversionEndpoint" type="text" value=model.general.conversionEndpoint class=(if hasConversionEndpointInputError 'error')}}
</div>
<div class="regular-button button-blue" {{ action 'save' }}>save</div>
</form>
</form>
</div>
</div>

17
gui/app/templates/components/customize/global-settings.hbs
View file

@ -1,4 +1,6 @@
<form>
<div class="page-customize">
<div class="smtp-admin">
<form>
<div class="form-header">
<div class="title">Mail Server Settings</div>
<div class="tip">Used for sending email notifications</div>
@ -29,12 +31,13 @@
{{input id="smtp-password" type="text" value=model.smtp.password class=(if SMTPPasswordEmptyError 'error')}}
</div>
<div class="regular-button button-blue" {{ action 'saveSMTP' }}>save</div>
</form>
</form>
</div>
<div class="margin-top-50">
</div>
<div class="margin-top-50" />
<form class="form-bordered">
<div class="license-admin">
<form class="form-bordered">
<div class="form-header">
<div class="title">Optional Edition License</div>
<div class="tip">Only applies to Enterprise Edition</div>
@ -45,4 +48,6 @@
{{textarea value=model.license rows="15"}}
</div>
<div class="regular-button button-blue" {{ action 'saveLicense' }}>save</div>
</form>
</form>
</div>
</div>

20
gui/app/templates/components/customize/user-admin.hbs
View file

@ -1,4 +1,5 @@
<div class="user-admin">
<div class="page-customize">
<div class="user-admin">
<div class="form-header">
<div class="title">User Management</div>
<div class="tip">Set basic information, passwords and permissions for {{users.length}} users</div>
@ -29,14 +30,14 @@
</tr>
</thead>
<tbody>
{{#each users as |user|}}
{{#each users key="id" as |user|}}
<tr>
<td class="{{unless user.active 'inactive-user'}} {{if user.admin 'admin-user'}}">
<div class="selector pull-left">
{{#if user.selected}}
<i class="material-icons checkbox" {{action 'toggleSelect' user}}>check_box</i>
{{else if user.me}}
{{#if user.me}}
<i class="material-icons color-gray">check_box_outline_blank</i>
{{else if user.selected}}
<i class="material-icons checkbox" {{action 'toggleSelect' user}}>check_box</i>
{{else}}
<i class="material-icons checkbox" {{action 'toggleSelect' user}}>check_box_outline_blank</i>
{{/if}}
@ -95,9 +96,9 @@
{{/each}}
</tbody>
</table>
</div>
</div>
<div class="dropdown-dialog edit-user-dialog">
<div class="dropdown-dialog edit-user-dialog">
<div class="content">
<form>
<div class="row">
@ -151,9 +152,9 @@
</div>
</div>
<div class="clearfix"></div>
</div>
</div>
<div class="dropdown-dialog delete-user-dialog">
<div class="dropdown-dialog delete-user-dialog">
<div class="content">
<p>Are you sure you want to delete user <span class="bold">{{deleteUser.fullname}}?</span></p>
</div>
@ -166,4 +167,5 @@
</div>
</div>
<div class="clearfix"></div>
</div>
</div>

8
gui/app/templates/components/customize/user-settings.hbs
View file

@ -1,8 +1,10 @@
{{#if isAuthProviderDocumize}}
<div class="page-customize">
<div class="add-user">
<form>
<div class="form-header">
<div class="title">Add user</div>
<div class="tip">New users receive an invitation email with a random password</div>
<div class="title">New User</div>
<div class="tip">Newly added users receive an invitation email with a random password</div>
</div>
<div class="input-control">
<label>Firstname</label>
@ -18,4 +20,6 @@
</div>
<div class="regular-button button-blue" {{ action 'add' }}>Add</div>
</form>
</div>
</div>
{{/if}}

2
server/middleware.go
View file

@ -169,11 +169,13 @@ func (m *middleware) Authorize(w http.ResponseWriter, r *http.Request, next http
Active bool `json:"active"`
Admin bool `json:"admin"`
Editor bool `json:"editor"`
ViewUsers bool `json:"viewUsers"`
}
state.Active = u.Active
state.Admin = u.Admin
state.Editor = u.Editor
state.ViewUsers = u.ViewUsers
sb, err := json.Marshal(state)
w.Header().Add("X-Documize-Status", string(sb))