@reporting-bi/cli 0.0.6 → 0.0.7

package/dist/index.js

@@ -2831,7 +2831,7 @@ var ReportingAuthClient = class {
   async getAuthInit() {
     if (this.options.tokenProvider) {
       const token = await this.options.tokenProvider();
-      return token ? { headers: { "Authorization": `Bearer ${token}` } } : {};
+      return token?.access_token ? { headers: { "Authorization": `Bearer ${token.access_token}` } } : {};
     }
     return { credentials: "include" };
   }
@@ -2905,14 +2905,18 @@ var ReportingAuthClient = class {
     }
     return this.response;
   }
-  redirect() {
+  redirect(authorizationCode) {
     let url = `${this.options.serviceUrl}/redirect`;
     const queryParams = [];
     if (this.options.clientId) {
       queryParams.push("client_id=" + encodeURIComponent(this.options.clientId));
     }
     if (this.options.redirectUrl) {
-      queryParams.push("redirect_uri=" + encodeURIComponent(this.options.redirectUrl));
+      let redirectUri = this.options.redirectUrl;
+      if (authorizationCode) {
+        queryParams.push("code=" + encodeURIComponent(authorizationCode));
+      }
+      queryParams.push("redirect_uri=" + encodeURIComponent(redirectUri));
     }
     url += (url.includes("?") ? "&" : "?") + queryParams.join("&");
     window.location.href = url;
@@ -2974,15 +2978,22 @@ var ReportingAuthClient = class {
   }
   async refreshToken() {
     const body = { grant_type: "refresh_token" };
+    if (this.options.tokenProvider) {
+      const token = await this.options.tokenProvider();
+      if (token?.refresh_token) {
+        body.refresh_token = token.refresh_token;
+      }
+    }
     if (this.options.clientId)
       body.client_id = this.options.clientId;
     if (this.options.clientSecret)
       body.client_secret = this.options.clientSecret;
-    this.response = await this.fetchWithAuth(`${this.options.serviceUrl}/token`, {
+    this.response = await fetch(`${this.options.serviceUrl}/token`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json"
       },
+      credentials: body.refresh_token ? "include" : "omit",
       body: JSON.stringify(body)
     });
     if (!this.response.ok) {
@@ -3046,15 +3057,34 @@ function setActive(domain, accounting2) {
   saveCredentials(creds);
   return true;
 }
-function createAuthClient(domain, tokenProvider) {
+function createAuthClient(domain, tokens) {
   return new ReportingAuthClient({
     serviceUrl: `${domain}/auth`,
     clientId: CLIENT_ID,
     clientSecret: CLIENT_SECRET,
-    tokenProvider
+    tokenProvider: tokens ? () => ({ access_token: tokens.access_token, refresh_token: tokens.refresh_token }) : void 0
   });
 }
-function createService(name, accountingOverride) {
+async function ensureValidToken(conn) {
+  const now = Math.floor(Date.now() / 1e3);
+  const margin = 60;
+  if (conn.tokens.expires_at && conn.tokens.expires_at > now + margin) return;
+  if (!conn.tokens.refresh_token) return;
+  const client = createAuthClient(conn.domain, conn.tokens);
+  try {
+    await client.refreshToken();
+    const credentials = await client.readCredentials();
+    if (credentials?.access_token) {
+      conn.tokens.access_token = credentials.access_token;
+      if (credentials.refresh_token) conn.tokens.refresh_token = credentials.refresh_token;
+      conn.tokens.expires_at = credentials.expires_in ? now + credentials.expires_in : 0;
+      storeTokens(conn.domain, conn.tokens);
+    }
+  } catch (err) {
+    console.error("Token refresh failed:", err instanceof Error ? err.message : err);
+  }
+}
+async function createService(name, accountingOverride) {
   const conn = getActiveConnection();
   if (!conn) {
     console.error('Not logged in. Run "rpbi login" first.');
@@ -3065,6 +3095,7 @@ function createService(name, accountingOverride) {
     console.error('No accounting set. Run "rpbi use <domain> --accounting <id>" first.');
     process.exit(1);
   }
+  await ensureValidToken(conn);
   const service = new import_rp_client.Service({
     name,
     baseUrl: `${conn.domain}/ms`,
@@ -3076,6 +3107,10 @@ function createService(name, accountingOverride) {
   service.accountingProvider = ap;
   return service;
 }
+function getFields(flags, defaults) {
+  if (flags.columns) return flags.columns.split(",").map((s) => s.trim());
+  return defaults;
+}
 var FLAG_ALIASES = {
   a: "accounting"
 };
@@ -3147,7 +3182,7 @@ function output(data, flags) {
 
 // src/commands/accounting.ts
 async function fetchAccountingName(accountingId) {
-  const service = createService("accounting", accountingId);
+  const service = await createService("accounting", accountingId);
   const accountings = await service.get("accountings", { fields: ["accounting", "company"] });
   const match = accountings?.find((a) => a.accounting === accountingId);
   return match?.company ?? null;
@@ -3164,7 +3199,7 @@ async function accounting(args2) {
   }
 }
 async function list(flags) {
-  const service = createService("accounting");
+  const service = await createService("accounting");
   const accountings = await service.get("accountings", { fields: ["accounting", "company"] });
   output(accountings || [], flags);
 }
@@ -3329,7 +3364,7 @@ async function logout(domain) {
     return;
   }
   try {
-    const client = createAuthClient(domain, () => tokens.access_token);
+    const client = createAuthClient(domain, tokens);
     await client.revokeToken();
   } catch {
   }
@@ -3410,24 +3445,24 @@ async function use(args2) {
 var fs2 = __toESM(require("node:fs"));
 var DEFAULT_LANG = "cs";
 async function list2(flags) {
-  const service = createService("wiki");
+  const service = await createService("wiki");
   const pages = await service.get("pages");
   output(pages || [], flags);
 }
 async function get(id, flags) {
   const lang = flags.lang || DEFAULT_LANG;
-  const service = createService("wiki");
+  const service = await createService("wiki");
   const page = await service.get(`page/${lang}/${id}`);
   output(page, flags);
 }
 async function read(id, flags) {
   const lang = flags.lang || DEFAULT_LANG;
-  const service = createService("wiki");
+  const service = await createService("wiki");
   const content2 = await service.get(`pageContent/${lang}/${id}`, void 0, { parseResponse: false });
   process.stdout.write(content2 || "");
 }
 async function search(query, flags) {
-  const service = createService("wiki");
+  const service = await createService("wiki");
   const results = await service.get("search", { q: query });
   output(results || [], flags);
 }
@@ -3451,7 +3486,7 @@ async function readContent(flags) {
 }
 async function save(id, flags) {
   const lang = flags.lang || DEFAULT_LANG;
-  const service = createService("wiki");
+  const service = await createService("wiki");
   const content2 = await readContent(flags);
   const page = {
     lang,
@@ -3464,7 +3499,7 @@ async function save(id, flags) {
 }
 async function del(id, flags) {
   const lang = flags.lang || DEFAULT_LANG;
-  const service = createService("wiki");
+  const service = await createService("wiki");
   await service.delete(`page/${lang}/${id}`);
   console.log(`Page ${id} deleted.`);
 }
@@ -3508,23 +3543,24 @@ async function wiki(args2) {
 
 // src/commands/etl.ts
 var fs3 = __toESM(require("node:fs"));
+var DEFAULT_FIELDS = ["id_thread", "description", "module", "type", "enabled", "ord_num"];
 async function list3(flags) {
-  const service = createService("etl");
-  const threads = await service.get("threads", { fields: ["id_thread", "description", "module", "type", "enabled", "ord_num"] });
+  const service = await createService("etl");
+  const threads = await service.get("threads", { fields: getFields(flags, DEFAULT_FIELDS) });
   output(threads || [], flags);
 }
 async function get2(id, flags) {
-  const service = createService("etl");
+  const service = await createService("etl");
   const thread = await service.get(`threads/${id}`);
   output(thread, flags);
 }
 async function content(id, flags) {
-  const service = createService("etl");
+  const service = await createService("etl");
   const text = await service.get(`threadContent/${id}`, void 0, { parseResponse: false });
   process.stdout.write(text || "");
 }
 async function exec2(id, flags) {
-  const service = createService("etl");
+  const service = await createService("etl");
   let body = void 0;
   if (flags.file) {
     body = fs3.readFileSync(flags.file, "utf-8");
@@ -3535,8 +3571,8 @@ async function exec2(id, flags) {
   process.stdout.write(result || "");
 }
 async function search2(query, flags) {
-  const service = createService("etl");
-  const results = await service.get("search", { q: query });
+  const service = await createService("etl");
+  const results = await service.get("search", { q: query, fields: getFields(flags, DEFAULT_FIELDS) });
   output(results || [], flags);
 }
 async function etl(args2) {
@@ -3576,24 +3612,26 @@ async function etl(args2) {
 }
 
 // src/commands/jobs.ts
+var DEFAULT_LIST_FIELDS = ["job_name", "description", "enabled", "last_run", "next_run"];
+var DEFAULT_STATUS_FIELDS = ["job_name", "running", "enabled", "last_run", "next_run"];
 async function list4(flags) {
-  const service = createService("jobs");
-  const jobs2 = await service.get("userJobs");
+  const service = await createService("jobs");
+  const jobs2 = await service.get("userJobs", { fields: getFields(flags, DEFAULT_LIST_FIELDS) });
   output(jobs2 || [], flags);
 }
 async function start(jobName, flags) {
-  const service = createService("jobs");
+  const service = await createService("jobs");
   await service.get("start", { job_name: jobName });
   console.log(`Job "${jobName}" started.`);
 }
 async function stop(jobName, flags) {
-  const service = createService("jobs");
+  const service = await createService("jobs");
   await service.get("stop", { job_name: jobName });
   console.log(`Job "${jobName}" stopped.`);
 }
 async function statusCmd(flags) {
-  const service = createService("jobs");
-  const statuses = await service.get("jobStatuses");
+  const service = await createService("jobs");
+  const statuses = await service.get("jobStatuses", { fields: getFields(flags, DEFAULT_STATUS_FIELDS) });
   output(statuses || [], flags);
 }
 async function jobs(args2) {
@@ -3623,18 +3661,19 @@ async function jobs(args2) {
 }
 
 // src/commands/analytics.ts
+var DEFAULT_CONTEXT_FIELDS = ["id_context", "name", "module", "user_name"];
 async function contexts(flags) {
-  const service = createService("analytics");
-  const ctxs = await service.get("namedContext");
+  const service = await createService("analytics");
+  const ctxs = await service.get("namedContext", { fields: getFields(flags, DEFAULT_CONTEXT_FIELDS) });
   output(ctxs || [], flags);
 }
 async function getContext(id, flags) {
-  const service = createService("analytics");
+  const service = await createService("analytics");
   const ctx = await service.get(`context/${id}`);
   output(ctx, flags);
 }
 async function report(id, flags) {
-  const service = createService("analytics");
+  const service = await createService("analytics");
   const index = flags.index || "0";
   const result = await service.get(`report/${id}/${index}`, void 0, { parseResponse: false });
   process.stdout.write(result || "");
@@ -3645,12 +3684,12 @@ async function dimensions(flags) {
     console.error("Usage: rpbi analytics dimensions --module <module>");
     process.exit(1);
   }
-  const service = createService("definition");
-  const dims = await service.get(`visibleDimensions/${module2}`);
+  const service = await createService("definition");
+  const dims = await service.get(`visibleDimensions/${module2}`, { fields: getFields(flags) });
   output(dims || [], flags);
 }
 async function periods(flags) {
-  const service = createService("analytics");
+  const service = await createService("analytics");
   const tree = await service.get("years");
   output(tree || [], flags);
 }
@@ -3683,24 +3722,27 @@ async function analytics(args2) {
 }
 
 // src/commands/users.ts
+var DEFAULT_LIST_FIELDS2 = ["user_name", "login_name", "company"];
+var DEFAULT_RIGHTS_FIELDS = ["right", "accounting", "role", "source"];
+var DEFAULT_ROLES_FIELDS = ["id_access_role", "role", "description"];
 async function list5(flags) {
-  const service = createService("users");
-  const users2 = await service.get("allUsers");
+  const service = await createService("users");
+  const users2 = await service.get("allUsers", { fields: getFields(flags, DEFAULT_LIST_FIELDS2) });
   output(users2 || [], flags);
 }
 async function get3(user, flags) {
-  const service = createService("users");
+  const service = await createService("users");
   const result = await service.get(user);
   output(result, flags);
 }
 async function rights(flags) {
-  const service = createService("users");
-  const result = await service.get("userRights");
+  const service = await createService("users");
+  const result = await service.get("userRights", { fields: getFields(flags, DEFAULT_RIGHTS_FIELDS) });
   output(result || [], flags);
 }
 async function roles(flags) {
-  const service = createService("users");
-  const result = await service.get("accessRoles");
+  const service = await createService("users");
+  const result = await service.get("accessRoles", { fields: getFields(flags, DEFAULT_ROLES_FIELDS) });
   output(result || [], flags);
 }
 async function users(args2) {
@@ -3724,13 +3766,16 @@ async function users(args2) {
 }
 
 // src/commands/def.ts
+var DEFAULT_STATEMENTS_FIELDS = ["id_statement", "statement", "description"];
+var DEFAULT_DIMENSIONS_FIELDS = ["dim_num", "description", "enabled", "ord_num"];
+var DEFAULT_MODULES_FIELDS = ["module", "name", "type"];
 async function statements(flags) {
-  const service = createService("definition");
-  const result = await service.get("finStatements");
+  const service = await createService("definition");
+  const result = await service.get("finStatements", { fields: getFields(flags, DEFAULT_STATEMENTS_FIELDS) });
   output(result || [], flags);
 }
 async function statement(id, flags) {
-  const service = createService("definition");
+  const service = await createService("definition");
   const result = await service.get(`finStatement/${id}`);
   output(result, flags);
 }
@@ -3740,23 +3785,23 @@ async function dimensions2(flags) {
     console.error("Usage: rpbi def dimensions --module <module>");
     process.exit(1);
   }
-  const service = createService("definition");
-  const result = await service.get(`dimensions/${module2}`);
+  const service = await createService("definition");
+  const result = await service.get(`dimensions/${module2}`, { fields: getFields(flags, DEFAULT_DIMENSIONS_FIELDS) });
   output(result || [], flags);
 }
 async function modules(flags) {
-  const service = createService("definition");
-  const result = await service.get("modules");
+  const service = await createService("definition");
+  const result = await service.get("modules", { fields: getFields(flags, DEFAULT_MODULES_FIELDS) });
   output(result || [], flags);
 }
 async function scenarios(flags) {
-  const service = createService("definition");
-  const result = await service.get("scenarios");
+  const service = await createService("definition");
+  const result = await service.get("scenarios", { fields: getFields(flags) });
   output(result || [], flags);
 }
 async function fiscalYears(flags) {
-  const service = createService("definition");
-  const result = await service.get("fiscalYears");
+  const service = await createService("definition");
+  const result = await service.get("fiscalYears", { fields: getFields(flags) });
   output(result || [], flags);
 }
 async function def(args2) {
@@ -3786,28 +3831,29 @@ async function def(args2) {
 }
 
 // src/commands/mdm.ts
+var DEFAULT_TABLES_FIELDS = ["id_md", "md_name", "type"];
 async function tables(flags) {
-  const service = createService("mdm");
-  const result = await service.get("tableDefinitions");
+  const service = await createService("mdm");
+  const result = await service.get("tableDefinitions", { fields: getFields(flags, DEFAULT_TABLES_FIELDS) });
   output(result || [], flags);
 }
 async function table(id, flags) {
-  const service = createService("mdm");
+  const service = await createService("mdm");
   const result = await service.get(`tableDefinition/${id}`);
   output(result, flags);
 }
 async function columns(id, flags) {
-  const service = createService("mdm");
-  const result = await service.get(`columnDefinitions/${id}`);
+  const service = await createService("mdm");
+  const result = await service.get(`columnDefinitions/${id}`, { fields: getFields(flags) });
   output(result || [], flags);
 }
 async function values(id, flags) {
-  const service = createService("mdm");
-  const result = await service.get(`values/${id}`);
+  const service = await createService("mdm");
+  const result = await service.get(`values/${id}`, { fields: getFields(flags) });
   output(result || [], flags);
 }
 async function exportCsv(id, flags) {
-  const service = createService("mdm");
+  const service = await createService("mdm");
   const type = flags.type || "mdm";
   const result = await service.get(`export/${id}/${type}`, void 0, { parseResponse: false });
   process.stdout.write(result || "");
@@ -3849,19 +3895,21 @@ async function mdm(args2) {
 }
 
 // src/commands/helpdesk.ts
+var DEFAULT_LIST_FIELDS3 = ["id_request", "subject", "status", "priority", "who_created"];
+var DEFAULT_MESSAGES_FIELDS = ["id_message", "text", "who_created", "date_created"];
 async function list6(flags) {
-  const service = createService("helpdesk");
-  const tickets = await service.get("tickets");
+  const service = await createService("helpdesk");
+  const tickets = await service.get("tickets", { fields: getFields(flags, DEFAULT_LIST_FIELDS3) });
   output(tickets || [], flags);
 }
 async function get4(id, flags) {
-  const service = createService("helpdesk");
+  const service = await createService("helpdesk");
   const ticket = await service.get(`ticket/${id}`);
   output(ticket, flags);
 }
 async function messages(id, flags) {
-  const service = createService("helpdesk");
-  const msgs = await service.get(`messages/${id}`);
+  const service = await createService("helpdesk");
+  const msgs = await service.get(`messages/${id}`, { fields: getFields(flags, DEFAULT_MESSAGES_FIELDS) });
   output(msgs || [], flags);
 }
 async function create(flags) {
@@ -3871,7 +3919,7 @@ async function create(flags) {
     console.error('Usage: rpbi helpdesk create --subject "..." [--text "..."] [--priority N]');
     process.exit(1);
   }
-  const service = createService("helpdesk");
+  const service = await createService("helpdesk");
   const ticket = { subject };
   if (flags.priority) ticket.priority = parseInt(flags.priority);
   const result = await service.post("ticket", ticket);
@@ -3978,6 +4026,7 @@ Wiki:
 
 Global options:
   --json                                Output raw JSON instead of table format
+  --columns col1,col2,...               Select specific columns to display
 
 Default domain: https://reporting.bi
 Default language: cs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reporting-bi/cli",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "license": "UNLICENSED",
   "description": "Reporting.bi CLI — command-line interface for the Reporting.bi platform",
   "main": "./dist/index.js",
@@ -13,6 +13,7 @@
   "scripts": {
     "build": "yarn node build.mjs",
     "watch": "yarn build --watch",
+    "rpbi": "yarn node dist/index.js",
     "deploy-installers": "cp install.sh ../rp-static/install-cli.sh && cp install.ps1 ../rp-static/install-cli.ps1",
     "release": "yarn node -e \"const p=require('./package.json');const v=p.version.split('.');v[2]++;p.version=v.join('.');require('fs').writeFileSync('package.json',JSON.stringify(p,null,'\\t')+'\\n')\" && yarn build && git add package.json && git commit -m \"rp-cli v$(yarn node -p \"require('./package.json').version\")\" && git push && yarn npm publish --access public"
   },