FIX: issues 1 and 3

.eslintrc

@@ -0,0 +1,53 @@
+{
+    "extends": "eslint:recommended",
+    "env": {
+      "node": true,
+      "mocha": true,
+      "es6": true
+    },
+    "parserOptions": {
+      "ecmaVersion": 9,
+      "sourceType": "module",
+      "ecmaFeatures" : {
+        "globalReturn": false,
+        "impliedStrict": true,
+        "jsx": false
+      }
+    },
+    "rules": {
+      "indent": [
+        "error",
+        2
+      ],
+      "linebreak-style": [
+        "error",
+        "unix"
+      ],
+      "quotes": [
+        "error",
+        "single"
+      ],
+      "semi": [
+        "error",
+        "always"
+      ],
+      "no-console": [
+        "warn"
+      ],
+      "no-var": [
+        "error"
+      ],
+      "prefer-const": ["error", {
+        "destructuring": "any",
+        "ignoreReadBeforeAssign": false
+      }],
+      "no-unused-vars": [
+        "error", 
+        { 
+          "vars": "all",
+          "args": "none",
+          "ignoreRestSiblings": false 
+        }
+      ]
+    }
+  }

examples/memory/model.js

@@ -24,7 +24,7 @@ InMemoryCache.prototype.dump = function() {
  */
 
 InMemoryCache.prototype.getAccessToken = function(bearerToken) {
-  var tokens = this.tokens.filter(function(token) {
+  const tokens = this.tokens.filter(function(token) {
     return token.accessToken === bearerToken;
   });
 
@@ -36,7 +36,7 @@ InMemoryCache.prototype.getAccessToken = function(bearerToken) {
  */
 
 InMemoryCache.prototype.getRefreshToken = function(bearerToken) {
-  var tokens = this.tokens.filter(function(token) {
+  const tokens = this.tokens.filter(function(token) {
     return token.refreshToken === bearerToken;
   });
 
@@ -48,7 +48,7 @@ InMemoryCache.prototype.getRefreshToken = function(bearerToken) {
  */
 
 InMemoryCache.prototype.getClient = function(clientId, clientSecret) {
-  var clients = this.clients.filter(function(client) {
+  const clients = this.clients.filter(function(client) {
     return client.clientId === clientId && client.clientSecret === clientSecret;
   });
 
@@ -75,7 +75,7 @@ InMemoryCache.prototype.saveToken = function(token, client, user) {
  */
 
 InMemoryCache.prototype.getUser = function(username, password) {
-  var users = this.users.filter(function(user) {
+  const users = this.users.filter(function(user) {
     return user.username === username && user.password === password;
   });
 

examples/mongodb/model.js

@@ -3,8 +3,8 @@
  * Module dependencies.
  */
 
-var mongoose = require('mongoose');
-var Schema = mongoose.Schema;
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
 
 /**
  * Schema definitions.
@@ -35,9 +35,9 @@ mongoose.model('OAuthUsers', new Schema({
   username: { type: String }
 }));
 
-var OAuthTokensModel = mongoose.model('OAuthTokens');
-var OAuthClientsModel = mongoose.model('OAuthClients');
-var OAuthUsersModel = mongoose.model('OAuthUsers');
+const OAuthTokensModel = mongoose.model('OAuthTokens');
+const OAuthClientsModel = mongoose.model('OAuthClients');
+const OAuthUsersModel = mongoose.model('OAuthUsers');
 
 /**
  * Get access token.
@@ -77,7 +77,7 @@ module.exports.getUser = function(username, password) {
  */
 
 module.exports.saveToken = function(token, client, user) {
-  var accessToken = new OAuthTokensModel({
+  const accessToken = new OAuthTokensModel({
     accessToken: token.accessToken,
     accessTokenExpiresOn: token.accessTokenExpiresOn,
     client : client,
@@ -98,8 +98,8 @@ module.exports.saveToken = function(token, client, user) {
     saveResult = saveResult && typeof saveResult == 'object' ? saveResult.toJSON() : saveResult;
 
     // Unsure what else points to `saveResult` in @node-oauth/oauth2-server, making copy to be safe
-    var data = new Object();
-    for( var prop in saveResult ) data[prop] = saveResult[prop];
+    const data = new Object();
+    for( const prop in saveResult ) data[prop] = saveResult[prop];
 
     // /oauth-server/lib/models/token-model.js complains if missing `client` and `user`. Creating missing properties.
     data.client = data.clientId;

examples/postgresql/index.js

@@ -3,14 +3,14 @@
  * Module dependencies.
  */
 
-var bodyParser = require('body-parser');
-var express = require('express');
-var oauthServer = require('express-oauth-server');
-var render = require('co-views')('views');
-var util = require('util');
+const bodyParser = require('body-parser');
+const express = require('express');
+const oauthServer = require('express-oauth-server');
+const render = require('co-views')('views');
+const util = require('util');
 
 // Create an Express application.
-var app = express();
+const app = express();
 
 // Add body parser.
 app.use(bodyParser.json());
@@ -68,7 +68,7 @@ app.post('/login', function(req, res) {
   }
 
   // Successful logins should send the user back to /oauth/authorize.
-  var path = req.body.redirect || '/home';
+  const path = req.body.redirect || '/home';
 
   return res.redirect(util.format('/%s?client_id=%s&redirect_uri=%s', path, req.query.client_id, req.query.redirect_uri));
 });

examples/postgresql/model.js

@@ -1,24 +1,27 @@
-
 /**
  * Module dependencies.
  */
 
-var pg = require('pg-promise')(process.env.DATABASE_URL);
+const pg = require('pg-promise')(process.env.DATABASE_URL);
 
 /*
  * Get access token.
  */
 
-module.exports.getAccessToken = function(bearerToken) {
-  return pg.query('SELECT access_token, access_token_expires_on, client_id, refresh_token, refresh_token_expires_on, user_id FROM oauth_tokens WHERE access_token = $1', [bearerToken])
-    .then(function(result) {
-      var token = result.rows[0];
+module.exports.getAccessToken = function (bearerToken) {
+  return pg
+    .query(
+      'SELECT access_token, access_token_expires_on, client_id, refresh_token, refresh_token_expires_on, user_id FROM oauth_tokens WHERE access_token = $1',
+      [bearerToken]
+    )
+    .then(function (result) {
+      const token = result.rows[0];
 
       return {
         accessToken: token.access_token,
-        client: {id: token.client_id},
+        client: { id: token.client_id },
         expires: token.expires,
-        user: {id: token.userId}, // could be any object
+        user: { id: token.userId }, // could be any object
       };
     });
 };
@@ -27,10 +30,14 @@ module.exports.getAccessToken = function(bearerToken) {
  * Get client.
  */
 
-module.exports.getClient = function *(clientId, clientSecret) {
-  return pg.query('SELECT client_id, client_secret, redirect_uri FROM oauth_clients WHERE client_id = $1 AND client_secret = $2', [clientId, clientSecret])
-    .then(function(result) {
-      var oAuthClient = result.rows[0];
+module.exports.getClient = function (clientId, clientSecret) {
+  return pg
+    .query(
+      'SELECT client_id, client_secret, redirect_uri FROM oauth_clients WHERE client_id = $1 AND client_secret = $2',
+      [clientId, clientSecret]
+    )
+    .then(function (result) {
+      const oAuthClient = result.rows[0];
 
       if (!oAuthClient) {
         return;
@@ -48,9 +55,13 @@ module.exports.getClient = function *(clientId, clientSecret) {
  * Get refresh token.
  */
 
-module.exports.getRefreshToken = function *(bearerToken) {
-  return pg.query('SELECT access_token, access_token_expires_on, client_id, refresh_token, refresh_token_expires_on, user_id FROM oauth_tokens WHERE refresh_token = $1', [bearerToken])
-    .then(function(result) {
+module.exports.getRefreshToken = function (bearerToken) {
+  return pg
+    .query(
+      'SELECT access_token, access_token_expires_on, client_id, refresh_token, refresh_token_expires_on, user_id FROM oauth_tokens WHERE refresh_token = $1',
+      [bearerToken]
+    )
+    .then(function (result) {
       return result.rowCount ? result.rows[0] : false;
     });
 };
@@ -59,9 +70,13 @@ module.exports.getRefreshToken = function *(bearerToken) {
  * Get user.
  */
 
-module.exports.getUser = function *(username, password) {
-  return pg.query('SELECT id FROM users WHERE username = $1 AND password = $2', [username, password])
-    .then(function(result) {
+module.exports.getUser = function (username, password) {
+  return pg
+    .query('SELECT id FROM users WHERE username = $1 AND password = $2', [
+      username,
+      password,
+    ])
+    .then(function (result) {
       return result.rowCount ? result.rows[0] : false;
     });
 };
@@ -70,15 +85,20 @@ module.exports.getUser = function *(username, password) {
  * Save token.
  */
 
-module.exports.saveAccessToken = function *(token, client, user) {
-  return pg.query('INSERT INTO oauth_tokens(access_token, access_token_expires_on, client_id, refresh_token, refresh_token_expires_on, user_id) VALUES ($1, $2, $3, $4)', [
-    token.accessToken,
-    token.accessTokenExpiresOn,
-    client.id,
-    token.refreshToken,
-    token.refreshTokenExpiresOn,
-    user.id
-  ]).then(function(result) {
-    return result.rowCount ? result.rows[0] : false; // TODO return object with client: {id: clientId} and user: {id: userId} defined
-  });
+module.exports.saveAccessToken = function (token, client, user) {
+  return pg
+    .query(
+      'INSERT INTO oauth_tokens(access_token, access_token_expires_on, client_id, refresh_token, refresh_token_expires_on, user_id) VALUES ($1, $2, $3, $4)',
+      [
+        token.accessToken,
+        token.accessTokenExpiresOn,
+        client.id,
+        token.refreshToken,
+        token.refreshTokenExpiresOn,
+        user.id,
+      ]
+    )
+    .then(function (result) {
+      return result.rowCount ? result.rows[0] : false; // TODO return object with client: {id: clientId} and user: {id: userId} defined
+    });
 };

examples/redis/index.js

@@ -3,12 +3,12 @@
  * Module dependencies.
  */
 
-var bodyParser = require('body-parser');
-var express = require('express');
-var oauthServer = require('@node-oauth/oauth2-server');
+const bodyParser = require('body-parser');
+const express = require('express');
+const oauthServer = require('@node-oauth/oauth2-server');
 
 // Create an Express application.
-var app = express();
+const app = express();
 
 // Add body parser.
 app.use(bodyParser.json());

examples/redis/model.js

@@ -3,14 +3,14 @@
  * Module dependencies.
  */
 
-var db = require('bluebird').promisify(require('redis').createClient());
-var fmt = require('util').format;
+const db = require('bluebird').promisify(require('redis').createClient());
+const fmt = require('util').format;
 
 /**
  * Redis formats.
  */
 
-var formats = {
+const formats = {
   client: 'clients:%s',
   token: 'tokens:%s',
   user: 'users:%s'
@@ -96,7 +96,7 @@ module.exports.getUser = function(username, password) {
  */
 
 module.exports.saveToken = function(token, client, user) {
-  var data = {
+  const data = {
     accessToken: token.accessToken,
     accessTokenExpiresAt: token.accessTokenExpiresAt,
     clientId: client.id,

examples/redis/testData.js

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 
-var db = require('redis').createClient();
+const db = require('redis').createClient();
 
 db.multi()
   .hmset('users:username', {