Use "eslint-config-simplabs" (#1186)

* ESLint: Ignore blueprint files

These files include templating tokens that can not be parsed by ESLint

* Add "eslint-config-simplabs" dev dependency

* Remove unused import

* Cleanup whitespace and remaining ESLint issues

Author: Turbo87

.eslintignore

@@ -0,0 +1 @@
+/blueprints/*/files

.eslintrc.js

@@ -1,13 +1,4 @@
 module.exports = {
   root: true,
-  parserOptions: {
-    ecmaVersion: 6,
-    sourceType: 'module'
-  },
-  extends: 'eslint:recommended',
-  env: {
-    browser: true
-  },
-  rules: {
-  }
+  extends: 'simplabs',
 };

addon/authenticators/devise.js

@@ -112,6 +112,7 @@ export default BaseAuthenticator.extend({
     @public
   */
   restore(data) {
+    // eslint-disable-next-line prefer-promise-reject-errors
     return this._validate(data) ? Promise.resolve(data) : Promise.reject();
   },
 
@@ -137,7 +138,7 @@ export default BaseAuthenticator.extend({
     return new Promise((resolve, reject) => {
       const useResponse = this.get('rejectWithResponse');
       const { resourceName, identificationAttributeName, tokenAttributeName } = this.getProperties('resourceName', 'identificationAttributeName', 'tokenAttributeName');
-      const data         = {};
+      const data = {};
       data[resourceName] = { password };
       data[resourceName][identificationAttributeName] = identification;
 

addon/authenticators/oauth2-password-grant.js

@@ -181,7 +181,7 @@ export default BaseAuthenticator.extend({
   */
   restore(data) {
     return new RSVP.Promise((resolve, reject) => {
-      const now                 = (new Date()).getTime();
+      const now = (new Date()).getTime();
       const refreshAccessTokens = this.get('refreshAccessTokens');
       if (!isEmpty(data['expires_at']) && data['expires_at'] < now) {
         if (refreshAccessTokens) {
@@ -227,7 +227,7 @@ export default BaseAuthenticator.extend({
   */
   authenticate(identification, password, scope = [], headers = {}) {
     return new RSVP.Promise((resolve, reject) => {
-      const data                = { 'grant_type': 'password', username: identification, password };
+      const data = { 'grant_type': 'password', username: identification, password };
       const serverTokenEndpoint = this.get('serverTokenEndpoint');
       const useResponse = this.get('rejectWithResponse');
       const scopesString = makeArray(scope).join(' ');
@@ -357,15 +357,15 @@ export default BaseAuthenticator.extend({
   },
 
   _refreshAccessToken(expiresIn, refreshToken) {
-    const data                = { 'grant_type': 'refresh_token', 'refresh_token': refreshToken };
+    const data = { 'grant_type': 'refresh_token', 'refresh_token': refreshToken };
     const serverTokenEndpoint = this.get('serverTokenEndpoint');
     return new RSVP.Promise((resolve, reject) => {
       this.makeRequest(serverTokenEndpoint, data).then((response) => {
         run(() => {
-          expiresIn       = response['expires_in'] || expiresIn;
-          refreshToken    = response['refresh_token'] || refreshToken;
+          expiresIn = response['expires_in'] || expiresIn;
+          refreshToken = response['refresh_token'] || refreshToken;
           const expiresAt = this._absolutizeExpirationTime(expiresIn);
-          const data      = assign(response, { 'expires_in': expiresIn, 'expires_at': expiresAt, 'refresh_token': refreshToken });
+          const data = assign(response, { 'expires_in': expiresIn, 'expires_at': expiresAt, 'refresh_token': refreshToken });
           this._scheduleAccessTokenRefresh(expiresIn, null, refreshToken);
           this.trigger('sessionDataUpdated', data);
           resolve(data);

addon/authorizers/devise.js

@@ -57,7 +57,7 @@ export default BaseAuthorizer.extend({
   */
   authorize(data, block) {
     const { tokenAttributeName, identificationAttributeName } = this.getProperties('tokenAttributeName', 'identificationAttributeName');
-    const userToken          = data[tokenAttributeName];
+    const userToken = data[tokenAttributeName];
     const userIdentification = data[identificationAttributeName];
 
     if (!isEmpty(userToken) && !isEmpty(userIdentification)) {

addon/internal-session.js

@@ -109,7 +109,7 @@ export default ObjectProxy.extend(Evented, {
   },
 
   _setup(authenticator, authenticatedContent, trigger) {
-    trigger = !!trigger && !this.get('isAuthenticated');
+    trigger = Boolean(trigger) && !this.get('isAuthenticated');
     this.beginPropertyChanges();
     this.setProperties({
       isAuthenticated: true,
@@ -134,7 +134,7 @@ export default ObjectProxy.extend(Evented, {
   },
 
   _clear(trigger) {
-    trigger = !!trigger && this.get('isAuthenticated');
+    trigger = Boolean(trigger) && this.get('isAuthenticated');
     this.beginPropertyChanges();
     this.setProperties({
       isAuthenticated: false,

addon/services/session.js

@@ -2,7 +2,7 @@ import Ember from 'ember';
 
 const SESSION_DATA_KEY_PREFIX = /^data\./;
 
-const { computed, A, Service, Evented, getOwner, isNone, assert }  = Ember;
+const { computed, A, Service, Evented, getOwner, isNone, assert } = Ember;
 
 /**
   __The session service provides access to the current session as well as

addon/session-stores/adaptive.js

@@ -105,7 +105,7 @@ export default Base.extend({
       localStorage.setItem(LOCAL_STORAGE_TEST_KEY, true);
       localStorage.removeItem(LOCAL_STORAGE_TEST_KEY);
       return true;
-    } catch(e) {
+    } catch (e) {
       return false;
     }
   }),

addon/session-stores/cookie.js

@@ -170,7 +170,7 @@ export default BaseStore.extend({
   */
   persist(data) {
     this._lastData = data;
-    data           = JSON.stringify(data || {});
+    data = JSON.stringify(data || {});
     let expiration = this._calculateExpirationTime();
     this._write(data, expiration);
     return RSVP.resolve();
@@ -211,16 +211,16 @@ export default BaseStore.extend({
 
   _calculateExpirationTime() {
     let cachedExpirationTime = this._read(`${this.get('cookieName')}-expiration_time`);
-    cachedExpirationTime     = cachedExpirationTime ? new Date().getTime() + cachedExpirationTime * 1000 : null;
+    cachedExpirationTime = cachedExpirationTime ? new Date().getTime() + cachedExpirationTime * 1000 : null;
     return this.get('cookieExpirationTime') ? new Date().getTime() + this.get('cookieExpirationTime') * 1000 : cachedExpirationTime;
   },
 
   _write(value, expiration) {
     let cookieOptions = {
-      domain:  this.get('cookieDomain'),
+      domain: this.get('cookieDomain'),
       expires: isEmpty(expiration) ? null : new Date(expiration),
-      path:    '/',
-      secure:  this.get('_secureCookies')
+      path: '/',
+      secure: this.get('_secureCookies')
     };
     if (this._oldCookieName) {
       A([this._oldCookieName, `${this._oldCookieName}-expiration_time`]).forEach((oldCookie) => {
@@ -252,7 +252,7 @@ export default BaseStore.extend({
   _renew() {
     return this.restore().then((data) => {
       if (!isEmpty(data) && data !== {}) {
-        data           = typeOf(data) === 'string' ? data : JSON.stringify(data || {});
+        data = typeOf(data) === 'string' ? data : JSON.stringify(data || {});
         let expiration = this._calculateExpirationTime();
         this._write(data, expiration);
       }

app/initializers/ember-simple-auth.js

@@ -1,13 +1,13 @@
-import Ember from 'ember';
 import ENV from '../config/environment';
 import Configuration from 'ember-simple-auth/configuration';
 import setupSession from 'ember-simple-auth/initializers/setup-session';
 import setupSessionService from 'ember-simple-auth/initializers/setup-session-service';
 
 export default {
-  name:       'ember-simple-auth',
-  initialize: function(registry) {
-    const config   = ENV['ember-simple-auth'] || {};
+  name: 'ember-simple-auth',
+
+  initialize(registry) {
+    const config = ENV['ember-simple-auth'] || {};
     config.baseURL = ENV.rootURL || ENV.baseURL;
     Configuration.load(config);
 

app/instance-initializers/ember-simple-auth.js

@@ -1,8 +1,9 @@
 import setupSessionRestoration from 'ember-simple-auth/instance-initializers/setup-session-restoration';
 
 export default {
-  name:       'ember-simple-auth',
-  initialize: function(instance) {
+  name: 'ember-simple-auth',
+
+  initialize(instance) {
     setupSessionRestoration(instance);
   }
 };

blueprints/.eslintrc.js

@@ -1,5 +1,4 @@
 module.exports = {
-  env: {
-    node: true
-  }
+  root: true,
+  extends: 'simplabs/configs/node-0.x',
 };

blueprints/authenticator/index.js

@@ -10,7 +10,7 @@ module.exports = {
   ],
 
   locals: function(options) {
-    var name      = options.entity.name;
+    var name = options.entity.name;
     var baseClass = options.baseClass || 'base';
 
     if (baseClass === 'torii') {

blueprints/authorizer/index.js

@@ -9,7 +9,7 @@ module.exports = {
   ],
 
   locals: function(options) {
-    var name      = options.entity.name;
+    var name = options.entity.name;
     var baseClass = options.baseClass || 'base';
 
     if (baseClass === 'oauth2') {

ember-cli-build.js

@@ -1,46 +1,48 @@
-/* global require, module */
+/* eslint-env node */
+'use strict';
+
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
-const yuidoc = require('broccoli-yuidoc');
+const Yuidoc = require('broccoli-yuidoc');
 const version = require('git-repo-version')();
-const Handlebars = require('handlebars');
 
-var sourceTrees = [];
+let sourceTrees = [];
 
 module.exports = function(defaults) {
-  var app = new EmberAddon(defaults, {
+  let app = new EmberAddon(defaults, {
     storeConfigInMeta: true,
     jscsOptions: {
       enabled: true,
-      testGenerator: function(relativePath, errors) {
+      testGenerator(relativePath, errors) {
         if (errors) {
-          errors = "\\n" + this.escapeErrorString(errors);
+          errors = `\\n${this.escapeErrorString(errors)}`;
         } else {
-          errors = "";
+          errors = '';
         }
 
-        return "describe('JSCS - " + relativePath + "', function() {\n" +
-          "it('should pass jscs', function() { \n" +
-          "  expect(" + !errors + ", '" + relativePath + " should pass jscs." + errors + "').to.be.ok; \n" +
-          "})});\n";
+        return `describe('JSCS - ${relativePath}', function() {
+  it('should pass jscs', function() {
+    expect(${!errors}, '${relativePath} should pass jscs.${errors}').to.be.ok; 
+  });
+});`;
       }
     }
   });
 
   app.import('bower_components/bootstrap/dist/css/bootstrap.css');
 
-  const yuidocTree = new yuidoc(['addon', 'app'], {
+  const yuidocTree = new Yuidoc(['addon', 'app'], {
     destDir: 'docs',
     yuidoc: {
       project: {
-        name:    'The Ember Simple Auth API',
-        version: version,
+        name: 'The Ember Simple Auth API',
+        version,
       },
       linkNatives: false,
-      quiet:       true,
-      parseOnly:   false,
-      lint:        false,
-      themedir:    'docs/theme',
-      helpers:     ['docs/theme/helpers/helpers.js']
+      quiet: true,
+      parseOnly: false,
+      lint: false,
+      themedir: 'docs/theme',
+      helpers: ['docs/theme/helpers/helpers.js']
     }
   });
 

index.js

@@ -1,10 +1,10 @@
-/* jshint node: true */
+/* eslint-env node */
 'use strict';
 
 module.exports = {
   name: 'ember-simple-auth',
 
-  included: function(app) {
+  included(app) {
     this._super.included.apply(this, arguments);
 
     // see: https://github.com/ember-cli/ember-cli/issues/3718

package.json

@@ -66,6 +66,7 @@
     "ember-sinon": "~0.6.0",
     "ember-source": "^2.11.0",
     "ember-suave": "~4.0.0",
+    "eslint-config-simplabs": "^0.2.0",
     "express": "^4.14.0",
     "git-repo-version": "^0.4.1",
     "glob": "^7.0.5",

server/.eslintrc.js

@@ -1,5 +1,4 @@
 module.exports = {
-  env: {
-    node: true
-  }
+  root: true,
+  extends: 'simplabs/configs/node-0.x',
 };

server/index.js

@@ -1,17 +1,17 @@
 module.exports = function(app) {
-  var globSync   = require('glob').sync;
+  var globSync = require('glob').sync;
   var bodyParser = require('body-parser');
-  var cors       = require('cors');
-  var mocks      = globSync('./mocks/**/*.js', { cwd: __dirname }).map(require);
-  var proxies    = globSync('./proxies/**/*.js', { cwd: __dirname }).map(require);
+  var cors = require('cors');
+  var mocks = globSync('./mocks/**/*.js', { cwd: __dirname }).map(require);
+  var proxies = globSync('./proxies/**/*.js', { cwd: __dirname }).map(require);
 
   app.use(bodyParser.json({ type: 'application/*+json' }));
   app.use(bodyParser.urlencoded({
     extended: true
   }));
 
   // Log proxy requests
-  var morgan  = require('morgan');
+  var morgan = require('morgan');
   app.use(morgan('dev'));
 
   // enable *all* CORS requests

server/mocks/accounts.js

@@ -1,11 +1,11 @@
 module.exports = function(app) {
-  var express        = require('express');
+  var express = require('express');
   var accountsRouter = express.Router();
 
   accountsRouter.get('/1', function(req, res) {
     res.setHeader('Access-Control-Allow-Origin', '*');
     if (/Bearer .+/.test(req.headers.authorization)) {
-      const response = {
+      var response = {
         data: {
           type: 'accounts',
           id: '1',

server/mocks/posts.js

@@ -1,10 +1,10 @@
 module.exports = function(app) {
-  var express     = require('express');
+  var express = require('express');
   var postsRouter = express.Router();
 
   postsRouter.get('/', function(req, res) {
     if (/Bearer .+/.test(req.headers.authorization)) {
-      const response = {
+      var response = {
         data: [
           {
             type: 'posts',

server/mocks/token.js

@@ -1,5 +1,5 @@
 module.exports = function(app) {
-  var express     = require('express');
+  var express = require('express');
   var tokenRouter = express.Router();
 
   tokenRouter.post('/token', function(req, res) {

test-support/helpers/ember-simple-auth.js

@@ -1,3 +1,5 @@
+/* global wait */
+
 import Test from 'ember-simple-auth/authenticators/test';
 
 const TEST_CONTAINER_KEY = 'authenticator:test';
@@ -15,16 +17,16 @@ export function authenticateSession(app, sessionData) {
   ensureAuthenticator(app, container);
   session.authenticate(TEST_CONTAINER_KEY, sessionData);
   return wait();
-};
+}
 
 export function currentSession(app) {
   return app.__container__.lookup('service:session');
-};
+}
 
 export function invalidateSession(app) {
   const session = app.__container__.lookup('service:session');
   if (session.get('isAuthenticated')) {
     session.invalidate();
   }
   return wait();
-};
+}