[DNM]

.editorconfig

@@ -0,0 +1,14 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

.eslintrc.json

@@ -0,0 +1,76 @@
+{
+  "root": true,
+  "env": {
+    "browser": true,
+    "es6": true,
+    "node": true
+  },
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "project": "tsconfig.json",
+    "sourceType": "module"
+  },
+  "plugins": ["@typescript-eslint", "import"],
+  "extends": [
+    // Recommended defaults for ESLint:
+    "eslint:recommended",
+    // Turn off what's checked by TS compiler:
+    "plugin:@typescript-eslint/eslint-recommended",
+    // Turn on recommended TS-specific rules:
+    "plugin:@typescript-eslint/recommended",
+    // Turn on extra rules that require type-checking:
+    "plugin:@typescript-eslint/recommended-requiring-type-checking",
+    // Turn on rules for imports:
+    "plugin:import/typescript",
+    // Turn off rules conflicting with Prettier:
+    "prettier"
+  ],
+  "ignorePatterns": ["node_modules", "dist", "coverage"],
+  "rules": {
+    // This is already checked by Typescript's "noUnusedLocals" setting
+    "@typescript-eslint/no-unused-vars": "off",
+
+    // No reason to disallow
+    "@typescript-eslint/no-inferrable-types": "off",
+
+    // Optimize code for legibility, not for ease of parsing
+    "@typescript-eslint/no-use-before-define": "off",
+
+    // Allow all interface names
+    "@typescript-eslint/interface-name-prefix": "off",
+
+    // Require type annotations for return types, with some exceptions
+    "@typescript-eslint/explicit-function-return-type": [
+      "warn",
+      {
+        "allowExpressions": true,
+        "allowTypedFunctionExpressions": true,
+        "allowHigherOrderFunctions": true
+      }
+    ],
+
+    // Disallow default exports; only allow named exports
+    "import/no-default-export": "error",
+
+    // Impose alphabetically ordered imports
+    "import/order": "error",
+
+    // Standardize usage of array types (`T[]` or `Array<T>`)
+    "@typescript-eslint/array-type": [
+      "error",
+      { "default": "array-simple", "readonly": "generic" }
+    ],
+
+    // Disallow variable names conflicting with deprecated globals
+    "no-restricted-globals": [
+      "error",
+      "event",
+      "name",
+      "external",
+      "orientation"
+    ],
+
+    // Disallow use of `console`
+    "no-console": "error"
+  }
+}

.gitignore

@@ -1,7 +1,29 @@
-node_modules/
+
+# IDE
+/.idea
+/.awcache
+/.vscode/*.code-workspace
+/.vscode/settings.json
+
+# misc
+npm-debug.log
+
+# folders
+#/dist
+/node_modules
 docs/_build/
 __pycache__/
+
+# files
+.DS_Store
 *.pyc
+<<<<<<< HEAD
+/aio
+
+# codecoverage
+/.nyc_output
+/coverage
+=======
 lib-cov
 *.seed
 *.log
@@ -34,3 +56,4 @@ tramp
 # Org-mode
 .org-id-locations
 *_archive
+>>>>>>> e11930b8c35537b10f965c7390d7fe58622ba0f8

.nycrc

@@ -0,0 +1,10 @@
+{
+	"extends": "@istanbuljs/nyc-config-typescript",
+	"all": true,
+    "reporter": [
+		"lcovonly",
+		"html",
+		"text",
+		"text-summary"
+    ]
+} 

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all",
+  "endOfLine": "lf"
+}

.travis.yml

@@ -1,12 +1,18 @@
 language: node_js
 
 node_js:
+<<<<<<< HEAD
+  - 8
+  - 10
+  - 12
+=======
   - 4
   - 6
   - 8
   - 10
   - 12
   - 13
   - 14
+>>>>>>> e11930b8c35537b10f965c7390d7fe58622ba0f8
 
 sudo: false

.vscode/README.md

@@ -0,0 +1,22 @@
+# VSCode Configuration
+
+This folder contains opt-in [Workspace Settings](https://code.visualstudio.com/docs/getstarted/settings) and [Extension Recommendations](https://code.visualstudio.com/docs/editor/extension-gallery#_workspace-recommended-extensions) that our team recommends using when working on this repository.
+
+## Usage
+
+To use the recommended settings follow the steps below:
+
+- copy `.vscode/recommended-settings.json` to `.vscode/settings.json`
+- restart the editor
+
+If you already have your custom workspace settings you should instead manually merge the file content.
+
+This isn't an automatic process so you will need to repeat it when settings are updated.
+
+To see the recommended extensions select "Extensions: Show Recommended Extensions" in the [Command Palette](https://code.visualstudio.com/docs/getstarted/userinterface#_command-palette).
+
+## Editing `.vscode/recommended-settings.json`
+
+If you wish to add extra configuration items please keep in mind any settings you add here will be used by many users.
+
+Try to keep these settings to things that help facilitate the development process and avoid altering the user workflow whenever possible.

.vscode/extensions.json

@@ -0,0 +1,11 @@
+{
+  // See http://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+  // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+
+  // List of extensions which should be recommended for users of this workspace.
+  "recommendations": [
+    "editorconfig.editorconfig",
+    "esbenp.prettier-vscode",
+    "ms-vscode.vscode-typescript-tslint-plugin"
+  ]
+}

.vscode/launch.json

@@ -0,0 +1,23 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Mocha Tests",
+      "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+      "args": [
+        "--require",
+        "ts-node/register",
+        "-u",
+        "tdd",
+        "--timeout",
+        "999999",
+        "--colors",
+        "--recursive",
+        "${workspaceFolder}/test/**/*.spec.ts"
+      ],
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/recommended-settings.json

