Skip to content

Commit edede08

Browse files
committed
Merge branch 'development' into feat/DX-3899
2 parents 7d071a9 + 31e3d9e commit edede08

File tree

31 files changed

+109
-507
lines changed

31 files changed

+109
-507
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,10 @@ jobs:
173173
if: ${{env.release_releaseAll == 'true' || env.release_plugins_clone == 'true'}}
174174
working-directory: ./packages/contentstack-clone
175175
run: npm install
176+
- name: Compiling Clone
177+
if: ${{ steps.clone-installation.conclusion == 'success' }}
178+
working-directory: ./packages/contentstack-clone
179+
run: npm run prepack
176180
- name: Publishing clone
177181
uses: JS-DevTools/npm-publish@v3
178182
if: ${{ steps.clone-installation.conclusion == 'success' }}

.talismanrc

Lines changed: 5 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,6 @@
11
fileignoreconfig:
2-
- filename: pnpm-lock.yaml
3-
checksum: 0752290f958c3f14f617c0f58568415a9337ce0cf5a551a1d81ad65bbdc462a6
4-
- filename: package-lock.json
5-
checksum: 840448a79fea752dee717baeb9a74ea9a7a54d576c09e565dd8f8ecb69c7f0f6
6-
- filename: packages/contentstack-clone/.eslintrc
7-
checksum: a7230ffa600c58047ac73f2dec7a23ca5862e36e68f04f2671379496739bd818
8-
- filename: packages/contentstack-clone/package.json
9-
checksum: a81ef3f125ddb91a4e13e77745d9c7927f02e3ff17978374560de6f4825db1c9
10-
- filename: packages/contentstack-clone/src/types/clone-config.ts
11-
checksum: c22f8b8a592e7b4da967715e595e79a680ab970ca85b65528d5ac318032e1857
12-
- filename: packages/contentstack-clone/test/commands/stack-clone.test.ts
13-
checksum: 889b9d64434261910a50c14e039e6256fd6157727076308f39bba87b854d459a
14-
- filename: packages/contentstack-clone/src/core/util/clone-handler.ts
15-
checksum: b34987603f2e53c4b5d3753a4b5f4370fcb6d3cc9181b953de13fcc7214648a1
16-
- filename: packages/contentstack-clone/test/lib/helpers/command-helpers.test.ts
17-
checksum: 2702c3cedd9def635fa48408a3a4bbab6728ec8a2700af4f8d5ed6bbe2da4faa
18-
- filename: packages/contentstack-clone/test/lib/util/clone-handler.branch.test.ts
19-
checksum: 0f1fccb38c89b4baa9fa2b145905b626b5ce9633ae30021676a924fa88aa570c
20-
- filename: packages/contentstack-clone/test/commands/cm/stacks/clone.test.ts
21-
checksum: 577aa1cba4e06b3c864c568853692eeaf6eee276b6eb3e040df112259118f4c4
22-
- filename: packages/contentstack-clone/test/lib/util/clone-handler.helpers.test.ts
23-
checksum: efd55d08a7b5263e9ba0d871208552c5df941274bc035bac6101ed26b6ba2da4
24-
- filename: packages/contentstack-clone/test/lib/util/clone-handler.commands.test.ts
25-
checksum: e3c5be3312013df0c20faca3ff280130f9ce187a4187c5045b016b0c7b489b46
26-
- filename: packages/contentstack-clone/test/lib/util/clone-handler.execution.test.ts
27-
checksum: d63e7253b2c8eb4da3238fdf78b66dfbad8e6340fb6ff0b4bcb6ae5cafba1328
28-
- filename: packages/contentstack-config/src/commands/config/get/proxy.ts
29-
checksum: 9c49c2e6246ecdc5a4141c7e5f413d34f1fc799e25b3bbf60b61372c7a9a6f36
30-
- filename: packages/contentstack-config/src/utils/interactive.ts
31-
checksum: 09ebc9918e5161e423238df8879b782daf673e52a5ca97e000a9618517a40b96
32-
- filename: packages/contentstack-config/src/commands/config/set/proxy.ts
33-
checksum: 058c98f96a2de7e75a65536933e5fcd88f0fb7e8a487d9c172f4daacd0d05bea
34-
- filename: packages/contentstack-export-to-csv/src/base-command.ts
35-
checksum: 2a110ef8afbe59c8bcc2f6cd48b06f92d8f717be2ecd88222f2c32bfcf2c7e31
36-
- filename: packages/contentstack-export-to-csv/src/messages/index.ts
37-
checksum: 3921258082ff6dd15bab11481a187ba3e8f73e674c787153f679f9c0951f67cd
38-
- filename: packages/contentstack-export-to-csv/src/types/index.ts
39-
checksum: 28c19efb0c13969d40df964f86fa6de444316e320801f19dee7392df7a36851d
40-
- filename: packages/contentstack-export-to-csv/src/utils/data-transform.ts
41-
checksum: 8540c23a6b7af1f4ae277b8976c0557f8968f10a41f022dfef97e1e0aed911fb
42-
- filename: packages/contentstack-export-to-csv/src/utils/interactive.ts
43-
checksum: 84bc2f171cb9e7707befc777aa50d7ab3ed5caf0c8c35639f55a83511b8686c1
44-
- filename: packages/contentstack-export-to-csv/src/utils/teams-export.ts
45-
checksum: 813eb651cd01a43baee33ea33d5253f7b41212c4b3a7c56e94aa035c97bf99fc
46-
- filename: packages/contentstack-export-to-csv/src/utils/api-client.ts
47-
checksum: 6b6c321a91c9766f344569a810359055556b25ae93d02133fa66591232f12bf5
48-
- filename: packages/contentstack-export-to-csv/src/commands/cm/export-to-csv.ts
49-
checksum: 7aa3a41132b1a765c5ec9326f8f044dc10ffca3ad2f97b04d13ccbedbb95962e
50-
- filename: packages/contentstack-export-to-csv/test/unit/utils/error-handler.test.ts
51-
checksum: d491184f9db125ab6c6ec28407f614e868ee115ea8593cb9d2b83c1f115b9e63
52-
- filename: packages/contentstack-export-to-csv/test/unit/utils/data-transform.test.ts
53-
checksum: f5e40f93389f4fa62be90f0203ebd849c9c882d38afe3a8c35ae91970894a74e
54-
- filename: packages/contentstack-utilities/src/proxy-helper.ts
55-
checksum: 2a8379d7a34acb3c14093599fb4ba7307c94b0f280ea70d6d862ecb2448fe924
56-
- filename: packages/contentstack-migration/test/unit/validators/edit-content-type-validator.test.ts
57-
checksum: 0eeae791e22943cd871ffd9e29db84d30abddadd381969539e9acb122d2e03af
58-
- filename: packages/contentstack-migration/test/unit/commands/cm/stacks/migration.test.ts
59-
checksum: 9efc2552963731c0ddc8feeed42c97fbde98f2472407e61f0e98502e1599993c
60-
- filename: packages/contentstack-migration/test/unit/validators/create-content-type-validator.test.ts
61-
checksum: 2b82ec338f6e2723086ffd04d9d6c324ef0c33ee286a067903bc11f539cf8907
62-
version: ""
2+
- filename: package-lock.json
3+
checksum: 9bc80890e9aff310a9288fdc9fbaccb2652594b2e92f95f8b17f5d4a2be45f81
4+
- filename: pnpm-lock.yaml
5+
checksum: 70c84ad3ad7bcee1ed18cd49d921bce674c25fa4b20dfacd9dc3bd5a20ecee6b
6+
version: '1.0'

