WIP

npm · Jun 28, 2022 · ee841d3 · ee841d3
1 parent 0ce09f1
commit ee841d3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/lib/utils/config/definition.js b/lib/utils/config/definition.js
@@ -12,6 +12,7 @@ const allowed = [
   'default',
   'defaultDescription',
   'deprecated',
+	'deprecatedValues',
   'description',
   'flatten',
   'hint',

diff --git a/lib/utils/config/definitions.js b/lib/utils/config/definitions.js
@@ -240,9 +240,10 @@ define('auth-type', {
   default: 'legacy',
   type: ['legacy', 'webauthn', 'sso', 'saml', 'oauth'],
   deprecated: `
-    The SSO/SAML/OAuth methods are deprecated and will be removed in
+    The SSO/SAML/OAuth/Webauthn methods are deprecated and will be removed in
     a future version of npm in favor of web-based login.
   `,
+  deprecatedValues: ['webauthn', 'sso', 'saml', 'oauth'],
   description: `
     What authentication strategy to use with \`adduser\`/\`login\`.
 

diff --git a/node_modules/@npmcli/config/lib/index.js b/node_modules/@npmcli/config/lib/index.js
@@ -98,12 +98,16 @@ class Config {
     const types = {}
     const defaults = {}
     this.deprecated = {}
+    this.deprecatedValues = {}
     for (const [key, def] of Object.entries(definitions)) {
       defaults[key] = def.default
       types[key] = def.type
       if (def.deprecated) {
         this.deprecated[key] = def.deprecated.trim().replace(/\n +/, '\n')
       }
+      if (def.deprecatedValues) {
+        this.deprecatedValues[key] = def.deprecatedValues
+      }
     }
 
     // populated the first time we flatten the object
@@ -507,8 +511,14 @@ class Config {
 
   [_checkDeprecated] (key, where, obj, kv) {
     // XXX(npm9+) make this throw an error
-    if (this.deprecated[key]) {
-      log.warn('config', key, this.deprecated[key])
+    const value = obj[key];
+    const hasDeprecatedValues = Array.isArray(this.deprecatedValues[key]);
+    const warn =
+      (hasDeprecatedValues && this.deprecatedValues[key].includes(value)) ||
+      (!hasDeprecatedValues && this.deprecated[key]);
+
+    if (warn) {
+      log.warn("config", key, this.deprecated[key]);
     }
   }