add all grant type

ref #4

.babelrc

@@ -0,0 +1,9 @@
+{
+    "presets": [
+      ["env", {
+        "targets": {
+          "node": "8.9.2"
+        }
+      }]
+    ]
+  }

.eslintrc.js

@@ -1,11 +1,40 @@
 module.exports = {
+  "parserOptions": {
+    "ecmaVersion": 8,
+    "ecmaFeatures": {
+
+      "experimentalObjectRestSpread": true
+    }
+  },
   "env": {
     "browser": true,
     "es6": true,
-    "node": true
+    "node": true,
+    "jest": true,
   },
-  "extends": "eslint:recommended",
+  "extends": [
+    "eslint:recommended",
+    "plugin:ava/recommended",
+    "plugin:node/recommended",
+    "plugin:promise/recommended",
+    "plugin:security/recommended",
+    "plugin:import/errors",
+    "plugin:import/warnings",
+  ],
+  "plugins": [
+    "ava",
+    "node",
+    "import",
+    "promise",
+    "security"
+  ],
   "rules": {
+    "node/no-unpublished-require": ["error", {
+      "allowModules": ["electron"]
+    }],
+    "promise/avoid-new": "off",
+    "promise/always-return": "off",
+    "no-multiple-empty-lines": ["error", { max: 1 }],
     "indent": [
       "error",
       2,
@@ -22,6 +51,12 @@ module.exports = {
     "semi": [
       "error",
       "never"
+    ],
+    "no-var": [
+      "error"
+    ],
+    "prefer-const": [
+      "error"
     ]
   }
 };

.npmignore

@@ -1,5 +1,8 @@
 .vscode
 coverage
 example/
+docs/
 .eslintrc*
-ss/
+ss/
+**/*.test.js
+*/__test_utils/*

README.md

@@ -44,7 +44,7 @@ provider.perform()
 const { OAuth2Provider } = require("electron-oauth-helper")
 
 const config = { /* oauth config. please see example/main/config.example.js.  */}
-const provider = new OAuth2Provider(config)
+const provider = new OAuth2Provider(config).withCustomAuthPrameter({}).withCustomTokenParameter({})
 provider.perform()
   .then(resp => {
     console.log(resp)
@@ -289,14 +289,12 @@ provider.perform()
 
 #### Access Token Response
 
-> [Successful Response](https://tools.ietf.org/html/rfc6749#section-5.1)
+> [Successful Response](https://tools.ietf.org/html/rfc6749#section-4.2.2)
 
 > [Error Response](https://tools.ietf.org/html/rfc6749#section-4.2.2.1)
 
 ### Resource Owner Password Credentials Grant
 
-TODO
-
 > [RFC 6749: 4.3](https://tools.ietf.org/html/rfc6749#section-4.3)
 
 ```js
@@ -349,8 +347,6 @@ No need.
 
 ### Client Credentials Grant
 
-TODO
-
 > [RFC 6749: 4.4](https://tools.ietf.org/html/rfc6749#section-4.4)
 
 ```js

example/src/main/config.example.js

@@ -2,7 +2,7 @@ const GitHub = {
   client_id: "your client id",
   client_secret: "your client secret",
   scope: "read:user",
-  redirect_url: "your redirect url",
+  redirect_uri: "your redirect url",
   authorize_url: "https://github.com/login/oauth/authorize",
   access_token_url: "https://github.com/login/oauth/access_token",
 }
@@ -64,6 +64,7 @@ const Firebase = {
   messagingSenderId: ""
 }
 
+/* eslint-disable security/detect-object-injection*/
 const mapTypeToConfig = type => {
   return {
     GitHub,
@@ -75,5 +76,6 @@ const mapTypeToConfig = type => {
     Firebase,
   }[type]
 }
+/* eslint-enable */
 
 module.exports = mapTypeToConfig

example/src/main/main.js

@@ -13,8 +13,9 @@ const {
 const firebase = require("firebase")
 
 const mapTypeToConfig = require("./config")
-
-firebase.initializeApp(mapTypeToConfig("Firebase"))
+if (mapTypeToConfig("Firebase")) {
+  firebase.initializeApp(mapTypeToConfig("Firebase"))
+}
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -81,11 +82,31 @@ ipc.on("oauth", (event, type) => {
   })()
 
   const provider = new Provider(config)
-  provider.perform()
+
+  const options = Object.assign({
+    show: false,
+    width: 800,
+    height: 800,
+    webPreferences: {
+      nodeIntegration: false,
+      contextIsolation: true,
+    },
+  })
+
+  let window = new BrowserWindow(options)
+  window.once("ready-to-show", () => {
+    window.show()
+  })
+  window.once("closed", () => {
+    window = null
+  })
+
+  provider.perform(window)
     .then(resp => {
-      console.log(resp)
+      window.close()
+      console.log("Got response (◍•ᴗ•◍):", resp)
     })
     .catch(error => console.error(error))
 })
 
-process.on("uncaughtException", error => console.error(error))
+process.on("uncaughtException", error => console.error(error))

example/src/render/index.js

@@ -6,6 +6,8 @@ const {
   OAuth2Provider,
 } = require("electron").remote.require("../../../")
 
+const { BrowserWindow } = require("electron").remote
+
 /** @type {firebase} */
 const firebase = require("electron").remote.require("firebase")
 const querystring = require("querystring")
@@ -32,38 +34,51 @@ const onClick = event => {
         return OAuth2Provider
       }
     })()
+
+    const options = Object.assign({
+      show: false,
+      width: 800,
+      height: 800,
+      webPreferences: {
+        nodeIntegration: false,
+        contextIsolation: true,
+      },
+    })
+
+    let window = new BrowserWindow(options)
+    window.once("ready-to-show", () => {
+      window.show()
+    })
+    window.once("closed", () => {
+      window = null
+    })
+
     const provider = new Provider(config)
-    provider.perform()
+    provider.perform(window)
       .then(resp => {
-        console.log("Got response", resp)
+        window.close()
 
         if (isLinkFirebaseAuth && type === "GoogleClientWebApp") {
 
+          console.log("join google")
           // https://firebase.google.com/docs/reference/js/firebase.auth.GoogleAuthProvider#.credential
           const credential = firebase.auth.GoogleAuthProvider.credential(null, resp.access_token)
-          firebase.auth().signInWithCredential(credential)
-            .then(result => {
-              console.log("joined google", result)
-            })
-            .catch(error => {
-              console.error(error)
-            })
+          return firebase.auth().signInWithCredential(credential)
         }
 
         if (isLinkFirebaseAuth && type === "GitHub") {
-
+          console.log("join github")
           const query = querystring.parse(resp)
           // https://firebase.google.com/docs/auth/web/github-auth#handle_the_sign-in_flow_manually
           const credential = firebase.auth.GithubAuthProvider.credential(query.access_token)
-          firebase.auth().signInWithCredential(credential)
-            .then(result => {
-              console.log(result)
-            })
-            .catch(error => {
-              console.error(error)
-            })
+          return firebase.auth().signInWithCredential(credential)
         }
+        return resp
+      })
+      .then(resp => {
+        console.log("Got response", resp)
       })
+      .catch(error => console.error(error))
   } else {
 
     ipc.send("oauth", type)

index.js

@@ -4,4 +4,4 @@ const OAuth2Provider = require("./lib/oauth2")
 module.exports = {
   OAuth1Provider,
   OAuth2Provider,
-}
+}

lib/__test_utils/index.js

@@ -0,0 +1,68 @@
+const Koa = require("koa")
+const Router = require("koa-router")
+const bodyParser = require("koa-bodyparser")
+const net = require("net")
+const debug = require("debug")("eoh:test_util")
+
+const routing = koa => routingFn => {
+  const router = new Router()
+  routingFn(router)
+  koa.use(router.routes())
+}
+
+const startServer = async t => {
+  const port = await getPort()
+  const koa = new Koa()
+  koa.use(bodyParser())
+  const server = koa.listen(port)
+  t.context = {
+    koa,
+    port,
+    server,
+  }
+}
+
+const stopServer = async t => {
+  if (t && t.context && t.context.server) {
+    await t.context.server.close()
+  }
+}
+
+// private
+
+const getPort = async () => {
+
+  return new Promise((resolve, reject) => {
+
+    let port = Math.floor(Math.random() * (60000 - 5000 + 1) + 5000)
+    const server = net.createServer()
+    server.on("error", error => {
+      debug("got error:", error)
+      server.close(() => {
+        port += 1
+        if (error.code !== "EADDRINUSE" || port >= 65535) {
+          server.removeAllListeners()
+          reject(error)
+        }
+        setImmediate(() => {
+          server.listen(port)
+        })
+      })
+    })
+    server.on("listening", () => {
+      debug("connected:", port)
+      server.removeAllListeners()
+      server.close(() => {
+        resolve(port)
+      })
+    })
+    debug("try connect:", port)
+    server.listen(port)
+  })
+}
+
+module.exports = {
+  startServer,
+  stopServer,
+  routing
+}