@@ -0,0 +1,39 @@
+{
+  "files.exclude": {
+    "**/.git": true,
+    "**/.DS_Store": true,
+    "**/node_modules": true,
+    "dist": true
+  },
+  "files.watcherExclude": {
+    "**/.git/**": true,
+    "**/node_modules/**": true,
+    "**/dist/**": true
+  },
+  "search.exclude": {
+    "**/node_modules": true,
+    "**/dist": true
+  },
+  "editor.formatOnSave": false,
+  "typescript.format.enable": false,
+  "editor.formatOnPaste": false,
+  "[typescript]": {
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": true,
+      "source.fixAll.tslint": true
+    }
+  },
+  "[json]": {
+    "editor.formatOnSave": true
+  },
+  "[jsonc]": {
+    "editor.formatOnSave": true
+  },
+  "[javascript]": {
+    "editor.formatOnSave": true
+  },
+  "prettier.singleQuote": true,
+  "prettier.trailingComma": "all",
+  "prettier.printWidth": 80
+}

CHANGELOG.md

@@ -1,9 +1,34 @@
 ## Changelog
 
+<<<<<<< HEAD
+### 5.0.0
+* BREAKING: Remove support for node v6
+* BREAKING: Remove support for callbacks only support native Promises
+* new: Rewrote in TypeScript
+* new: Switch from Eslint to Tslint
+* new: added .vscode folder for recommend extensions and recommend setting required for development
+* new: added suitable TypeScript Interfaces for various Objects
+
+### 4.0.0
+* BREAKING: Set server_error Code to 500
+* BREAKING: Remove support for node v4
+* new: Added revoke-handler to revoke access token
+* new: Added implicit grant flow
+* new: Switch from jshint to eslin
+* fix: authorization_code grant should not be required in implicit flowt
+
+### 3.1.0
+* new: Added package-lock.json
+* new: Extend model object with request context
+* new: .npmignore tests
+* fix: validate requested scope on authorize request
+* fix: issue correct expiry dates for tokens
+=======
 ### 3.1.0
 * new: .npmignore tests
 * fix: validate requested scope on authorize request
 * fix: always issue correct expiry dates for tokens
+>>>>>>> e11930b8c35537b10f965c7390d7fe58622ba0f8
 * fix: set numArgs for promisify of generateAuthorizationCode
 * fix: Changed 'hasOwnProperty' call in Response
 * docs: Ensure accessTokenExpiresAt is required
@@ -12,6 +37,12 @@
 * readme: Update Slack badge and link
 * readme: Fix link to RFC6750 standard
 
+<<<<<<< HEAD
+### 3.0.1
+* Updated dependencies
+
+### 3.0.0
+=======
 ### 3.0.2 (24/05/2020)
 
 * Update all dependencies 🎉
@@ -23,6 +54,7 @@
 Tag never released on npm
 
 ### 3.0.0 (04/08/2017)
+>>>>>>> e11930b8c35537b10f965c7390d7fe58622ba0f8
 * Complete re-write, with Promises and callback support
 * Dropped support for node v0.8, v0.10, v0.12
 * Supports Node v4, v6, v7, and v8.  Will continue support for node current and active LTS versions

README.md

@@ -1,4 +1,7 @@
+<<<<<<< HEAD
+=======
 
+>>>>>>> e11930b8c35537b10f965c7390d7fe58622ba0f8
 # oauth2-server
 
 [![npm Version][npm-image]][npm-url]
@@ -22,7 +25,7 @@ The *oauth2-server* module is framework-agnostic but there are several officiall
 
 ## Features
 
-- Supports `authorization_code`, `client_credentials`, `refresh_token` and `password` grant, as well as *extension grants*, with scopes.
+- Supports `authorization_code`, `client_credentials`, `refresh_token`, `implicit` and `password` grant, as well as *extension grants*, with scopes.
 - Can be used with *promises*, *Node-style callbacks*, *ES6 generators* and *async*/*await* (using [Babel](https://babeljs.io)).
 - Fully [RFC 6749](https://tools.ietf.org/html/rfc6749.html) and [RFC 6750](https://tools.ietf.org/html/rfc6750.html) compliant.
 - Implicitly supports any form of storage, e.g. *PostgreSQL*, *MySQL*, *MongoDB*, *Redis*, etc.

TODO

@@ -0,0 +1,8 @@
+
+Todo:
+  ✔ Add a todo
+  ✔ A Basic Rewrite of library in TypeScript
+  ✔ A Basic Rewrite of tests in TypeScript
+  ☐ Add examples for nestjs, expressjs, koa and others
+  ☐ Add Migration guide
+  ☐ Review all Docs

dist/index.d.ts

@@ -0,0 +1,10 @@
+export * from './lib/errors';
+export * from './lib/grant-types';
+export * from './lib/handlers';
+export * from './lib/interfaces';
+export { Request } from './lib/request';
+export { Response } from './lib/response';
+export * from './lib/response-types';
+export { OAuth2Server } from './lib/server';
+export * from './lib/token-types';
+export * from './lib/validator/is';