Merge pull request #7 from node-oauth/3.0.0

Update deps and use @node-oauth/oauth2-server

.eslintrc

@@ -0,0 +1,18 @@
+{
+  "extends": "eslint:recommended",
+  "env": {
+    "node": true,
+    "mocha": true,
+    "es6": false
+  },
+  "parserOptions": {
+    "ecmaVersion": 9,
+    "sourceType": "module",
+    "ecmaFeatures" : {
+      "globalReturn": false,
+      "impliedStrict": true,
+      "jsx": false
+    }
+  }
+}
+

.github/workflows/tests.yml

@@ -19,7 +19,7 @@ jobs:
         node: [14, 16, 18]
     steps:
     - name: Checkout ${{ matrix.node }}
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Setup node ${{ matrix.node }}
       uses: actions/setup-node@v3
@@ -33,7 +33,7 @@ jobs:
         key: ${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
         restore-keys: |
           ${{ runner.os }}-node-${{ matrix.node }}
-    - run: npm i
+    - run: npm ci
     - run: npm run test:coverage
 
     # with the following action we enforce PRs to have a high coverage

.gitignore

@@ -1 +1,43 @@
 node_modules/
+docs/_build/
+__pycache__/
+*.pyc
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+*.iml
+
+.idea
+.jshint
+.DS_Store
+
+pids
+logs
+results
+
+lib/dockerImage/keys
+coverage
+npm-debug.log*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+.elc
+auto-save-list
+tramp
+.\#*
+.vscode
+
+# Org-mode
+.org-id-locations
+*_archive
+
+# coverage
+.nyc_output
+
+package-lock.json
+yarn.lock

.mocharc.yml

@@ -1,8 +1,9 @@
 recursive: true
 reporter: "spec"
-retries: 1
+retries: 0
 slow: 20
 timeout: 2000
 ui: "bdd"
-require: test/assertions
+exit: true
+# require: test/assertions
 # for more options see here https://github.com/mochajs/mocha/blob/master/example/config/.mocharc.yml

.npmignore

@@ -0,0 +1,4 @@
+test/
+examples/
+package-lock.json
+yarn.lock

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 3.0.0
+- use @node-oauth/oauth2-server
+- update all dependencies to latest
+- add code coverage to tests
+- add GitHub actions CI
+- replace jshint with eslint
+
+---
+These previous versions are from the forked `oauthjs` org.
+We did not publish them are related in any way to these publications.
+
 ## 2.0.0
 * Refactor for v3.0.0 of node-oauth2-server
 

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Seegno
+Copyright (c) 2015 - Today Seegno and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Readme.md → README.md

@@ -1,27 +1,37 @@
-# Express OAuth Server [![Build Status](https://travis-ci.org/oauthjs/express-oauth-server.png?branch=master)](https://travis-ci.org/oauthjs/express-oauth-server)
+# Express OAuth Server 
 
 Complete, compliant and well tested module for implementing an OAuth2 Server/Provider with [express](https://github.com/expressjs/express) in [node.js](http://nodejs.org/).
 
-This is the express wrapper for [oauth2-server](https://github.com/oauthjs/node-oauth2-server).
+[![Tests](https://github.com/node-oauth/express-oauth-server/actions/workflows/tests.yml/badge.svg)](https://github.com/node-oauth/express-oauth-server/actions/workflows/tests.yml)
+[![CodeQL](https://github.com/node-oauth/express-oauth-server/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/node-oauth/express-oauth-server/actions/workflows/github-code-scanning/codeql)
+![GitHub](https://img.shields.io/github/license/node-oauth/express-oauth-server)
+
+
+This is the express wrapper for [@node-oauth/oauth2-server](https://github.com/node-oauth/node-oauth2-server),
+it's a fork from the former [oauthjs/express-oauth-server](https://github.com/oauthjs/express-oauth-server).
 
 ## Installation
 
-    $ npm install express-oauth-server
+```shell
+$ npm install @node-oauth/express-oauth-server
+```
 
 ## Quick Start
 
-The module provides two middlewares - one for granting tokens and another to authorize them. `express-oauth-server` and, consequently `oauth2-server`, expect the request body to be parsed already.
+The module provides two middlewares - one for granting tokens and another to authorize them. 
+`@node-oauth/express-oauth-server` and, consequently `@node-oauth/oauth2-server`,
+expect the request body to be parsed already.
 The following example uses `body-parser` but you may opt for an alternative library.
 
 ```js
 var bodyParser = require('body-parser');
 var express = require('express');
-var OAuthServer = require('express-oauth-server');
+var OAuthServer = require('@node-oauth/express-oauth-server');
 
 var app = express();
 
 app.oauth = new OAuthServer({
-  model: {}, // See https://github.com/oauthjs/node-oauth2-server for specification
+  model: {}, // See https://github.com/node-oauth/node-oauth2-server for specification
 });
 
 app.use(bodyParser.json());

examples/mongodb/model.js

@@ -1,3 +1,4 @@
+/* global Promise */
 
 /**
  * Module dependencies.

examples/postgresql/index.js

@@ -5,7 +5,7 @@
 
 var bodyParser = require('body-parser');
 var express = require('express');
-var oauthServer = require('express-oauth-server');
+var oauthServer = require('@node-oauth/express-oauth-server');
 var render = require('co-views')('views');
 var util = require('util');
 

examples/postgresql/model.js

@@ -1,5 +1,6 @@
+/* eslint-disable  require-yield */
 
-/**
+ /**
  * Module dependencies.
  */
 
@@ -82,3 +83,5 @@ module.exports.saveAccessToken = function *(token, client, user) {
     return result.rowCount ? result.rows[0] : false; // TODO return object with client: {id: clientId} and user: {id: userId} defined
   });
 };
+
+/* eslint-enable  require-yield */

examples/redis/model.js

@@ -1,3 +1,4 @@
+/* global Promise */
 
 /**
  * Module dependencies.