Apply suggestions from code review

101arrowz · bmeck · web-flow · commit 74f38f8ed6c8 · 2023-07-17T08:24:25.000-07:00
Co-authored-by: Bradley Farias &lt;bradley.meck@gmail.com&gt;
Signed-off-by: 101arrowz &lt;arjunbarrett@gmail.com&gt;
diff --git a/lib/commands/login/index.js b/lib/commands/login/index.js
@@ -115,6 +115,7 @@ export const login = {
         enforcedOrgs = [enforcedChoices[0]?.value]
       }
     }
+    // MUST DO all updateSetting ON SAME TICK TO AVOID PARTIAL WRITE
     updateSetting('enforcedOrgs', enforcedOrgs)
     const oldKey = getSetting('apiKey')
     updateSetting('apiKey', apiKey)
diff --git a/lib/shadow/npm-injection.cjs b/lib/shadow/npm-injection.cjs
@@ -493,7 +493,7 @@ async function packagesHaveRiskyIssues (registry, pkgs, ora = null, input, outpu
         }
         for (const issue of (pkgData.value?.issues ?? [])) {
           if (rules[issue.type]) {
-            if (typeof rules[issue.type] == 'boolean' || rules[issue.type].action === 'error') {
+            if ((typeof rules[issue.type] == 'boolean' && rules[issue.type])  || rules[issue.type].action === 'error') {
               failures.push(issue)
             } else if (rules[issue.type].action == 'warn') {
               warns.push(issue)

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ export const login = {`
`115`	`115`	`enforcedOrgs = [enforcedChoices[0]?.value]`
`116`	`116`	`}`
`117`	`117`	`}`
	`118`	`+ // MUST DO all updateSetting ON SAME TICK TO AVOID PARTIAL WRITE`
`118`	`119`	`updateSetting('enforcedOrgs', enforcedOrgs)`
`119`	`120`	`const oldKey = getSetting('apiKey')`
`120`	`121`	`updateSetting('apiKey', apiKey)`
Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ async function packagesHaveRiskyIssues (registry, pkgs, ora = null, input, outpu`
`493`	`493`	`}`
`494`	`494`	`for (const issue of (pkgData.value?.issues ?? [])) {`
`495`	`495`	`if (rules[issue.type]) {`
`496`		`- if (typeof rules[issue.type] == 'boolean' \|\| rules[issue.type].action === 'error') {`
	`496`	`+ if ((typeof rules[issue.type] == 'boolean' && rules[issue.type]) \|\| rules[issue.type].action === 'error') {`
`497`	`497`	`failures.push(issue)`
`498`	`498`	`} else if (rules[issue.type].action == 'warn') {`
`499`	`499`	`warns.push(issue)`