@shoper/cli 0.2.1-1 → 0.2.1-3

package/build/cli/auth/tokens/api/cli_auth_tokens_api.js

@@ -40,4 +40,7 @@ export class CliAuthTokensApi extends FeatureApi {
     getTokensCount() {
         return this.#service.getTokensCount();
     }
+    validateToken(token) {
+        return this.#service.validateToken(token);
+    }
 }

package/build/cli/auth/tokens/cli_auth_tokens_utils.js

@@ -23,4 +23,34 @@ export class CLiAuthTokensUtils {
             return true;
         return tokenPayload.exp - Math.floor(Date.now() / 1000) < 0;
     }
+    static isValidJWT(token) {
+        const parts = token.split('.');
+        if (parts.length !== 3) {
+            return { isValid: false, message: 'Invalid token format. JWT should have 3 parts.' };
+        }
+        try {
+            const decoded = jwt.decode(token, { complete: true });
+            if (!decoded) {
+                return { isValid: false, message: 'Failed to decode token.' };
+            }
+            const { header } = decoded;
+            const payload = decoded.payload;
+            const expectedPayloadKeys = ['sub', 'exp', 'iat', 'iss', 'nbf', 'scope', 'id', 'name', 'key'];
+            for (const key of Object.keys(payload)) {
+                if (!expectedPayloadKeys.includes(key)) {
+                    return { isValid: false, message: `Unexpected key in payload: ${key}` };
+                }
+            }
+            // Check if the token has expired
+            const now = Math.floor(Date.now() / 1000); // Current time in seconds
+            if (payload.exp < now) {
+                return { isValid: false, message: 'Token has expired.' };
+            }
+            // If all checks pass, consider the token valid (structure and keys checked)
+            return { isValid: true, message: 'Token is valid (structure and keys checked).' };
+        }
+        catch {
+            return { isValid: false, message: 'Error decoding the token. Invalid format.' };
+        }
+    }
 }

package/build/cli/auth/tokens/service/cli_auth_tokens_service.js

@@ -16,6 +16,9 @@ export class CLiAuthTokensService {
         tokens.push(tokeItem);
         this._setTokens(tokens);
     }
+    validateToken(token) {
+        return CLiAuthTokensUtils.isValidJWT(token);
+    }
     hasToken(index) {
         return index <= this.getTokensCount();
     }

package/build/cli/commands/auth/cli_auth_add_token_command.js

@@ -16,6 +16,13 @@ export class CliAuthAddTokenCommand extends BaseCliCommand {
         const cliAuthTokensApi = this.getApi(CLI_AUTH_TOKENS_API_NAME);
         try {
             const { input: token } = await promptInput('Please paste your CLI token:');
+            const { isValid, message } = cliAuthTokensApi.validateToken(token);
+            if (!isValid) {
+                renderOnce(React.createElement(Error, { header: "Error: Failed to add token: " },
+                    React.createElement(Box, null,
+                        React.createElement(Text, null, message))));
+                return;
+            }
             cliAuthTokensApi.addToken(token);
             cliAuthTokensApi.setDefaultToken(cliAuthTokensApi.getTokensCount());
             renderOnce(React.createElement(Success, null,

package/build/theme/features/theme/push/service/theme_push_service.js

@@ -72,8 +72,7 @@ export class ThemePushService {
             const { uploadedImageData, rejectedImageData } = await themeFilesUploadApi.uploadFiles(filesToUpload);
             if (uploadedImageData.length)
                 await ThemeImagesUtils.removeUploadedOriginalFiles(themeRootDir, uploadedImageData);
-            if (rejectedImageData.length)
-                await this._removeUploadedThemeFiles(rejectedImageData, themeRootDir);
+            // if (rejectedImageData.length) await this._removeUploadedThemeFiles(rejectedImageData, themeRootDir);
             return {
                 localFileNameToUploaded: uploadedImageData.reduce((acc, { originalFilename, uploadedFilename }) => {
                     return {

package/package.json

@@ -2,7 +2,7 @@
     "name": "@shoper/cli",
     "packageManager": "yarn@3.2.0",
     "sideEffects": false,
-    "version": "0.2.1-1",
+    "version": "0.2.1-3",
     "description": "CLI tool for Shoper",
     "author": "Joanna Firek",
     "license": "MIT",