@dotenvx/dotenvx 1.71.2 → 1.72.0

package/src/lib/services/encrypt.js

@@ -38,6 +38,7 @@ class Encrypt {
     this.noCreate = noCreate
     this.token = token
     this.selectKeyStorage = options.selectKeyStorage
+    this.command = options.command
 
     this.processedEnvs = []
     this.changedFilepaths = new Set()
@@ -104,7 +105,8 @@ class Encrypt {
       const { publicKeyName, privateKeyName } = keyNames(envFilepath)
       const { publicKeyValue, privateKeyValue } = await keyValues(envFilepath, {
         keysFilepath: this.envKeysFilepath,
-        noArmor: this.noArmor
+        noArmor: this.noArmor,
+        command: this.command
       })
 
       // first pass - provision
@@ -115,7 +117,8 @@ class Encrypt {
           keysFilepath: this.envKeysFilepath,
           noArmor: this.noArmor,
           token: this.token,
-          selectKeyStorage: this.selectKeyStorage
+          selectKeyStorage: this.selectKeyStorage,
+          command: this.command
         })
         envSrc = prov.envSrc
         publicKey = prov.publicKey

package/src/lib/services/get.js

@@ -3,26 +3,31 @@ const Errors = require('./../helpers/errors')
 const { determine } = require('./../helpers/envResolution')
 
 class Get {
-  constructor (key, envs = [], overload = false, all = false, envKeysFilepath = null, noArmor = false) {
+  constructor (key, envs = [], overload = false, all = false, envKeysFilepath = null, noArmor = false, options = {}) {
     this.key = key
     this.envs = envs
     this.overload = overload
     this.all = all
     this.envKeysFilepath = envKeysFilepath
     this.noArmor = noArmor
+    this.command = options.command
   }
 
   runSync () {
     const processEnv = { ...process.env }
     const envs = determine(this.envs, processEnv)
-    const { processedEnvs } = new Run(envs, this.overload, processEnv, this.envKeysFilepath, this.noArmor).runSync()
+    const { processedEnvs } = new Run(envs, this.overload, processEnv, this.envKeysFilepath, this.noArmor, {
+      command: this.command
+    }).runSync()
     return this._result(processedEnvs, processEnv)
   }
 
   async run () {
     const processEnv = { ...process.env }
     const envs = determine(this.envs, processEnv)
-    const { processedEnvs } = await new Run(envs, this.overload, processEnv, this.envKeysFilepath, this.noArmor).run()
+    const { processedEnvs } = await new Run(envs, this.overload, processEnv, this.envKeysFilepath, this.noArmor, {
+      command: this.command
+    }).run()
     return this._result(processedEnvs, processEnv)
   }
 

package/src/lib/services/keypair.js

@@ -5,10 +5,11 @@ const {
 } = require('./../helpers/keyResolution')
 
 class Keypair {
-  constructor (envFile = '.env', envKeysFilepath = null, noArmor = false) {
+  constructor (envFile = '.env', envKeysFilepath = null, noArmor = false, options = {}) {
     this.envFile = envFile
     this.envKeysFilepath = envKeysFilepath
     this.noArmor = noArmor
+    this.command = options.command
   }
 
   runSync () {
@@ -17,7 +18,11 @@ class Keypair {
     const filepaths = this._filepaths()
     for (const filepath of filepaths) {
       const { publicKeyName, privateKeyName } = keyNames(filepath)
-      const { publicKeyValue, privateKeyValue } = keyValuesSync(filepath, { keysFilepath: this.envKeysFilepath, noArmor: this.noArmor })
+      const { publicKeyValue, privateKeyValue } = keyValuesSync(filepath, {
+        keysFilepath: this.envKeysFilepath,
+        noArmor: this.noArmor,
+        command: this.command
+      })
 
       out[publicKeyName] = publicKeyValue
       out[privateKeyName] = privateKeyValue
@@ -32,7 +37,11 @@ class Keypair {
     const filepaths = this._filepaths()
     for (const filepath of filepaths) {
       const { publicKeyName, privateKeyName } = keyNames(filepath)
-      const { publicKeyValue, privateKeyValue } = await keyValues(filepath, { keysFilepath: this.envKeysFilepath, noArmor: this.noArmor })
+      const { publicKeyValue, privateKeyValue } = await keyValues(filepath, {
+        keysFilepath: this.envKeysFilepath,
+        noArmor: this.noArmor,
+        command: this.command
+      })
 
       out[publicKeyName] = publicKeyValue
       out[privateKeyName] = privateKeyValue

package/src/lib/services/login.js

@@ -0,0 +1,26 @@
+const Session = require('../../db/session')
+const PostOauthDeviceCode = require('../api/postOauthDeviceCode')
+
+class Login {
+  constructor (hostname) {
+    this.hostname = hostname
+  }
+
+  async run () {
+    const sesh = new Session()
+    const devicePublicKey = sesh.devicePublicKey()
+    const systemInformation = await sesh.systemInformation()
+
+    const data = await new PostOauthDeviceCode(this.hostname, devicePublicKey, systemInformation).run()
+
+    return {
+      deviceCode: data.device_code,
+      userCode: data.user_code,
+      verificationUri: data.verification_uri,
+      verificationUriComplete: data.verification_uri_complete,
+      interval: data.interval
+    }
+  }
+}
+
+module.exports = Login

package/src/lib/services/loginPoll.js

@@ -0,0 +1,35 @@
+const Session = require('../../db/session')
+const PostOauthToken = require('../api/postOauthToken')
+
+class LoginPoll {
+  constructor (hostname, deviceCode, interval) {
+    this.hostname = hostname
+    this.deviceCode = deviceCode
+    this.interval = interval
+  }
+
+  async run () {
+    const sesh = new Session()
+
+    while (true) {
+      try {
+        const data = await new PostOauthToken(this.hostname, this.deviceCode).run()
+
+        if (data.access_token) {
+          sesh.login(this.hostname, data.id, data.username, data.access_token)
+          return data
+        }
+
+        await new Promise(resolve => setTimeout(resolve, this.interval * 1000))
+      } catch (error) {
+        if (error.code === 'authorization_pending') {
+          await new Promise(resolve => setTimeout(resolve, (this.interval + 1) * 1000))
+        } else {
+          throw error
+        }
+      }
+    }
+  }
+}
+
+module.exports = LoginPoll

package/src/lib/services/logout.js

@@ -0,0 +1,26 @@
+const Session = require('../../db/session')
+const PostLogout = require('../api/postLogout')
+
+class Logout {
+  constructor (hostname) {
+    this.hostname = hostname
+  }
+
+  async run () {
+    const sesh = new Session()
+    const token = sesh.token()
+
+    const data = await new PostLogout(this.hostname, token).run()
+
+    const id = data.id
+    const username = data.username
+    const accessToken = data.access_token
+    const settingsDevicesUrl = `${this.hostname}/settings/devices`
+
+    sesh.logout(this.hostname, id, accessToken)
+
+    return { username, accessToken, settingsDevicesUrl }
+  }
+}
+
+module.exports = Logout

package/src/lib/services/rotate.js

@@ -29,12 +29,13 @@ const dotenvParse = require('./../helpers/dotenvParse')
 const detectEncoding = require('./../helpers/detectEncoding')
 
 class Rotate {
-  constructor (envs = [], key = [], excludeKey = [], envKeysFilepath = null, noArmor = false) {
+  constructor (envs = [], key = [], excludeKey = [], envKeysFilepath = null, noArmor = false, options = {}) {
     this.envs = determine(envs, process.env)
     this.key = key
     this.excludeKey = excludeKey
     this.envKeysFilepath = envKeysFilepath
     this.noArmor = noArmor
+    this.command = options.command
 
     this.processedEnvs = []
     this.changedFilepaths = new Set()
@@ -83,7 +84,11 @@ class Rotate {
       const envParsed = dotenvParse(envSrc, false, false, true)
 
       const { publicKeyName, privateKeyName } = keyNames(envFilepath)
-      const { privateKeyValue } = await keyValues(envFilepath, { keysFilepath: this.envKeysFilepath, noArmor: this.noArmor })
+      const { privateKeyValue } = await keyValues(envFilepath, {
+        keysFilepath: this.envKeysFilepath,
+        noArmor: this.noArmor,
+        command: this.command
+      })
 
       let newPublicKey
       let newPrivateKey
@@ -91,7 +96,9 @@ class Rotate {
       let envKeysSrc
 
       if (!this.noArmor) {
-        const kp = await armorKeypair()
+        const kp = await armorKeypair(undefined, {
+          command: this.command
+        })
         newPublicKey = kp.publicKey
         newPrivateKey = kp.privateKey
 

package/src/lib/services/run.js

@@ -25,6 +25,7 @@ class Run {
     this.noArmor = noArmor
     this.noSpinner = options.noSpinner
     this.token = options.token
+    this.command = options.command
 
     this.processedEnvs = []
     this.readableFilepaths = new Set()
@@ -95,7 +96,13 @@ class Run {
         privateKeyName: resolvedPrivateKeyName,
         privateKeyValue,
         privateKeySource
-      } = keyValuesFromEnvSrc(env, privateKeyName, { keysFilepath: this.envKeysFilepath, noArmor: this.noArmor, processEnv: this.processEnv, token: this.token })
+      } = keyValuesFromEnvSrc(env, privateKeyName, {
+        keysFilepath: this.envKeysFilepath,
+        noArmor: this.noArmor,
+        processEnv: this.processEnv,
+        token: this.token,
+        command: this.command
+      })
 
       const {
         parsed,
@@ -145,7 +152,8 @@ class Run {
         keysFilepath: this.envKeysFilepath,
         noArmor: this.noArmor,
         noSpinner: this.noSpinner,
-        token: this.token
+        token: this.token,
+        command: this.command
       })
 
       const {
@@ -198,7 +206,8 @@ class Run {
       const { privateKeyValue, privateKeySource } = await keyValues(filepath, {
         keysFilepath: this.envKeysFilepath,
         noArmor: this.noArmor,
-        token: this.token
+        token: this.token,
+        command: this.command
       })
 
       const {

package/src/lib/services/sets.js

@@ -34,7 +34,7 @@ function allValuesForKey (envSrc, key) {
 }
 
 class Sets {
-  constructor (key, value, envs = [], encrypt = true, envKeysFilepath = null, noArmor = false, noCreate = false) {
+  constructor (key, value, envs = [], encrypt = true, envKeysFilepath = null, noArmor = false, noCreate = false, options = {}) {
     this.envs = determine(envs, process.env)
     this.key = key
     this.value = value
@@ -42,6 +42,7 @@ class Sets {
     this.envKeysFilepath = envKeysFilepath
     this.noArmor = noArmor
     this.noCreate = noCreate
+    this.command = options.command
 
     this.processedEnvs = []
     this.changedFilepaths = new Set()
@@ -131,11 +132,21 @@ class Sets {
         let privateKey
 
         const { publicKeyName, privateKeyName } = keyNames(filepath)
-        const { publicKeyValue, privateKeyValue } = keyValuesSync(filepath, { keysFilepath: this.envKeysFilepath, noArmor: this.noArmor })
+        const { publicKeyValue, privateKeyValue } = keyValuesSync(filepath, {
+          keysFilepath: this.envKeysFilepath,
+          noArmor: this.noArmor,
+          command: this.command
+        })
 
         // first pass - provisionSync
         if (!privateKeyValue && !publicKeyValue) {
-          const prov = provisionSync({ envSrc, envFilepath, keysFilepath: this.envKeysFilepath, noArmor: this.noArmor })
+          const prov = provisionSync({
+            envSrc,
+            envFilepath,
+            keysFilepath: this.envKeysFilepath,
+            noArmor: this.noArmor,
+            command: this.command
+          })
           envSrc = prov.envSrc
           publicKey = prov.publicKey
           privateKey = prov.privateKey
@@ -238,11 +249,21 @@ class Sets {
         let privateKey
 
         const { publicKeyName, privateKeyName } = keyNames(filepath)
-        const { publicKeyValue, privateKeyValue } = await keyValues(filepath, { keysFilepath: this.envKeysFilepath, noArmor: this.noArmor })
+        const { publicKeyValue, privateKeyValue } = await keyValues(filepath, {
+          keysFilepath: this.envKeysFilepath,
+          noArmor: this.noArmor,
+          command: this.command
+        })
 
         // first pass - provision
         if (!privateKeyValue && !publicKeyValue) {
-          const prov = await provision({ envSrc, envFilepath, keysFilepath: this.envKeysFilepath, noArmor: this.noArmor })
+          const prov = await provision({
+            envSrc,
+            envFilepath,
+            keysFilepath: this.envKeysFilepath,
+            noArmor: this.noArmor,
+            command: this.command
+          })
           envSrc = prov.envSrc
           publicKey = prov.publicKey
           privateKey = prov.privateKey