diff --git a/lib/interactiveCli/set-app.js b/lib/interactiveCli/set-app.js index c6689102..5a762865 100644 --- a/lib/interactiveCli/set-app.js +++ b/lib/interactiveCli/set-app.js @@ -2,7 +2,9 @@ const _ = require('lodash'); const chalk = require('chalk'); +const accountUtils = require('@serverless/utils/account'); const configUtils = require('@serverless/utils/config'); +const { ServerlessSDK } = require('@serverless/platform-client'); const { createApp, createDeployProfile, @@ -10,7 +12,6 @@ const { getDeployProfiles, getMetadata, listTenants, - refreshToken, setDefaultDeploymentProfile, } = require('@serverless/platform-sdk'); const enableConfirm = require('./enableConfirm'); @@ -144,7 +145,7 @@ const steps = { // make a valid representation for (const org of Object.keys(user.accessKeys)) orgs.add(org); } else { - await refreshToken(); + await accountUtils.refreshToken(new ServerlessSDK()); user = configUtils.getLoggedInUser(); orgs = new Set( (await listTenants({ username: user.username, idToken: user.idToken })).map( diff --git a/lib/interactiveCli/set-app.test.js b/lib/interactiveCli/set-app.test.js index bfd06a9d..79023041 100644 --- a/lib/interactiveCli/set-app.test.js +++ b/lib/interactiveCli/set-app.test.js @@ -14,6 +14,8 @@ const semver = require('semver'); const setupServerless = require('../../test/setupServerless'); const platformSdkPath = require.resolve('@serverless/platform-sdk'); +const platformClientPath = require.resolve('@serverless/platform-client'); + const lifecycleHookNamesBlacklist = [ 'interactiveCli:initializeService', 'interactiveCli:setupAws', @@ -69,7 +71,6 @@ describe('interactiveCli: set-app', function () { }), listTenants: async () => [{ tenantName: 'testinteractivecli' }, { tenantName: 'otherorg' }], login: sinon.stub().resolves(), - refreshToken: async () => {}, setDefaultDeploymentProfile: setDefaultDeploymentProfileStub, }; modulesCacheStub = { @@ -77,6 +78,13 @@ describe('interactiveCli: set-app', function () { [require.resolve('./utils')]: { resolveAccessKey: async () => 'token' }, [require.resolve('.//register')]: registerConfiguration, [require.resolve('../deployProfile')]: { configureDeployProfile: async () => {} }, + [platformClientPath]: { + ServerlessSDK: class ServerlessSDK { + async refreshToken() { + return {}; + } + }, + }, [platformSdkPath]: platformSdkStub, }; sinon.stub(registerConfiguration, 'check').resolves(false); diff --git a/package.json b/package.json index efc700a7..68a5dd8b 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "repository": "serverless/enterprise-plugin", "dependencies": { "@serverless/event-mocks": "^1.1.1", - "@serverless/platform-client": "^3.1.5", + "@serverless/platform-client": "^3.9.1", "@serverless/platform-sdk": "^2.3.2", "@serverless/utils": "^3.1.0", "chalk": "^4.1.0",