@dotenvx/dotenvx 2.28.0 → 2.28.2

package/src/lib/transforms/set.js

@@ -7,19 +7,12 @@ const TYPE_ENV_FILE = 'envFile'
 const getResolver = require('./../resolvers/get')
 const { determine } = require('./../helpers/envResolution')
 const detectEncoding = require('./../helpers/detectEncoding')
-const { isPlainKey, mutateSrc, mutateKeysSrc } = require('../helpers/cryptography')
+const { isPlainKey, mutateSrc } = require('../helpers/cryptography')
 const keynames = require('../conventions/keynames')
 const Errors = require('../helpers/errors')
-const PostArmorUp = require('../api/postArmorUp')
-const prompts = require('../helpers/prompts')
-const teamChoicesFromMeta = require('../helpers/teamChoicesFromMeta')
-const isTeamRequiredError = require('../helpers/isTeamRequiredError')
-const Session = require('../../db/session')
 
 const selectKeyStorage = require('../helpers/selectKeyStorage')
-const storeNativePrivateKey = require('../helpers/storeNativePrivateKey')
-const onePasswordCustody = require('../helpers/onePasswordCustody')
-const bitwardenCustody = require('../helpers/bitwardenCustody')
+const custodians = require('../custodians')
 
 async function setTransform (options = {}) {
   const envs = options.envs || []
@@ -28,6 +21,7 @@ async function setTransform (options = {}) {
   const fk = options.fk || '.env.keys'
   const noArmor = options.noArmor
   let storage
+  const custodyContext = {}
   const noNative = options.noNative
   const noCreate = options.noCreate
   const noEncrypt = !options.encrypt || isPlainKey(key)
@@ -91,46 +85,9 @@ async function setTransform (options = {}) {
 
         const comment = path.basename(envFilepath)
 
-        if (storage === 'bitwarden') {
-          await bitwardenCustody.set(publicKey, privateKey)
-        } else if (storage === 'onepassword') {
-          await onePasswordCustody.set(publicKey, privateKey)
-        } else if (storage === 'native' && storeNativePrivateKey(publicKey, privateKey, fk)) {
-          row.nativePrivateKeyAdded = true
-        } else if (storage !== 'armored') {
-          const mutated = mutateKeysSrc({ keysSrc, privateKeyName, privateKeyValue: privateKey, comment })
-          keysSrc = mutated.keysSrc
-        } else {
-          const sesh = new Session()
-          const hostname = sesh.hostname()
-          const token = sesh.token()
-          const devicePublicKey = sesh.devicePublicKey()
-
-          try {
-            await new PostArmorUp(hostname, token, devicePublicKey, publicKey, privateKey, undefined).run()
-          } catch (error) {
-            if (!isTeamRequiredError(error)) {
-              throw error
-            }
-
-            const choices = teamChoicesFromMeta(error.meta)
-
-            let team = choices[0].value
-            if (choices.length > 1) {
-              team = await prompts.select({
-                message: 'Select team',
-                choices
-              }, {
-                input: process.stdin,
-                output: process.stderr
-              })
-            }
-
-            await new PostArmorUp(hostname, token, devicePublicKey, publicKey, privateKey, team).run()
-          }
-
-          // don't set keysSrc (in armor)
-        }
+        const stored = await custodians.store(storage, publicKey, privateKey, Object.assign(custodyContext, { keysSrc, privateKeyName, comment, keysFilepath: fk }))
+        if (Object.prototype.hasOwnProperty.call(stored, 'keysSrc')) keysSrc = stored.keysSrc
+        if (stored.nativePrivateKeyAdded) row.nativePrivateKeyAdded = true
       }
 
       if (noEncrypt) {