Create User & Complete Password Processes (#16)

* #3 Complete password implemented.  Still needs testing.

* #3 Complete password tested.  MFA no longer is two steps to activate.

* #17 Starting to create new user.  Need to add role select box.

* #17 Create user is implemented but error handling is still required.  #15 Current user and sign out is improved.

README.md

@@ -69,6 +69,12 @@ yarn add --dev @fortawesome/free-solid-svg-icons
 yarn add --dev @fortawesome/free-regular-svg-icons
 yarn add --dev @fortawesome/free-brands-svg-icons
 
+# Ember Select Boxes - this addon is great
+ember install @zestia/ember-select-box
+
+# For custom actions that aren't normal REST end points; e.g. `current-user` needs a `sign-out` endpoint.
+ember install ember-api-actions
+
 # For importing libraries (replaces ember-browserify); needed for: `import Auth from '@aws-amplify/Auth'
 ember install ember-auto-import
 

app/adapters/current-user.js

@@ -0,0 +1,8 @@
+import ApplicationAdapter from './application';
+
+export default ApplicationAdapter.extend({
+  _buildURL(/*modelName, id*/) {
+    const url = this._super(...arguments);
+    return url.replace('current-users', 'current-user');
+  }
+});

app/controllers/forgot-password.js

@@ -1,3 +1,9 @@
 import Controller from '@ember/controller';
 
-export default Controller.extend({});
+export default Controller.extend({
+  email: '',
+
+  queryParams: [
+    { email: { type: 'string' } }
+  ]
+});

app/models/current-user.js

@@ -0,0 +1,32 @@
+import { collectionAction } from 'ember-api-actions';
+import BaseModel from 'ember-cybertooth-base-model/models/-base';
+import DS from 'ember-data';
+
+export default BaseModel.extend({
+  /* Attributes
+   * ---------------------------------------------------------------------------------------------------------------- */
+
+  email: DS.attr('string'),
+
+  /* Relationships
+   * ---------------------------------------------------------------------------------------------------------------- */
+
+  roles: DS.hasMany('role'),
+  sessions: DS.hasMany('session'),
+
+  /* Instance Methods
+   * ---------------------------------------------------------------------------------------------------------------- */
+
+  signOut() {
+    return new Promise((resolve, reject) => {
+      this._signOut()
+        .then(() => resolve(this))
+        .catch(response => reject(response))
+    });
+  },
+
+  /* Custom API end points
+   * ---------------------------------------------------------------------------------------------------------------- */
+
+  _signOut: collectionAction({ path: 'sign-out', type: 'PATCH' })
+});

app/models/session.js

@@ -10,12 +10,15 @@ export default BaseModel.extend({
   browser: DS.attr('string'),
   browserVersion: DS.attr('string'),
   device: DS.attr('string'),
+  invalidatedAt: DS.attr('date'),
   ipAddress: DS.attr('string'),
   platform: DS.attr('string'),
   platformVersion: DS.attr('string'),
 
   /** Relationships
    * ---------------------------------------------------------------------------------------------------------------- */
 
+  invalidatedBy: DS.belongsTo('user'),
+
   user: DS.belongsTo('user')
 });

app/models/user.js

@@ -1,16 +1,25 @@
+import { not, readOnly } from '@ember/object/computed';
 import BaseModel from 'ember-cybertooth-base-model/models/-base';
 import DS from 'ember-data';
 
 export default BaseModel.extend({
 
-  /** Attributes
+  /* Attributes
    * ---------------------------------------------------------------------------------------------------------------- */
 
   email: DS.attr('string'),
+  inCognito: DS.attr('boolean'),
 
-  /** Relationships
+  /* Relationships
    * ---------------------------------------------------------------------------------------------------------------- */
 
   roles: DS.hasMany('role'),
-  sessions: DS.hasMany('session')
+  sessions: DS.hasMany('session', { inverse: 'user' }),
+
+  /* Computed
+   * ---------------------------------------------------------------------------------------------------------------- */
+
+  'inCognito?': readOnly('inCognito'),
+
+  'notInCognito?': not('inCognito?')
 });

app/router.js

@@ -17,6 +17,8 @@ Router.map(function () {
           this.route('sessions', function () {
           });
         });
+        this.route('new', function () {
+        });
       });
     });
     this.route('profile', function () {

app/routes/application.js

@@ -9,7 +9,12 @@ export default Route.extend(ApplicationRouteMixin, {
     },
 
     logout(session) {
-      session.invalidate();
+      this.get('store')
+        .peekAll('current-user')
+        .get('firstObject')
+        .signOut()
+        .finally(() => this.get('store').unloadAll('current-user'))
+        .finally(() => session.invalidate())
     }
   },
 

app/routes/forgot-password.js

@@ -1,4 +1,5 @@
 import { hash } from 'rsvp';
+import { getWithDefault } from '@ember/object';
 import Route from '@ember/routing/route';
 
 export default Route.extend({
@@ -17,9 +18,13 @@ export default Route.extend({
     }
   },
 
-  model() {
+  model(params) {
     return hash({
-      username: ''
+      username: getWithDefault(params, 'email', '')
     });
+  },
+
+  queryParams: {
+    email: { refreshModel: true }
   }
 });

app/routes/login.js

@@ -6,6 +6,18 @@ import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-
 
 export default Route.extend(UnauthenticatedRouteMixin, {
   actions: {
+    completePassword(authenticationState, newPassword, additionalAttributes = {}/*, submitEvent*/) {
+      this.get('session')
+        .completePassword(authenticationState, newPassword, additionalAttributes)
+        .then(authenticationState => {
+          if (authenticationState.get('mfaRequired?')) {
+            set(this, 'controller.model.authenticationState', authenticationState);
+          }
+        })
+        .catch(response => this.get('notify').error(response.message));
+      return false;
+    },
+
     confirmSignIn(authenticationState, code) {
       this.get('session')
         .confirmSignIn(authenticationState, code)
@@ -18,7 +30,7 @@ export default Route.extend(UnauthenticatedRouteMixin, {
       this.get('session')
         .signIn(username, password)
         .then(authenticationState => {
-          if (authenticationState.get('mfaRequired?')) {
+          if (authenticationState.get('mfaRequired?') || authenticationState.get('newPasswordRequired?')) {
             set(this, 'controller.model.authenticationState', authenticationState);
           }
         })
@@ -32,8 +44,10 @@ export default Route.extend(UnauthenticatedRouteMixin, {
 
   model(params) {
     return {
+      additionalAttributes: {},
       authenticationState: {},  // will be set during sign in if MFA is enabled
       mfaCode: '',
+      newPassword: '',
       password: '',
       username: isNone(get(params, 'username')) ? '' : get(params, 'username')
     }

app/routes/protected.js

@@ -1,4 +1,17 @@
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 import Route from '@ember/routing/route';
 
-export default Route.extend(AuthenticatedRouteMixin, {});
+export default Route.extend(AuthenticatedRouteMixin, {
+  /**
+   * Loading the `current-user` into the store; you can peek to get access to it.
+   * @return {*|Promise} the `current-user` instance.
+   */
+  model() {
+    return this.get('store').queryRecord('current-user', {
+      include: '' +
+        'roles' +
+        ',sessions' +
+        ''
+    });
+  }
+});

app/routes/protected/configuration/users/new.js

@@ -0,0 +1,10 @@
+import { hash } from 'rsvp';
+import Route from '@ember/routing/route';
+
+export default Route.extend({
+  model() {
+    return hash({
+      roles: this.get('store').query('role', { sort: 'name' })
+    })
+  }
+});

app/routes/protected/configuration/users/new/index.js

@@ -0,0 +1,37 @@
+import { isBlank } from '@ember/utils';
+import { get } from '@ember/object';
+import { hash } from 'rsvp';
+import Route from '@ember/routing/route';
+
+export default Route.extend({
+  actions: {
+    chooseRole(user, chosenRole) {
+      if (isBlank(chosenRole)) {
+        return true;
+      }
+
+      user.get('roles').pushObject(chosenRole);
+      return true;
+    },
+
+    save(user) {
+      user
+        .save()
+        .then((/*response*/) => {
+          this.get('notify').success('Created.');
+        })
+        .catch((errors) => {
+          console.error('???', errors);
+          this.get('notify').error('Check for errors.');
+        });
+      return false;
+    }
+  },
+
+  model() {
+    return hash({
+      roles: get(this.modelFor('protected.configuration.users.new'), 'roles'),
+      user: this.get('store').createRecord('user')
+    });
+  }
+});

app/routes/protected/profile/change-password.js

@@ -7,8 +7,8 @@ export default Route.extend({
       session
         .changePassword(currentPassword, newPassword)
         .then(() => {
-          this.transitionTo('protected.index')
-            .then(newRoute => newRoute.get('notify').success('Your password was updated successfully.'));
+          this.refresh();
+          this.get('notify').success('Your password was updated successfully.');
         })
         .catch(response => this.get('notify').error(response.message));
       return false;

app/routes/protected/profile/configure-mfa.js

@@ -37,22 +37,15 @@ export default Route.extend({
       return false;
     },
 
-    finalize(session, mfaActivationState) {
+    verify(session, mfaActivationState) {
       session
-        .finalizeTotp(mfaActivationState)
+        .verifyTotpPasscode(mfaActivationState)
         .then(() => {
           set(this, 'controller.model.mfaActivationState', {});
           this.get('notify').success('Multi-factor authentication is now enabled.')
         })
         .catch((response) => this.get('notify').error(response.message));
       return false;
-    },
-
-    verify(session, mfaActivationState) {
-      session
-        .verifyTotpPasscode(mfaActivationState)
-        .catch((response) => this.get('notify').error(response.message));
-      return false;
     }
   },
 

app/serializers/application.js

@@ -0,0 +1,8 @@
+import DS from 'ember-data';
+
+export default DS.JSONAPISerializer.extend({
+  attrs: {
+    createdAt: { serialize: false },
+    updatedAt: { serialize: false }
+  }
+});

app/templates/forgot-password.hbs

@@ -13,7 +13,7 @@
           <legend>Reset My Password</legend>
           <form class="form" onsubmit={{action (route-action "forgotPassword" session model.username)}}>
             <div class="form-group">
-              <label for="js-username" class="control-label">Email Address</label>
+              <label for="js-username">Email Address</label>
               {{input-text
                 aria-describedby="js-username-help"
                 autocomplete="email"