Merge pull request #5793 from snyk/fix/ACC-2350-ignore-is-authed

fix: stop verifying token on ingore cmd

Author: dotkas

src/cli/commands/auth/index.ts

@@ -3,7 +3,7 @@ import { v4 as uuidv4 } from 'uuid';
 import * as Debug from 'debug';
 import { Spinner } from 'cli-spinner';
 import * as snyk from '../../../lib';
-import { verifyAPI } from './is-authed';
+import { verifyAPI } from './verify';
 import { isCI } from '../../../lib/is-ci';
 import { isDocker } from '../../../lib/is-docker';
 import { args as argsLib } from '../../args';

src/cli/commands/auth/is-authed.ts src/cli/commands/auth/verify.tssrc/cli/commands/auth/is-authed.ts renamed to src/cli/commands/auth/verify.ts

@@ -1,14 +1,6 @@
-import * as snyk from '../../../lib';
 import config from '../../../lib/config';
 import { makeRequest } from '../../../lib/request';
 
-export function isAuthed() {
-  const token = snyk.config.get('api');
-  return verifyAPI(token).then((res: any) => {
-    return res.body.ok;
-  });
-}
-
 export function verifyAPI(api) {
   const payload = {
     body: {

src/cli/commands/ignore.ts

@@ -1,32 +1,27 @@
 import * as policy from 'snyk-policy';
 import chalk from 'chalk';
 import * as authorization from '../../lib/authorization';
-import * as auth from './auth/is-authed';
 import { apiTokenExists } from '../../lib/api-token';
 import { isCI } from '../../lib/is-ci';
 import { MethodResult } from './types';
+import { MisconfiguredAuthInCI } from '../../lib/errors/misconfigured-auth-in-ci-error';
 
 import * as Debug from 'debug';
 const debug = Debug('snyk');
 
-import { MisconfiguredAuthInCI } from '../../lib/errors/misconfigured-auth-in-ci-error';
-
 export default function ignore(options): Promise<MethodResult> {
   debug('snyk ignore called with options: %O', options);
+  try {
+    apiTokenExists();
+  } catch (err) {
+    if (isCI()) {
+      throw MisconfiguredAuthInCI();
+    }
+    throw err;
+  }
 
-  return auth
-    .isAuthed()
-    .then((authed) => {
-      if (!authed) {
-        if (isCI()) {
-          throw MisconfiguredAuthInCI();
-        }
-      }
-      apiTokenExists();
-    })
-    .then(() => {
-      return authorization.actionAllowed('cliIgnore', options);
-    })
+  return authorization
+    .actionAllowed('cliIgnore', options)
     .then((cliIgnoreAuthorization) => {
       if (!cliIgnoreAuthorization.allowed) {
         debug('snyk ignore called when disallowed');

test/tap/auth.test.ts

@@ -1,7 +1,7 @@
 import { test } from 'tap';
 import * as sinon from 'sinon';
 import stripAnsi = require('strip-ansi');
-import * as isAuthed from '../../src/cli/commands/auth/is-authed';
+import * as auth from '../../src/cli/commands/auth/verify';
 import * as errors from '../../src/lib/errors/legacy-errors';
 import { fakeServer } from '../acceptance/fake-server';
 import { getServerPort } from '../jest/util/getServerPort';
@@ -32,7 +32,7 @@ test('auth shows an appropriate error message when a request times out', async (
   const failedReq = new Promise((resolve) => {
     return resolve({ res: { statusCode: 502 } });
   });
-  const verifyStub = sinon.stub(isAuthed, 'verifyAPI').returns(failedReq);
+  const verifyStub = sinon.stub(auth, 'verifyAPI').returns(failedReq);
 
   t.teardown(() => {
     verifyStub.restore();
@@ -52,7 +52,7 @@ test('auth shows an appropriate error message when a request fails with a user m
   const failedReq = new Promise((resolve) => {
     return resolve({ res: { statusCode: 502, body: { userMessage } } });
   });
-  const verifyStub = sinon.stub(isAuthed, 'verifyAPI').returns(failedReq);
+  const verifyStub = sinon.stub(auth, 'verifyAPI').returns(failedReq);
 
   t.teardown(() => {
     verifyStub.restore();