Merge branch 'main' into separate-clients

Author: itaihanski

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
           - macos-latest
           - windows-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           fetch-depth: 0
       - name: Setup python for test ${{ matrix.py }}
@@ -64,7 +64,7 @@ jobs:
     env:
       COVERAGE_FILE: "coverage"
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         id: download
@@ -92,7 +92,7 @@ jobs:
     name: gitleaks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           fetch-depth: 0
       - uses: gitleaks/gitleaks-action@ff98106e4c7b2bc287b24eaf42907196329070c7 # v2.3.9

.github/workflows/python-publish.yaml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
       - name: Setup
         uses: descope/.github/.github/actions/python/poetry/setup@main
         with:

.pre-commit-config.yaml

@@ -34,7 +34,7 @@ repos:
       - id: flake8
         additional_dependencies: [Flake8-pyproject]
   - repo: https://github.com/python-poetry/poetry
-    rev: 2.1.3
+    rev: 2.1.4
     hooks:
       - id: poetry-export
         files: pyproject.toml
@@ -43,11 +43,11 @@ repos:
       - id: poetry-check
         files: pyproject.toml
   - repo: https://github.com/pre-commit/pre-commit
-    rev: v4.2.0
+    rev: v4.3.0
     hooks:
       - id: validate_manifest
   - repo: https://github.com/tox-dev/tox-ini-fmt
-    rev: 1.5.0
+    rev: 1.6.0
     hooks:
       - id: tox-ini-fmt
         args: ["-p", "type"]

descope/management/common.py

@@ -407,9 +407,3 @@ def sort_to_dict(sort: List[Sort]) -> list:
                 }
             )
     return sort_list
-
-
-def map_to_values_object(input_map: dict):
-    if not input_map:
-        return {}
-    return {k: {"values": v} for k, v in input_map.items()}

descope/management/user.py

@@ -8,7 +8,6 @@
     MgmtV1,
     Sort,
     associated_tenants_to_dict,
-    map_to_values_object,
     sort_to_dict,
 )
 from descope.management.user_pwd import UserPassword
@@ -652,7 +651,9 @@ def search_all(
         to_modified_time (int): Optional int, only include users whose last modification/update occurred on or before this time (in Unix epoch milliseconds)
         user_ids (List[str]): Optional list of user IDs to filter by
         tenant_role_ids (dict): Optional mapping of tenant ID to list of role IDs.
+            Dict value is in the form of {"tenant_id": {"values":["role_id1", "role_id2"], "and": True}} if you want to match all roles (AND) or any role (OR).
         tenant_role_names (dict): Optional mapping of tenant ID to list of role names.
+            Dict value is in the form of {"tenant_id": {"values":["role_name1", "role_name2"], "and": True}} if you want to match all roles (AND) or any role (OR).
 
         Return value (dict):
         Return dict in the format
@@ -719,9 +720,9 @@ def search_all(
             body["toModifiedTime"] = to_modified_time
 
         if tenant_role_ids is not None:
-            body["tenantRoleIds"] = map_to_values_object(tenant_role_ids)
+            body["tenantRoleIds"] = tenant_role_ids
         if tenant_role_names is not None:
-            body["tenantRoleNames"] = map_to_values_object(tenant_role_names)
+            body["tenantRoleNames"] = tenant_role_names
 
         response = self._http.post(
             MgmtV1.users_search_path,
@@ -771,7 +772,9 @@ def search_all_test_users(
         from_modified_time (int): Optional int, only include users whose last modification/update occurred on or after this time (in Unix epoch milliseconds)
         to_modified_time (int): Optional int, only include users whose last modification/update occurred on or before this time (in Unix epoch milliseconds)
         tenant_role_ids (dict): Optional mapping of tenant ID to list of role IDs.
+            Dict value is in the form of {"tenant_id": {"values":["role_id1", "role_id2"], "and": True}} if you want to match all roles (AND) or any role (OR).
         tenant_role_names (dict): Optional mapping of tenant ID to list of role names.
+            Dict value is in the form of {"tenant_id": {"values":["role_name1", "role_name2"], "and": True}} if you want to match all roles (AND) or any role (OR).
 
         Return value (dict):
         Return dict in the format
@@ -835,9 +838,9 @@ def search_all_test_users(
             body["toModifiedTime"] = to_modified_time
 
         if tenant_role_ids is not None:
-            body["tenantRoleIds"] = map_to_values_object(tenant_role_ids)
+            body["tenantRoleIds"] = tenant_role_ids
         if tenant_role_names is not None:
-            body["tenantRoleNames"] = map_to_values_object(tenant_role_names)
+            body["tenantRoleNames"] = tenant_role_names
 
         response = self._http.post(
             MgmtV1.test_users_search_path,