package-lock.json

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/contentstack-audit/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
],
2020
"dependencies": {
2121
"@contentstack/cli-command": "~1.7.2",
22-
"@contentstack/cli-utilities": "~1.17.0",
22+
"@contentstack/cli-utilities": "~1.17.1",
2323
"@oclif/core": "^4.3.0",
2424
"@oclif/plugin-help": "^6.2.28",
2525
"@oclif/plugin-plugins": "^5.4.54",
@@ -85,4 +85,4 @@
8585
"keywords": [
8686
"oclif"
8787
]
88-
}
88+
}

packages/contentstack-auth/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@contentstack/cli-auth",
33
"description": "Contentstack CLI plugin for authentication activities",
4-
"version": "1.7.2",
4+
"version": "1.7.3",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"scripts": {
@@ -23,7 +23,7 @@
2323
},
2424
"dependencies": {
2525
"@contentstack/cli-command": "~1.7.2",
26-
"@contentstack/cli-utilities": "~1.17.0",
26+
"@contentstack/cli-utilities": "~1.17.1",
2727
"@oclif/core": "^4.3.0",
2828
"@oclif/plugin-help": "^6.2.28",
2929
"otplib": "^12.0.1"
@@ -81,4 +81,4 @@
8181
}
8282
},
8383
"repository": "contentstack/cli"
84-
}
84+
}

