Skip to content

Commit d19a4c8

Browse files
committed
fix: otplib method migration and test cases
1 parent 7b84e5b commit d19a4c8

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

.talismanrc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
fileignoreconfig:
2+
- filename: test/unit/ContentstackClient-test.js
3+
checksum: ffeb69822e7614a9ab14bb26f5f3ec8bdbbb6d3feb259064bda6c1379e3c7d37
4+
- filename: lib/contentstackClient.js
5+
checksum: f564f6eee5c17dc73abdeab4be226a3b37942893e149d907d2a4ef415c485c5e
26
- filename: test/unit/globalField-test.js
37
checksum: 25185e3400a12e10a043dc47502d8f30b7e1c4f2b6b4d3b8b55cdc19850c48bf
48
- filename: lib/stack/index.js
@@ -26,10 +30,6 @@ fileignoreconfig:
2630
checksum: e8a32ffbbbdba2a15f3d327273f0a5b4eb33cf84cd346562596ab697125bbbc6
2731
- filename: test/sanity-check/api/bulkOperation-test.js
2832
checksum: f40a14c84ab9a194aaf830ca68e14afde2ef83496a07d4a6393d7e0bed15fb0e
29-
- filename: lib/contentstackClient.js
30-
checksum: b76ca091caa3a1b2658cd422a2d8ef3ac9996aea0aff3f982d56bb309a3d9fde
31-
- filename: test/unit/ContentstackClient-test.js
32-
checksum: 974a4f335aef025b657d139bb290233a69bed1976b947c3c674e97baffe4ce2f
3333
- filename: test/unit/ContentstackHTTPClient-test.js
3434
checksum: 4043efd843e24da9afd0272c55ef4b0432e3374b2ca12b913f1a6654df3f62be
3535
- filename: test/unit/contentstack-test.js

lib/contentstackClient.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import cloneDeep from 'lodash/cloneDeep'
77
import { User } from './user/index'
88
import error from './core/contentstackError'
99
import OAuthHandler from './core/oauthHandler'
10-
import { authenticator } from 'otplib'
10+
import { generateSync } from 'otplib'
1111

