PyPI - jiradc-cli - Versions diffs - 0.3.0__tar.gz → 0.5.0__tar.gz - Mend

jiradc-cli 0.3.0tar.gz → 0.5.0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

{jiradc_cli-0.3.0 → jiradc_cli-0.5.0}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jiradc-cli
-Version: 0.3.0
+Version: 0.5.0
 Summary: Typer CLI for Jira Data Center using browser session cookies.
 Project-URL: Homepage, https://github.com/marcosgalleterobbva/jiradc-cli
 Project-URL: Repository, https://github.com/marcosgalleterobbva/jiradc-cli
@@ -110,6 +110,9 @@ jiradc project versions PROJ
 jiradc issue search --jql "assignee = currentUser() AND statusCategory != Done"
 jiradc issue get PROJ-123
 jiradc issue create --project PROJ --summary "New task" --issue-type Task
+jiradc issue create --project PROJ --summary "Task with custom field" \
+  --description "Required description" \
+  --custom-field 'customfield_13300={"inputValues":["Team Backlog Value"]}'
 jiradc issue editmeta PROJ-123
 jiradc issue edit PROJ-123 --summary "Updated summary" --priority High

{jiradc_cli-0.3.0 → jiradc_cli-0.5.0}/README.md RENAMED Viewed

@@ -83,6 +83,9 @@ jiradc project versions PROJ
 jiradc issue search --jql "assignee = currentUser() AND statusCategory != Done"
 jiradc issue get PROJ-123
 jiradc issue create --project PROJ --summary "New task" --issue-type Task
+jiradc issue create --project PROJ --summary "Task with custom field" \
+  --description "Required description" \
+  --custom-field 'customfield_13300={"inputValues":["Team Backlog Value"]}'
 jiradc issue editmeta PROJ-123
 jiradc issue edit PROJ-123 --summary "Updated summary" --priority High

{jiradc_cli-0.3.0 → jiradc_cli-0.5.0}/jiradc_cli/__init__.py RENAMED Viewed

@@ -2,4 +2,4 @@
 __all__ = ["__version__"]
-__version__ = "0.3.0"
+__version__ = "0.5.0"

{jiradc_cli-0.3.0 → jiradc_cli-0.5.0}/jiradc_cli/client.py RENAMED Viewed

@@ -30,6 +30,7 @@ class JiraClient:
     def __init__(self, config: JiraConfig, timeout_seconds: int = 30) -> None:
         self.base_url = config.base_url.rstrip("/")
         self.timeout_seconds = timeout_seconds
