tsoft-cli 3.6.0 → 3.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsoft-cli",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "tsoft360 tema geliştirme ve yönetim aracı",
   "type": "module",
   "bin": {

package/src/api-client.js

@@ -1,10 +1,12 @@
 import axios from 'axios';
-import { loadTokens, ensureValidToken } from './storage.js';
+import { loadTokens, ensureValidToken, refreshAccessToken, saveTokens, isRefreshTokenValid } from './storage.js';
+import { verboseLog } from './output-mode.js';
 
 export class ApiClient {
     constructor(store) {
         this.store = store;
         this.baseURL = `https://${store}/api/v3/public/onlinestore`;
+        this._retried = false;
     }
 
     async getAuthHeaders() {
@@ -22,6 +24,29 @@ export class ApiClient {
         };
     }
 
+    async refreshAndRetry(requestFn) {
+        if (this._retried) {
+            throw new Error('Yetkilendirme hatası. Lütfen tekrar giriş yapın: tsoft login');
+        }
+        this._retried = true;
+
+        const tokens = await loadTokens(this.store);
+        verboseLog('refresh token valid:', tokens ? isRefreshTokenValid(tokens) : 'no tokens');
+        if (tokens && isRefreshTokenValid(tokens)) {
+            try {
+                verboseLog('calling refreshAccessToken...');
+                const newTokens = await refreshAccessToken(tokens.refreshToken, tokens.store);
+                await saveTokens(newTokens, tokens.store);
+                verboseLog('refresh success, retrying request...');
+                return await requestFn();
+            } catch (refreshError) {
+                verboseLog('refresh failed:', refreshError.message);
+            }
+        }
+
+        throw new Error('Yetkilendirme hatası. Lütfen tekrar giriş yapın: tsoft login');
+    }
+
     async get(endpoint, config = {}) {
         const headers = await this.getAuthHeaders();
 
@@ -33,6 +58,10 @@ export class ApiClient {
 
             return response.data;
         } catch (error) {
+            if (error.response?.status === 401 && !this._retried) {
+                verboseLog('401 received, attempting refresh...');
+                return await this.refreshAndRetry(() => this.get(endpoint, config));
+            }
             this.handleError(error);
         }
     }
@@ -48,6 +77,9 @@ export class ApiClient {
 
             return response.data;
         } catch (error) {
+            if (error.response?.status === 401 && !this._retried) {
+                return await this.refreshAndRetry(() => this.post(endpoint, data, config));
+            }
             this.handleError(error);
         }
     }
@@ -63,6 +95,9 @@ export class ApiClient {
 
             return response;
         } catch (error) {
+            if (error.response?.status === 401 && !this._retried) {
+                return await this.refreshAndRetry(() => this.download(endpoint, params));
+            }
             this.handleError(error);
         }
     }

package/src/index.js

@@ -3,7 +3,7 @@
 import { createRequire } from 'module';
 import { Command } from 'commander';
 import chalk from 'chalk';
-import { setJsonMode } from './output-mode.js';
+import { setJsonMode, setVerboseMode } from './output-mode.js';
 import { initLocale } from './i18n.js';
 import { renderBrandedHelp } from './ui/help-renderer.js';
 import { loginCommand } from './commands/login.js';
@@ -30,15 +30,19 @@ program
   .description('tsoft360 theme development and management tool')
   .version(version);
 
-// Global --json flag for machine-readable output (CI/CD)
+// Global flags
 program.option('--json', 'Machine-readable JSON output for CI/CD');
+program.option('--verbose', 'Verbose debug output');
 
 // preAction hook: runs before every command
 program.hook('preAction', (thisCommand) => {
   const opts = thisCommand.opts();
   if (opts.json) {
     setJsonMode(true);
-    chalk.level = 0; // Disable chalk colors — no ANSI codes inside JSON
+    chalk.level = 0;
+  }
+  if (opts.verbose) {
+    setVerboseMode(true);
   }
 });
 

package/src/output-mode.js

@@ -5,6 +5,7 @@
  */
 
 let _jsonMode = false;
+let _verboseMode = false;
 
 /**
  * JSON modu aktif et (index.js preAction hook'undan cagrilir)
@@ -43,3 +44,17 @@ export function humanOut(fn) {
     fn();
   }
 }
+
+export function setVerboseMode(val) {
+  _verboseMode = Boolean(val);
+}
+
+export function isVerbose() {
+  return _verboseMode;
+}
+
+export function verboseLog(...args) {
+  if (_verboseMode) {
+    console.error('[verbose]', ...args);
+  }
+}

package/src/storage.js

@@ -141,15 +141,11 @@ export async function refreshAccessToken(refreshToken, store) {
     const refreshUrl = config.getRefreshUrl(store);
 
     try {
-        // Laravel Passport application/x-www-form-urlencoded formatında bekler
-        const params = new URLSearchParams();
-        params.append('grant_type', 'refresh_token');
-        params.append('refresh_token', refreshToken);
-        params.append('client_id', config.CLIENT_ID);
-
-        const response = await axios.post(refreshUrl, params, {
+        const response = await axios.post(refreshUrl, {
+            refreshToken: refreshToken,
+        }, {
             headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
+                'Content-Type': 'application/json',
                 'Accept': 'application/json',
             },
         });