@dotenvx/dotenvx-ops 0.28.1 → 0.29.1

package/CHANGELOG.md

@@ -2,7 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-[Unreleased](https://github.com/dotenvx/dotenvx-ops/compare/v0.28.1...main)
+[Unreleased](https://github.com/dotenvx/dotenvx-ops/compare/v0.29.1...main)
+
+## [0.29.1](https://github.com/dotenvx/dotenvx-ops/compare/v0.29.0...v0.29.1) (2026-01-07)
+
+### Changed
+
+* Send `org` with post to `/backup`
+
+## [0.29.0](https://github.com/dotenvx/dotenvx-ops/compare/v0.28.1...v0.29.0) (2026-01-07)
+
+### Added
+
+* Add automatic login to `backup` command ([#19](https://github.com/dotenvx/dotenvx-ops/pull/19))
+* Add `settings path` command ([#19](https://github.com/dotenvx/dotenvx-ops/pull/19)) 
 
 ## [0.28.1](https://github.com/dotenvx/dotenvx-ops/compare/v0.28.0...v0.28.1) (2026-01-02)
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.28.1",
+  "version": "0.29.1",
   "name": "@dotenvx/dotenvx-ops",
   "description": "production grade dotenvx–with operational primitives",
   "author": "@motdotla",

package/src/cli/actions/backup.js

@@ -1,27 +1,62 @@
-// const fs = require('fs')
-// const crypto = require('crypto')
-
+const open = require('open')
 const { logger } = require('@dotenvx/dotenvx')
 
 const { createSpinner } = require('./../../lib/helpers/createSpinner')
+const clipboardy = require('./../../lib/helpers/clipboardy')
+const confirm = require('./../../lib/helpers/confirm')
+const formatCode = require('./../../lib/helpers/formatCode')
+const truncate = require('./../../lib/helpers/truncate')
 
+const LoggedIn = require('./../../lib/services/loggedIn')
+const Login = require('./../../lib/services/login')
+const LoginPoll = require('./../../lib/services/loginPoll')
 const Backup = require('./../../lib/services/backup')
 
-const spinner = createSpinner('backing up')
+const spinner = createSpinner('waiting on browser authorization')
 
 async function backup () {
   // debug opts
   const options = this.opts()
 
+  const hostname = options.hostname
+
   try {
     logger.debug(`options: ${JSON.stringify(options)}`)
 
-    spinner.start()
+    const loggedIn = await new LoggedIn(hostname).run()
+    if (!loggedIn) {
+      const {
+        deviceCode,
+        userCode,
+        verificationUri,
+        verificationUriComplete,
+        interval
+      } = await new Login(hostname).run()
+
+      try { clipboardy.writeSync(userCode) } catch (_e) {}
+
+      logger.debug(`POST ${hostname} with deviceCode ${deviceCode} at interval ${interval}`)
+      logger.info(`press Enter to open [${verificationUri}] and enter code [${formatCode(userCode)}]...`)
+
+      // begin polling
+      const pollPromise = new LoginPoll(hostname, deviceCode, interval).run()
+      spinner.start()
+
+      // optionally allow user to open browser
+      confirm({ message: `press Enter to open [${verificationUri}] and enter code [${formatCode(userCode)}]...` })
+        .then(answer => answer && open(verificationUriComplete))
+        .catch(() => {}) // ignore
+
+      const data = await pollPromise
+      spinner.succeed(`logged in [${data.username}] to this device and activated token [${truncate(data.access_token, 11)}]`)
+    }
+
+    spinner.start('backing up')
 
     const {
       projectUsernameName,
       files
-    } = await new Backup(options.hostname, options.force).run()
+    } = await new Backup(hostname, options.org).run()
     logger.debug(`files: ${JSON.stringify(files)}`)
 
     // write output files

package/src/cli/actions/login.js

@@ -1,69 +1,17 @@
 const open = require('open')
 const { logger } = require('@dotenvx/dotenvx')
 
-const Session = require('./../../db/session')
+const Login = require('./../../lib/services/login')
+const LoginPoll = require('./../../lib/services/loginPoll')
 
 const clipboardy = require('./../../lib/helpers/clipboardy')
 const { createSpinner } = require('./../../lib/helpers/createSpinner')
 const confirm = require('./../../lib/helpers/confirm')
 const truncate = require('./../../lib/helpers/truncate')
 const formatCode = require('./../../lib/helpers/formatCode')
-const dotenvxProjectId = require('./../../lib/helpers/dotenvxProjectId')
 
 const spinner = createSpinner('waiting on browser authorization')
 
-// api calls
-const PostOauthToken = require('./../../lib/api/postOauthToken')
-const PostOauthDeviceCode = require('./../../lib/api/postOauthDeviceCode')
-
-async function pollTokenUrl (hostname, deviceCode, interval) {
-  logger.debug(`POST ${hostname} with deviceCode ${deviceCode} at interval ${interval}`)
-
-  const sesh = new Session()
-
-  while (true) {
-    try {
-      let data
-      try {
-        data = await new PostOauthToken(hostname, deviceCode).run()
-        if (data.access_token) {
-          const id = data.id
-          const username = data.username
-          const accessToken = data.access_token
-
-          // log in user
-          sesh.login(hostname, id, username, accessToken)
-          spinner.succeed(`logged in [${username}] to this device and activated token [${truncate(accessToken, 11)}]`)
-          // logger.help('⮕ next run [dotenvx-ops sync]')
-
-          process.exit(0)
-        } else {
-          await new Promise(resolve => setTimeout(resolve, interval * 1000))
-        }
-      } catch (error) {
-        // continue polling if authorization_pending
-        if (error.code === 'authorization_pending') {
-          const newInterval = interval + 1 // grow the interval
-          await new Promise(resolve => setTimeout(resolve, newInterval * 1000))
-        } else {
-          throw error
-        }
-      }
-    } catch (error) {
-      spinner.stop()
-      if (error.message) {
-        logger.error(error.message)
-      } else {
-        logger.error(error)
-      }
-      if (error.help) {
-        logger.help(error.help)
-      }
-      process.exit(1)
-    }
-  }
-}
-
 async function login () {
   const options = this.opts()
   logger.debug(`options: ${JSON.stringify(options)}`)
@@ -71,35 +19,32 @@ async function login () {
   const hostname = options.hostname
 
   try {
-    const sesh = new Session()
-    const devicePublicKey = sesh.devicePublicKey()
-    const systemInformation = await sesh.systemInformation()
-    const _dotenvxProjectId = dotenvxProjectId(process.cwd(), false)
-    const data = await new PostOauthDeviceCode(hostname, devicePublicKey, systemInformation, _dotenvxProjectId).run()
-
-    const deviceCode = data.device_code
-    const userCode = data.user_code
-    const verificationUri = data.verification_uri
-    const verificationUriComplete = data.verification_uri_complete
-    const interval = data.interval
+    const {
+      deviceCode,
+      userCode,
+      verificationUri,
+      verificationUriComplete,
+      interval
+    } = await new Login(options.hostname).run()
 
     try { clipboardy.writeSync(userCode) } catch (_e) {}
 
-    // begin polling
-    pollTokenUrl(hostname, deviceCode, interval)
-
+    logger.debug(`POST ${hostname} with deviceCode ${deviceCode} at interval ${interval}`)
     logger.info(`press Enter to open [${verificationUri}] and enter code [${formatCode(userCode)}]...`)
+
+    // begin polling
+    const pollPromise = new LoginPoll(hostname, deviceCode, interval).run()
     spinner.start()
 
-    // // optionally allow user to open browser
-    const answer = await confirm({ message: `press Enter to open [${verificationUri}] and enter code [${formatCode(userCode)}]...` })
+    // optionally allow user to open browser
+    confirm({ message: `press Enter to open [${verificationUri}] and enter code [${formatCode(userCode)}]...` })
+      .then(answer => answer && open(verificationUriComplete))
+      .catch(() => {}) // ignore
 
-    if (answer) {
-      await open(verificationUriComplete)
-    } else {
-      spinner.stop()
-      process.exit(1)
-    }
+    const data = await pollPromise
+    spinner.succeed(`logged in [${data.username}] to this device and activated token [${truncate(data.access_token, 11)}]`)
+    logger.help('⮕ next run [dotenvx-ops backup]')
+    process.exit(0)
   } catch (error) {
     spinner.stop()
     if (error.message) {

package/src/cli/actions/rotate/github/connect.js

@@ -33,7 +33,7 @@ async function connect () {
         org = choices[0].value // just use first choice
       } else {
         org = await prompts.select({
-          message: 'Select dotenvx organization',
+          message: 'Select org',
           choices
         })
       }

package/src/cli/actions/rotate/npm/connect.js

@@ -33,7 +33,7 @@ async function connect () {
         org = choices[0].value // just use first choice
       } else {
         org = await prompts.select({
-          message: 'Select dotenvx organization',
+          message: 'Select org',
           choices
         })
       }

package/src/cli/actions/rotate/openai/connect.js

@@ -33,7 +33,7 @@ async function connect () {
         org = choices[0].value // just use first choice
       } else {
         org = await prompts.select({
-          message: 'Select dotenvx organization',
+          message: 'Select org',
           choices
         })
       }

package/src/cli/actions/settings/path.js

@@ -0,0 +1,21 @@
+const { logger } = require('@dotenvx/dotenvx')
+
+const Session = require('./../../../db/session')
+
+function path () {
+  try {
+    const sesh = new Session()
+    const path = sesh.path()
+    if (path && path.length > 1) {
+      process.stdout.write(path)
+    } else {
+      logger.error('missing path. Try generating one with [dotenvx-ops login].')
+      process.exit(1)
+    }
+  } catch (error) {
+    logger.error(error.message)
+    process.exit(1)
+  }
+}
+
+module.exports = path

package/src/cli/commands/settings.js

@@ -36,4 +36,11 @@ settings
   .description('print hostname')
   .action(hostnameAction)
 
+// dotenvx-ops settings path
+const pathAction = require('./../actions/settings/path')
+settings
+  .command('path')
+  .description('print path to settings file')
+  .action(pathAction)
+
 module.exports = settings

package/src/cli/dotenvx-ops.js

@@ -35,6 +35,7 @@ const backupAction = require('./actions/backup')
 program
   .command('backup')
   .description('backup .env.keys file(s)')
+  .option('--org <organizationSlug>')
   .option('-h, --hostname <url>', 'set hostname', sesh.hostname())
   .action(backupAction)
 

package/src/db/session.js

@@ -51,6 +51,10 @@ class Session {
     return new Device().publicKey()
   }
 
+  path () {
+    return this.store.path
+  }
+
   async systemInformation () {
     const system = await si.system()
     const osInfo = await si.osInfo()

package/src/lib/api/postBackup.js

@@ -3,12 +3,13 @@ const buildApiError = require('../../lib/helpers/buildApiError')
 const packageJson = require('../../lib/helpers/packageJson')
 
 class PostBackup {
-  constructor (hostname, token, devicePublicKey, encoded, dotenvxProjectId, pwd = null, gitUrl = null, gitBranch = null, systemUuid = null, osPlatform = null, osArch = null) {
+  constructor (hostname, token, devicePublicKey, encoded, dotenvxProjectId = null, org = null, pwd = null, gitUrl = null, gitBranch = null, systemUuid = null, osPlatform = null, osArch = null) {
     this.hostname = hostname || 'https://ops.dotenvx.com'
     this.token = token
     this.devicePublicKey = devicePublicKey
     this.encoded = encoded
     this.dotenvxProjectId = dotenvxProjectId
+    this.org = org
     this.pwd = pwd
     this.gitUrl = gitUrl
     this.gitBranch = gitBranch
@@ -23,6 +24,7 @@ class PostBackup {
     const url = `${this.hostname}/api/backup`
     const encoded = this.encoded
     const dotenvxProjectId = this.dotenvxProjectId
+    const org = this.org
     const backedupAt = new Date().toISOString()
     const pwd = this.pwd
     const gitUrl = this.gitUrl
@@ -41,6 +43,7 @@ class PostBackup {
         device_public_key: devicePublicKey,
         encoded,
         dotenvx_project_id: dotenvxProjectId,
+        org: org,
         backedup_at: backedupAt,
         pwd,
         git_url: gitUrl,

package/src/lib/helpers/buildApiError.js

@@ -8,6 +8,7 @@ function buildApiError (statusCode, json) {
   error.code = code
   error.help = help
   error.meta = meta
+  error.json = json
 
   return error
 }

package/src/lib/services/backup.js

@@ -2,6 +2,7 @@ const fs = require('fs')
 const path = require('path')
 const si = require('systeminformation')
 const dotenvx = require('@dotenvx/dotenvx')
+const prompts = require('@inquirer/prompts')
 
 const Session = require('./../../db/session')
 
@@ -10,11 +11,13 @@ const gitBranch = require('./../helpers/gitBranch')
 const dotenvxProjectId = require('./../helpers/dotenvxProjectId')
 
 // api calls
+const GetAccount = require('./../api/getAccount')
 const PostBackup = require('./../api/postBackup')
 
 class Backup {
-  constructor (hostname) {
+  constructor (hostname, org = null) {
     this.hostname = hostname
+    this.org = org
     this.cwd = process.cwd()
   }
 
@@ -22,12 +25,38 @@ class Backup {
     const sesh = new Session()
     const token = sesh.token()
     const devicePublicKey = sesh.devicePublicKey()
+    let _org = this.org
 
     // required
     const files = this._files()
     const payload = { files }
     const encoded = Buffer.from(JSON.stringify(payload)).toString('base64')
-    const _dotenvxProjectId = dotenvxProjectId(this.cwd)
+
+    // user must be logged in to use feature
+    const accountJson = await new GetAccount(this.hostname, token).run()
+
+    // optional project id
+    const _dotenvxProjectId = dotenvxProjectId(this.cwd, false)
+
+    // missing .env.x file
+    if (!_dotenvxProjectId) {
+      // set org
+      if (!_org) {
+        const choices = accountJson.organizations.map(o => ({
+          name: o.provider_slug,
+          value: o.provider_slug
+        }))
+
+        if (choices.length === 1) {
+          _org = choices[0].value // just use first choice
+        } else {
+          _org = await prompts.select({
+            message: 'Select org',
+            choices
+          })
+        }
+      }
+    }
 
     // optional
     const _pwd = this.cwd
@@ -41,7 +70,7 @@ class Backup {
     const _osPlatform = osInfo.platform
     const _osArch = osInfo.arch
 
-    const data = await new PostBackup(this.hostname, token, devicePublicKey, encoded, _dotenvxProjectId, _pwd, _gitUrl, _gitBranch, _systemUuid, _osPlatform, _osArch).run()
+    const data = await new PostBackup(this.hostname, token, devicePublicKey, encoded, _dotenvxProjectId, _org, _pwd, _gitUrl, _gitBranch, _systemUuid, _osPlatform, _osArch).run()
 
     return {
       id: data.id,

package/src/lib/services/loggedIn.js

@@ -0,0 +1,24 @@
+const Session = require('./../../db/session')
+const GetAccount = require('./../../lib/api/getAccount')
+
+class LoggedIn {
+  constructor (hostname) {
+    this.hostname = hostname
+  }
+
+  async run () {
+    const hostname = this.hostname
+    const sesh = new Session()
+    const token = sesh.token()
+
+    try {
+      await new GetAccount(hostname, token).run()
+      return true
+    } catch (error) {
+      if (error.code === 'unauthorized') return false
+      throw error
+    }
+  }
+}
+
+module.exports = LoggedIn

package/src/lib/services/login.js

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

package/src/lib/services/loginPoll.js

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