From 19707f5b863da60a318742f74ad4473ed0b09f00 Mon Sep 17 00:00:00 2001
From: Jerry McRae <u@JerryMcRae.com>
Date: Fri, 16 Jan 2015 16:54:29 -0800
Subject: [PATCH 1/4] read from users username first, then profile.name.  Write
 changes to username.

---
 client/accounts_admin.html       |  10 ++-
 client/info_account_modal.html   |  10 ++-
 client/info_account_modal.js     |  13 +--
 client/update_account_modal.html |  54 ++++++-------
 client/update_account_modal.js   |   2 +-
 libs/user_query.js               |   1 +
 package.js                       |   5 +-
 server/methods.js                |   6 +-
 versions.json                    | 132 +++++++++++++++++++++----------
 9 files changed, 147 insertions(+), 86 deletions(-)

diff --git a/client/accounts_admin.html b/client/accounts_admin.html
index 3366e03..c2a93c4 100644
--- a/client/accounts_admin.html
+++ b/client/accounts_admin.html
@@ -30,10 +30,14 @@
                         {{/unless}}
                     </td>
                     <td>
-                        {{#if profile.name}}
-                            {{profile.name}}
+                        {{#if username}}
+                            {{username}}
                         {{else}}
-                            {{email}}
+                            {{#if profile.name}}
+                                {{profile.name}}
+                            {{else}}
+                                {{email}}
+                            {{/if}}
                         {{/if}}
                     </td>
                     <td>{{email}}</td>
diff --git a/client/info_account_modal.html b/client/info_account_modal.html
index f015768..c714008 100644
--- a/client/info_account_modal.html
+++ b/client/info_account_modal.html
@@ -17,10 +17,14 @@ <h4>Account Info</h4>
 			<ul class="list-group">
 				<li class="list-group-item"><strong>Name</strong>
 					<span class="pull-right">
-						{{#if profile.name}}
-							{{profile.name}}
+						{{#if username}}
+							{{username}}
 						{{else}}
-							{{email}}
+							{{#if profile.name}}
+								{{profile.name}}
+							{{else}}
+								{{email}}
+							{{/if}}
 						{{/if}}
 					</span>
 				</li>
diff --git a/client/info_account_modal.js b/client/info_account_modal.js
index 0a1577b..ceb821c 100644
--- a/client/info_account_modal.js
+++ b/client/info_account_modal.js
@@ -28,11 +28,14 @@ Template.infoAccountModalInner.helpers({
 			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});
+			if (this.roles.hasOwnProperty(role) ) {
+				// excludes any Array prototype extensions
+				var r = this.roles[role];
+				if (role === '0') {
+					pairs.push({key: 'Roles', value: r});
+				} else {
+					pairs.push({key: '-', value: r});
+				}
 			}
 		}
 		return pairs;
diff --git a/client/update_account_modal.html b/client/update_account_modal.html
index b8436db..4ce51da 100644
--- a/client/update_account_modal.html
+++ b/client/update_account_modal.html
@@ -11,44 +11,44 @@
 <template name="updateAccountModalInner">
 	{{#with userInScope}}
 		<div class="modal-header">
-			<h4>Update {{email}}</h4>
+			<h4>Update User</h4>
 		</div>
-		<div class="modal-body">
-			<div class="form-group">
-				<div class="input-group">
-					<span class="input-group-addon">Name</span>
-					<input data-user-id="{{_id}}" class="form-control admin-user-info" name="profile.name" value="{{profile.name}}" placeholder="{{email}}">
-				</div>
-			</div>
+        <div class="modal-body">
+            <div class="form-group">
+                <div class="input-group">
+                    <span class="input-group-addon">Name</span>
+                    <input data-user-id="{{_id}}" class="form-control admin-user-info" name="username" value="{{username}}" placeholder="{{email}}">
+                </div>
+            </div>
 			{{#if roles}}
-				<ul class="list-group">
+                <ul class="list-group">
 					{{#each roles}}
-						<li class="list-group-item">
-							<button data-user-id="{{../_id}}" class="btn btn-danger btn-xs remove-role" type="button">Remove</button>
-							<span class="pull-right">{{this}}</span>
-						</li>
+                        <li class="list-group-item">
+                            <button data-user-id="{{../_id}}" class="btn btn-danger btn-xs remove-role" type="button">Remove</button>
+                            <span class="pull-right">{{this}}</span>
+                        </li>
 					{{/each}}
-				</ul>
+                </ul>
 			{{else}}
-				This account has no roles.
+                This account has no roles.
 			{{/if}}
 			{{#if unsetRoles}}
-			<div class="btn-group clearfix full-width">
-				<button type="button" class="btn btn-success dropdown-toggle pull-right" data-toggle="dropdown">
-					<span class="glyphicon glyphicon-plus"></span> Add Role 
-				</button>
-				<ul class="dropdown-menu pull-right" role="menu">
-					{{#each unsetRoles}}
-						<li><a href="#" class="add-role" data-user-id="{{../_id}}">{{this}}</a></li>
-					{{/each}}
-				</ul>
-			</div>
+                <div class="btn-group clearfix full-width">
+                    <button type="button" class="btn btn-success dropdown-toggle pull-right" data-toggle="dropdown">
+                        <span class="glyphicon glyphicon-plus"></span> Add Role
+                    </button>
+                    <ul class="dropdown-menu pull-right" role="menu">
+						{{#each unsetRoles}}
+                            <li><a href="#" class="add-role" data-user-id="{{../_id}}">{{this}}</a></li>
+						{{/each}}
+                    </ul>
+                </div>
 			{{else}}
-			<em>All roles already set.</em>
+                <em>All roles already set.</em>
 			{{/if}}
 		</div>
 		<div class="modal-footer">
 			<button type="button" data-dismiss="modal" class="btn btn-primary">Done</button>
-		</div>
+        </div>
 	{{/with}}
 </template>
diff --git a/client/update_account_modal.js b/client/update_account_modal.js
index 559fe0c..a559839 100644
--- a/client/update_account_modal.js
+++ b/client/update_account_modal.js
@@ -7,7 +7,7 @@ Template.updateAccountModalInner.helpers({
 			//Iterate through services
 			for (var serviceName in this.services) {
 				var serviceObject = this.services[serviceName];
-				//If an 'id' isset then assume valid service
+				//If an 'id' is set then assume valid service
 				if (serviceObject.id) {
 					if (serviceObject.email) {
 						return serviceObject.email;
diff --git a/libs/user_query.js b/libs/user_query.js
index a934433..fb3a131 100644
--- a/libs/user_query.js
+++ b/libs/user_query.js
@@ -10,6 +10,7 @@ filteredUserQuery = function(userId, filter) {
 		// TODO: passing to regex directly could be dangerous
 		users = Meteor.users.find({
 			$or: [
+				{'username': {$regex: filter, $options: 'i'}},
 				{'profile.name': {$regex: filter, $options: 'i'}},
 				{'emails.address': {$regex: filter, $options: 'i'}}
 			]
diff --git a/package.js b/package.js
index 493affd..e852125 100644
--- a/package.js
+++ b/package.js
@@ -1,6 +1,7 @@
 Package.describe({
+	name: "accounts-admin",
 	summary: "A roles based account management system using bootstrap 3",
-  version: "0.2.7",
+  version: "0.2.8",
   git: "https://github.com/hharnisc/meteor-accounts-admin-ui-bootstrap-3.git"
 });
 
@@ -28,4 +29,4 @@ 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');
-});
+});
\ No newline at end of file
diff --git a/server/methods.js b/server/methods.js
index 165c4af..ec81aa7 100644
--- a/server/methods.js
+++ b/server/methods.js
@@ -75,7 +75,7 @@ Meteor.methods({
 			throw new Meteor.Error(422, 'Cannot delete role admin');
 
 		// remove the role from all users who currently have the role
-		// if successfull remove the role
+		// if successful remove the role
 		Meteor.users.update(
 			{roles: role },
 			{$pull: {roles: role }},
@@ -95,8 +95,8 @@ Meteor.methods({
 		if (!user || !Roles.userIsInRole(user, ['admin']))
 			throw new Meteor.Error(401, "You need to be an admin to update a user.");
 
-		if (property !== 'profile.name')
-			throw new Meteor.Error(422, "Only 'name' is supported.");
+		if (property !== 'username')
+			throw new Meteor.Error(422, "Only 'username' is supported.");
 
 		obj = {};
 		obj[property] = value;
diff --git a/versions.json b/versions.json
index 152174a..93977bb 100644
--- a/versions.json
+++ b/versions.json
@@ -2,170 +2,218 @@
   "dependencies": [
     [
       "accounts-base",
-      "1.0.0"
+      "1.1.2"
     ],
     [
       "alanning:roles",
-      "1.2.12"
+      "1.2.13"
     ],
     [
       "application-configuration",
-      "1.0.0"
+      "1.0.3"
     ],
     [
       "autoupdate",
-      "1.0.0"
+      "1.1.3"
+    ],
+    [
+      "base64",
+      "1.0.1"
     ],
     [
       "binary-heap",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "blaze",
-      "1.0.0"
+      "2.0.3"
     ],
     [
       "blaze-tools",
-      "1.0.0"
+      "1.0.1"
+    ],
+    [
+      "boilerplate-generator",
+      "1.0.1"
     ],
     [
       "callback-hook",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "check",
-      "1.0.0"
+      "1.0.2"
+    ],
+    [
+      "ddp",
+      "1.0.12"
     ],
     [
       "deps",
-      "1.0.0"
+      "1.0.5"
     ],
     [
       "ejson",
-      "1.0.0"
+      "1.0.4"
+    ],
+    [
+      "fastclick",
+      "1.0.1"
     ],
     [
       "follower-livedata",
-      "1.0.0"
+      "1.0.2"
     ],
     [
       "geojson-utils",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "html-tools",
-      "1.0.0"
+      "1.0.2"
     ],
     [
       "htmljs",
-      "1.0.0-cordova1"
+      "1.0.2"
+    ],
+    [
+      "http",
+      "1.0.8"
     ],
     [
       "id-map",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "jquery",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "json",
+      "1.0.1"
+    ],
+    [
+      "launch-screen",
       "1.0.0"
     ],
     [
       "livedata",
-      "1.0.6"
+      "1.0.11"
     ],
     [
       "localstorage",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "logging",
-      "1.0.0"
+      "1.0.5"
     ],
     [
       "meteor",
-      "1.0.2"
+      "1.1.3"
+    ],
+    [
+      "meteor-platform",
+      "1.2.0"
     ],
     [
       "minifiers",
-      "1.0.0"
+      "1.1.2"
     ],
     [
       "minimongo",
-      "1.0.0"
+      "1.0.5"
     ],
     [
-      "mongo-livedata",
-      "1.0.0"
+      "mobile-status-bar",
+      "1.0.1"
+    ],
+    [
+      "mongo",
+      "1.0.9"
     ],
     [
       "observe-sequence",
-      "1.0.0"
+      "1.0.3"
     ],
     [
       "ordered-dict",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "random",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "reactive-dict",
-      "1.0.0"
+      "1.0.4"
+    ],
+    [
+      "reactive-var",
+      "1.0.3"
     ],
     [
       "reload",
-      "1.0.0"
+      "1.1.1"
     ],
     [
       "retry",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "routepolicy",
-      "1.0.0-cordova1"
+      "1.0.2"
     ],
     [
       "service-configuration",
-      "1.0.0"
+      "1.0.2"
     ],
     [
       "session",
-      "1.0.0"
+      "1.0.4"
     ],
     [
       "spacebars",
-      "1.0.0"
+      "1.0.3"
     ],
     [
       "spacebars-compiler",
-      "1.0.0"
+      "1.0.3"
     ],
     [
       "standard-app-packages",
-      "1.0.0"
+      "1.0.3"
     ],
     [
       "templating",
-      "1.0.0"
+      "1.0.9"
+    ],
+    [
+      "tracker",
+      "1.0.3"
     ],
     [
       "ui",
-      "1.0.0"
+      "1.0.4"
     ],
     [
       "underscore",
-      "1.0.0"
+      "1.0.1"
+    ],
+    [
+      "url",
+      "1.0.2"
     ],
     [
       "webapp",
-      "1.0.0"
+      "1.1.4"
+    ],
+    [
+      "webapp-hashing",
+      "1.0.1"
     ]
   ],
   "pluginDependencies": [],
-  "toolVersion": "meteor-tool@1.0.26",
+  "toolVersion": "meteor-tool@1.0.36",
   "format": "1.0"
 }
\ No newline at end of file

From 63588903a42b1ea1b3ec66cc52dbf8b242fb04af Mon Sep 17 00:00:00 2001
From: Jerry McRae <u@JerryMcRae.com>
Date: Fri, 16 Jan 2015 17:38:14 -0800
Subject: [PATCH 2/4] add caption to admin screen

---
 .gitignore                 | 1 +
 client/accounts_admin.html | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 677a6fc..7d88e62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .build*
+.idea
diff --git a/client/accounts_admin.html b/client/accounts_admin.html
index c2a93c4..b959c6c 100644
--- a/client/accounts_admin.html
+++ b/client/accounts_admin.html
@@ -11,6 +11,9 @@
         </div>
     </div>
     <table class='table table-striped'>
+        <caption style="text-align: center;">
+            <h2>Users and Roles</h2>
+        </caption>
         <thead>
             <tr>
                 <th></th>

From 0ce4f3665d772544edde140443c9014db14698a0 Mon Sep 17 00:00:00 2001
From: Jerry McRae <u@JerryMcRae.com>
Date: Wed, 21 Jan 2015 16:37:42 -0800
Subject: [PATCH 3/4] verify username is unique if changed;  better error
 message display for field change.

---
 client/update_account_modal.html | 2 +-
 client/update_account_modal.js   | 6 ++++--
 server/methods.js                | 9 ++++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/client/update_account_modal.html b/client/update_account_modal.html
index 4ce51da..ab6657c 100644
--- a/client/update_account_modal.html
+++ b/client/update_account_modal.html
@@ -11,7 +11,7 @@
 <template name="updateAccountModalInner">
 	{{#with userInScope}}
 		<div class="modal-header">
-			<h4>Update User</h4>
+			<h3>Update User</h3>
 		</div>
         <div class="modal-body">
             <div class="form-group">
diff --git a/client/update_account_modal.js b/client/update_account_modal.js
index a559839..09382d4 100644
--- a/client/update_account_modal.js
+++ b/client/update_account_modal.js
@@ -76,10 +76,12 @@ Template.updateAccountModalInner.events({
 		Meteor.call('updateUserInfo', userId, ele.name, ele.value, function(error) {
 			if (error)
 			{
-				if (typeof Errors === "undefined") Log.error('Error: ' + error.reason);
-				else Errors.throw(error.reason);
+				Log.error('Error calling updateUserInfo: ' + error.error);
+				var me = $("div.modal.in .modal-header").append("<div class='alert alert-danger' role='alert'>")
+				$("div.alert",me).html(error.error)
 				return;
 			}
+			$("div.modal.in .modal-header div.alert").remove();
 			Session.set('userInScope', Meteor.users.findOne(userId));
 		});
 	}
diff --git a/server/methods.js b/server/methods.js
index ec81aa7..5d50d2f 100644
--- a/server/methods.js
+++ b/server/methods.js
@@ -95,9 +95,12 @@ Meteor.methods({
 		if (!user || !Roles.userIsInRole(user, ['admin']))
 			throw new Meteor.Error(401, "You need to be an admin to update a user.");
 
-		if (property !== 'username')
-			throw new Meteor.Error(422, "Only 'username' is supported.");
-
+		if (['username','profile.name'].indexOf(property) === -1)
+			throw new Meteor.Error(422, "Programming error: Only 'username' or 'profile.name' is supported.");
+		if (property = 'username') {
+			if (Meteor.users.find({_id:{$ne:id},username:value}).count())
+				throw new Meteor.Error("username <b>" + value + "</b> already in use")
+		}
 		obj = {};
 		obj[property] = value;
 		Meteor.users.update({_id: id}, {$set: obj});

From 12b98807a9a3ded1fbab06de80029f029750cb53 Mon Sep 17 00:00:00 2001
From: Jerry McRae <u@JerryMcRae.com>
Date: Wed, 21 Jan 2015 17:45:57 -0800
Subject: [PATCH 4/4] put both Username and profile.name on all screens

---
 client/accounts_admin.html       |  9 +++++++++
 client/accounts_admin.js         |  1 +
 client/info_account_modal.html   | 11 ++++++++++-
 client/update_account_modal.html |  6 +++++-
 server/methods.js                |  2 +-
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/client/accounts_admin.html b/client/accounts_admin.html
index b959c6c..60ebe0c 100644
--- a/client/accounts_admin.html
+++ b/client/accounts_admin.html
@@ -17,6 +17,7 @@ <h2>Users and Roles</h2>
         <thead>
             <tr>
                 <th></th>
+                <th>Username</th>
                 <th>Name</th>
                 <th>Email</th>
                 <th>Roles</th>
@@ -43,6 +44,14 @@ <h2>Users and Roles</h2>
                             {{/if}}
                         {{/if}}
                     </td>
+                    <td>
+                        {{#if profile.name}}
+                            {{profile.name}}
+                        {{else}}
+                            {{username}}
+                        {{/if}}
+
+                    </td>
                     <td>{{email}}</td>
                     <td>{{roles}}</td>
                 </tr>
diff --git a/client/accounts_admin.js b/client/accounts_admin.js
index 785f781..81ae94e 100644
--- a/client/accounts_admin.js
+++ b/client/accounts_admin.js
@@ -52,6 +52,7 @@ Template.accountsAdmin.events({
     },
 
     'click .glyphicon-pencil': function(event, template) {
+		$("div.modal .modal-header div.alert").remove();
 		Session.set('userInScope', this);
     }
 });
diff --git a/client/info_account_modal.html b/client/info_account_modal.html
index c714008..8a85f27 100644
--- a/client/info_account_modal.html
+++ b/client/info_account_modal.html
@@ -15,7 +15,7 @@ <h4>Account Info</h4>
 	{{#with userInScope}}
 	 	<div class="modal-body">
 			<ul class="list-group">
-				<li class="list-group-item"><strong>Name</strong>
+				<li class="list-group-item"><strong>Username</strong>
 					<span class="pull-right">
 						{{#if username}}
 							{{username}}
@@ -28,6 +28,15 @@ <h4>Account Info</h4>
 						{{/if}}
 					</span>
 				</li>
+				<li class="list-group-item"><strong>Name</strong>
+					<span class="pull-right">
+						{{#if profile.name}}
+							{{profile.name}}
+						{{else}}
+							{{username}}
+						{{/if}}
+					</span>
+				</li>
 				<li class="list-group-item"><strong>Email</strong><span class="pull-right">{{email}}</span></li>
 				<li class="list-group-item"><strong>ID</strong><span class="pull-right">{{_id}}</span></li>
 				{{#each rolePairs}}
diff --git a/client/update_account_modal.html b/client/update_account_modal.html
index ab6657c..284bc36 100644
--- a/client/update_account_modal.html
+++ b/client/update_account_modal.html
@@ -16,9 +16,13 @@ <h3>Update User</h3>
         <div class="modal-body">
             <div class="form-group">
                 <div class="input-group">
-                    <span class="input-group-addon">Name</span>
+                    <span class="input-group-addon">Username</span>
                     <input data-user-id="{{_id}}" class="form-control admin-user-info" name="username" value="{{username}}" placeholder="{{email}}">
                 </div>
+                <div class="input-group">
+                    <span class="input-group-addon">Name</span>
+                    <input data-user-id="{{_id}}" class="form-control admin-user-info" name="profile.name" value="{{profile.name}}" placeholder="{{username}}">
+                </div>
             </div>
 			{{#if roles}}
                 <ul class="list-group">
diff --git a/server/methods.js b/server/methods.js
index 5d50d2f..221aab6 100644
--- a/server/methods.js
+++ b/server/methods.js
@@ -97,7 +97,7 @@ Meteor.methods({
 
 		if (['username','profile.name'].indexOf(property) === -1)
 			throw new Meteor.Error(422, "Programming error: Only 'username' or 'profile.name' is supported.");
-		if (property = 'username') {
+		if (property === 'username') {
 			if (Meteor.users.find({_id:{$ne:id},username:value}).count())
 				throw new Meteor.Error("username <b>" + value + "</b> already in use")
 		}