Skip to content

Commit a9b3084

Browse files
committed
Updated Connect Stack Code to use Management Token, removed usage of AuthToken
1 parent d3ac726 commit a9b3084

File tree

4 files changed

+20
-36
lines changed

4 files changed

+20
-36
lines changed

.talismanrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ fileignoreconfig:
66
- filename: src/commands/cm/stacks/validate-regex.ts
77
checksum: 60a38392c57ddfd834c0b8204a7b766d53e47681e11e7eb1936bf624a09ee70e
88
- filename: src/utils/connect-stack.ts
9-
checksum: 4531b14cadad275114fa73df74ad55202157a3cd4a984d9170b7bc52abc0a87c
9+
checksum: 93a3bfe4672280d58668be94baeeb3c254cf2850e9c51af79951fcf3cad916cb
1010
- filename: test/utils/connect-stack.test.ts
11-
checksum: f5b2cea668977cc0ffd5c278207e729e7f1493e70a77a3e273942939cfd4509a
11+
checksum: 42b14b635cef68608fb7835e91a4123731accf660c7e6a897672f28a277e27ea
1212
- filename: test/utils/get-management-token.test.ts
1313
checksum: 27bf7650b7264db640f23aa75ce21c4ecfa4f32ddc5caed48952dc12e9c59f41

src/commands/cm/stacks/validate-regex.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {Command, flags} from '@contentstack/cli-command'
2-
import getAuthToken from '../../../utils/get-auth-token'
32
import {inquireAlias, inquireModule} from '../../../utils/interactive'
43
import connectStack from '../../../utils/connect-stack'
54
const regexMessages = require('../../../../messages/index.json').validateRegex
@@ -28,15 +27,6 @@ export default class ValidateRegex extends Command {
2827
async run() {
2928
const commandObject = this.parse(ValidateRegex)
3029

31-
let authToken
32-
try {
33-
authToken = await getAuthToken()
34-
} catch (error) {
35-
this.error(regexMessages.errors.login, {
36-
ref: regexMessages.command.login,
37-
})
38-
}
39-
4030
await inquireAlias(commandObject.flags)
4131

4232
let tokenDetails: any
@@ -51,7 +41,7 @@ export default class ValidateRegex extends Command {
5141
await inquireModule(commandObject.flags)
5242

5343
try {
54-
await connectStack(commandObject.flags, this.cmaHost, authToken, tokenDetails.apiKey)
44+
await connectStack(commandObject.flags, this.cmaHost, tokenDetails)
5545
} catch (error) {
5646
this.error(regexMessages.errors.stack.fetch)
5747
}

src/utils/connect-stack.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@ import {cli} from 'cli-ux'
33
import processStack from './process-stack'
44
const regexMessages = require('../../messages/index.json').validateRegex
55

6-
export default async function connectStack(flags: any, host: string, authToken: string, apiKey: string) {
6+
export default async function connectStack(flags: any, host: string, tokenDetails: any) {
77
try {
88
const startTime = Date.now()
99
cli.action.start(regexMessages.cliAction.connectStackStart, '', {stdout: true})
1010
const client = contentstackSdk.client({
1111
host: host,
12-
authtoken: authToken,
13-
})
14-
await client.stack({api_key: apiKey}).fetch().then(async (stack: any) => {
15-
await processStack(flags, stack, startTime)
1612
})
13+
const stackInstance = await client.stack({api_key: tokenDetails.apiKey, management_token: tokenDetails.token})
14+
await processStack(flags, stackInstance, startTime)
1715
} catch (error) {
1816
throw new Error(regexMessages.errors.stack.apiKey)
1917
}

test/utils/connect-stack.test.ts

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,47 +22,43 @@ describe('Get Client from Management SDK, connect with Stack & process Stack', (
2222
jest.restoreAllMocks()
2323
})
2424

25-
test('API Key is Valid', async () => {
25+
test('Token details are Valid', async () => {
2626
const host = 'api-contentstack.io'
27-
const apiKey = 'blt1234'
28-
const authToken = 'blt1234'
27+
const tokenDetails = {
28+
apiKey: 'blt1234',
29+
token: 'blt1234',
30+
}
2931
const flags = {
3032
contentType: true,
3133
globalField: true,
3234
}
3335
contentstackSdk.client.mockImplementation(() => {
3436
return {
35-
stack: jest.fn().mockImplementation(() => {
36-
return {
37-
fetch: jest.fn().mockResolvedValue(Promise.resolve({stack: {}})),
38-
}
39-
}),
37+
stack: jest.fn().mockResolvedValue(Promise.resolve({stack: {}})),
4038
}
4139
})
42-
await connectStack(flags, host, authToken, apiKey)
40+
await connectStack(flags, host, tokenDetails)
4341
expect(cli.action.start).toHaveBeenCalled()
4442
expect(processStack).toHaveBeenCalled()
4543
})
4644

47-
test('API Key is Invalid', async () => {
45+
test('Token details is Invalid', async () => {
4846
try {
4947
const host = 'api-contentstack.io'
50-
const apiKey = 'blt1234'
51-
const authToken = 'blt1234'
48+
const tokenDetails = {
49+
apiKey: 'blt1234',
50+
token: 'blt1234',
51+
}
5252
const flags = {
5353
contentType: true,
5454
globalField: true,
5555
}
5656
contentstackSdk.client.mockImplementation(() => {
5757
return {
58-
stack: jest.fn().mockImplementation(() => {
59-
return {
60-
fetch: jest.fn().mockRejectedValue(Promise.resolve(Error)),
61-
}
62-
}),
58+
stack: jest.fn().mockRejectedValue(Promise.resolve(Error)),
6359
}
6460
})
65-
await connectStack(flags, host, authToken, apiKey)
61+
await connectStack(flags, host, tokenDetails)
6662
expect(cli.action.start).toHaveBeenCalled()
6763
} catch (error) {
6864
expect(error.message).toBe(regexMessages.errors.stack.apiKey)

0 commit comments

Comments
 (0)