packages/contentstack-auth/src/utils/auth-handler.ts

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -182,36 +182,6 @@ class AuthHandler {
182182
}
183183
});
184184
}
185-
186-
/**
187-
* Validate token
188-
* @param {string} authtoken
189-
* @returns {Promise} Promise object returns response object from Contentstack
190-
*/
191-
async validateAuthtoken(authtoken: string): Promise<object> {
192-
log.debug('Starting token validation.', { module: 'auth-handler', hasAuthToken: !!authtoken });
193-
194-
return new Promise((resolve, reject) => {
195-
if (authtoken) {
196-
log.debug('Making token validation API call.', { module: 'auth-handler' });
197-
198-
this._client
199-
.getUser()
200-
.then((user: object) => {
201-
log.debug('Token validation successful.', { module: 'auth-handler', user });
202-
resolve(user);
203-
})
204-
.catch((error: Error) => {
205-
log.debug('Token validation failed.', { module: 'auth-handler', error: error.message });
206-
cliux.print('CLI_AUTH_TOKEN_VALIDATION_FAILED', { color: 'yellow' });
207-
reject(error);
208-
});
209-
} else {
210-
log.debug('Token validation failed: no auth token provided.', { module: 'auth-handler' });
211-
reject(new Error(messageHandler.parse('CLI_AUTH_TOKEN_VALIDATION_NO_TOKEN')));
212-
}
213-
});
214-
}
215185
}
216186

217187
export default new AuthHandler();
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
export { default as authHandler } from './auth-handler';
22
export { default as mfaHandler } from './mfa-handler';
33
export * as interactive from './interactive';
4-
export * as tokenValidation from './tokens-validation';

packages/contentstack-auth/src/utils/mfa-handler.ts

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -104,32 +104,6 @@ class MFAHandler {
104104
}
105105
}
106106

107-
/**
108-
* Gets MFA code through manual user input
109-
* @returns Promise<string> The MFA code
110-
* @throws Error if code format is invalid
111-
*/
112-
async getManualMFACode(): Promise<string> {
113-
try {
114-
const code = await askOTP();
115-
if (!/^\d{6}$/.test(code)) {
116-
throw new Error(messageHandler.parse('CLI_AUTH_MFA_INVALID_CODE'));
117-
}
118-
return code;
119-
} catch (error) {
120-
log.debug('Failed to get MFA code', { module: 'mfa-handler', error });
121-
throw error;
122-
}
123-
}
124-
125-
/**
126-
* Validates an MFA code format
127-
* @param code The MFA code to validate
128-
* @returns boolean True if valid, false otherwise
129-
*/
130-
isValidMFACode(code: string): boolean {
131-
return /^\d{6}$/.test(code);
132-
}
133107
}
134108

135109
export default new MFAHandler();

0 commit comments

Comments
 (0)