refactor: remove project token, unused since 0.19.0 (#17039)

packages/desktop-gui/src/runs/runs-list.jsx

@@ -41,11 +41,11 @@ class RunsList extends Component {
   componentDidMount () {
     this._pingApiServer()
     this._handlePolling()
-    this._getKey()
+    this._getRecordKeys()
   }
 
   componentDidUpdate () {
-    this._getKey()
+    this._getRecordKeys()
     this._handlePolling()
   }
 
@@ -106,7 +106,7 @@ class RunsList extends Component {
     runsApi.stopPollingRuns()
   }
 
-  _getKey () {
+  _getRecordKeys () {
     if (this._needsKey()) {
       projectsApi.getRecordKeys().then((keys = []) => {
         if (keys.length) {

packages/server/lib/api.js

@@ -458,30 +458,6 @@ module.exports = {
     .catch(tagError)
   },
 
-  _projectToken (method, projectId, authToken) {
-    return rp({
-      method,
-      url: apiRoutes.projectToken(projectId),
-      json: true,
-      auth: {
-        bearer: authToken,
-      },
-      headers: {
-        'x-route-version': '2',
-      },
-    })
-    .get('apiToken')
-    .catch(tagError)
-  },
-
-  getProjectToken (projectId, authToken) {
-    return this._projectToken('get', projectId, authToken)
-  },
-
-  updateProjectToken (projectId, authToken) {
-    return this._projectToken('put', projectId, authToken)
-  },
-
   getReleaseNotes (version) {
     return rp.get({
       url: onRoutes.releaseNotes(version),

packages/server/lib/cypress.js

@@ -175,10 +175,6 @@ module.exports = {
         mode = 'logs'
       } else if (options.clearLogs) {
         mode = 'clearLogs'
-      } else if (options.getKey) {
-        mode = 'getKey'
-      } else if (options.generateKey) {
-        mode = 'generateKey'
       } else if (!(options.exitWithCode == null)) {
         mode = 'exitWithCode'
       } else if (options.runProject) {
@@ -242,24 +238,6 @@ module.exports = {
         .then(exit0)
         .catch(exitErr)
 
-      case 'getKey':
-        // print the key + exit
-        return require('./project-base').ProjectBase
-        .getSecretKeyByPath(options.projectRoot)
-        .then((key) => {
-          return console.log(key) // eslint-disable-line no-console
-        }).then(exit0)
-        .catch(exitErr)
-
-      case 'generateKey':
-        // generate + print the key + exit
-        return require('./project-base').ProjectBase
-        .generateSecretKeyByPath(options.projectRoot)
-        .then((key) => {
-          return console.log(key) // eslint-disable-line no-console
-        }).then(exit0)
-        .catch(exitErr)
-
       case 'exitWithCode':
         return require('./modes/exit')(options)
         .then(exit)

packages/server/lib/project-base.ts

@@ -1025,34 +1025,6 @@ export class ProjectBase<TServer extends ServerE2E | ServerCt> extends EE {
     return new ProjectBase(path).getConfig()
   }
 
-  static getSecretKeyByPath (path) {
-    // get project id
-    return ProjectBase.id(path)
-    .then((id) => {
-      return user.ensureAuthToken()
-      .then((authToken) => {
-        return api.getProjectToken(id, authToken)
-        .catch(() => {
-          errors.throw('CANNOT_FETCH_PROJECT_TOKEN')
-        })
-      })
-    })
-  }
-
-  static generateSecretKeyByPath (path) {
-    // get project id
-    return ProjectBase.id(path)
-    .then((id) => {
-      return user.ensureAuthToken()
-      .then((authToken) => {
-        return api.updateProjectToken(id, authToken)
-        .catch(() => {
-          errors.throw('CANNOT_CREATE_PROJECT_TOKEN')
-        })
-      })
-    })
-  }
-
   // Given a path to the project, finds all specs
   // returns list of specs with respect to the project root
   static findSpecs (projectRoot, specPattern) {

packages/server/lib/util/args.js

@@ -13,7 +13,7 @@ const nestedObjectsInCurlyBracesRe = /\{(.+?)\}/g
 const nestedArraysInSquareBracketsRe = /\[(.+?)\]/g
 const everythingAfterFirstEqualRe = /=(.*)/
 
-const allowList = 'appPath apiKey browser ci ciBuildId clearLogs config configFile cwd env execPath exit exitWithCode generateKey getKey group headed inspectBrk key logs mode outputPath parallel ping port project proxySource quiet record reporter reporterOptions returnPkg runMode runProject smokeTest spec tag updating version testingType'.split(' ')
+const allowList = 'appPath apiKey browser ci ciBuildId clearLogs config configFile cwd env execPath exit exitWithCode group headed inspectBrk key logs mode outputPath parallel ping port project proxySource quiet record reporter reporterOptions returnPkg runMode runProject smokeTest spec tag updating version testingType'.split(' ')
 // returns true if the given string has double quote character "
 // only at the last position.
 const hasStrayEndQuote = (s) => {
@@ -177,8 +177,6 @@ module.exports = {
       'exec-path': 'execPath',
       'exit-with-code': 'exitWithCode',
       'inspect-brk': 'inspectBrk',
-      'get-key': 'getKey',
-      'new-key': 'generateKey',
       'output-path': 'outputPath',
       'proxy-source': 'proxySource',
       'reporter-options': 'reporterOptions',

packages/server/lib/util/routes.js

@@ -56,7 +56,6 @@ const apiRoutes = makeRoutes(apiUrl, {
   orgs: 'organizations',
   projects: 'projects',
   project: 'projects/:id',
-  projectToken: 'projects/:id/token',
   projectRuns: 'projects/:id/runs',
   projectRecordKeys: 'projects/:id/keys',
   exceptions: 'exceptions',

packages/server/test/integration/cypress_spec.js

@@ -281,146 +281,6 @@ describe('lib/cypress', () => {
     })
   })
 
-  context('--get-key', () => {
-    it('writes out key and exits on success', function () {
-      return Promise.all([
-        user.set({ name: 'brian', authToken: 'auth-token-123' }),
-
-        ProjectBase.id(this.todosPath)
-        .then((id) => {
-          this.projectId = id
-        }),
-      ])
-      .then(() => {
-        sinon.stub(api, 'getProjectToken')
-        .withArgs(this.projectId, 'auth-token-123')
-        .resolves('new-key-123')
-
-        return cypress.start(['--get-key', `--project=${this.todosPath}`])
-      }).then(() => {
-        expect(console.log).to.be.calledWith('new-key-123')
-        this.expectExitWith(0)
-      })
-    })
-
-    it('logs error and exits when user isn\'t logged in', function () {
-      return user.set({})
-      .then(() => {
-        return cypress.start(['--get-key', `--project=${this.todosPath}`])
-      }).then(() => {
-        this.expectExitWithErr('NOT_LOGGED_IN')
-      })
-    })
-
-    it('logs error and exits when project does not have an id', function () {
-      return user.set({ authToken: 'auth-token-123' })
-      .then(() => {
-        return cypress.start(['--get-key', `--project=${this.pristinePath}`])
-      }).then(() => {
-        this.expectExitWithErr('NO_PROJECT_ID', this.pristinePath)
-      })
-    })
-
-    it('logs error and exits when project could not be found at the path', function () {
-      return user.set({ authToken: 'auth-token-123' })
-      .then(() => {
-        return cypress.start(['--get-key', '--project=path/to/no/project'])
-      }).then(() => {
-        this.expectExitWithErr('NO_PROJECT_FOUND_AT_PROJECT_ROOT', 'path/to/no/project')
-      })
-    })
-
-    it('logs error and exits when project token cannot be fetched', function () {
-      return Promise.all([
-        user.set({ authToken: 'auth-token-123' }),
-
-        ProjectBase.id(this.todosPath)
-        .then((id) => {
-          this.projectId = id
-        }),
-      ])
-      .then(() => {
-        sinon.stub(api, 'getProjectToken')
-        .withArgs(this.projectId, 'auth-token-123')
-        .rejects(new Error())
-
-        return cypress.start(['--get-key', `--project=${this.todosPath}`])
-      }).then(() => {
-        this.expectExitWithErr('CANNOT_FETCH_PROJECT_TOKEN')
-      })
-    })
-  })
-
-  context('--new-key', () => {
-    it('writes out key and exits on success', function () {
-      return Promise.all([
-        user.set({ name: 'brian', authToken: 'auth-token-123' }),
-
-        ProjectBase.id(this.todosPath)
-        .then((id) => {
-          this.projectId = id
-        }),
-      ])
-      .then(() => {
-        sinon.stub(api, 'updateProjectToken')
-        .withArgs(this.projectId, 'auth-token-123')
-        .resolves('new-key-123')
-
-        return cypress.start(['--new-key', `--project=${this.todosPath}`])
-      }).then(() => {
-        expect(console.log).to.be.calledWith('new-key-123')
-        this.expectExitWith(0)
-      })
-    })
-
-    it('logs error and exits when user isn\'t logged in', function () {
-      return user.set({})
-      .then(() => {
-        return cypress.start(['--new-key', `--project=${this.todosPath}`])
-      }).then(() => {
-        this.expectExitWithErr('NOT_LOGGED_IN')
-      })
-    })
-
-    it('logs error and exits when project does not have an id', function () {
-      return user.set({ authToken: 'auth-token-123' })
-      .then(() => {
-        return cypress.start(['--new-key', `--project=${this.pristinePath}`])
-      }).then(() => {
-        this.expectExitWithErr('NO_PROJECT_ID', this.pristinePath)
-      })
-    })
-
-    it('logs error and exits when project could not be found at the path', function () {
-      return user.set({ authToken: 'auth-token-123' })
-      .then(() => {
-        return cypress.start(['--new-key', '--project=path/to/no/project'])
-      }).then(() => {
-        this.expectExitWithErr('NO_PROJECT_FOUND_AT_PROJECT_ROOT', 'path/to/no/project')
-      })
-    })
-
-    it('logs error and exits when project token cannot be fetched', function () {
-      return Promise.all([
-        user.set({ authToken: 'auth-token-123' }),
-
-        ProjectBase.id(this.todosPath)
-        .then((id) => {
-          this.projectId = id
-        }),
-      ])
-      .then(() => {
-        sinon.stub(api, 'updateProjectToken')
-        .withArgs(this.projectId, 'auth-token-123')
-        .rejects(new Error())
-
-        return cypress.start(['--new-key', `--project=${this.todosPath}`])
-      }).then(() => {
-        this.expectExitWithErr('CANNOT_CREATE_PROJECT_TOKEN')
-      })
-    })
-  })
-
   context('--run-project', () => {
     beforeEach(() => {
       sinon.stub(electron.app, 'on').withArgs('ready').yieldsAsync()

packages/server/test/unit/api_spec.js

@@ -1128,74 +1128,6 @@ describe('lib/api', () => {
     })
   })
 
-  context('.getProjectToken', () => {
-    it('GETs /projects/:id/token', () => {
-      nock(API_BASEURL)
-      .matchHeader('x-os-name', 'linux')
-      .matchHeader('x-cypress-version', pkg.version)
-      .matchHeader('authorization', 'Bearer auth-token-123')
-      .matchHeader('accept-encoding', /gzip/)
-      .get('/projects/project-123/token')
-      .reply(200, {
-        apiToken: 'token-123',
-      })
-
-      return api.getProjectToken('project-123', 'auth-token-123')
-      .then((resp) => {
-        expect(resp).to.eq('token-123')
-      })
-    })
-
-    it('tags errors', () => {
-      nock(API_BASEURL)
-      .matchHeader('authorization', 'Bearer auth-token-123')
-      .matchHeader('accept-encoding', /gzip/)
-      .get('/projects/project-123/token')
-      .reply(500, {})
-
-      return api.getProjectToken('project-123', 'auth-token-123')
-      .then(() => {
-        throw new Error('should have thrown here')
-      }).catch((err) => {
-        expect(err.isApiError).to.be.true
-      })
-    })
-  })
-
-  context('.updateProjectToken', () => {
-    it('PUTs /projects/:id/token', () => {
-      nock(API_BASEURL)
-      .matchHeader('x-os-name', 'linux')
-      .matchHeader('x-cypress-version', pkg.version)
-      .matchHeader('authorization', 'Bearer auth-token-123')
-      .matchHeader('accept-encoding', /gzip/)
-      .put('/projects/project-123/token')
-      .reply(200, {
-        apiToken: 'token-123',
-      })
-
-      return api.updateProjectToken('project-123', 'auth-token-123')
-      .then((resp) => {
-        expect(resp).to.eq('token-123')
-      })
-    })
-
-    it('tags errors', () => {
-      nock(API_BASEURL)
-      .matchHeader('authorization', 'Bearer auth-token-123')
-      .matchHeader('accept-encoding', /gzip/)
-      .put('/projects/project-id-123/token')
-      .reply(500, {})
-
-      return api.updateProjectToken('project-123', 'auth-token-123')
-      .then(() => {
-        throw new Error('should have thrown here')
-      }).catch((err) => {
-        expect(err.isApiError).to.be.true
-      })
-    })
-  })
-
   context('.createCrashReport', () => {
     beforeEach(function () {
       this.setup = (body, authToken, delay = 0) => {