resolve issues

Author: 101arrowz

lib/commands/login/index.js

@@ -3,6 +3,7 @@ import meow from 'meow'
 import ora from 'ora'
 import prompts from 'prompts'
 
+import { ChalkOrMarkdown } from '../../utils/chalk-markdown.js'
 import { AuthError, InputError } from '../../utils/errors.js'
 import { setupSdk } from '../../utils/sdk.js'
 import { getSetting, updateSetting } from '../../utils/settings.js'
@@ -33,10 +34,14 @@ export const login = {
     if (!isInteractive()) {
       throw new InputError('cannot prompt for credentials in a non-interactive shell')
     }
+    const format = new ChalkOrMarkdown(false)
     const { apiKey } = await prompts({
       type: 'password',
       name: 'apiKey',
-      message: 'Enter your Socket.dev API key',
+      message: `Enter your ${format.hyperlink(
+        'Socket.dev API key',
+        'https://docs.socket.dev/docs/api-keys'
+      )}`,
     })
 
     if (!apiKey) {

lib/shadow/npm-injection.cjs

@@ -12,6 +12,7 @@ const oraPromise = import('ora')
 const isInteractivePromise = import('is-interactive')
 const chalkPromise = import('chalk')
 const chalkMarkdownPromise = import('../utils/chalk-markdown.js')
+const settingsPromise = import('../utils/settings.js')
 const ipc_version = require('../../package.json').version
 
 try {
@@ -32,7 +33,9 @@ try {
  * @typedef {import('stream').Writable} Writable
  */
 
-const pubToken = 'sktsec_t_--RAN5U4ivauy4w37-6aoKyYPDt5ZbaT5JBVMqiwKo_api'
+const pubTokenPromise = settingsPromise.then(({ getSetting }) =>
+  getSetting('apiKey') || 'sktsec_t_--RAN5U4ivauy4w37-6aoKyYPDt5ZbaT5JBVMqiwKo_api'
+);
 
 // shadow `npm` and `npx` to mitigate subshells
 require('./link.cjs')(fs.realpathSync(path.join(__dirname, 'bin')), 'npm')
@@ -64,6 +67,7 @@ const pkgidParts = (pkgid) => {
 async function * batchScan (
   pkgids
 ) {
+  const pubToken = await pubTokenPromise
   const query = {
     packages: pkgids.map(pkgid => {
       const { name, version } = pkgidParts(pkgid)

lib/utils/sdk.js

@@ -24,7 +24,7 @@ export async function setupSdk () {
     const input = await prompts({
       type: 'password',
       name: 'apiKey',
-      message: 'Enter your Socket.dev API key',
+      message: 'Enter your Socket.dev API key (not saved)',
     })
 
     apiKey = sessionAPIKey = input.apiKey

lib/utils/settings.js

@@ -4,6 +4,7 @@ import * as path from 'path'
 
 // @ts-ignore no types for ascii85
 import ascii85 from 'ascii85'
+import ora from 'ora'
 
 let dataHome = process.platform === 'win32'
   ? process.env['LOCALAPPDATA']
@@ -20,31 +21,33 @@ if (!dataHome) {
 
 const settingsPath = path.join(dataHome, 'socket', 'settings')
 
-/** @type {any} */
+/** @type {{apiKey?: string | null}} */
 let settings = {}
 
 if (fs.existsSync(settingsPath)) {
   const raw = fs.readFileSync(settingsPath)
   try {
     settings = JSON.parse(ascii85.decode(raw).toString())
   } catch (e) {
-    // failed decode - don't load
+    ora(`Failed to parse settings at ${settingsPath}`).warn()
   }
 } else {
   fs.mkdirSync(path.dirname(settingsPath), { recursive: true })
 }
 
 /**
- * @param {string} key
- * @returns {any}
+ * @template {keyof typeof settings} Key
+ * @param {Key} key
+ * @returns {typeof settings[Key]}
  */
 export function getSetting (key) {
   return settings[key]
 }
 
 /**
- * @param {string} key
- * @param {any} value
+ * @template {keyof typeof settings} Key
+ * @param {Key} key
+ * @param {typeof settings[Key]} value
  * @returns {void}
  */
 export function updateSetting (key, value) {