thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #51 from thermokarst/refactor-users

Browse source 
Refactor users
This commit is contained in:
Matthew Dillon 2015-11-10 10:26:24 -07:00
commit 9fa701c44e
41 changed files with 599 additions and 309 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/equal.js
View file

@ -1,7 +1,9 @@
import Ember from 'ember';
const { Helper: { helper } } = Ember;
export function equalHelper(params) {
return params[0] === params[1];
}
export default Ember.HTMLBars.makeBoundHelper(equalHelper);
export default helper(equalHelper);

5
app/mirage/config.js
View file

@ -2,7 +2,7 @@ export default function() {
// Don't use mirage for development (for now)
this.urlPrefix = 'http://127.0.0.1:8901';
this.namespace = '/api';
this.passthrough();
this.passthrough('http://localhost:4200/**', 'http://127.0.0.1:8901/**');
}
export function testConfig() {
@ -10,7 +10,10 @@ export function testConfig() {
this.namespace = '/api/hymenobacter';
this.timing = 0;
this.get('/users');
this.post('/users');
this.get('/users/:id');
this.put('/users/:id');
this.get('/species');
this.post('/species');

1
app/mixins/save-model.js
View file

@ -16,6 +16,7 @@ export default Mixin.create({
if (model.get('hasDirtyAttributes')) {
model.save().then((model) => {
this.get('flashMessages').clearMessages();
this.transitionToRoute(fallbackRoute, model);
}, () => {
ajaxError(model.get('errors'), this.get('flashMessages'));

2
app/mixins/setup-metadata.js
View file

@ -5,10 +5,12 @@ const { Mixin, inject: { service }} = Ember;
export default Mixin.create({
currentUser: service('session-account'),
metaData: null,
isAdmin: null,
setupMetaDataOnInit: Ember.on('init', function() {
this.get('currentUser.account').then((user) => {
this.set('metaData', user.get('metaData'));
this.set('isAdmin', user.get('isAdmin'));
});
}),
});

2
app/pods/protected/characteristics/edit/controller.js
View file

@ -6,5 +6,5 @@ const { Controller } = Ember;
export default Controller.extend(SaveModel, {
// Required for SaveModel mixin
fallbackRouteSave: 'protected.characteristics.show',
fallbackRouteCancel: 'protected.characteristics.index',
fallbackRouteCancel: 'protected.characteristics.show',
});

31
app/pods/protected/users/changepassword/controller.js
View file

@ -1,33 +1,30 @@
import Ember from 'ember';
import ajaxRequest from '../../../../utils/ajax-request';
export default Ember.Controller.extend({
session: Ember.inject.service('session'),
currentUser: Ember.inject.service('session-account'),
const { Controller, inject: { service } } = Ember;
passwordConfirm: null,
export default Controller.extend({
session: service(),
currentUser: service('session-account'),
actions: {
save: function() {
if (this.get('password') !== this.get('passwordConfirm')) {
this.get('flashMessages').clearMessages();
this.get('flashMessages').error("Password fields don't match");
return;
}
let url = `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/users/password`;
let options = {
save: function(password) {
const url = `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/users/password`;
const id = this.get('currentUser.account.id');
const options = {
method: 'POST',
data: {
id: this.get('currentUser.account.id'),
password: this.get('password'),
id: id,
password: password,
},
};
ajaxRequest(url, options, this.get('session'));
this.transitionToRoute('protected.users.index');
this.transitionToRoute('protected.users.show', id);
this.get('flashMessages').information('Your password has been changed.');
},
cancel: function() {
this.transitionToRoute('protected.users.show', this.get('currentUser.account.id'));
},
},
});

52
app/pods/protected/users/changepassword/password-form/component.js Normal file
View file

@ -0,0 +1,52 @@
import Ember from 'ember';
const { Component } = Ember;
export default Component.extend({
password: null,
passwordConfirm: null,
matches: false,
// Actions
"on-save": null,
"on-cancel": null,
updateField: function(property, value) {
this.set(property, value);
this.verifyPassword(this.get('password'), this.get('passwordConfirm'));
},
verifyPassword: function(password, passwordConfirm) {
if (password && passwordConfirm) {
if (password !== passwordConfirm) {
this.get('flashMessages').clearMessages();
this.get('flashMessages').error("Password fields don't match");
this.set('matches', false);
} else {
this.get('flashMessages').clearMessages();
this.set('matches', true);
}
}
},
actions: {
save: function() {
this.verifyPassword(this.get('password'), this.get('passwordConfirm'));
if (this.get('matches')) {
return this.attrs['on-save'](this.get('password'));
}
},
cancel: function() {
return this.attrs['on-cancel']();
},
passwordDidChange: function(value) {
this.updateField('password', value);
},
passwordConfirmDidChange: function(value) {
this.updateField('passwordConfirm', value);
},
},
});

29
app/pods/protected/users/changepassword/password-form/template.hbs Normal file
View file

@ -0,0 +1,29 @@
<div class="grid-1">
<div class="span-1">
<fieldset>
<legend>Change password</legend>
<form {{action 'save' on='submit'}}>
<ul>
<li>
<label>New Password</label>
{{one-way-input type="password" class="password" value=password update=(action "passwordDidChange")}}
</li>
<li>
<label>New Password (confirm)</label>
{{one-way-input type="password" class="password-confirm" value=passwordConfirm update=(action "passwordConfirmDidChange")}}
</li>
<li>
<a class="button-red smaller" {{action 'cancel'}}>
Cancel
</a>
{{#if matches}}
<button type="submit" class="button-green smaller submit-password">
Submit
</button>
{{/if}}
</li>
</ul>
</form>
</fieldset>
</div>
</div>

11
app/pods/protected/users/changepassword/route.js
View file

@ -1,16 +1,19 @@
import Ember from 'ember';
export default Ember.Route.extend({
currentUser: Ember.inject.service('session-account'),
const { Route, inject: { service } } = Ember;
export default Route.extend({
currentUser: service('session-account'),
beforeModel: function(transition) {
this._super(transition);
let user_id = transition.params['protected.users.changepassword'].user_id;
// Only the logged in user can change their password
const user_id = transition.params['protected.users.changepassword'].user_id;
this.get('currentUser.account').then((user) => {
if (user.get('id') !== user_id) {
this.transitionTo('protected.users.index');
this.transitionTo('protected.users.show', user.get('id'));
}
});
}

29
app/pods/protected/users/changepassword/template.hbs
View file

@ -1,24 +1,5 @@
<div class="grid-1">
<div class="span-1">
<fieldset>
<legend>Change password</legend>
<form {{action 'save' on='submit'}}>
<ul>
<li>
<label>New Password</label>
{{input type="password" value=password}}
</li>
<li>
<label>New Password (confirm)</label>
{{input type="password" value=passwordConfirm}}
</li>
<li>
<button type="submit" class="button-green smaller">
Submit
</button>
</li>
</ul>
</form>
</fieldset>
</div>
</div>
{{
protected/users/changepassword/password-form
on-save=(action "save")
on-cancel=(action "cancel")
}}

42
app/pods/protected/users/edit/controller.js
View file

@ -1,40 +1,10 @@
import Ember from 'ember';
import ajaxError from '../../../../utils/ajax-error';
import SaveModel from '../../../../mixins/save-model';
export default Ember.Controller.extend({
actions: {
save: function() {
let user = this.get('model');
const { Controller } = Ember;
if (user.get('hasDirtyAttributes')) {
let attrs = user.changedAttributes(), roleChanged = false;
if (attrs.role) {
roleChanged = true;
}
user.save().then((user) => {
this.get('flashMessages').clearMessages();
if (roleChanged) {
// Need to clear the store so that canEdit and canAdd
// attributes reflect the new role.
this.get('store').unloadAll();
}
this.transitionToRoute('protected.users.show', user);
}, () => {
ajaxError(user.get('errors'), this.get('flashMessages'));
});
} else {
this.transitionToRoute('protected.users.show', user);
}
},
cancel: function() {
let user = this.get('model');
user.get('errors').clear();
user.rollbackAttributes();
this.transitionToRoute('protected.users.show', user);
},
},
export default Controller.extend(SaveModel, {
// Required for SaveModel mixin
fallbackRouteSave: 'protected.users.show',
fallbackRouteCancel: 'protected.users.show',
});

10
app/pods/protected/users/edit/route.js
View file

@ -1,8 +1,12 @@
import Ember from 'ember';
export default Ember.Route.extend({
currentUser: Ember.inject.service('session-account'),
const { Route, inject: { service } } = Ember;
export default Route.extend({
currentUser: service('session-account'),
// Not using ElevatedAccess Mixin because the rules for viewing user accounts
// is slightly different.
beforeModel: function(transition) {
this._super(transition);
@ -16,7 +20,7 @@ export default Ember.Route.extend({
},
model: function(params) {
return this.store.findRecord('user', params.user_id, { reload: true });
return this.store.findRecord('user', params.user_id);
},
});

5
app/pods/protected/users/edit/template.hbs
View file

@ -1,7 +1,6 @@
{{
protected/users/user-form
user=model
currentUser=currentUser.account
save="save"
cancel="cancel"
on-save=(action "save")
on-cancel=(action "cancel")
}}

6
app/pods/protected/users/index/route.js
View file

@ -1,7 +1,9 @@
import Ember from 'ember';
export default Ember.Route.extend({
currentUser: Ember.inject.service('session-account'),
const { Route, inject: { service } } = Ember;
export default Route.extend({
currentUser: service('session-account'),
beforeModel: function(transition) {
this._super(transition);

35
app/pods/protected/users/index/template.hbs
View file

@ -1,33 +1,6 @@
<h2>{{genus-name}} Users</h2>
<h3>Total users: {{model.length}}</h3>
<table class="flakes-table">
<thead>
<tr>
<th>Name</th>
<th>Email</th>
<th>Role</th>
<th>Date Registered</th>
</tr>
</thead>
<tbody>
{{#each model as |row|}}
<tr>
<td>
{{#link-to 'protected.users.show' row}}
{{row.name}}
{{/link-to}}
</td>
<td>
{{row.email}}
</td>
<td>
{{row.fullRole}}
</td>
<td>
{{null-time row.createdAt 'LL'}}
</td>
</tr>
{{/each}}
</tbody>
</table>
{{
protected/users/index/users-table
users=model
}}

7
app/pods/protected/users/index/users-table/component.js Normal file
View file

@ -0,0 +1,7 @@
import Ember from 'ember';
const { Component } = Ember;
export default Component.extend({
users: null,
});

33
app/pods/protected/users/index/users-table/template.hbs Normal file
View file

@ -0,0 +1,33 @@
<h3 id="total-users">Total users: {{users.length}}</h3>
<table class="flakes-table">
<thead>
<tr>
<th>Name</th>
<th>Email</th>
<th>Role</th>
<th>Date Registered</th>
</tr>
</thead>
<tbody>
{{#each users as |user|}}
<tr>
<td>
{{#link-to 'protected.users.show' user}}
{{user.name}}
{{/link-to}}
</td>
<td>
{{user.email}}
</td>
<td>
{{user.fullRole}}
</td>
<td>
{{null-time user.createdAt 'LL'}}
</td>
</tr>
{{/each}}
</tbody>
</table>

1
app/pods/protected/users/loading/template.hbs Normal file
View file

@ -0,0 +1 @@
{{loading-panel}}

10
app/pods/protected/users/show/controller.js
View file

@ -1,9 +1,9 @@
import Ember from 'ember';
import DeleteModel from '../../../../mixins/delete-model';
export default Ember.Controller.extend({
currentUser: Ember.inject.service('session-account'),
const { Controller } = Ember;
isUser: Ember.computed('model.id', 'currentUser.account.id', function() {
return this.get('model.id') === this.get('currentUser.account.id');
}),
export default Controller.extend(DeleteModel, {
// Required for DeleteModel mixin
transitionRoute: 'protected.index',
});

16
app/pods/protected/users/show/route.js
View file

@ -1,21 +1,25 @@
import Ember from 'ember';
export default Ember.Route.extend({
currentUser: Ember.inject.service('session-account'),
const { Route, inject: { service } } = Ember;
export default Route.extend({
currentUser: service('session-account'),
// Not using ElevatedAccess Mixin because the rules for viewing user accounts
// is slightly different.
beforeModel: function(transition) {
this._super(transition);
this.get('currentUser.account').then((currentUser) => {
let user_id = transition.params['protected.users.show'].user_id;
if (!currentUser.get('isAdmin') && currentUser.get('id') !== user_id) {
this.get('currentUser.account').then((user) => {
const user_id = transition.params['protected.users.show'].user_id;
if (!user.get('isAdmin') && user.get('id') !== user_id) {
this.transitionTo('protected.users.index');
}
});
},
model: function(params) {
return this.store.findRecord('user', params.user_id, { reload: true });
return this.store.findRecord('user', params.user_id);
},
});

58
app/pods/protected/users/show/template.hbs
View file

@ -1,53 +1,5 @@
<div class="span-1">
<fieldset class="flakes-information-box">
<legend>
{{model.name}}
</legend>
{{! ROW 1 }}
<div class="grid-2 gutter-20">
<dl class="span-1">
<dt>Email</dt>
<dd>
{{model.email}}
</dd>
</dl>
<dl class="span-1">
<dt>Role</dt>
<dd>
{{model.fullRole}}
</dd>
</dl>
</div>
{{! ROW 2 }}
<div class="grid-2 gutter-20">
<dl class="span-1">
<dt>Record Created</dt>
<dd>{{null-time model.createdAt 'LL'}}</dd>
</dl>
<dl class="span-1">
<dt>Record Updated</dt>
<dd>{{null-time model.updatedAt 'LL'}}</dd>
</dl>
</div>
</fieldset>
</div>
<br>
<div class="grid-2 gutter-20">
{{#if isUser}}
<div class="span-1">
{{#link-to 'protected.users.changepassword' model.id class="button-gray smaller"}}
Change Password
{{/link-to}}
</div>
{{/if}}
<div class="span-1">
{{#if model.canEdit}}
{{#link-to 'protected.users.edit' model.id class="button-gray smaller"}}
Edit
{{/link-to}}
{{/if}}
</div>
</div>
{{
protected/users/show/user-card
user=model
on-delete=(action 'delete')
}}

13
app/pods/protected/users/show/user-card/component.js Normal file
View file

@ -0,0 +1,13 @@
import Ember from 'ember';
const { Component, computed, inject: { service } } = Ember;
export default Component.extend({
currentUser: service('session-account'),
user: null,
isUser: computed('user.id', 'currentUser.account.id', function() {
return this.get('user.id') === this.get('currentUser.account.id');
}),
});

53
app/pods/protected/users/show/user-card/template.hbs Normal file
View file

@ -0,0 +1,53 @@
<div class="span-1">
<fieldset class="flakes-information-box">
<legend>
{{user.name}}
</legend>
{{! ROW 1 }}
<div class="grid-2 gutter-20">
<dl class="span-1">
<dt>Email</dt>
<dd>
{{user.email}}
</dd>
</dl>
<dl class="span-1">
<dt>Role</dt>
<dd>
{{user.fullRole}}
</dd>
</dl>
</div>
{{! ROW 2 }}
<div class="grid-2 gutter-20">
<dl class="span-1">
<dt>Record Created</dt>
<dd>{{null-time user.createdAt 'LL'}}</dd>
</dl>
<dl class="span-1">
<dt>Record Updated</dt>
<dd>{{null-time user.updatedAt 'LL'}}</dd>
</dl>
</div>
</fieldset>
</div>
<br>
<div class="grid-2 gutter-20">
{{#if isUser}}
<div class="span-1">
{{#link-to 'protected.users.changepassword' user.id class="button-gray smaller"}}
Change Password
{{/link-to}}
</div>
{{/if}}
<div class="span-1">
{{#if user.canEdit}}
{{#link-to 'protected.users.edit' user.id class="button-gray smaller"}}
Edit
{{/link-to}}
{{/if}}
</div>
</div>

54
app/pods/protected/users/user-form/component.js
View file

@ -1,15 +1,61 @@
import Ember from 'ember';
import SetupMetaData from '../../../../mixins/setup-metadata';
export default Ember.Component.extend({
const { Component } = Ember;
export default Component.extend(SetupMetaData, {
// Read-only attributes
user: null,
isDirty: false,
roles: Ember.String.w('A R W'),
// Actions
"on-save": null,
"on-cancel": null,
"on-update": null,
// Property mapping
propertiesList: ['name', 'email', 'role'],
name: null,
email: null,
role: null,
resetOnInit: Ember.on('init', function() {
this.get('propertiesList').forEach((field) => {
const valueInUser = this.get('user').get(field);
this.set(field, valueInUser);
});
}),
updateField: function(property, value) {
this.set(property, value);
// Manually compare against passed in value
if (this.get('user').get(property) !== value) {
this.set('isDirty', true);
} else {
this.set('isDirty', false);
}
},
actions: {
save: function() {
this.sendAction('save');
return this.attrs['on-save'](this.getProperties(this.get('propertiesList')));
},
cancel: function() {
this.sendAction('cancel');
return this.attrs['on-cancel']();
},
}
nameDidChange: function(value) {
this.updateField('name', value);
},
emailDidChange: function(value) {
this.updateField('email', value);
},
roleDidChange: function(value) {
this.updateField('role', value);
},
},
});

18
app/pods/protected/users/user-form/template.hbs
View file

@ -1,29 +1,29 @@
<form class="grid-form" {{action 'save' on='submit'}}>
<fieldset>
<legend><em>{{user.name}}</em></legend>
<legend><em>{{name}}</em></legend>
<div data-row-span="1">
<div data-field-span="1">
<label>Name</label>
{{input value=user.name}}
{{one-way-input type="text" class="user-name" value=name update=(action "nameDidChange")}}
</div>
</div>
<div data-row-span="1">
<div data-field-span="1">
<label>Email</label>
{{input value=user.email}}
{{one-way-input type="text" class="email" value=email update=(action "emailDidChange")}}
</div>
</div>
<div data-row-span="1">
<div data-field-span="1">
<label>Role</label>
{{#if session.currentUser.isAdmin}}
<select onchange={{action (mut user.role) value="target.value"}}>
{{#if isAdmin}}
<select onchange={{action "roleDidChange" value="target.value"}}>
{{#each roles as |roleChoice|}}
<option value={{roleChoice}} selected={{equal user.role roleChoice}}>{{roleChoice}}</option>
<option value={{roleChoice}} selected={{equal role roleChoice}}>{{roleChoice}}</option>
{{/each}}
</select>
{{else}}
{{user.role}}
{{role}} {{!-- Not editable --}}
{{/if}}
</div>
</div>
@ -32,8 +32,8 @@
<a class="button-red smaller" {{action 'cancel'}}>
Cancel
</a>
{{#if user.hasDirtyAttributes}}
<button type="submit" class="button-green smaller">
{{#if isDirty}}
<button type="submit" class="button-green smaller save-user">
Save
</button>
{{/if}}

6
app/pods/users/lockoutauthenticate/controller.js
View file

@ -1,6 +1,8 @@
import Ember from 'ember';
export default Ember.Controller.extend({
queryParams: ['token'],
const { Controller } = Ember;
export default Controller.extend({
queryParams: ['token'],
token: null,
});

10
app/pods/users/lockoutauthenticate/route.js
View file

@ -1,14 +1,16 @@
import Ember from 'ember';
import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin';
export default Ember.Route.extend(UnauthenticatedRouteMixin, {
session: Ember.inject.service('session'),
currentUser: Ember.inject.service('session-account'),
const { Route, get, inject: { service } } = Ember;
export default Route.extend(UnauthenticatedRouteMixin, {
session: service(),
currentUser: service('session-account'),
beforeModel: function(transition) {
this._super(transition);
let token = Ember.get(transition, 'queryParams.token');
const token = get(transition, 'queryParams.token');
this.get('session').authenticate('authenticator:jwt-resolved', token).then(() => {
this.get('currentUser.account').then((account) => {
this.transitionTo('protected.users.changepassword', account.get('id'));

23
app/pods/users/new/controller.js
View file

@ -1,30 +1,29 @@
import Ember from 'ember';
import ajaxError from '../../../utils/ajax-error';
export default Ember.Controller.extend({
passwordConfirm: null,
const { Controller } = Ember;
export default Controller.extend({
isLoading: false,
actions: {
save: function() {
let user = this.get('user');
// All validation is server-side, except for password verification matching
if (user.get('password') !== this.get('passwordConfirm')) {
this.get('flashMessages').clearMessages();
this.get('flashMessages').error("Password fields don't match");
return;
}
save: function(properties) {
const user = this.get('model');
user.setProperties(properties);
if (user.get('hasDirtyAttributes')) {
this.set('isLoading', true);
user.save().then(() => {
this.transitionTo('login').then(() => {
this.transitionToRoute('login').then(() => {
this.get('flashMessages').information(`You have successfully signed up.
Please check your email for further instructions.`);
});
}, () => {
this.set('isLoading', false);
ajaxError(user.get('errors'), this.get('flashMessages'));
});
}
},
},
});

66
app/pods/users/new/new-user-form/component.js Normal file
View file

@ -0,0 +1,66 @@
import Ember from 'ember';
const { Component } = Ember;
export default Component.extend({
// Read-only attributes
user: null,
isLoading: null,
// Actions
"on-save": null,
"on-cancel": null,
// Property mapping
propertiesList: ['name', 'email', 'password', 'passwordConfirm'],
name: null,
email: null,
password: null,
passwordConfirm: null,
resetOnInit: Ember.on('init', function() {
this.get('propertiesList').forEach((field) => {
const valueInUser = this.get('user').get(field);
this.set(field, valueInUser);
});
}),
updateField: function(property, value) {
this.set(property, value);
// Manually compare against passed in value
if (this.get('user').get(property) !== value) {
this.set('isDirty', true);
} else {
this.set('isDirty', false);
}
},
actions: {
save: function() {
// All validation is server-side, except for password verification matching
if (this.get('password') !== this.get('passwordConfirm')) {
this.get('flashMessages').clearMessages();
this.get('flashMessages').error("Password fields don't match");
return;
}
return this.attrs['on-save'](this.getProperties(this.get('propertiesList')));
},
nameDidChange: function(value) {
this.updateField('name', value);
},
emailDidChange: function(value) {
this.updateField('email', value);
},
passwordDidChange: function(value) {
this.updateField('password', value);
},
passwordConfirmDidChange: function(value) {
this.updateField('passwordConfirm', value);
}
}
});

36
app/pods/users/new/new-user-form/template.hbs Normal file
View file

@ -0,0 +1,36 @@
{{#if isLoading}}
{{loading-panel}}
{{else}}
<div class="grid-1">
<div class="span-1">
<fieldset>
<legend>New User Signup</legend>
<form {{action 'save' on='submit'}}>
<ul>
<li>
<label>Name</label>
{{one-way-input type="text" class="user-name" value=name update=(action "nameDidChange")}}
</li>
<li>
<label>Email</label>
{{one-way-input type="text" class="email" value=email update=(action "emailDidChange")}}
</li>
<li>
<label>Password</label>
{{one-way-input type="password" class="password" value=password update=(action "passwordDidChange")}}
</li>
<li>
<label>Password (confirm)</label>
{{one-way-input type="password" class="password-verify" value=passwordConfirm update=(action "passwordConfirmDidChange")}}
</li>
<li>
<button type="submit" class="button-green smaller save-user">
Submit
</button>
</li>
</ul>
</form>
</fieldset>
</div>
</div>
{{/if}}

13
app/pods/users/new/route.js
View file

@ -1,15 +1,10 @@
import Ember from 'ember';
import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin';
export default Ember.Route.extend(UnauthenticatedRouteMixin, {
const { Route } = Ember;
export default Route.extend(UnauthenticatedRouteMixin, {
model: function() {
return Ember.RSVP.hash({
user: this.store.createRecord('user'),
});
return this.store.createRecord('user');
},
setupController: function(controller, model) {
controller.setProperties(model);
},
});

38
app/pods/users/new/template.hbs
View file

@ -1,32 +1,6 @@
<div class="grid-1">
<div class="span-1">
<fieldset>
<legend>New User Signup</legend>
<form {{action 'save' on='submit'}}>
<ul>
<li>
<label>Name</label>
{{input value=user.name}}
</li>
<li>
<label>Email</label>
{{input value=user.email}}
</li>
<li>
<label>Password</label>
{{input type="password" value=user.password}}
</li>
<li>
<label>Password (confirm)</label>
{{input type="password" value=passwordConfirm}}
</li>
<li>
<button type="submit" class="button-green smaller">
Submit
</button>
</li>
</ul>
</form>
</fieldset>
</div>
</div>
{{
users/new/new-user-form
user=model
isLoading=isLoading
on-save=(action "save")
}}

19
app/pods/users/new/verify/route.js
View file

@ -1,31 +1,26 @@
import Ember from 'ember';
import ajaxRequest from '../../../../utils/ajax-request';
export default Ember.Route.extend({
session: Ember.inject.service('session'),
const { Route, inject: { service } } = Ember;
apiURL: function() {
return this.get('globals.apiURL');
}.property(),
genus: function() {
return this.get('globals.genus');
}.property(),
export default Route.extend({
session: service(),
globals: service(),
model: function(params) {
let url = `${this.get('apiURL')}/api/${this.get('genus')}/users/verify/${params.nonce}`;
const url = `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/users/verify/${params.nonce}`;
return ajaxRequest(url, {}, this.get('session'));
},
afterModel: function(model/*, transition*/) {
this.get('flashMessages').success(model.msg);
this.get('flashMessages').success(model.get('msg'));
this.transitionTo('login');
},
actions: {
error: function(error/*, transition*/) {
let err = Ember.$.parseJSON(error.responseText);
const err = Ember.$.parseJSON(error.responseText);
this.get('flashMessages').error(err.error);
this.transitionTo('login');
}

1
app/pods/users/new/verify/template.hbs
View file

@ -1 +0,0 @@
{{outlet}}

15
app/pods/users/requestlockouthelp/controller.js
View file

@ -1,15 +1,18 @@
import Ember from 'ember';
import ajaxRequest from '../../../utils/ajax-request';
export default Ember.Controller.extend({
session: Ember.inject.service('session'),
const { Controller, inject: { service } } = Ember;
export default Controller.extend({
session: service(),
globals: service(),
actions: {
save: function() {
let url = `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/users/lockout`;
let options = {
submit: function(email) {
const url = `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/users/lockout`;
const options = {
method: 'POST',
data: { email: this.get('email') },
data: { email: email },
};
ajaxRequest(url, options, this.get('session'));
this.transitionToRoute('login');

18
app/pods/users/requestlockouthelp/lockout-form/component.js Normal file
View file

@ -0,0 +1,18 @@
import Ember from 'ember';
const { Component } = Ember;
export default Component.extend({
email: null,
"on-submit": null,
actions: {
save: function() {
return this.attrs["on-submit"](this.get('email'));
},
emailDidChange: function(value) {
this.set('email', value);
},
}
});

18
app/pods/users/requestlockouthelp/lockout-form/template.hbs Normal file
View file

@ -0,0 +1,18 @@
<div class="grid-1">
<div class="span-1">
<fieldset>
<legend>Account Lockout/Password Reset</legend>
<form {{action 'save' on='submit'}}>
<ul>
<li>
<label>Email</label>
{{one-way-input type="text" class="email" value=email update=(action "emailDidChange")}}
</li>
<li>
<button type="submit" class="button-green smaller">Submit</button>
</li>
</ul>
</form>
</fieldset>
</div>
</div>

8
app/pods/users/requestlockouthelp/route.js
View file

@ -1,8 +0,0 @@
import Ember from 'ember';
export default Ember.Route.extend({
deactivate: function() {
this.controller.set('email', null);
},
});

22
app/pods/users/requestlockouthelp/template.hbs
View file

@ -1,18 +1,4 @@
<div class="grid-1">
<div class="span-1">
<fieldset>
<legend>Account Lockout/Password Reset</legend>
<form {{action 'save' on='submit'}}>
<ul>
<li>
<label>Email</label>
{{input value=email}}
</li>
<li>
<button type="submit" class="button-green smaller">Submit</button>
</li>
</ul>
</form>
</fieldset>
</div>
</div>
{{
users/requestlockouthelp/lockout-form
on-submit=(action "submit")
}}

11
app/services/session-account.js
View file

@ -2,19 +2,20 @@ import Ember from 'ember';
import DS from 'ember-data';
import parseBase64 from '../utils/parse-base64';
const { service } = Ember.inject;
const { Service, computed, isEmpty, inject: { service } } = Ember;
const { PromiseObject } = DS;
export default Ember.Service.extend({
export default Service.extend({
session: service('session'),
store: service(),
account: Ember.computed('session.data.authenticated.access_token', function() {
account: computed('session.data.authenticated.access_token', function() {
const token = this.get('session.data.authenticated.access_token');
const claims = parseBase64(token);
const id = claims['sub'];
if (!Ember.isEmpty(id)) {
return DS.PromiseObject.create({
if (!isEmpty(id)) {
return PromiseObject.create({
promise: this.get('store').findRecord('user', id),
});
}

77
tests/acceptance/users-test.js Normal file
View file

@ -0,0 +1,77 @@
import Ember from 'ember';
import { module, test } from 'qunit';
import startApp from '../helpers/start-app';
import { invalidateSession, authenticateSession } from '../helpers/ember-simple-auth';
module('Acceptance | users', {
beforeEach: function() {
this.application = startApp();
authenticateSession(this.application, {
access_token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWN0ZGIiLCJzdWIiOiIxIiwiZXhwIjoxNDQ2NTAyMjI2LCJpYXQiOjE0NDY0OTg2MjZ9.vIjKHAsp2TkCV505EbtCo2xQT-2oQkB-Nv5y0b6E7Mg"
});
server.create('users', { role: 'A', canEdit: true });
},
afterEach: function() {
Ember.run(this.application, 'destroy');
}
});
test('visiting /users', function(assert) {
const users = server.createList('users', 19); // We already created one user in beforeEach
visit('/users');
andThen(function() {
assert.equal(currentURL(), '/users');
assert.equal(find(".flakes-table > tbody > tr").length, users.length + 1);
assert.equal(find("#total-users").text(), "Total users: 20");
});
});
test('visiting /users/:id', function(assert) {
const user = server.create('users');
visit(`/users/${user.id}`);
andThen(function() {
assert.equal(currentURL(), `/users/${user.id}`);
assert.equal(find(".flakes-information-box > legend").text().trim(), user.name);
});
});
test('editing /users/:id/edit', function(assert) {
const user = server.create('users', { 'canEdit': true });
visit(`/users/${user.id}/edit`);
andThen(function() {
assert.equal(currentURL(), `/users/${user.id}/edit`);
fillIn('.user-name', 'Revised User Name');
click('.save-user');
andThen(function() {
assert.equal(currentURL(), `/users/${user.id}`);
assert.equal(find(".flakes-information-box > legend").text().trim(), 'Revised User Name');
});
});
});
test('creating /users/new', function(assert) {
invalidateSession(this.application);
visit(`/users/new`);
andThen(function() {
assert.equal(currentURL(), `/users/new`);
fillIn('.user-name', 'New User Name');
fillIn('.email', 'example@example.com');
fillIn('.password', 'Password1');
fillIn('.password-verify', 'Password1');
click('.save-user');
andThen(function() {
assert.equal(currentURL(), `/login`);
assert.equal(find(".flakes-message").text().trim(), `✖ You have successfully signed up.
Please check your email for further instructions.`);
});
});
});