Replace pass-auth authenticated service with user service

.docker/nginx-template.conf

@@ -5,31 +5,8 @@ server {
     #charset utf-8;
     #access_log  /var/log/nginx/host.access.log  main;
 
-    # Add Content Security Policy
-    add_header Content-Security-Policy "$CSP_HEADERS";
-
     location / {
         root   /usr/share/nginx/html;
         index  index.html index.htm;
-        add_header Content-Security-Policy "$CSP_HEADERS";
-    }
-
-    # This is important, any 404 will cause the ember
-    # app to re-load.  This is because all ember URLs
-    # (e.g. https://pass/grants/foo), when issued as an HTTP
-    # request, have nothing that 'serves' them.  Instead, the
-    # ember app, when loaded, inspects the URL and renders the
-    # correct page client-side.  So we want the ember app to load
-    # and parse all these 404 URLs.
-    #
-    # Note, the equals sign means that a 200 is returned
-    # instead of a 404
-    error_page 404 = ${PASS_UI_ROOT_URL}/index.html;
-
-    # redirect server error pages to the static page /50x.html
-    #
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-        root   /usr/share/nginx/html;
     }
 }

app/authenticators/http-only.js

@@ -18,9 +18,6 @@ export default class HttpOnly extends Base {
    */
   restore(data) {
     return new RSVP.Promise((resolve, reject) => {
-      if (window.location.pathname === '/app/auth-callback') {
-        return reject('Could not restore session.');
-      }
       if (!this._validateData(data)) {
         return reject('Could not restore session.');
       }
@@ -35,7 +32,7 @@ export default class HttpOnly extends Base {
    * @public
    */
   async authenticate() {
-    const url = `${window.location.origin}/authenticated`;
+    const url = `/user/whoami`;
 
     let response = await fetch(url);
 
@@ -61,16 +58,16 @@ export default class HttpOnly extends Base {
 
   async _validateData(data) {
     // see https://tools.ietf.org/html/rfc6749#section-4.2.2
-    if (isEmpty(data) || isEmpty(data.user.id)) return false;
+    if (isEmpty(data) || isEmpty(data.id)) return false;
 
-    const url = `${window.location.origin}/authenticated`;
+    const url = `/user/whoami`;
 
     let response = await fetch(url);
 
     if (response.ok) {
       const refreshedData = await response.json();
 
-      return data.user.id === refreshedData.user.id;
+      return data.id === refreshedData.id;
     } else {
       return false;
     }

app/index.html

@@ -8,6 +8,7 @@
 
     {{content-for "head"}}
 
+    <link rel="icon" href="/app/favicon.png" />
     <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css" />
     <link integrity="" rel="stylesheet" href="{{rootURL}}assets/pass-ui.css" />
     <link rel="stylesheet" href="{{rootURL}}coreUI.css" />

app/router.js

@@ -28,8 +28,6 @@ Router.map(function () {
   });
   this.route('not-found-error', { path: '/*path' });
   this.route('thanks');
-  this.route('auth-callback');
-  this.route('authenticated');
 });
 
 export default Router;

app/services/app-static-config.js

@@ -32,10 +32,6 @@ export default class AppStaticConfigService extends Service {
         const overrides = `${this._config.branding.overrides}`;
         this.addCSS(overrides);
       }
-      if (this._config.branding.favicon) {
-        const favicon = `${this._config.branding.favicon}`;
-        this.addFavicon(favicon);
-      }
     }
   }
 
@@ -85,17 +81,4 @@ export default class AppStaticConfigService extends Service {
 
     window.document.head.appendChild(newLink);
   }
-
-  addFavicon(uri) {
-    const fav = document.querySelector('head link[rel="icon"]');
-    if (fav || !uri) {
-      return;
-    }
-
-    const newFav = window.document.createElement('link');
-    newFav.setAttribute('rel', 'icon');
-    newFav.setAttribute('href', uri);
-
-    window.document.head.appendChild(newFav);
-  }
 }

app/services/current-user.js

@@ -21,7 +21,7 @@ export default class CurrentUserService extends Service {
    */
   @task
   load = function* () {
-    let userId = this.session.data.authenticated.user.id;
+    let userId = this.session.data.authenticated.id;
 
     if (userId) {
       let user = yield this.store.findRecord('user', userId);

mirage/config.js

@@ -42,17 +42,6 @@ export default function (config) {
         };
       });
 
-      /** Auth Service  */
-      this.get('/authenticated', (schema, request) => {
-        const user = schema.find('user', 0);
-
-        return {
-          user: {
-            id: user.id,
-          },
-        };
-      });
-
       /** User Service */
       this.get('/pass-user-service/whoami', (schema, request) => {
         const userId = request.queryParams.userToken;

tests/acceptance/app-test.js

@@ -11,7 +11,7 @@ module('Acceptance | application', function (hooks) {
   setupMirage(hooks);
 
   hooks.beforeEach(async function () {
-    await authenticateSession({ user: { id: '0' } });
+    await authenticateSession({ id: '0' });
   });
 
   test('Make sure app loads outside of root', async function (assert) {

tests/acceptance/nih-submission-test.js

@@ -12,9 +12,7 @@ module('Acceptance | submission', function (hooks) {
   setupMirage(hooks);
 
   hooks.beforeEach(async function () {
-    await authenticateSession({
-      user: { id: '0' },
-    });
+    await authenticateSession({ id: '0' });
   });
 
   test('can walk through an nih submission workflow and make a submission - base case', async function (assert) {

tests/acceptance/proxy-submission-test.js

@@ -33,9 +33,7 @@ module('Acceptance | proxy submission', function (hooks) {
 
     this.server.create('user', attrs);
 
-    await authenticateSession({
-      user: { id: '0' },
-    });
+    await authenticateSession({ id: '0' });
   });
 
   test('can walk through a proxy submission workflow and make a submission – with pass account', async function (assert) {

tests/unit/services/current-user-test.js

@@ -19,7 +19,7 @@ module('Unit | Service | current-user', (hooks) => {
       '@id': user.get('id'),
     };
 
-    service.set('session', { data: { authenticated: { user: { id: '000' } } } });
+    service.set('session', { data: { authenticated: { id: '000' } } });
 
     service.set(
       'store',