+        self.xsrf_token = _extract_xsrf_token(config.cookie)
         self.session = requests.Session()
         self.session.headers.update(
             {
@@ -60,7 +61,14 @@ class JiraClient:
         request_headers = dict(self.session.headers)
         if method_upper in {"POST", "PUT", "PATCH", "DELETE"}:
             # Jira Data Center instances behind SSO/WAF frequently enforce XSRF checks on mutations.
-            request_headers.setdefault("X-Atlassian-Token", "no-check")
+            if self.xsrf_token:
+                request_headers["X-Atlassian-Token"] = self.xsrf_token
+            else:
+                request_headers.setdefault("X-Atlassian-Token", "no-check")
+            request_headers.setdefault("Origin", self.base_url)
+            request_headers.setdefault(
+                "Referer", f"{self.base_url}/secure/Dashboard.jspa"
+            )
         if headers:
             request_headers.update(headers)
         try:
@@ -111,6 +119,14 @@ def _looks_like_html(text: str) -> bool:
     return lowered.startswith("<!doctype html") or lowered.startswith("<html")
+def _extract_xsrf_token(cookie: str) -> str | None:
+    for part in cookie.split(";"):
+        chunk = part.strip()
+        if chunk.lower().startswith("atlassian.xsrf.token="):
+            return chunk.split("=", 1)[1].strip() or None
+    return None
 def _summarize_html_error(text: str, status_code: int) -> str:
     referral_match = re.search(r"log-referral-id\">([^<]+)<", text, re.IGNORECASE)
     referral = referral_match.group(1).strip() if referral_match else None

{jiradc_cli-0.3.0 → jiradc_cli-0.5.0}/jiradc_cli/main.py RENAMED Viewed

@@ -175,6 +175,149 @@ def _print_issue_rows(rows: list[dict[str, Any]]) -> None:
         typer.echo(f"{str(issue_key):12} {status_name or '-':14} {assignee_name or '-':20} {summary}")
+def _load_json_object_option(raw_value: str, option_name: str) -> dict[str, Any]:
+    source = raw_value
+    if raw_value.startswith("@"):
+        path = Path(raw_value[1:]).expanduser()
+        try:
+            source = path.read_text(encoding="utf-8")
+        except OSError as exc:
+            raise typer.Exit(code=_fail(f"{option_name}: unable to read file {path}: {exc}"))
+    try:
+        payload = json.loads(source)
+    except json.JSONDecodeError as exc:
+        raise typer.Exit(code=_fail(f"{option_name}: invalid JSON ({exc.msg})."))
+    if not isinstance(payload, dict):
+        raise typer.Exit(code=_fail(f"{option_name}: expected a JSON object."))
+    return payload
+def _parse_custom_field_assignments(assignments: list[str]) -> dict[str, Any]:
+    fields: dict[str, Any] = {}
+    for assignment in assignments:
+        if "=" not in assignment:
+            raise typer.Exit(
+                code=_fail(
+                    "--custom-field must use FIELD_ID=VALUE format "
+                    "(VALUE can be plain text or JSON)."
+                )
+            )
+        field_id, raw_value = assignment.split("=", 1)
+        field_id = field_id.strip()
+        value_text = raw_value.strip()
+        if not field_id:
+            raise typer.Exit(code=_fail("--custom-field must include a field id before '='."))
+        if not value_text:
+            raise typer.Exit(code=_fail(f"--custom-field {field_id}: value cannot be empty."))
+        try:
+            parsed_value = json.loads(value_text)
+        except json.JSONDecodeError:
+            parsed_value = value_text
+        fields[field_id] = parsed_value
+    return fields
+def _collect_issue_create_extra_fields(
+    custom_fields: list[str],
+    fields_json: str | None,
+) -> dict[str, Any]:
+    merged = _parse_custom_field_assignments(custom_fields)
+    if fields_json is not None:
+        merged.update(_load_json_object_option(fields_json, "--fields-json"))
+    return merged
+def _extract_issue_types(payload: Any) -> list[dict[str, Any]]:
+    candidates: list[dict[str, Any]] = []
+    if not isinstance(payload, dict):
+        return candidates
+    direct = payload.get("issueTypes")
+    if isinstance(direct, list):
+        candidates.extend(item for item in direct if isinstance(item, dict))
+    values = payload.get("values")
+    if isinstance(values, list):
+        candidates.extend(item for item in values if isinstance(item, dict))
+    projects = payload.get("projects")
+    if isinstance(projects, list):
+        for project in projects:
+            if not isinstance(project, dict):
+                continue
+            issue_types = project.get("issuetypes")
+            if not isinstance(issue_types, list):
+                issue_types = project.get("issueTypes")
+            if isinstance(issue_types, list):
+                candidates.extend(item for item in issue_types if isinstance(item, dict))
+    deduped: list[dict[str, Any]] = []
+    seen: set[str] = set()
+    for issue_type in candidates:
+        key = str(issue_type.get("id") or issue_type.get("name") or "")
+        if key in seen:
+            continue
+        seen.add(key)
+        deduped.append(issue_type)
+    return deduped
+def _extract_createmeta_fields(payload: Any, issue_type_id: str | None = None) -> dict[str, Any] | None:
+    if not isinstance(payload, dict):
+        return None
+    fields = payload.get("fields")
+    if isinstance(fields, dict):
+        return fields
+    values = payload.get("values")
+    if isinstance(values, list):
+        fallback: dict[str, Any] | None = None
+        for value in values:
+            if not isinstance(value, dict):
+                continue
+            value_fields = value.get("fields")
+            if not isinstance(value_fields, dict):
+                continue
+            if issue_type_id and str(value.get("id")) == issue_type_id:
+                return value_fields
+            if fallback is None:
+                fallback = value_fields
+        if fallback is not None:
+            return fallback
+    projects = payload.get("projects")
+    if isinstance(projects, list):
+        fallback = None
+        for project in projects:
+            if not isinstance(project, dict):
+                continue
+            issue_types = project.get("issuetypes")
+            if not isinstance(issue_types, list):
+                issue_types = project.get("issueTypes")
+            if not isinstance(issue_types, list):
+                continue
+            for issue_type in issue_types:
+                if not isinstance(issue_type, dict):
+                    continue
+                issue_fields = issue_type.get("fields")
+                if not isinstance(issue_fields, dict):
+                    continue
+                if issue_type_id and str(issue_type.get("id")) == issue_type_id:
+                    return issue_fields
+                if fallback is None:
+                    fallback = issue_fields
+        if fallback is not None:
+            return fallback
+    return None
 def _worklog_adjustment_params(
     *,
     adjust_estimate: str | None,
@@ -489,6 +632,19 @@ def issue_create(
     issue_type: str = typer.Option("Task", "--issue-type", help="Jira issue type name."),
     description: str | None = typer.Option(None, "--description", help="Issue description."),
     assignee: str | None = typer.Option(None, "--assignee", help="Username to assign at creation."),
+    custom_field: list[str] = typer.Option(
+        [],
+        "--custom-field",
+        help=(
+            "Custom field assignment in FIELD_ID=VALUE format. "
+            "VALUE may be plain text or JSON. Repeat option for multiple fields."
+        ),
+    ),
+    fields_json: str | None = typer.Option(
+        None,
+        "--fields-json",
+        help="JSON object with additional fields, or @<path> to load JSON from file.",
+    ),
     raw: bool = typer.Option(False, "--raw", help="Print full JSON response."),
 ) -> None:
     """Create an issue."""
@@ -503,6 +659,7 @@ def issue_create(
             fields["description"] = description
         if assignee:
             fields["assignee"] = {"name": assignee}
+        fields.update(_collect_issue_create_extra_fields(custom_field, fields_json))
         return _require_client().request("POST", "/api/2/issue", json_body={"fields": fields})
     payload = _require_success("issue create", run)
@@ -525,12 +682,20 @@ def issue_create_meta_types(
     """List issue types available when creating issues in a project."""
     def run() -> Any:
+        client = _require_client()
         params = {"maxResults": max_results, "startAt": start_at}
-        return _require_client().request(
+        payload = client.request(
             "GET",
             f"/api/2/issue/createmeta/{project}/issuetypes",
             params=params,
         )
+        if _extract_issue_types(payload):
+            return payload
+        return client.request(
+            "GET",
+            "/api/2/issue/createmeta",
+            params={"projectKeys": project, "expand": "projects.issuetypes"},
+        )
     payload = _require_success("issue createmeta-types", run)
     if raw:
@@ -539,8 +704,8 @@ def issue_create_meta_types(
     if not isinstance(payload, dict):
         typer.echo(str(payload))
         return
-    issue_types = payload.get("issueTypes")
-    if not isinstance(issue_types, list):
+    issue_types = _extract_issue_types(payload)
+    if not issue_types:
         _echo_json(payload)
         return
     for issue_type in issue_types:
@@ -563,12 +728,24 @@ def issue_create_meta_fields(
     """List field metadata for issue creation in a project/issue type."""
     def run() -> Any:
+        client = _require_client()
         params = {"maxResults": max_results, "startAt": start_at}
-        return _require_client().request(
+        payload = client.request(
             "GET",
             f"/api/2/issue/createmeta/{project}/issuetypes/{issue_type_id}",
             params=params,
         )
+        if _extract_createmeta_fields(payload, issue_type_id) is not None:
+            return payload
+        return client.request(
+            "GET",
+            "/api/2/issue/createmeta",
+            params={
+                "projectKeys": project,
+                "issuetypeIds": issue_type_id,
+                "expand": "projects.issuetypes.fields",
+            },
+        )
     payload = _require_success("issue createmeta-fields", run)
     if raw:
@@ -577,7 +754,7 @@ def issue_create_meta_fields(
     if not isinstance(payload, dict):
         typer.echo(str(payload))
         return
-    fields = payload.get("fields")
+    fields = _extract_createmeta_fields(payload, issue_type_id)
     if not isinstance(fields, dict):
         _echo_json(payload)
         return

{jiradc_cli-0.3.0 → jiradc_cli-0.5.0}/jiradc_cli.egg-info/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jiradc-cli
-Version: 0.3.0
+Version: 0.5.0
 Summary: Typer CLI for Jira Data Center using browser session cookies.
 Project-URL: Homepage, https://github.com/marcosgalleterobbva/jiradc-cli
 Project-URL: Repository, https://github.com/marcosgalleterobbva/jiradc-cli
@@ -110,6 +110,9 @@ jiradc project versions PROJ
 jiradc issue search --jql "assignee = currentUser() AND statusCategory != Done"
 jiradc issue get PROJ-123
 jiradc issue create --project PROJ --summary "New task" --issue-type Task
+jiradc issue create --project PROJ --summary "Task with custom field" \
+  --description "Required description" \
+  --custom-field 'customfield_13300={"inputValues":["Team Backlog Value"]}'
 jiradc issue editmeta PROJ-123
 jiradc issue edit PROJ-123 --summary "Updated summary" --priority High

{jiradc_cli-0.3.0 → jiradc_cli-0.5.0}/pyproject.toml RENAMED Viewed

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "jiradc-cli"
-version = "0.3.0"
+version = "0.5.0"
 description = "Typer CLI for Jira Data Center using browser session cookies."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -45,7 +45,7 @@ jiradc = "jiradc_cli.main:main"
 include = ["jiradc_cli*"]
 [tool.bumpversion]
-current_version = "0.3.0"
+current_version = "0.5.0"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"