1212
export default function contentstackClient ({ http }) {
1313
/**
@@ -43,7 +43,7 @@ export default function contentstackClient ({ http }) {
4343
requestBody = credentials
4444

4545
if (!requestBody.tfa_token && mfaSecret) {
46-
requestBody.tfa_token = authenticator.generate(mfaSecret)
46+
requestBody.tfa_token = generateSync({ secret: mfaSecret })
4747
}
4848
return http.post('/user-session', { user: requestBody }, { params: params })
4949
.then((response) => {

test/unit/ContentstackClient-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ describe('Contentstack Client', () => {
239239
})
240240

241241
it('should handle login with TOTP secret', done => {
242-
const mfaSecret = 'MFASECRET'
242+
const mfaSecret = 'JBSWY3DPEHPK3PXPJBSWY3DPEHPK3PXP'
243243

244244
mock.onPost('/user-session').reply(config => {
245245
const data = JSON.parse(config.data)
@@ -416,7 +416,7 @@ describe('Contentstack Client', () => {
416416
.login({
417417
email: 'test@example.com',
418418
password: 'password123',
419-
mfaSecret: 'MFASECRET'
419+
mfaSecret: 'JBSWY3DPEHPK3PXPJBSWY3DPEHPK3PXP'
420420
})
421421
.then(response => {
422422
expect(response.user.authtoken).to.equal('Test Auth')

test/unit/taxonomy-test.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ describe('Contentstack Taxonomy test', () => {
101101
it('Taxonomy fetch with locale parameter test', done => {
102102
const mock = new MockAdapter(Axios)
103103
const queryParams = { locale: 'hi-in' }
104-
mock.onGet('/taxonomies/UID', queryParams).reply(200, {
104+
mock.onGet('/taxonomies/UID', { params: queryParams }).reply(200, {
105105
taxonomy: {
106106
...taxonomyMock,
107107
locale: 'hi-in'
@@ -139,7 +139,7 @@ describe('Contentstack Taxonomy test', () => {
139139
referenced_content_type_count: 2
140140
}
141141
}
142-
mock.onGet('/taxonomies/UID', queryParams).reply(200, responseData)
142+
mock.onGet('/taxonomies/UID', { params: queryParams }).reply(200, responseData)
143143
makeTaxonomy({
144144
taxonomy: {
145145
...systemUidMock
@@ -166,7 +166,7 @@ describe('Contentstack Taxonomy test', () => {
166166
include_fallback: true,
167167
fallback_locale: 'en-us'
168168
}
169-
mock.onGet('/taxonomies/UID', queryParams).reply(200, {
169+
mock.onGet('/taxonomies/UID', { params: queryParams }).reply(200, {
170170
taxonomy: {
171171
...taxonomyMock,
172172
locale: 'hi-in'
@@ -199,7 +199,7 @@ describe('Contentstack Taxonomy test', () => {
199199
uuid: '65c091865ae75f256a76adc2'
200200
}
201201
}
202-
mock.onGet('/taxonomies/UID', queryParams).reply(200, responseData)
202+
mock.onGet('/taxonomies/UID', { params: queryParams }).reply(200, responseData)
203203
makeTaxonomy({
204204
taxonomy: {
205205
...systemUidMock
@@ -234,7 +234,7 @@ describe('Contentstack Taxonomy test', () => {
234234
it('Taxonomies query with locale parameter test', done => {
235235
const mock = new MockAdapter(Axios)
236236
const queryParams = { locale: 'hi-in' }
237-
mock.onGet('/taxonomies', queryParams).reply(200, {
237+
mock.onGet('/taxonomies', { params: queryParams }).reply(200, {
238238
taxonomies: [
239239
{
240240
...taxonomyMock,
@@ -275,7 +275,7 @@ describe('Contentstack Taxonomy test', () => {
275275
],
276276
count: 1
277277
}
278-
mock.onGet('/taxonomies', queryParams).reply(200, responseData)
278+
mock.onGet('/taxonomies', { params: queryParams }).reply(200, responseData)
279279
makeTaxonomy()
280280
.query(queryParams)
281281
.find()
@@ -299,7 +299,7 @@ describe('Contentstack Taxonomy test', () => {
299299
include_fallback: true,
300300
fallback_locale: 'en-us'
301301
}
302-
mock.onGet('/taxonomies', queryParams).reply(200, {
302+
mock.onGet('/taxonomies', { params: queryParams }).reply(200, {
303303
taxonomies: [
304304
{
305305
...taxonomyMock,
@@ -325,7 +325,7 @@ describe('Contentstack Taxonomy test', () => {
325325
asc: 'name',
326326
desc: 'created_at'
327327
}
328-
mock.onGet('/taxonomies', queryParams).reply(200, {
328+
mock.onGet('/taxonomies', { params: queryParams }).reply(200, {
329329
taxonomies: [
330330
taxonomyMock
331331
],
@@ -348,7 +348,7 @@ describe('Contentstack Taxonomy test', () => {
348348
typeahead: 'taxonomy',
349349
deleted: false
350350
}
351-
mock.onGet('/taxonomies', queryParams).reply(200, {
351+
mock.onGet('/taxonomies', { params: queryParams }).reply(200, {
352352
taxonomies: [
353353
taxonomyMock
354354
],
@@ -370,7 +370,7 @@ describe('Contentstack Taxonomy test', () => {
370370
skip: 10,
371371
limit: 5
372372
}
373-
mock.onGet('/taxonomies', queryParams).reply(200, {
373+
mock.onGet('/taxonomies', { params: queryParams }).reply(200, {
374374
taxonomies: [
375375
taxonomyMock
376376
],
@@ -400,7 +400,7 @@ describe('Contentstack Taxonomy test', () => {
400400
],
401401
count: 1
402402
}
403-
mock.onGet('/taxonomies', queryParams).reply(200, responseData)
403+
mock.onGet('/taxonomies', { params: queryParams }).reply(200, responseData)
404404
makeTaxonomy()
405405
.query(queryParams)
406406
.find()
@@ -527,7 +527,7 @@ describe('Contentstack Taxonomy test', () => {
527527
notice: 'Taxonomy unlocalized successfully',
528528
status: 200
529529
}
530-
mock.onDelete('/taxonomies/UID', { locale: 'hi-in' }).reply(200, deleteResponse)
530+
mock.onDelete('/taxonomies/UID', { params: { locale: 'hi-in' } }).reply(200, deleteResponse)
531531
makeTaxonomy({
532532
taxonomy: {
533533
...systemUidMock
@@ -571,7 +571,7 @@ describe('Contentstack Taxonomy test', () => {
571571
notice: 'Taxonomy unlocalized successfully',
572572
status: 200
573573
}
574-
mock.onDelete('/taxonomies/UID', { locale: 'mr-in' }).reply(200, deleteResponse)
574+
mock.onDelete('/taxonomies/UID', { params: { locale: 'mr-in' } }).reply(200, deleteResponse)
575575
makeTaxonomy({
576576
taxonomy: {
577577
...systemUidMock

0 commit comments

Comments
 (0)