From b0dd807388f547e27c3a073cccc26bfc27afb2fa Mon Sep 17 00:00:00 2001 From: andy lash Date: Sun, 27 Apr 2014 14:06:10 -0700 Subject: [PATCH 01/16] added impersonation and security checks --- client/accounts_admin.html | 6 ++++- client/accounts_admin.js | 16 ++++++++----- client/impersonate_account_modal.html | 24 +++++++++++++++++++ client/impersonate_account_modal.js | 30 ++++++++++++++++++++++++ libs/user_query.js | 2 +- package.js | 4 +++- server/methods.js | 33 ++++++++++++++++++++++++--- server/publish.js | 3 ++- server/startup.js | 2 +- 9 files changed, 106 insertions(+), 14 deletions(-) create mode 100644 client/impersonate_account_modal.html create mode 100644 client/impersonate_account_modal.js diff --git a/client/accounts_admin.html b/client/accounts_admin.html index 3366e03..fd4e58a 100644 --- a/client/accounts_admin.html +++ b/client/accounts_admin.html @@ -1,4 +1,5 @@ \ No newline at end of file + {{> impersonateAccountModal}} + + diff --git a/client/accounts_admin.js b/client/accounts_admin.js index 785f781..a510724 100644 --- a/client/accounts_admin.js +++ b/client/accounts_admin.js @@ -39,20 +39,24 @@ var setUserFilter = _.throttle(function(template) { Template.accountsAdmin.events({ 'keyup .search-input-filter': function(event, template) { - setUserFilter(template); - return false; + setUserFilter(template); + return false; }, 'click .glyphicon-trash': function(event, template) { - Session.set('userInScope', this); + Session.set('userInScope', this); }, 'click .glyphicon-info-sign': function(event, template) { - Session.set('userInScope', this); + Session.set('userInScope', this); }, 'click .glyphicon-pencil': function(event, template) { - Session.set('userInScope', this); + Session.set('userInScope', this); + }, + + 'click .glyphicon-eye-open': function(event, template) { + Session.set('userInScope', this); } }); @@ -68,4 +72,4 @@ Template.accountsAdmin.rendered = function() { searchElement[0].focus(); searchElement[0].setSelectionRange(pos, pos); -}; \ No newline at end of file +}; diff --git a/client/impersonate_account_modal.html b/client/impersonate_account_modal.html new file mode 100644 index 0000000..a6e3dd0 --- /dev/null +++ b/client/impersonate_account_modal.html @@ -0,0 +1,24 @@ + + + diff --git a/client/impersonate_account_modal.js b/client/impersonate_account_modal.js new file mode 100644 index 0000000..e6d8b75 --- /dev/null +++ b/client/impersonate_account_modal.js @@ -0,0 +1,30 @@ +Template.impersonateAccountModalInner.helpers({ + userInScope: function () { + return Session.get('userInScope'); + }, +}); + + +Template.impersonateAccountModalInner.events({ + 'click .btn-danger': function (event, template) { + var self = this; + Meteor.call('impersonateUser', self._id, function (error) { + if (error) { + // optionally use a meteor errors package + if (typeof Errors === "undefined") + Log.error('Error: ' + error.reason); + else { + Errors. + throw (error.reason); + } + } + // $("#impersonateaccount").modal("hide"); + // event.stopImmediatePropagation(); + // event.preventDefault(); + Meteor.connection.setUserId(self._id); + $('body').removeClass('modal-open'); + $('.modal-backdrop').remove(); + Router.go("plansList"); + }); + } +}); diff --git a/libs/user_query.js b/libs/user_query.js index a934433..ce97a2c 100644 --- a/libs/user_query.js +++ b/libs/user_query.js @@ -18,4 +18,4 @@ filteredUserQuery = function(userId, filter) { users = Meteor.users.find({}, {sort: {emails: 1}, limit: queryLimit}); } return users; -}; \ No newline at end of file +}; diff --git a/package.js b/package.js index 46c822a..12d20f5 100644 --- a/package.js +++ b/package.js @@ -20,10 +20,12 @@ Package.on_use(function (api, where) { api.add_files('client/update_account_modal.js', 'client'); api.add_files('client/update_roles_modal.html', 'client'); api.add_files('client/update_roles_modal.js', 'client'); + api.add_files('client/impersonate_account_modal.html', 'client'); + api.add_files('client/impersonate_account_modal.js', 'client'); api.add_files('style/style.css', 'client'); api.add_files('server/startup.js', 'server'); api.add_files('server/publish.js', 'server'); api.add_files('server/methods.js', 'server'); -}); \ No newline at end of file +}); diff --git a/server/methods.js b/server/methods.js index 165c4af..c8fab07 100644 --- a/server/methods.js +++ b/server/methods.js @@ -1,17 +1,20 @@ Meteor.methods({ deleteUser: function(userId) { + check(userId, String); var user = Meteor.user(); if (!user || !Roles.userIsInRole(user, ['admin'])) throw new Meteor.Error(401, "You need to be an admin to delete a user."); if (user._id == userId) throw new Meteor.Error(422, 'You can\'t delete yourself.'); - + // remove the user Meteor.users.remove(userId); }, addUserRole: function(userId, role) { + check(userId, String); + check(role, String); var user = Meteor.user(); if (!user || !Roles.userIsInRole(user, ['admin'])) throw new Meteor.Error(401, "You need to be an admin to update a user."); @@ -32,6 +35,8 @@ Meteor.methods({ }, removeUserRole: function(userId, role) { + check(userId, String); + check(role, String); var user = Meteor.user(); if (!user || !Roles.userIsInRole(user, ['admin'])) throw new Meteor.Error(401, "You need to be an admin to update a user."); @@ -51,6 +56,7 @@ Meteor.methods({ }, addRole: function(role) { + check(role, String); var user = Meteor.user(); if (!user || !Roles.userIsInRole(user, ['admin'])) throw new Meteor.Error(401, "You need to be an admin to update a user."); @@ -63,6 +69,7 @@ Meteor.methods({ }, removeRole: function(role) { + check(role, String); var user = Meteor.user(); if (!user || !Roles.userIsInRole(user, ['admin'])) throw new Meteor.Error(401, "You need to be an admin to update a user."); @@ -91,6 +98,10 @@ Meteor.methods({ }, updateUserInfo: function(id, property, value) { + check(id, String); + check(property, String); + //Giving the value a range of possible safe values + check(value, Match.OneOf(String, Number, Boolean, Date, undefined, null)); var user = Meteor.user(); if (!user || !Roles.userIsInRole(user, ['admin'])) throw new Meteor.Error(401, "You need to be an admin to update a user."); @@ -102,5 +113,21 @@ Meteor.methods({ obj[property] = value; Meteor.users.update({_id: id}, {$set: obj}); - } -}); \ No newline at end of file + }, + + //Inspired by: https://dweldon.silvrback.com/impersonating-a-user + impersonateUser: function(targetUserId) { + check(targetUserId, String); + + var user = Meteor.user(); + if (!user || !Roles.userIsInRole(user, ['admin'])) + throw new Meteor.Error(401, "You need to be an admin to impersonate a user."); + + if (! Meteor.users.findOne(targetUserId)) + throw new Meteor.Error(422, "Unable to find targetUserId to impersonate: " + targetUserId); + + this.setUserId(targetUserId); + + }, + +}); diff --git a/server/publish.js b/server/publish.js index 236205d..fb551b5 100644 --- a/server/publish.js +++ b/server/publish.js @@ -3,5 +3,6 @@ Meteor.publish('roles', function (){ }); Meteor.publish('filteredUsers', function(filter) { + check(filter, Match.OneOf(String, RegExp, null)); return filteredUserQuery(this.userId, filter); -}); \ No newline at end of file +}); diff --git a/server/startup.js b/server/startup.js index cdda152..f92c939 100644 --- a/server/startup.js +++ b/server/startup.js @@ -3,4 +3,4 @@ Meteor.startup(function() { if (Meteor.roles.find({name: 'admin'}).count() < 1 ) { Roles.createRole('admin'); } -}); \ No newline at end of file +}); From 273bec7a8975543ddb3633e060acf14b5311d03a Mon Sep 17 00:00:00 2001 From: andy lash Date: Fri, 16 May 2014 12:01:14 -0700 Subject: [PATCH 02/16] added configuration, last login support --- README.md | 72 +++++++++++++++++++++++++++-- client/accounts_admin.html | 13 +++++- client/accounts_admin.js | 10 +++- client/impersonate_account_modal.js | 6 ++- libs/user_query.js | 4 +- package.js | 4 ++ server/methods.js | 7 ++- 7 files changed, 107 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e8fe474..a916eb4 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ A roles based account management system using bootstrap 3 for Meteor. - [History](#history) - [Quick Start](#quick-start) - [Iron Router Integration](#iron-router-integration) +- [Configuration & Optional Features](#configuration) - [Contributing](#contributing) ## TODO @@ -105,7 +106,7 @@ if (Meteor.isClient) {
-
    +
      {{> loginButtons }} @@ -131,9 +132,9 @@ After you edit app.js and app.html you need to create a new user and then set th 1. Go to [http://localhost:3000](http://localhost:3000) and click on the "Sign In / Up" and create your user there. 2. In the browser console grab the user id from the user you just created Meteor.userId() 3. Copy the user id and paste it into to "your_admin_user_id" in app.js created above. -4. Restart meteor +4. Restart meteor -At this point you should see the UI. Signout and add a few more users so you can play with the roles. You can add and +At this point you should see the UI. Signout and add a few more users so you can play with the roles. You can add and remove roles all through the UI. ## Iron Router Integration @@ -167,6 +168,69 @@ Router.map(function() { }); }); ``` +## Configuration & Optional Features + +**Configuration** +You can optionally configure this beyond the defaults by creating a accountsAdminUiConfiguration object anywhere in +the server/client shared part of your source code. + +To change the number of users shown in the main accounts screen: + +```javascript +accountsAdminUiConfiguration = { + maxUsersPerPage: 25, //max users to show in accounts_admin screen +}; +``` + +**Impersonation** +Impersonation allows administrators to become a user without having login credentials for that user. It's very +handy for debugging user problems as ad administrator can experience you application as a user does. Iron Router is +required for it to automatically change to a different route on successful impersonation. To enable it you +need this minimum configuration: + +```javascript +accountsAdminUiConfiguration = { + allowImpersonation: true, //true or the feature isn't enabled + impersonationRoles: ['admin'], //only this role(s) may use this impersonation feature + impersonationSuccessRoute: 'plansList', //once you have successfully impersonated a user, it will Router.go(impersonationSuccessRoute) +}; +``` + +You will also want to put your impersonationSuccessRoute subscriptions in an Deps.autorun so that they change when the user changes. +Something like (though you need to change this for whatever makes sense for your routing configuration): +```javascript +this.route('plansList', { + onBeforeAction: function () { + var self = this; + Deps.autorun(function () { + var user = Meteor.user(); + if (user) { + logger.debug("Subscribe for business and plans to user: " + user._id); + self.subscribe('plans').wait(); + } + }); + }, +}); +``` +NOTE - This is an adminsitrative feature that allows a privileged user access beyond it's normal user. Use with caution. + +Code inspired by: https://dweldon.silvrback.com/impersonating-a-user + + +**Last login support** +This feature requires the user-status (mrt add user-status) package. It shows the last login time for each user along with +a boolean indicating if they are logged in now. Enable with this configuration: + +```javascript +accountsAdminUiConfiguration = { + userStatus: true, //if true and user-status pacakge installed, this will show last login and current login status +}; + + + + + + ## Contributing @@ -174,4 +238,4 @@ If you've got a change you think would benefit the community send me a pull requ **Contributors** - [@djkmiles](https://github.com/djkmiles) -- [@alanning](https://github.com/alanning) \ No newline at end of file +- [@alanning](https://github.com/alanning) diff --git a/client/accounts_admin.html b/client/accounts_admin.html index fd4e58a..60c0bf1 100644 --- a/client/accounts_admin.html +++ b/client/accounts_admin.html @@ -18,6 +18,11 @@ Name Email Roles + {{#if userStatus}} + Last Login + Online? + {{/if}} + @@ -28,7 +33,9 @@ - + {{#if allowImpersonate}} + + {{/if}} {{/unless}} @@ -40,6 +47,10 @@ {{email}} {{roles}} + {{#if userStatus}} + {{status.lastLogin}} + {{status.online}} + {{/if}} {{/each}} diff --git a/client/accounts_admin.js b/client/accounts_admin.js index a510724..e086c38 100644 --- a/client/accounts_admin.js +++ b/client/accounts_admin.js @@ -28,7 +28,15 @@ Template.accountsAdmin.helpers({ myself: function(userId) { return Meteor.userId() === userId; - } + }, + + allowImpersonate: function() { + return (typeof accountsAdminUiConfiguration !== 'undefined' && accountsAdminUiConfiguration.allowImpersonation); + }, + + userStatus: function() { + return (typeof accountsAdminUiConfiguration !== 'undefined' && accountsAdminUiConfiguration.userStatus); + }, }); // search no more than 2 times per second diff --git a/client/impersonate_account_modal.js b/client/impersonate_account_modal.js index e6d8b75..da9c116 100644 --- a/client/impersonate_account_modal.js +++ b/client/impersonate_account_modal.js @@ -24,7 +24,11 @@ Template.impersonateAccountModalInner.events({ Meteor.connection.setUserId(self._id); $('body').removeClass('modal-open'); $('.modal-backdrop').remove(); - Router.go("plansList"); + + if (typeof accountsAdminUiConfiguration !== 'undefined' && + accountsAdminUiConfiguration.impersonationSuccessRoute) { + Router.go(accountsAdminUiConfiguration.impersonationSuccessRoute); + } }); } }); diff --git a/libs/user_query.js b/libs/user_query.js index ce97a2c..1623dff 100644 --- a/libs/user_query.js +++ b/libs/user_query.js @@ -4,7 +4,9 @@ filteredUserQuery = function(userId, filter) { return Meteor.users.find(userId); // TODO: configurable limit and paginiation - var queryLimit = 25; + var queryLimit = 25; + if (typeof accountsAdminUiConfiguration !== 'undefined' && accountsAdminUiConfiguration.maxUsersPerPage) + queryLimit = accountsAdminUiConfiguration.maxUsersPerPage; if(!!filter) { // TODO: passing to regex directly could be dangerous diff --git a/package.js b/package.js index 12d20f5..654dc09 100644 --- a/package.js +++ b/package.js @@ -6,6 +6,8 @@ Package.on_use(function (api, where) { api.use('standard-app-packages', ['client', 'server']); api.use('bootstrap-3', 'client'); api.use('roles', ['client', 'server']); + api.use('iron-router', 'client', { weak: true }); + api.use('user-status', 'client', { weak: true }); api.add_files('libs/user_query.js', ['client', 'server']); @@ -28,4 +30,6 @@ Package.on_use(function (api, where) { api.add_files('server/startup.js', 'server'); api.add_files('server/publish.js', 'server'); api.add_files('server/methods.js', 'server'); + + api.export("accountsAdminUi"); }); diff --git a/server/methods.js b/server/methods.js index c8fab07..7135e71 100644 --- a/server/methods.js +++ b/server/methods.js @@ -126,7 +126,12 @@ Meteor.methods({ if (! Meteor.users.findOne(targetUserId)) throw new Meteor.Error(422, "Unable to find targetUserId to impersonate: " + targetUserId); - this.setUserId(targetUserId); + + if (typeof accountsAdminUiConfiguration !== 'undefined' && + accountsAdminUiConfiguration.allowImpersonation) + this.setUserId(targetUserId); + else + throw new Meteor.Error(422, "Enable accountsAdminUiConfiguration.allowImpersonation key to allow impersonation"); }, From 4253a15ce436995fb16783ffacf408f77fdc7e7e Mon Sep 17 00:00:00 2001 From: andy lash Date: Fri, 16 May 2014 12:02:30 -0700 Subject: [PATCH 03/16] fixed typo in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a916eb4..6aded1c 100644 --- a/README.md +++ b/README.md @@ -225,7 +225,7 @@ a boolean indicating if they are logged in now. Enable with this configuration: accountsAdminUiConfiguration = { userStatus: true, //if true and user-status pacakge installed, this will show last login and current login status }; - +``` From 02fd64b18ff440ae46abb5862a4b5ece011ecbe4 Mon Sep 17 00:00:00 2001 From: Andy Lash Date: Thu, 21 Aug 2014 15:22:55 -0700 Subject: [PATCH 04/16] New lastlogin format from change to user-status package. Optionally hand subscribe to filteredUsers and roles collections --- client/accounts_admin.html | 5 +++-- client/accounts_admin.js | 23 +++++++++++++++++++++++ client/startup.js | 12 ++++++++---- smart.json | 2 +- 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/client/accounts_admin.html b/client/accounts_admin.html index 60c0bf1..239a604 100644 --- a/client/accounts_admin.html +++ b/client/accounts_admin.html @@ -22,7 +22,7 @@ Last Login Online? {{/if}} - + Created @@ -48,9 +48,10 @@ {{email}} {{roles}} {{#if userStatus}} - {{status.lastLogin}} + {{lastLogin}} {{status.online}} {{/if}} + {{createdAt}} {{/each}} diff --git a/client/accounts_admin.js b/client/accounts_admin.js index e086c38..5f1f7ee 100644 --- a/client/accounts_admin.js +++ b/client/accounts_admin.js @@ -37,6 +37,18 @@ Template.accountsAdmin.helpers({ userStatus: function() { return (typeof accountsAdminUiConfiguration !== 'undefined' && accountsAdminUiConfiguration.userStatus); }, + lastLogin: function() { + if (this.status && this.status.lastLogin) { + var date = (typeof this.status.lastLogin === "object" && this.status.lastLogin.date) ? + this.status.lastLogin.date : this.status.lastLogin; + return date.toLocaleString(); + } + return ''; + }, + createdAt: function() { + return (this.createdAt) ? this.createdAt.toDateString() : ''; + }, + }); // search no more than 2 times per second @@ -68,6 +80,11 @@ Template.accountsAdmin.events({ } }); +Template.accountsAdmin.created = function() { + Session.set("sortKey", "email"); +}; + + Template.accountsAdmin.rendered = function() { var searchElement = document.getElementsByClassName('search-input-filter'); if(!searchElement) @@ -81,3 +98,9 @@ Template.accountsAdmin.rendered = function() { searchElement[0].focus(); searchElement[0].setSelectionRange(pos, pos); }; + +Template.accountsAdmin.destroyed = function() { + //clean up the session + Session.set('userInScope', undefined); + Session.set('sortKey', undefined); +} diff --git a/client/startup.js b/client/startup.js index 71e7285..a417ef5 100644 --- a/client/startup.js +++ b/client/startup.js @@ -1,6 +1,10 @@ + + Meteor.startup(function() { - Meteor.subscribe('roles'); - Deps.autorun(function(e) { - Meteor.subscribe('filteredUsers', Session.get('userFilter')); - }); + if (!accountsAdminUiConfiguration || !accountsAdminUiConfiguration.manualSubscriptions) { + Meteor.subscribe('roles'); + Deps.autorun(function() { + Meteor.subscribe('filteredUsers', Session.get('userFilter')); + }); + } }); \ No newline at end of file diff --git a/smart.json b/smart.json index 77e15f4..b33054d 100644 --- a/smart.json +++ b/smart.json @@ -7,6 +7,6 @@ "git": "https://github.com/hharnisc/meteor-accounts-admin-ui-bootstrap-3.git", "packages": { "bootstrap-3": "3.1.1-1", - "roles": "1.2.8" + "roles": "1.2.9" } } From 5915691169078eb1091fe9f2a16bacd7b1337d7b Mon Sep 17 00:00:00 2001 From: Andy Lash Date: Mon, 24 Nov 2014 11:53:11 -0800 Subject: [PATCH 05/16] add server pagination + filter --- client/accounts_admin.html | 123 +++++++------- client/accounts_admin.js | 255 +++++++++++++++++++--------- client/impersonate_account_modal.js | 34 ++-- client/info_account_modal.html | 6 +- client/info_account_modal.js | 36 ++-- client/startup.js | 24 ++- client/update_account_modal.html | 6 +- client/update_roles_modal.html | 4 +- lib/config.js | 12 ++ lib/user_query.js | 49 ++++++ package.js | 53 +++--- server/methods.js | 23 ++- server/publish.js | 27 ++- server/startup.js | 3 + versions.json | 223 ++++++++++++++++++++++++ 15 files changed, 653 insertions(+), 225 deletions(-) create mode 100644 lib/config.js create mode 100644 lib/user_query.js create mode 100644 versions.json diff --git a/client/accounts_admin.html b/client/accounts_admin.html index 239a604..4a26418 100644 --- a/client/accounts_admin.html +++ b/client/accounts_admin.html @@ -1,65 +1,68 @@ + + + + + + diff --git a/client/accounts_admin.js b/client/accounts_admin.js index 5f1f7ee..3ac4663 100644 --- a/client/accounts_admin.js +++ b/client/accounts_admin.js @@ -1,106 +1,205 @@ -Template.accountsAdmin.helpers({ - users: function() { - return filteredUserQuery(Meteor.userId(), Session.get("userFilter")); - }, - - email: function () { - if (this.emails && this.emails.length) - return this.emails[0].address; - - if (this.services) { - //Iterate through services - for (var serviceName in this.services) { - var serviceObject = this.services[serviceName]; - //If an 'id' isset then assume valid service - if (serviceObject.id) { - if (serviceObject.email) { - return serviceObject.email; - } - } - } - } - return ""; - }, - - searchFilter: function() { - return Session.get("userFilter"); - }, - - myself: function(userId) { - return Meteor.userId() === userId; - }, +/* global Roles, AccountsAdmin */ +"use strict"; + +var getRoles = function(value) { + if (_.isArray(value)) { + return value.join(','); + } else if (_.isObject(value)) { + var str = ''; + if (_.isArray(value[Roles.GLOBAL_GROUP])) { + value[Roles.GLOBAL_GROUP].forEach(function(role) { + str += role + ','; + }); + } + _.keys(value).forEach(function(group) { + if (group !== Roles.GLOBAL_GROUP) { + value[group].forEach(function(role) { + str += role + ' (' + group + '),'; + }); + } + }); + return str; + } +}; - allowImpersonate: function() { - return (typeof accountsAdminUiConfiguration !== 'undefined' && accountsAdminUiConfiguration.allowImpersonation); - }, +var getEmail = function(value, user) { + + if (user.emails && user.emails.length) + return user.emails[0].address; + + if (user.services) { + //Iterate through services + user.services.forEach(function(serviceName) { + var serviceObject = user.services[serviceName]; + //If an 'id' isset then assume valid service + if (serviceObject.id) { + if (serviceObject.email) { + return serviceObject.email; + } + } + }); + } + return ""; +}; - userStatus: function() { - return (typeof accountsAdminUiConfiguration !== 'undefined' && accountsAdminUiConfiguration.userStatus); +Template.accountsAdmin.helpers({ + myself: function(userId) { + return Meteor.userId() === userId; }, - lastLogin: function() { - if (this.status && this.status.lastLogin) { - var date = (typeof this.status.lastLogin === "object" && this.status.lastLogin.date) ? - this.status.lastLogin.date : this.status.lastLogin; - return date.toLocaleString(); + fields: function() { + var fields = [{ + key: '', + label: '', + tmpl: Template.accountsAdminControlPanel + }, { + key: 'username', + label: 'username' + }, { + key: 'profile.name', + label: 'Name' + }, { + key: 'profile.businessName', + label: 'Account Name' + }, { + key: 'emails.0.address', + label: 'Email', + fn: function(value, user) { + return getEmail(value, user); + } + }, { + key: 'roles', + label: 'Roles', + fn: function(value) { + return getRoles(value); + } + }, { + key: 'createdAt', + label: 'Created?', + fn: function(value) { + return value && value.toDateString(); + } + }, ]; + if (AccountsAdmin.config.userStatus) { + fields.push({ + key: 'lastLogin', + label: 'Last Login', + fn: function(value) { + return value && value.toLocaleString(); + } + }); + fields.push({ + key: 'status.online', + label: 'Online?' + }); } - return ''; + return fields; }, - createdAt: function() { - return (this.createdAt) ? this.createdAt.toDateString() : ''; + users: function() { + var sortKey = Session.get("accountsAdminSortKey"); + var sort = {}; + sort[sortKey.sort] = sortKey.direction; + return AccountsAdmin.filteredUserQuery(Meteor.userId(), { + filter: Session.get("accountsAdminUserFilter"), + sort: sort + }); }, - + searchFilter: function() { + return Session.get("accountsAdminUserFilter"); + }, + maxUsersPerPage: function() { + return AccountsAdmin.config.maxUsersPerPage; + } }); // search no more than 2 times per second var setUserFilter = _.throttle(function(template) { - var search = template.find(".search-input-filter").value; - Session.set("userFilter", search); + var search = template.find(".search-input-filter").value; + Session.set("accountsAdminUserFilter", search); }, 500); Template.accountsAdmin.events({ - 'keyup .search-input-filter': function(event, template) { - setUserFilter(template); - return false; - }, - - 'click .glyphicon-trash': function(event, template) { - Session.set('userInScope', this); - }, - - 'click .glyphicon-info-sign': function(event, template) { - Session.set('userInScope', this); - }, - - 'click .glyphicon-pencil': function(event, template) { - Session.set('userInScope', this); - }, - - 'click .glyphicon-eye-open': function(event, template) { - Session.set('userInScope', this); - } + 'keyup .search-input-filter': function(event, template) { + setUserFilter(template); + return false; + }, + 'click .clickable': function() { + Session.set('userInScope', this); + }, + 'click .showMore': function(event) { + event.preventDefault(); + var skip = Session.get("accountsAdminSkip") || 0; + skip += (AccountsAdmin.config.maxUsersPerPage * +event.target.dataset.direction); + Session.set("accountsAdminSkip", skip); + }, }); Template.accountsAdmin.created = function() { - Session.set("sortKey", "email"); + Session.set("accountsAdminSortKey", { + key: 'username', + direction: 1 + }); }; Template.accountsAdmin.rendered = function() { - var searchElement = document.getElementsByClassName('search-input-filter'); - if(!searchElement) - return; - var filterValue = Session.get("userFilter"); + var searchElement = document.getElementsByClassName('search-input-filter'); + if (!searchElement) + return; + var filterValue = Session.get("accountsAdminUserFilter"); - var pos = 0; - if (filterValue) - pos = filterValue.length; + var pos = 0; + if (filterValue) + pos = filterValue.length; - searchElement[0].focus(); - searchElement[0].setSelectionRange(pos, pos); + searchElement[0].focus(); + searchElement[0].setSelectionRange(pos, pos); }; Template.accountsAdmin.destroyed = function() { //clean up the session Session.set('userInScope', undefined); - Session.set('sortKey', undefined); + Session.set('accountsAdminSortKey', undefined); +}; + +Template.accountsAdminHeader.helpers({ + header: function() { + return !_.isUndefined(this.label) && this.label || this.key; + }, + sortDown: function() { + var sort = Session.get("accountsAdminSortKey"); + return (sort.key === this.key && sort.direction === 1); + }, + sortUp: function() { + var sort = Session.get("accountsAdminSortKey"); + return (sort.key === this.key && sort.direction === -1); + }, +}); + +Template.accountsAdminHeader.events({ + 'click .sortIndicator': function(event) { + event.preventDefault(); + var sort = Session.get("accountsAdminSortKey"); + sort.direction *= -1; + sort.key = this.key; + Session.set("accountsAdminSortKey", sort); + } +}); + +function index(obj, i) { + return obj && obj[i]; } +Template.accountsAdminField.helpers({ + field: function() { + var val = this && this.field.key.split('.').reduce(index, this.user); + return this.field.fn && this.field.fn(val, this.user) || val; + }, +}); + +Template.accountsAdminControlPanel.helpers({ + myself: function(userId) { + return Meteor.userId() === userId; + }, + allowImpersonate: function() { + return AccountsAdmin.config.allowImpersonation; + }, +}); diff --git a/client/impersonate_account_modal.js b/client/impersonate_account_modal.js index da9c116..7a5b005 100644 --- a/client/impersonate_account_modal.js +++ b/client/impersonate_account_modal.js @@ -1,33 +1,27 @@ +/* global AccountsAdmin */ +"use strict"; + Template.impersonateAccountModalInner.helpers({ - userInScope: function () { + userInScope: function() { return Session.get('userInScope'); }, }); Template.impersonateAccountModalInner.events({ - 'click .btn-danger': function (event, template) { + 'click .btn-danger': function() { var self = this; - Meteor.call('impersonateUser', self._id, function (error) { + Meteor.call('impersonateUser', self._id, function(error) { if (error) { - // optionally use a meteor errors package - if (typeof Errors === "undefined") - Log.error('Error: ' + error.reason); - else { - Errors. - throw (error.reason); - } - } - // $("#impersonateaccount").modal("hide"); - // event.stopImmediatePropagation(); - // event.preventDefault(); - Meteor.connection.setUserId(self._id); - $('body').removeClass('modal-open'); - $('.modal-backdrop').remove(); + console.error("Render impersonate got error: ", error); + } else { + Meteor.connection.setUserId(self._id); + $('body').removeClass('modal-open'); + $('.modal-backdrop').remove(); - if (typeof accountsAdminUiConfiguration !== 'undefined' && - accountsAdminUiConfiguration.impersonationSuccessRoute) { - Router.go(accountsAdminUiConfiguration.impersonationSuccessRoute); + if (AccountsAdmin.config.impersonationSuccess) { + AccountsAdmin.config.impersonationSuccess(); + } } }); } diff --git a/client/info_account_modal.html b/client/info_account_modal.html index f015768..a5b32c5 100644 --- a/client/info_account_modal.html +++ b/client/info_account_modal.html @@ -26,8 +26,8 @@

      Account Info

    • Email{{email}}
    • ID{{_id}}
      • - {{#each rolePairs}} -
    • {{key}}{{value}}
      • + {{#each roles}} +
    • {{this}}
      • {{/each}}
@@ -35,4 +35,4 @@

Account Info

{{/with}} - \ No newline at end of file + diff --git a/client/info_account_modal.js b/client/info_account_modal.js index 0a1577b..ecf9237 100644 --- a/client/info_account_modal.js +++ b/client/info_account_modal.js @@ -22,19 +22,25 @@ Template.infoAccountModalInner.helpers({ return Session.get('userInScope'); }, - rolePairs: function() { - var pairs = []; - if (!this.roles) - pairs.push({key: 'Roles', value: 'None'}); - - for (var role in this.roles) { - var r = this.roles[role]; - if (role === '0') { - pairs.push({key: 'Roles', value: r}); - } else { - pairs.push({key: '-', value: r}); - } - } - return pairs; - } + roles: function() { + var self = this; + var roles = []; + if (_.isArray(self.roles)) { + roles = self.roles; + } else if (_.isObject(self.roles)) { + if (_.isArray(self.roles[Roles.GLOBAL_GROUP])) { + self.roles[Roles.GLOBAL_GROUP].forEach(function(role) { + roles.push(role); + }); + } + _.keys(self.roles).forEach(function(group) { + if (group !== Roles.GLOBAL_GROUP) { + self.roles[group].forEach(function(role) { + roles.push(role + ' (' + group + ')'); + }); + } + }); + } + return roles; + } }); diff --git a/client/startup.js b/client/startup.js index a417ef5..be28c32 100644 --- a/client/startup.js +++ b/client/startup.js @@ -1,10 +1,20 @@ +/* global AccountsAdmin */ +"use strict"; + +AccountsAdmin.subscribe = function() { + return [Meteor.subscribe('roles'), + Meteor.subscribe('filteredUsers', { + filter: Session.get('accountsAdminUserFilter') || '', + skip: Session.get("accountsAdminSkip") || null, + sort: Session.get("accountsAdminSortKey") || null, + })]; +}; Meteor.startup(function() { - if (!accountsAdminUiConfiguration || !accountsAdminUiConfiguration.manualSubscriptions) { - Meteor.subscribe('roles'); - Deps.autorun(function() { - Meteor.subscribe('filteredUsers', Session.get('userFilter')); - }); - } -}); \ No newline at end of file + if (!AccountsAdmin.config.manualSubscriptions) { + Tracker.autorun(function() { + AccountsAdmin.subscribe(); + }); + } +}); diff --git a/client/update_account_modal.html b/client/update_account_modal.html index b8436db..bad0b7a 100644 --- a/client/update_account_modal.html +++ b/client/update_account_modal.html @@ -20,7 +20,7 @@

Update {{email}}

- {{#if roles}} +
diff --git a/client/update_roles_modal.html b/client/update_roles_modal.html index f0ef694..48b0619 100644 --- a/client/update_roles_modal.html +++ b/client/update_roles_modal.html @@ -14,7 +14,7 @@

Update Roles

    - {{#each roles}} +
diff --git a/lib/config.js b/lib/config.js new file mode 100644 index 0000000..9665de2 --- /dev/null +++ b/lib/config.js @@ -0,0 +1,12 @@ +/* global AccountsAdmin:true */ +/* jshint strict: false */ + +AccountsAdmin = function() {}; + +AccountsAdmin.config = { + userStatus: true, + allowImpersonation: false, + impersonationSuccess: null, //iron-router route for impersonation + maxUsersPerPage: 25, + manualSubscriptions: false, +}; diff --git a/lib/user_query.js b/lib/user_query.js new file mode 100644 index 0000000..73d704b --- /dev/null +++ b/lib/user_query.js @@ -0,0 +1,49 @@ +/* global AccountsAdmin, Roles */ +/* jshint strict: false */ + +//Userid - current user +//Options: +// filter - alphanumeric string to search users name and email for +// skip - skip the first n values +// sort - return the users in the order specified by this sort object +AccountsAdmin.filteredUserQuery = function(userId, options) { + "use strict"; + + // if not an admin user don't show any other user + if (!Roles.userIsInRole(userId, ['admin'])) { + return Meteor.users.find(userId); + } + + var queryOptions = {}; + + if (Meteor.isServer) { //skip and limit force reactive-table to use addedBefore instead of added on the observer + //since these are really for server paging, no need to do them on the client + queryOptions.limit = AccountsAdmin.config.maxUsersPerPage; + if (options.skip && !options.filter) { + queryOptions.skip = options.skip; + } + } + + if (options.sort) { + queryOptions.sort = {}; + queryOptions.sort[options.sort.key] = options.sort.direction; + } + + var query = {}; + if (options.filter) { + query = { + $or: [{ + 'profile.name': { + $regex: options.filter, + $options: 'i' + } + }, { + 'emails.address': { + $regex: options.filter, + $options: 'i' + } + }] + }; + } + return Meteor.users.find(query, queryOptions); +}; diff --git a/package.js b/package.js index 654dc09..cd07ee2 100644 --- a/package.js +++ b/package.js @@ -1,35 +1,38 @@ +"use strict"; + Package.describe({ - summary: "A roles based account management system using bootstrap 3" + summary: "A roles based account management system using bootstrap 3", }); -Package.on_use(function (api, where) { +Package.onUse(function (api) { api.use('standard-app-packages', ['client', 'server']); - api.use('bootstrap-3', 'client'); - api.use('roles', ['client', 'server']); - api.use('iron-router', 'client', { weak: true }); - api.use('user-status', 'client', { weak: true }); + api.use('mizzao:bootstrap-3', 'client'); + api.use('alanning:roles', ['client', 'server']); + api.use('iron:router', 'client', { weak: true }); + api.use('mizzao:user-status@0.6.0', 'client', { weak: true }); - api.add_files('libs/user_query.js', ['client', 'server']); + api.addFiles('lib/config.js', ['client', 'server']); + api.addFiles('lib/user_query.js', ['client', 'server']); - api.add_files('client/startup.js', 'client'); - api.add_files('client/accounts_admin.html', 'client'); - api.add_files('client/accounts_admin.js', 'client'); - api.add_files('client/delete_account_modal.html', 'client'); - api.add_files('client/delete_account_modal.js', 'client'); - api.add_files('client/info_account_modal.html', 'client'); - api.add_files('client/info_account_modal.js', 'client'); - api.add_files('client/update_account_modal.html', 'client'); - api.add_files('client/update_account_modal.js', 'client'); - api.add_files('client/update_roles_modal.html', 'client'); - api.add_files('client/update_roles_modal.js', 'client'); - api.add_files('client/impersonate_account_modal.html', 'client'); - api.add_files('client/impersonate_account_modal.js', 'client'); + api.addFiles('client/startup.js', 'client'); + api.addFiles('client/accounts_admin.html', 'client'); + api.addFiles('client/accounts_admin.js', 'client'); + api.addFiles('client/delete_account_modal.html', 'client'); + api.addFiles('client/delete_account_modal.js', 'client'); + api.addFiles('client/info_account_modal.html', 'client'); + api.addFiles('client/info_account_modal.js', 'client'); + api.addFiles('client/update_account_modal.html', 'client'); + api.addFiles('client/update_account_modal.js', 'client'); + api.addFiles('client/update_roles_modal.html', 'client'); + api.addFiles('client/update_roles_modal.js', 'client'); + api.addFiles('client/impersonate_account_modal.html', 'client'); + api.addFiles('client/impersonate_account_modal.js', 'client'); - api.add_files('style/style.css', 'client'); + api.addFiles('style/style.css', 'client'); - api.add_files('server/startup.js', 'server'); - api.add_files('server/publish.js', 'server'); - api.add_files('server/methods.js', 'server'); + api.addFiles('server/startup.js', 'server'); + api.addFiles('server/publish.js', 'server'); + api.addFiles('server/methods.js', 'server'); - api.export("accountsAdminUi"); + api.export("AccountsAdmin"); }); diff --git a/server/methods.js b/server/methods.js index 7135e71..578743d 100644 --- a/server/methods.js +++ b/server/methods.js @@ -1,3 +1,6 @@ +/* global Roles, AccountsAdmin */ +"use strict"; + Meteor.methods({ deleteUser: function(userId) { check(userId, String); @@ -12,9 +15,10 @@ Meteor.methods({ Meteor.users.remove(userId); }, - addUserRole: function(userId, role) { + addUserRole: function(userId, role, group) { check(userId, String); check(role, String); + check(group, Match.Optional(String)); var user = Meteor.user(); if (!user || !Roles.userIsInRole(user, ['admin'])) throw new Meteor.Error(401, "You need to be an admin to update a user."); @@ -27,16 +31,17 @@ Meteor.methods({ throw new Meteor.Error(422, 'Role ' + role + ' does not exist.'); // handle user already has role - if (Roles.userIsInRole(userId, role)) + if (Roles.userIsInRole(userId, role, group)) throw new Meteor.Error(422, 'Account already has the role ' + role); // add the user to the role - Roles.addUsersToRoles(userId, role); + Roles.addUsersToRoles(userId, role, group); }, - removeUserRole: function(userId, role) { + removeUserRole: function(userId, role, group) { check(userId, String); check(role, String); + check(group, Match.Optional(String)); var user = Meteor.user(); if (!user || !Roles.userIsInRole(user, ['admin'])) throw new Meteor.Error(401, "You need to be an admin to update a user."); @@ -49,10 +54,10 @@ Meteor.methods({ throw new Meteor.Error(422, 'Role ' + role + ' does not exist.'); // handle user already has role - if (!Roles.userIsInRole(userId, role)) + if (!Roles.userIsInRole(userId, role, group)) throw new Meteor.Error(422, 'Account does not have the role ' + role); - Roles.removeUsersFromRoles(userId, role); + Roles.removeUsersFromRoles(userId, role, group); }, addRole: function(role) { @@ -127,11 +132,11 @@ Meteor.methods({ throw new Meteor.Error(422, "Unable to find targetUserId to impersonate: " + targetUserId); - if (typeof accountsAdminUiConfiguration !== 'undefined' && - accountsAdminUiConfiguration.allowImpersonation) + if (AccountsAdmin.config.allowImpersonation) { this.setUserId(targetUserId); + } else - throw new Meteor.Error(422, "Enable accountsAdminUiConfiguration.allowImpersonation key to allow impersonation"); + throw new Meteor.Error(422, "Enable AccountsAdmin.config.allowImpersonation key to allow impersonation"); }, diff --git a/server/publish.js b/server/publish.js index fb551b5..89ad890 100644 --- a/server/publish.js +++ b/server/publish.js @@ -1,8 +1,29 @@ +/* global AccountsAdmin */ +"use strict"; + Meteor.publish('roles', function (){ return Meteor.roles.find({}); }); -Meteor.publish('filteredUsers', function(filter) { - check(filter, Match.OneOf(String, RegExp, null)); - return filteredUserQuery(this.userId, filter); + +var positiveInteger = Match.Where(function(x) { + check(x, Match.Integer); + return x >= 0; +}); + +var plainString = Match.Where(function(x) { + check(x, String); + return !!x.match(/^\w*$/); +}); + +Meteor.publish('filteredUsers', function(options) { + var self = this; + check(options, Match.ObjectIncluding({ + filter: plainString, + skip: Match.OneOf(positiveInteger, undefined, null), + sort: Match.OneOf(Object, undefined, null) + // sort: Match.OneOf(Match.ObjectIncluding({ direction: Match.OneOf(1, -1), key: String }), null, undefined) + })); + + return AccountsAdmin.filteredUserQuery(self.userId, options); }); diff --git a/server/startup.js b/server/startup.js index f92c939..e332480 100644 --- a/server/startup.js +++ b/server/startup.js @@ -1,3 +1,6 @@ +/* global Roles */ +"use strict"; + Meteor.startup(function() { // create an admin role if it doesn't exist if (Meteor.roles.find({name: 'admin'}).count() < 1 ) { diff --git a/versions.json b/versions.json new file mode 100644 index 0000000..ce99072 --- /dev/null +++ b/versions.json @@ -0,0 +1,223 @@ +{ + "dependencies": [ + [ + "accounts-base", + "1.1.2" + ], + [ + "alanning:roles", + "1.2.13" + ], + [ + "application-configuration", + "1.0.3" + ], + [ + "autoupdate", + "1.1.3" + ], + [ + "base64", + "1.0.1" + ], + [ + "binary-heap", + "1.0.1" + ], + [ + "blaze", + "2.0.3" + ], + [ + "blaze-tools", + "1.0.1" + ], + [ + "boilerplate-generator", + "1.0.1" + ], + [ + "callback-hook", + "1.0.1" + ], + [ + "check", + "1.0.2" + ], + [ + "ddp", + "1.0.11" + ], + [ + "deps", + "1.0.5" + ], + [ + "ejson", + "1.0.4" + ], + [ + "fastclick", + "1.0.1" + ], + [ + "follower-livedata", + "1.0.2" + ], + [ + "geojson-utils", + "1.0.1" + ], + [ + "html-tools", + "1.0.2" + ], + [ + "htmljs", + "1.0.2" + ], + [ + "http", + "1.0.8" + ], + [ + "id-map", + "1.0.1" + ], + [ + "jquery", + "1.0.1" + ], + [ + "json", + "1.0.1" + ], + [ + "launch-screen", + "1.0.0" + ], + [ + "livedata", + "1.0.11" + ], + [ + "localstorage", + "1.0.1" + ], + [ + "logging", + "1.0.5" + ], + [ + "meteor", + "1.1.3" + ], + [ + "meteor-platform", + "1.2.0" + ], + [ + "minifiers", + "1.1.2" + ], + [ + "minimongo", + "1.0.5" + ], + [ + "mizzao:bootstrap-3", + "3.3.0" + ], + [ + "mobile-status-bar", + "1.0.1" + ], + [ + "mongo", + "1.0.8" + ], + [ + "observe-sequence", + "1.0.3" + ], + [ + "ordered-dict", + "1.0.1" + ], + [ + "random", + "1.0.1" + ], + [ + "reactive-dict", + "1.0.4" + ], + [ + "reactive-var", + "1.0.3" + ], + [ + "reload", + "1.1.1" + ], + [ + "retry", + "1.0.1" + ], + [ + "routepolicy", + "1.0.2" + ], + [ + "service-configuration", + "1.0.2" + ], + [ + "session", + "1.0.4" + ], + [ + "spacebars", + "1.0.3" + ], + [ + "spacebars-compiler", + "1.0.3" + ], + [ + "standard-app-packages", + "1.0.3" + ], + [ + "templating", + "1.0.9" + ], + [ + "tracker", + "1.0.3" + ], + [ + "ui", + "1.0.4" + ], + [ + "underscore", + "1.0.1" + ], + [ + "url", + "1.0.2" + ], + [ + "webapp", + "1.1.4" + ], + [ + "webapp-hashing", + "1.0.1" + ] + ], + "pluginDependencies": [], + "toolVersion": "meteor-tool@1.0.35", + "format": "1.0" +} \ No newline at end of file From bf9b147fc076c5683b58ba39843d949a161c12b4 Mon Sep 17 00:00:00 2001 From: Andy Lash Date: Mon, 24 Nov 2014 13:27:46 -0800 Subject: [PATCH 06/16] control column now showing again --- client/accounts_admin.html | 2 +- client/accounts_admin.js | 4 +- client/delete_account_modal.html | 2 +- client/delete_account_modal.js | 2 +- versions.json | 223 +++++++++++++++++++++++++++++++ 5 files changed, 228 insertions(+), 5 deletions(-) create mode 100644 versions.json diff --git a/client/accounts_admin.html b/client/accounts_admin.html index 4a26418..2870dbb 100644 --- a/client/accounts_admin.html +++ b/client/accounts_admin.html @@ -64,5 +64,5 @@ diff --git a/client/accounts_admin.js b/client/accounts_admin.js index 3ac4663..43ae9f6 100644 --- a/client/accounts_admin.js +++ b/client/accounts_admin.js @@ -123,7 +123,7 @@ Template.accountsAdmin.events({ return false; }, 'click .clickable': function() { - Session.set('userInScope', this); + Session.set('userInScope', this.user); }, 'click .showMore': function(event) { event.preventDefault(); @@ -189,7 +189,7 @@ function index(obj, i) { return obj && obj[i]; } Template.accountsAdminField.helpers({ - field: function() { + val: function() { var val = this && this.field.key.split('.').reduce(index, this.user); return this.field.fn && this.field.fn(val, this.user) || val; }, diff --git a/client/delete_account_modal.html b/client/delete_account_modal.html index cd99739..152d329 100644 --- a/client/delete_account_modal.html +++ b/client/delete_account_modal.html @@ -18,4 +18,4 @@

Are you sure you want to delete {{email}}?

{{/with}} - \ No newline at end of file + diff --git a/client/delete_account_modal.js b/client/delete_account_modal.js index bab4898..0a7091c 100644 --- a/client/delete_account_modal.js +++ b/client/delete_account_modal.js @@ -36,4 +36,4 @@ Template.deleteAccountModalInner.events({ $("#deleteaccount").modal("hide"); }); } -}); \ No newline at end of file +}); diff --git a/versions.json b/versions.json new file mode 100644 index 0000000..ce99072 --- /dev/null +++ b/versions.json @@ -0,0 +1,223 @@ +{ + "dependencies": [ + [ + "accounts-base", + "1.1.2" + ], + [ + "alanning:roles", + "1.2.13" + ], + [ + "application-configuration", + "1.0.3" + ], + [ + "autoupdate", + "1.1.3" + ], + [ + "base64", + "1.0.1" + ], + [ + "binary-heap", + "1.0.1" + ], + [ + "blaze", + "2.0.3" + ], + [ + "blaze-tools", + "1.0.1" + ], + [ + "boilerplate-generator", + "1.0.1" + ], + [ + "callback-hook", + "1.0.1" + ], + [ + "check", + "1.0.2" + ], + [ + "ddp", + "1.0.11" + ], + [ + "deps", + "1.0.5" + ], + [ + "ejson", + "1.0.4" + ], + [ + "fastclick", + "1.0.1" + ], + [ + "follower-livedata", + "1.0.2" + ], + [ + "geojson-utils", + "1.0.1" + ], + [ + "html-tools", + "1.0.2" + ], + [ + "htmljs", + "1.0.2" + ], + [ + "http", + "1.0.8" + ], + [ + "id-map", + "1.0.1" + ], + [ + "jquery", + "1.0.1" + ], + [ + "json", + "1.0.1" + ], + [ + "launch-screen", + "1.0.0" + ], + [ + "livedata", + "1.0.11" + ], + [ + "localstorage", + "1.0.1" + ], + [ + "logging", + "1.0.5" + ], + [ + "meteor", + "1.1.3" + ], + [ + "meteor-platform", + "1.2.0" + ], + [ + "minifiers", + "1.1.2" + ], + [ + "minimongo", + "1.0.5" + ], + [ + "mizzao:bootstrap-3", + "3.3.0" + ], + [ + "mobile-status-bar", + "1.0.1" + ], + [ + "mongo", + "1.0.8" + ], + [ + "observe-sequence", + "1.0.3" + ], + [ + "ordered-dict", + "1.0.1" + ], + [ + "random", + "1.0.1" + ], + [ + "reactive-dict", + "1.0.4" + ], + [ + "reactive-var", + "1.0.3" + ], + [ + "reload", + "1.1.1" + ], + [ + "retry", + "1.0.1" + ], + [ + "routepolicy", + "1.0.2" + ], + [ + "service-configuration", + "1.0.2" + ], + [ + "session", + "1.0.4" + ], + [ + "spacebars", + "1.0.3" + ], + [ + "spacebars-compiler", + "1.0.3" + ], + [ + "standard-app-packages", + "1.0.3" + ], + [ + "templating", + "1.0.9" + ], + [ + "tracker", + "1.0.3" + ], + [ + "ui", + "1.0.4" + ], + [ + "underscore", + "1.0.1" + ], + [ + "url", + "1.0.2" + ], + [ + "webapp", + "1.1.4" + ], + [ + "webapp-hashing", + "1.0.1" + ] + ], + "pluginDependencies": [], + "toolVersion": "meteor-tool@1.0.35", + "format": "1.0" +} \ No newline at end of file From 352d478ae07eefa2cb0cec0a3fdac4aa08d2a91a Mon Sep 17 00:00:00 2001 From: Andy Lash Date: Sat, 29 Nov 2014 16:24:27 -0800 Subject: [PATCH 07/16] fix up per group roles --- client/accounts_admin.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/accounts_admin.js b/client/accounts_admin.js index 43ae9f6..d5a2b89 100644 --- a/client/accounts_admin.js +++ b/client/accounts_admin.js @@ -5,20 +5,20 @@ var getRoles = function(value) { if (_.isArray(value)) { return value.join(','); } else if (_.isObject(value)) { - var str = ''; + var roles = []; if (_.isArray(value[Roles.GLOBAL_GROUP])) { value[Roles.GLOBAL_GROUP].forEach(function(role) { - str += role + ','; + roles.push(role); }); } _.keys(value).forEach(function(group) { if (group !== Roles.GLOBAL_GROUP) { value[group].forEach(function(role) { - str += role + ' (' + group + '),'; + roles.push(role); }); } }); - return str; + return roles.join(','); } }; @@ -81,7 +81,7 @@ Template.accountsAdmin.helpers({ }, ]; if (AccountsAdmin.config.userStatus) { fields.push({ - key: 'lastLogin', + key: 'status.lastLogin.date', label: 'Last Login', fn: function(value) { return value && value.toLocaleString(); From 5878c0a0391813032de0ed962632acb3de4e31a1 Mon Sep 17 00:00:00 2001 From: Andy Lash Date: Mon, 1 Dec 2014 19:26:40 -0800 Subject: [PATCH 08/16] improvement to filter logic thats safer and less restrictive --- lib/user_query.js | 5 +++-- libs/user_query.js | 23 ----------------------- server/publish.js | 10 +++++----- 3 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 libs/user_query.js diff --git a/lib/user_query.js b/lib/user_query.js index 73d704b..9acf859 100644 --- a/lib/user_query.js +++ b/lib/user_query.js @@ -31,15 +31,16 @@ AccountsAdmin.filteredUserQuery = function(userId, options) { var query = {}; if (options.filter) { + var filter = options.filter.replace(/[^\w]/g, '.'); //my take on santizing the filter query = { $or: [{ 'profile.name': { - $regex: options.filter, + $regex: filter, $options: 'i' } }, { 'emails.address': { - $regex: options.filter, + $regex: filter, $options: 'i' } }] diff --git a/libs/user_query.js b/libs/user_query.js deleted file mode 100644 index 1623dff..0000000 --- a/libs/user_query.js +++ /dev/null @@ -1,23 +0,0 @@ -filteredUserQuery = function(userId, filter) { - // if not an admin user don't show any other user - if (!Roles.userIsInRole(userId, ['admin'])) - return Meteor.users.find(userId); - - // TODO: configurable limit and paginiation - var queryLimit = 25; - if (typeof accountsAdminUiConfiguration !== 'undefined' && accountsAdminUiConfiguration.maxUsersPerPage) - queryLimit = accountsAdminUiConfiguration.maxUsersPerPage; - - if(!!filter) { - // TODO: passing to regex directly could be dangerous - users = Meteor.users.find({ - $or: [ - {'profile.name': {$regex: filter, $options: 'i'}}, - {'emails.address': {$regex: filter, $options: 'i'}} - ] - }, {sort: {emails: 1}, limit: queryLimit}); - } else { - users = Meteor.users.find({}, {sort: {emails: 1}, limit: queryLimit}); - } - return users; -}; diff --git a/server/publish.js b/server/publish.js index 89ad890..7129f3c 100644 --- a/server/publish.js +++ b/server/publish.js @@ -11,15 +11,15 @@ var positiveInteger = Match.Where(function(x) { return x >= 0; }); -var plainString = Match.Where(function(x) { - check(x, String); - return !!x.match(/^\w*$/); -}); +// var plainString = Match.Where(function(x) { +// check(x, String); +// return !!x.match(/^\w*$/); +// }); Meteor.publish('filteredUsers', function(options) { var self = this; check(options, Match.ObjectIncluding({ - filter: plainString, + filter: String, skip: Match.OneOf(positiveInteger, undefined, null), sort: Match.OneOf(Object, undefined, null) // sort: Match.OneOf(Match.ObjectIncluding({ direction: Match.OneOf(1, -1), key: String }), null, undefined) From b517e30835bd9a8ab57e9e5a35c427b1f0fc6d15 Mon Sep 17 00:00:00 2001 From: Andy Lash Date: Wed, 10 Dec 2014 09:41:43 -0800 Subject: [PATCH 09/16] updated versions.json file --- versions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/versions.json b/versions.json index ce99072..777d397 100644 --- a/versions.json +++ b/versions.json @@ -46,7 +46,7 @@ ], [ "ddp", - "1.0.11" + "1.0.12" ], [ "deps", @@ -134,7 +134,7 @@ ], [ "mongo", - "1.0.8" + "1.0.9" ], [ "observe-sequence", @@ -218,6 +218,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.35", + "toolVersion": "meteor-tool@1.0.36", "format": "1.0" } \ No newline at end of file From df5da3a631fb59829ad61af2e8135ce23bc64b6c Mon Sep 17 00:00:00 2001 From: Andy Lash Date: Thu, 11 Dec 2014 13:39:11 -0800 Subject: [PATCH 10/16] Add set password feature. Also make the user update more restrictive, so it only does profile --- client/update_account_modal.html | 8 ++++++-- client/update_account_modal.js | 26 +++++++++++++++++++++++--- server/methods.js | 22 ++++++++++++++++++---- 3 files changed, 47 insertions(+), 9 deletions(-) diff --git a/client/update_account_modal.html b/client/update_account_modal.html index bad0b7a..3c49f8d 100644 --- a/client/update_account_modal.html +++ b/client/update_account_modal.html @@ -17,9 +17,13 @@

Update {{email}}

Name - +
-
+
+ Password + +
+
+ {{/if}}
diff --git a/client/update_account_modal.js b/client/update_account_modal.js index f288bd0..fdb1c23 100644 --- a/client/update_account_modal.js +++ b/client/update_account_modal.js @@ -1,3 +1,5 @@ +/* global Roles, Errors */ +"use strict"; var getPassword = function() { return "●●●●●●●●"; @@ -5,102 +7,101 @@ var getPassword = function() { Template.updateAccountModalInner.helpers({ - email: function () { - if (this.emails && this.emails.length) - return this.emails[0].address; - - if (this.services) { - //Iterate through services - for (var serviceName in this.services) { - var serviceObject = this.services[serviceName]; - //If an 'id' isset then assume valid service - if (serviceObject.id) { - if (serviceObject.email) { - return serviceObject.email; - } - } - } - } - return ""; - }, - - userInScope: function() { - return Session.get('userInScope'); - }, - - unsetRoles: function() { - var allRoles = _.pluck(Roles.getAllRoles().fetch(), "name"); - if (!this.roles) - return allRoles; - return _.difference(allRoles, this.roles); - }, + email: function() { + if (this.emails && this.emails.length) + return this.emails[0].address; + + if (this.services) { + //Iterate through services + for (var serviceName in this.services) { + if (this.services.hasOwnProperty(serviceName)) { + var serviceObject = this.services[serviceName]; + //If an 'id' isset then assume valid service + if (serviceObject.id) { + if (serviceObject.email) { + return serviceObject.email; + } + } + } + } + } + return ""; + }, + + userInScope: function() { + return Session.get('userInScope'); + }, + + unsetRoles: function() { + var allRoles = _.pluck(Roles.getAllRoles().fetch(), "name"); + if (!this.roles) + return allRoles; + return _.difference(allRoles, this.roles); + }, password: getPassword, }); Template.updateAccountModalInner.events({ - 'click .add-role': function(event, template) { - var role = this.toString(); - var userId = event.currentTarget.getAttribute('data-user-id'); - Meteor.call('addUserRole', userId, role, function(error) { - if (error) { - // optionally use a meteor errors package - if (typeof Errors === "undefined") - Log.error('Error: ' + error.reason); - else { - Errors.throw(error.reason); - } - } - - //update the data in the session variable to update modal templates - Session.set('userInScope', Meteor.users.findOne(userId)); - }); - }, - - 'click .remove-role' : function(event, template) { - var role = this.toString(); - var userId = event.currentTarget.getAttribute('data-user-id'); - - Meteor.call('removeUserRole', userId, role, function(error) { - if (error) { - // optionally use a meteor errors package - if (typeof Errors === "undefined") - Log.error('Error: ' + error.reason); - else { - Errors.throw(error.reason); - } - } + 'click .add-role': function(event) { + var role = this.toString(); + var userId = event.currentTarget.getAttribute('data-user-id'); + Meteor.call('addUserRole', userId, role, function(error) { + if (error) { + // optionally use a meteor errors package + if (typeof Errors === "undefined") + Log.error('Error: ' + error.reason); + else { + Errors.throw(error.reason); + } + } - //update the data in the session variable to update modal templates - Session.set('userInScope', Meteor.users.findOne(userId)); - }); - }, + //update the data in the session variable to update modal templates + Session.set('userInScope', Meteor.users.findOne(userId)); + }); + }, + + 'click .remove-role': function(event) { + var role = this.toString(); + var userId = event.currentTarget.getAttribute('data-user-id'); + + Meteor.call('removeUserRole', userId, role, function(error) { + if (error) { + // optionally use a meteor errors package + if (typeof Errors === "undefined") + Log.error('Error: ' + error.reason); + else { + Errors.throw(error.reason); + } + } - 'change .admin-user-info' : function(event, template) { + //update the data in the session variable to update modal templates + Session.set('userInScope', Meteor.users.findOne(userId)); + }); + }, - var ele = event.currentTarget; - var userId = this._id; + 'change .admin-user-info': function(event, template) { + var userId = this._id; var newName = template.$('input[name="profile.name"]').val(); - Meteor.call('updateUserProfile', userId, 'name', newName, function(error) { - if (error) - { - if (typeof Errors === "undefined") Log.error('Error: ' + error.reason); - else Errors.throw(error.reason); - return; - } - Session.set('userInScope', Meteor.users.findOne(userId)); - }); + Meteor.call('updateUserProfile', userId, 'name', newName, function(error) { + if (error) { + if (typeof Errors === "undefined") Log.error('Error: ' + error.reason); + else Errors.throw(error.reason); + return; + } + Session.set('userInScope', Meteor.users.findOne(userId)); + }); var newPassword = template.$('input[name="password"]').val(); - if (getPassword() !== newPassword ) { + if (getPassword() !== newPassword) { Meteor.call('setPassword', userId, newPassword, function(error) { if (error) { if (typeof Errors === "undefined") Log.error('Error: ' + error.reason); else Errors.throw(error.reason); return; } - }); + }); } - } + } }); diff --git a/client/update_roles_modal.html b/client/update_roles_modal.html index 48b0619..f0ef694 100644 --- a/client/update_roles_modal.html +++ b/client/update_roles_modal.html @@ -14,7 +14,7 @@

Update Roles

    - + {{/each}}
diff --git a/client/update_roles_modal.js b/client/update_roles_modal.js index 07b6776..1908e8d 100644 --- a/client/update_roles_modal.js +++ b/client/update_roles_modal.js @@ -1,3 +1,6 @@ +/* global Roles, Errors */ +"use strict"; + Template.updateRolesModalInner.helpers({ roles: function() { return Roles.getAllRoles(); @@ -23,7 +26,7 @@ Template.updateRolesModalInner.events({ }); }, - 'click .remove-role' : function(event, template) { + 'click .remove-role' : function(/*event, template*/) { var role = this.name; Meteor.call('removeRole', role, function(error) { @@ -62,4 +65,4 @@ Template.updateRolesModalInner.events({ }); } } -}); \ No newline at end of file +}); diff --git a/lib/user_query.js b/lib/user_query.js index 9acf859..9f0e308 100644 --- a/lib/user_query.js +++ b/lib/user_query.js @@ -1,5 +1,5 @@ /* global AccountsAdmin, Roles */ -/* jshint strict: false */ +"use strict"; //Userid - current user //Options: @@ -7,7 +7,6 @@ // skip - skip the first n values // sort - return the users in the order specified by this sort object AccountsAdmin.filteredUserQuery = function(userId, options) { - "use strict"; // if not an admin user don't show any other user if (!Roles.userIsInRole(userId, ['admin'])) { diff --git a/server/methods.js b/server/methods.js index 5c5800b..441219d 100644 --- a/server/methods.js +++ b/server/methods.js @@ -24,9 +24,6 @@ Meteor.methods({ if (!user || ! AccountsAdmin.checkForAdminAuthentication(user)) throw new Meteor.Error(401, "You need to be an authenticated admin"); - if (user._id === userId) - throw new Meteor.Error(422, 'You can\'t update yourself.'); - // handle invalid role if (Meteor.roles.find({name: role}).count() < 1 ) throw new Meteor.Error(422, 'Role ' + role + ' does not exist.'); @@ -47,9 +44,6 @@ Meteor.methods({ if (!user || ! AccountsAdmin.checkForAdminAuthentication(user)) throw new Meteor.Error(401, "You need to be an authenticated admin"); - if (user._id === userId) - throw new Meteor.Error(422, 'You can\'t update yourself.'); - // handle invalid role if (Meteor.roles.find({name: role}).count() < 1 ) throw new Meteor.Error(422, 'Role ' + role + ' does not exist.'); From 4214c68c46772b0c5e73ae9277fcf9ad623b814f Mon Sep 17 00:00:00 2001 From: Andy Lash Date: Mon, 17 Aug 2015 11:51:47 -0700 Subject: [PATCH 15/16] move to official bootstrap package --- client/update_account_modal.js | 2 +- package.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/update_account_modal.js b/client/update_account_modal.js index fdb1c23..c540092 100644 --- a/client/update_account_modal.js +++ b/client/update_account_modal.js @@ -100,8 +100,8 @@ Template.updateAccountModalInner.events({ else Errors.throw(error.reason); return; } + Log.info("User password set"); }); - } } }); diff --git a/package.js b/package.js index a6a21e2..0970244 100644 --- a/package.js +++ b/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "A roles based account management system using bootstrap 3", - version: "0.2.8", + version: "0.2.9", git: "https://github.com/hharnisc/meteor-accounts-admin-ui-bootstrap-3.git", name: 'accounts-admin-ui-bootstrap-3' }); @@ -11,7 +11,7 @@ Package.onUse(function (api) { api.versionsFrom("METEOR@0.9.0"); api.use('standard-app-packages', ['client', 'server']); - api.use('mizzao:bootstrap-3', 'client'); + api.use('twbs:bootstrap', 'client'); api.use('alanning:roles@1.2.9', ['client', 'server']); api.use('iron:router', 'client', { weak: true }); api.use('mizzao:user-status@0.6.0', 'client', { weak: true }); From c67fd780ae0f667a89eb402e7c2dad3b68b438ec Mon Sep 17 00:00:00 2001 From: Billy Vong Date: Mon, 12 Oct 2015 16:28:41 -0500 Subject: [PATCH 16/16] Change admin interface around, remove username col (same as email ), add business description, add core/pro --- client/accounts_admin.js | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/client/accounts_admin.js b/client/accounts_admin.js index 089e339..9f6d864 100644 --- a/client/accounts_admin.js +++ b/client/accounts_admin.js @@ -3,7 +3,7 @@ var getRoles = function(value) { if (_.isArray(value)) { - return value.join(','); + return value.join(', '); } else if (_.isObject(value)) { var roles = []; if (_.isArray(value[Roles.GLOBAL_GROUP])) { @@ -18,7 +18,7 @@ var getRoles = function(value) { }); } }); - return roles.join(','); + return roles.join(', '); } }; @@ -52,26 +52,32 @@ Template.accountsAdmin.helpers({ label: '', tmpl: Template.accountsAdminControlPanel }, { - key: 'username', - label: 'username' + key: 'emails.0.address', + label: 'Email', + fn: function(value, user) { + return getEmail(value, user); + } }, { key: 'profile.name', label: 'Name' }, { key: 'profile.businessName', label: 'Account Name' - }, { - key: 'emails.0.address', - label: 'Email', - fn: function(value, user) { - return getEmail(value, user); - } }, { key: 'roles', label: 'Roles', fn: function(value) { return getRoles(value); } + }, { + key: 'profile.businessNeeds', + label: 'Business Description', + }, { + key: 'profile.useCore', + label: 'Core', + }, { + key: 'profile.usePro', + label: 'Pro', }, { key: 'createdAt', label: 'Created?',