profile: better explanation on OTP (#24)

Use the defaut OTP explanation everywhere except when the context is "OTP-aware" (like when setting double-authentication) PR-URL: npm#24 Credit: @jdeniau Reviewed-By: @zkat
ab0de · Jul 20, 2018 · 21cf0ab · 21cf0ab
1 parent a9ac871
commit 21cf0ab
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/auth/legacy.js b/lib/auth/legacy.js
@@ -52,7 +52,7 @@ function login (conf) {
     })
     .catch((err) => {
       if (err.code !== 'EOTP') throw err
-      return read.otp('Authenticator provided OTP:').then((otp) => {
+      return read.otp('Enter one-time password from your authenticator app: ').then((otp) => {
         conf.auth.otp = otp
         const u = conf.creds.username
         const p = conf.creds.password

diff --git a/lib/profile.js b/lib/profile.js
@@ -195,7 +195,7 @@ function set (args) {
       newUser[prop] = value
       return profile.set(newUser, conf).catch((err) => {
         if (err.code !== 'EOTP') throw err
-        return readUserInfo.otp('Enter OTP:  ').then((otp) => {
+        return readUserInfo.otp().then((otp) => {
           conf.auth.otp = otp
           return profile.set(newUser, conf)
         })
@@ -262,7 +262,7 @@ function enable2fa (args) {
         return pulseTillDone.withPromise(profile.set({tfa: {password, mode: 'disable'}}, conf))
       } else {
         if (conf.auth.otp) return
-        return readUserInfo.otp('Enter OTP:  ').then((otp) => {
+        return readUserInfo.otp('Enter one-time password from your authenticator app: ').then((otp) => {
           conf.auth.otp = otp
         })
       }

diff --git a/lib/token.js b/lib/token.js
@@ -164,7 +164,7 @@ function rm (args) {
       return profile.removeToken(key, conf).catch((ex) => {
         if (ex.code !== 'EOTP') throw ex
         log.info('token', 'failed because revoking this token requires OTP')
-        return readUserInfo.otp('Authenticator provided OTP:').then((otp) => {
+        return readUserInfo.otp().then((otp) => {
           conf.auth.otp = otp
           return profile.removeToken(key, conf)
         })
@@ -192,7 +192,7 @@ function create (args) {
     return profile.createToken(password, readonly, validCIDR, conf).catch((ex) => {
       if (ex.code !== 'EOTP') throw ex
       log.info('token', 'failed because it requires OTP')
-      return readUserInfo.otp('Authenticator provided OTP:').then((otp) => {
+      return readUserInfo.otp().then((otp) => {
         conf.auth.otp = otp
         log.info('token', 'creating with OTP')
         return pulseTillDone.withPromise(profile.createToken(password, readonly, validCIDR, conf))