Merge branch 'release/20.6.0'

Author: fabmiz

.editorconfig

@@ -4,7 +4,6 @@
 
 root = true
 
-
 [*]
 # end_of_line = lf (https://github.com/editorconfig/editorconfig/issues/226)
 charset = utf-8

.eslintrc.js

@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
     globals: {
         server: true,
@@ -45,6 +47,7 @@ module.exports = {
         }],
         'no-underscore-dangle': 'off',
         'linebreak-style': ['error', (process.platform === 'win32' ? 'windows' : 'unix')],
+        'lines-between-class-members': 'off',
     },
     overrides: [
         {
@@ -104,4 +107,7 @@ module.exports = {
             },
         },
     ],
+    settings: {
+        'import/extensions': ['error', 'never'],
+    },
 };

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
+node_js:
+  - "10"
 
-sudo: false
 dist: trusty
 
 env:

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [20.6.0] - 2020-06-26
+## Changed
+- Upgrade to Ember 3.16
+- Miscellaneous security and dependency upgrades
+
 ## [20.5.0] - 2020-06-03
 ## Changed
 - Components
@@ -1606,8 +1611,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
-[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/20.5.0...develop
-[20.4.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.5.0
+[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/20.6.0...develop
+[20.6.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.6.0
+[20.5.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.5.0
 [20.4.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.4.0
 [20.3.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.3.1
 [20.3.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.3.0

app/adapters/osf-adapter.ts

@@ -102,7 +102,7 @@ export default class OsfAdapter extends JSONAPIAdapter {
         if (snapshot) {
             const { adapterOptions }: { adapterOptions?: { url?: string } } = snapshot;
             if (adapterOptions && adapterOptions.url) {
-                url = adapterOptions.url; // eslint-disable-line prefer-destructuring
+                url = adapterOptions.url;
             }
         }
 

app/authenticators/osf-cookie.ts

@@ -79,11 +79,7 @@ export default class OsfCookie extends Base {
         }
 
         // Push the user into the store for later use
-        try {
-            this.store.pushPayload(userData);
-        } catch (error) {
-            throw error;
-        }
+        this.store.pushPayload(userData);
 
         const { id } = userData.data;
         this.set('lastVerifiedUserId', id);
@@ -100,10 +96,10 @@ export default class OsfCookie extends Base {
         } = this;
 
         if (
-            isAuthenticated &&
-            lastVerifiedUserId &&
-            data &&
-            data.authenticated.id === lastVerifiedUserId
+            isAuthenticated
+            && lastVerifiedUserId
+            && data
+            && data.authenticated.id === lastVerifiedUserId
         ) {
             // Everything is in order, no need to re-auth
             return undefined;

app/errors.ts

@@ -1,3 +1,5 @@
-export class OsfError {}
+/* eslint-disable max-classes-per-file */
+export class OsfError { }
 
 export class NotLoggedIn extends OsfError {}
+/* eslint-enable max-classes-per-file */

app/institutions/index/controller.ts

@@ -27,8 +27,9 @@ export default class Institutions extends Controller {
         if (!this.textValue.length) {
             return this.model;
         }
-        return this.model.filter((institution: Institution) =>
-            institution.name.toLowerCase().indexOf(this.textValue.toLowerCase()) !== -1);
+        return this.model.filter(
+            (institution: Institution) => institution.name.toLowerCase().indexOf(this.textValue.toLowerCase()) !== -1,
+        );
     }
 
     @computed('filtered', 'sortOrder', 'page', 'textValue')

app/locations/auto.ts

@@ -1,7 +1,21 @@
 import AutoLocation from '@ember/routing/auto-location';
-import GuidLocationMixin from 'ember-osf-web/locations/guid-mixin';
+import cleanURL from 'ember-osf-web/utils/clean-url';
 
 // Sadly the `auto` location must be overriden, otherwise
 // ember-cli's server doesn't allow visiting specific URLs
-export default class GuidAutoLocation extends AutoLocation.extend(GuidLocationMixin) {
+export default class GuidAutoLocation extends AutoLocation {
+    setURL(url: string) {
+        return super.setURL(cleanURL(url));
+    }
+
+    replaceURL(url: string) {
+        if (super.replaceURL) {
+            return super.replaceURL(cleanURL(url));
+        }
+        return undefined;
+    }
+
+    formatURL(url: string): string {
+        return super.formatURL(cleanURL(url));
+    }
 }