google-oauth2-env-vars 1.2.0 → 1.4.0

package/README.md

@@ -38,6 +38,11 @@ const googleOAuth2 = new GoogleOAuth2({
   scope: ["https://www.googleapis.com/auth/photoslibrary.readonly"],
   // APIs to enable in Google console
   apis: ["photoslibrary.googleapis.com"],
+  //
+  // Optional
+  //
+  // Port for node server
+  port: 5000, // DEFAULT
 })
 
 const envVars = await googleOAuth2.generateEnvVars()

package/index.js

@@ -4,13 +4,19 @@ const {askClientIds} = require("./utils/ask-client-ids")
 const {getNewToken} = require("./utils/get-new-token")
 const {initAuth} = require("./utils/init-auth")
 
-const {CLIENT_ID, CLIENT_SECRET, TOKEN_FIELDS} = require("./utils/constants")
+const {
+  CLIENT_ID,
+  CLIENT_SECRET,
+  DEFAULT_PORT,
+  TOKEN_FIELDS,
+} = require("./utils/constants")
 
 class GoogleOAuth2 {
   constructor(options = {}) {
     this.tokenName = options.token || null
     this.scope = options.scope || null
     this.apisToEnable = options.apis || []
+    this.port = options.port || DEFAULT_PORT
   }
 
   isTokenValid(token) {
@@ -30,6 +36,7 @@ class GoogleOAuth2 {
       scope: this.scope,
       tokenName: this.tokenName,
       apisToEnable: this.apisToEnable,
+      port: this.port,
     })
 
     return token
@@ -78,11 +85,11 @@ class GoogleOAuth2 {
 
     try {
       envVars = this.getEnvVars()
-      console.log(`✅  ${CLIENT_ID} found in .env`)
-      console.log(`✅  ${CLIENT_SECRET} found in .env`)
-      console.log(`✅  ${this.tokenName} found in .env`)
+      console.log(`✅${CLIENT_ID} found in .env`)
+      console.log(`✅${CLIENT_SECRET} found in .env`)
+      console.log(`✅${this.tokenName} found in .env`)
     } catch (e) {
-      console.log(`❌  ${e.message}`)
+      console.log(`❌${e.message}`)
       envVars = await this.getNewEnvVars()
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-oauth2-env-vars",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "Generate and cache Google OAuth 2.0 tokens in .env files",
   "repository": "https://github.com/cedricdelpoux/google-oauth2-env-vars",
   "author": {
@@ -23,35 +23,23 @@
   ],
   "dependencies": {
     "clipboardy": "^2.3.0",
-    "dotenv": "^8.2.0",
-    "express": "^4.17.1",
-    "glob": "^7.1.6",
-    "googleapis": "^60.0.1",
-    "inquirer": "^7.3.3",
-    "open": "^7.3.0"
+    "dotenv": "^16.0.3",
+    "express": "^4.18.2",
+    "glob": "^9.3.2",
+    "googleapis": "^114.0.0",
+    "inquirer": "^8.0.0",
+    "open": "^8.0.0"
   },
   "devDependencies": {
-    "eslint": "^7.10.0",
-    "eslint-config-prettier": "^6.12.0",
-    "husky": "^4.3.0",
-    "lint-staged": "^10.4.0",
-    "prettier": "2.1.2"
+    "eslint": "^8.36.0",
+    "eslint-config-prettier": "^8.8.0",
+    "husky": "^8.0.3",
+    "lint-staged": "^13.2.0",
+    "prettier": "2.8.7"
   },
   "scripts": {
     "lint": "eslint index.js utils/*.js",
+    "prepare": "husky install",
     "prepublishOnly": "yarn lint"
-  },
-  "lint-staged": {
-    "*.js": [
-      "eslint"
-    ],
-    "*.{css,js,md}": [
-      "prettier --write"
-    ]
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
   }
 }

package/utils/constants.js

@@ -1,6 +1,7 @@
 module.exports = {
   CLIENT_ID: "GOOGLE_OAUTH_CLIENT_ID",
   CLIENT_SECRET: "GOOGLE_OAUTH_CLIENT_SECRET",
+  DEFAULT_PORT: 5000,
   OAUTH_URL:
     "https://console.developers.google.com/apis/credentials/oauthclient",
   ENABLE_API_URL:

package/utils/get-authorization-code.js

@@ -3,14 +3,14 @@ const express = require("express")
 
 const {openUrl} = require("./open-url")
 
-const getAuthorizationCode = async (authUrl) => {
+const getAuthorizationCode = async ({url, port}) => {
   return new Promise((resolve, reject) => {
     const app = express()
 
-    app.listen(5000, async () => {
+    app.listen(port, async () => {
       console.log("🤚  You need to authorize your application")
 
-      await openUrl({message: "Authorization URL:", url: authUrl})
+      await openUrl({message: "Authorization URL:", url})
 
       console.log("🛑  Follow the URL to authorize your application")
     })

package/utils/get-new-token.js

@@ -12,6 +12,7 @@ const getNewToken = async ({
   scope,
   tokenName,
   apisToEnable,
+  port,
 }) => {
   try {
     console.log("------------------------")
@@ -24,16 +25,16 @@ const getNewToken = async ({
 
         await openUrl({message: "API URL:", url: `${ENABLE_API_URL}${api}`})
 
-        console.log(`🛑  Follow the URL to Enable "${api}" API`)
+        console.log(`🛑  Follow the URL and enable "${api}" API`)
 
-        await waitInput()
+        await waitInput("API enabled?")
       }
     }
 
     const client = new google.auth.OAuth2(
       clientId,
       clientSecret,
-      "http://localhost:5000/callback"
+      `http://localhost:${port}/callback`
     )
 
     const authUrl = client.generateAuthUrl({
@@ -41,7 +42,7 @@ const getNewToken = async ({
       scope,
       prompt: "consent",
     })
-    const code = await getAuthorizationCode(authUrl)
+    const code = await getAuthorizationCode({url: authUrl, port})
 
     const {tokens} = await client.getToken(code)
 

package/utils/wait-input.js

@@ -1,14 +1,16 @@
 /* global Promise */
 const readline = require("readline")
 
-exports.waitInput = async () => {
+exports.waitInput = async (message) => {
   return new Promise((resolve) => {
     const rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout,
     })
 
-    rl.question("🚦  Type to continue", () => {
+    console.log("")
+
+    rl.question(`🚦  ${message} Press any key to continue setup`, () => {
       console.log("")
       console.log("------------------------")
       resolve()