@bragduck/cli 2.13.4 → 2.13.6

package/dist/bin/bragduck.js

@@ -3364,12 +3364,12 @@ var JiraService = class {
     }
   }
   /**
-   * Get current user's email
+   * Get current user's account ID (for Jira Cloud) or username (for Jira Server)
    */
   async getCurrentUser() {
     try {
       const user = await this.request("/rest/api/2/myself");
-      return user.emailAddress;
+      return user.accountId || user.name || user.emailAddress;
     } catch {
       return null;
     }
@@ -3383,15 +3383,10 @@ var JiraService = class {
       queries.push(`updated >= -${options.days}d`);
     }
     if (options.author) {
-      if (options.author.includes("@")) {
-        queries.push(
-          "(creator = currentUser() OR reporter = currentUser() OR assignee = currentUser())"
-        );
-      } else {
-        queries.push(
-          `(creator = "${options.author}" OR reporter = "${options.author}" OR assignee = "${options.author}")`
-        );
-      }
+      const escapedAuthor = options.author.replace(/"/g, '\\"');
+      queries.push(
+        `(creator = "${escapedAuthor}" OR reporter = "${escapedAuthor}" OR assignee = "${escapedAuthor}")`
+      );
     } else {
       queries.push(
         "(creator = currentUser() OR reporter = currentUser() OR assignee = currentUser())"
@@ -3475,6 +3470,11 @@ var JiraService = class {
    * Fetch issues with optional filtering
    */
   async getIssues(options = {}) {
+    if (options.author) {
+      logger.debug(`Fetching issues for author: ${options.author}`);
+    } else {
+      logger.debug("Fetching issues for current user (no author specified)");
+    }
     const jql = this.buildJQL(options);
     logger.debug(`Using JQL query: ${jql}`);
     const fields = [
@@ -3533,11 +3533,7 @@ var JiraService = class {
           const limitedIssues = allIssues.slice(0, options.limit);
           const commits2 = [];
           for (const issue of limitedIssues) {
-            const commit = await this.transformIssueToCommit(
-              issue,
-              void 0,
-              email2 || void 0
-            );
+            const commit = await this.transformIssueToCommit(issue, void 0, email2 || void 0);
             commits2.push(commit);
           }
           return commits2;
@@ -3809,12 +3805,12 @@ var ConfluenceService = class {
     }
   }
   /**
-   * Get current user's email
+   * Get current user's account ID (for Confluence Cloud) or username (for Server/DC)
    */
   async getCurrentUser() {
     try {
-      const creds = await this.getCredentials();
-      return creds.email;
+      const user = await this.request("/wiki/rest/api/user/current");
+      return user.accountId || user.username || user.email;
     } catch {
       return null;
     }
@@ -3833,11 +3829,8 @@ var ConfluenceService = class {
       queries.push(`lastModified > startOfDay("-${options.days}d")`);
     }
     if (options.author) {
-      if (options.author.includes("@")) {
-        queries.push("(creator = currentUser() or contributor = currentUser())");
-      } else {
-        queries.push(`(creator = "${options.author}" or contributor = "${options.author}")`);
-      }
+      const escapedAuthor = options.author.replace(/"/g, '\\"');
+      queries.push(`(creator = "${escapedAuthor}" or contributor = "${escapedAuthor}")`);
     } else {
       queries.push("(creator = currentUser() or contributor = currentUser())");
     }