chore(deps-dev): bump ember-simple-auth-token from 3.0.0 to 4.0.7 (#3886)

* chore(deps-dev): bump ember-simple-auth-token from 3.0.0 to 4.0.7

Bumps [ember-simple-auth-token](https://github.com/jpadilla/ember-simple-auth-token) from 3.0.0 to 4.0.7.
- [Release notes](https://github.com/jpadilla/ember-simple-auth-token/releases)
- [Commits](fenichelar/ember-simple-auth-token@v3.0.0...v4.0.7)

Signed-off-by: dependabot-preview[bot] <[email protected]>
Co-authored-by: Areeb Jamal <[email protected]>

Author: dependabot-preview[bot]

app/components/account/application-section.js

@@ -15,8 +15,8 @@ export default Component.extend({
             this.loader.load(`/auth/oauth/login/${  provider  }/${  authData.authorizationCode  }/?redirect_uri=${  authData.redirectUri}`)
               .then(async response => {
                 let credentials = {
-                  'identification' : response.email,
-                  'password'       : response.facebook_login_hash
+                  'username' : response.email,
+                  'password' : response.facebook_login_hash
                 };
 
                 let authenticator = 'authenticator:jwt';

app/components/forms/login-form.js

@@ -44,7 +44,7 @@ export default class extends Component.extend(FormMixin) {
   @action
   async submit() {
     this.onValid(async() => {
-      let credentials = { identification: this.identification, password: this.password },
+      let credentials = { username: this.identification, password: this.password },
           authenticator = 'authenticator:jwt';
       this.setProperties({
         errorMessage : null,
@@ -60,8 +60,8 @@ export default class extends Component.extend(FormMixin) {
 
         }
       } catch (e) {
-        if (e.error) {
-          this.set('errorMessage', this.l10n.tVar(e.error));
+        if (e.json && e.json.error) {
+          this.set('errorMessage', this.l10n.tVar(e.json.error));
         } else {
           this.set('errorMessage', this.l10n.t('An unexpected error occurred.'));
         }

app/controllers/oauth/callback.js

@@ -5,8 +5,8 @@ export default Controller.extend({
     this.loader.post(`/auth/oauth/login/${ queryParams.provider }?code=${ queryParams.code }`)
       .then(response => {
         let credentials = {
-              identification : response.email,
-              password       : response.oauth_hash
+              username : response.email,
+              password : response.oauth_hash
             },
             authenticator = 'authenticator:jwt';
 

app/controllers/public/index.js

@@ -29,7 +29,7 @@ export default Controller.extend({
         .then(() => {
           let credentials = newUser.getProperties('email', 'password'),
               authenticator = 'authenticator:jwt';
-          credentials.identification = newUser.email;
+          credentials.username = newUser.email;
           this.session
             .authenticate(authenticator, credentials)
             .then(async() => {
@@ -63,10 +63,10 @@ export default Controller.extend({
 
     },
 
-    async loginExistingUser(identification, password) {
+    async loginExistingUser(username, password) {
       this.set('isLoading', true);
       let credentials = {
-        identification,
+        username,
         password
       };
       let authenticator = 'authenticator:jwt';
@@ -83,7 +83,7 @@ export default Controller.extend({
         })
         .catch(reason => {
           if (!(this.isDestroyed || this.isDestroying)) {
-            if (reason && Object.prototype.hasOwnProperty.call(reason, 'status_code') && reason.status_code === 401) {
+            if (reason && reason.status === 401) {
               this.set('errorMessage', this.l10n.t('Your credentials were incorrect.'));
             } else {
               this.set('errorMessage', this.l10n.t('An unexpected error occurred.'));

app/controllers/register.js

@@ -36,10 +36,10 @@ export default Controller.extend({
         });
     },
 
-    async loginExistingUser(identification, password, token, eventId) {
+    async loginExistingUser(username, password, token, eventId) {
       this.set('isLoading', true);
       let credentials = {
-        identification,
+        username,
         password
       };
       let authenticator = 'authenticator:jwt';

config/environment.js

@@ -102,15 +102,11 @@ module.exports = function(environment) {
   };
 
   ENV['ember-simple-auth-token'] = {
-    refreshAccessTokens      : false,
-    serverTokenEndpoint      : `${ENV.APP.apiHost}/auth/session`,
-    identificationField      : 'email',
-    passwordField            : 'password',
-    tokenPropertyName        : 'access_token',
-    refreshTokenPropertyName : 'refresh_token',
-    authorizationPrefix      : 'JWT ',
-    authorizationHeaderName  : 'Authorization',
-    headers                  : {}
+    refreshAccessTokens : false,
+    serverTokenEndpoint : `${ENV.APP.apiHost}/auth/session`,
+    tokenPropertyName : 'access_token',
+    authorizationPrefix : 'JWT ',
+    authorizationHeaderName: 'Authorization'
   };
 
   ENV['g-map'] = {
@@ -211,6 +207,8 @@ module.exports = function(environment) {
     ENV['simple-auth'] = {
       store: 'simple-auth-session-store:ephemeral'
     };
+
+    ENV['ember-simple-auth-token'].tokenExpirationInvalidateSession = false;
   }
 
   if (environment === 'production') {

package.json

@@ -103,7 +103,7 @@
     "ember-router-scroll": "DockYard/ember-router-scroll#695d894",
     "ember-scroll-to": "^0.6.5",
     "ember-simple-auth": "^2.1.1",
-    "ember-simple-auth-token": "^3.0.0",
+    "ember-simple-auth-token": "^4.0.7",
     "ember-source": "~3.16.0",
     "ember-table": "^2.2.3",
     "ember-truth-helpers": "^2.1.0",

yarn.lock

@@ -6812,9 +6812,10 @@ [email protected]:
     node-fetch "^2.6.0"
     whatwg-fetch "^3.0.0"
 
-"ember-fetch@^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0":
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-6.5.1.tgz#6512153b9b85042744ed5a7934c8edb4a5b02dd0"
+"ember-fetch@^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0", "ember-fetch@^4.0.0 || ^5.0.0 || ^6.0.0":
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-6.7.2.tgz#82efce4a55a64863104347b71e598208b9acf518"
+  integrity sha512-+Dd++MJVkCXoqX2DPtFDjuoDMcLk+7fphLq7D8OoXwJq9KQMTff07sH18qhxWXV5Hqknvz3Uwy214g54vOboag==
   dependencies:
     abortcontroller-polyfill "^1.3.0"
     broccoli-concat "^3.2.2"
@@ -6826,7 +6827,7 @@ [email protected]:
     calculate-cache-key-for-tree "^2.0.0"
     caniuse-api "^3.0.0"
     ember-cli-babel "^6.8.2"
-    node-fetch "^2.3.0"
+    node-fetch "^2.6.0"
     whatwg-fetch "^3.0.0"
 
 ember-fullcalendar@^1.8.0:
@@ -7146,11 +7147,31 @@ ember-scroll-to@^0.6.5:
     ember-cli-babel "^6.3.0"
     ember-cli-htmlbars "^2.0.1"
 
-ember-simple-auth-token@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ember-simple-auth-token/-/ember-simple-auth-token-3.0.0.tgz#5641c543a9ac5dfa42ce6100296e144aa40742a9"
+ember-simple-auth-token@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/ember-simple-auth-token/-/ember-simple-auth-token-4.0.7.tgz#df4177d118b9f7a75a3879ceec04ab2c55e1cad2"
+  integrity sha512-1AyyBn0Bvmf4l0N1/ElR7bkP6T71+uU1H5qkCDqrOV1cM1o378/vx0MPtw0nLU0OM9/H6M+TNWyyR143MjcXfA==
   dependencies:
     ember-cli-babel "^6.6.0"
+    ember-fetch "^4.0.0 || ^5.0.0 || ^6.0.0"
+    ember-get-config "^0.2.4"
+    ember-simple-auth "^1.6.0"
+
+ember-simple-auth@^1.6.0:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/ember-simple-auth/-/ember-simple-auth-1.9.2.tgz#ee8b1b0ec4c5c0e08bc94560cb90552d4ae7fd5d"
+  integrity sha512-WTG2uGe8+TIfwsy5eaS7uIszEmyQ/pjKLUMjyq6YYkU9d9erSXVRiuO4h46OxTEbVI3c17mjAu/4kTxc+BOFZw==
+  dependencies:
+    base-64 "^0.1.0"
+    broccoli-file-creator "^2.0.0"
+    broccoli-funnel "^1.2.0 || ^2.0.0"
+    broccoli-merge-trees "^2.0.0 || ^3.0.0"
+    ember-cli-babel "^6.8.2"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cookies "^0.3.0 || ^0.4.0"
+    ember-fetch "^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
+    ember-getowner-polyfill "^1.1.0 || ^2.0.0"
+    silent-error "^1.0.0"
 
 ember-simple-auth@^2.1.1:
   version "2.1.1"
@@ -11838,7 +11859,7 @@ node-fetch-npm@^2.0.2:
     json-parse-better-errors "^1.0.0"
     safe-buffer "^5.1.1"
 
-node-fetch@^2.3.0, node-fetch@^2.6.0:
+node-fetch@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
   integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==