SigNoz is an open-source, OpenTelemetry-native observability platform for your team and their AI agents. Get logs, metrics, and traces in one tool with features like APM, distributed tracing, log management, infra monitoring, etc. Combined with SigNoz MCP and a native AI teammate (in SigNoz Cloud) it helps you build more resilient apps.
TypeScript apmapplication-monitoringdistributed-tracinggogood-first-issuejaegerloglogsmetricsmonitoringnextjsobservabilityopen-sourceopentelemetryprometheusreactreactjsself-hostedtracingtypescript
test(integration): drop the deprecated user endpoints from the suite (#12529)
Vikrant Guptac8e7685f0621
diff --git a/tests/fixtures/auth.py b/tests/fixtures/auth.pyindex 7684fa2d38..1ca737b583 100644--- a/tests/fixtures/auth.py+++ b/tests/fixtures/auth.py@@ -16,6 +16,7 @@ from wiremock.resources.mappings import (from fixtures import reuse, typesfrom fixtures.logger import setup_logger+from fixtures.role import find_role_by_namelogger = setup_logger(__name__)@@ -32,6 +33,7 @@ USER_VIEWER_EMAIL = "[email protected]"USER_VIEWER_PASSWORD = "password123Z$"USERS_BASE = "/api/v2/users"+USER_ROLES_BASE = "/api/v2/user_roles"def _login(signoz: types.SigNoz, email: str, password: str) -> str:@@ -344,24 +346,38 @@ def create_active_user(password: str,name: str = "",) -> str:- """Invite a user and activate via resetPassword. Returns user ID."""+ """Create a pending invite user and activate it by setting a password.++ role is a managed role name, e.g. signoz-viewer. Returns the user ID.+ """response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={"email": email, "role": role, "name": name},+ signoz.self.host_configs["8080"].get(USERS_BASE),+ json={+ "email": email,+ "displayName": name,+ "userRoles": [{"id": find_role_by_name(signoz, admin_token, role)}],+ },+ headers={"Authorization": f"Bearer {admin_token}"},+ timeout=5,+ )+ assert response.status_code == HTTPStatus.CREATED, response.text+ user_id = response.json()["data"]["id"]++ response = requests.put(+ signoz.self.host_configs["8080"].get(f"{USERS_BASE}/{user_id}/reset_password_tokens"),headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)assert response.status_code == HTTPStatus.CREATED, response.text- invited_user = response.json()["data"]response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),- json={"password": password, "token": invited_user["token"]},+ signoz.self.host_configs["8080"].get("/api/v2/factor_password/reset"),+ json={"password": password, "token": response.json()["data"]["token"]},timeout=5,)assert response.status_code == HTTPStatus.NO_CONTENT, response.text- return invited_user["id"]+ return user_iddef find_user_by_email(signoz: types.SigNoz, token: str, email: str) -> dict:@@ -409,21 +425,21 @@ def change_user_role(Role names should be managed role names (e.g. signoz-editor)."""- # Get current roles to find the old role's ID+ # Get current roles to find the old role's user_role entry IDresponse = requests.get(- signoz.self.host_configs["8080"].get(f"{USERS_BASE}/{user_id}/roles"),+ signoz.self.host_configs["8080"].get(f"{USERS_BASE}/{user_id}"),headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)assert response.status_code == HTTPStatus.OK, response.text- roles = response.json()["data"]+ user_roles = response.json()["data"]["userRoles"]- old_role_entry = next((r for r in roles if r["name"] == old_role), None)+ old_role_entry = next((ur for ur in user_roles if ur["role"]["name"] == old_role), None)assert old_role_entry is not None, f"User does not have role '{old_role}'"# Remove old roleresponse = requests.delete(- signoz.self.host_configs["8080"].get(f"{USERS_BASE}/{user_id}/roles/{old_role_entry['id']}"),+ signoz.self.host_configs["8080"].get(f"{USER_ROLES_BASE}/{old_role_entry['id']}"),headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)@@ -431,9 +447,9 @@ def change_user_role(# Assign new roleresponse = requests.post(- signoz.self.host_configs["8080"].get(f"{USERS_BASE}/{user_id}/roles"),- json={"name": new_role},+ signoz.self.host_configs["8080"].get(USER_ROLES_BASE),+ json={"userId": user_id, "roleId": find_role_by_name(signoz, admin_token, new_role)},headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)- assert response.status_code == HTTPStatus.OK, response.text+ assert response.status_code == HTTPStatus.CREATED, response.textdiff --git a/tests/fixtures/idp.py b/tests/fixtures/idp.pyindex 50e5b67aba..d567833831 100644--- a/tests/fixtures/idp.py+++ b/tests/fixtures/idp.py@@ -634,18 +634,6 @@ def get_oidc_domain(signoz: types.SigNoz, admin_token: str) -> dict:)-def get_user_by_email(signoz: types.SigNoz, admin_token: str, email: str) -> dict:- response = requests.get(- signoz.self.host_configs["8080"].get("/api/v1/user"),- timeout=2,- headers={"Authorization": f"Bearer {admin_token}"},- )- return next(- (user for user in response.json()["data"] if user["email"] == email),- None,- )--def perform_oidc_login(signoz: types.SigNoz, # pylint: disable=unused-argumentidp: types.TestContainerIDP,diff --git a/tests/fixtures/role.py b/tests/fixtures/role.pyindex 6f3835bfff..83c19e5179 100644--- a/tests/fixtures/role.py+++ b/tests/fixtures/role.py@@ -9,18 +9,14 @@ from fixtures import typesfrom fixtures.fs import get_testdata_file_path[email protected](name="find_role_id", scope="function")-def find_role_id(signoz: types.SigNoz) -> Callable[[str, str], str]:- def _find(token: str, name: str) -> str:- resp = requests.get(- signoz.self.host_configs["8080"].get("/api/v1/roles"),- headers={"Authorization": f"Bearer {token}"},- timeout=5,- )- assert resp.status_code == HTTPStatus.OK, resp.text- return next(r["id"] for r in resp.json()["data"] if r["name"] == name)-- return _find+def find_role_by_name(signoz: types.SigNoz, token: str, name: str) -> str:+ resp = requests.get(+ signoz.self.host_configs["8080"].get("/api/v1/roles"),+ headers={"Authorization": f"Bearer {token}"},+ timeout=5,+ )+ assert resp.status_code == HTTPStatus.OK, resp.text+ return next(r["id"] for r in resp.json()["data"] if r["name"] == name)@pytest.fixture(name="create_role", scope="function")diff --git a/tests/fixtures/serviceaccount.py b/tests/fixtures/serviceaccount.pyindex 5d253aae44..c30b7e9ac4 100644--- a/tests/fixtures/serviceaccount.py+++ b/tests/fixtures/serviceaccount.py@@ -4,22 +4,13 @@ import requestsfrom fixtures import typesfrom fixtures.logger import setup_logger+from fixtures.role import find_role_by_namelogger = setup_logger(__name__)SERVICE_ACCOUNT_BASE = "/api/v1/service_accounts"-def find_role_by_name(signoz: types.SigNoz, token: str, name: str) -> str:- resp = requests.get(- signoz.self.host_configs["8080"].get("/api/v1/roles"),- headers={"Authorization": f"Bearer {token}"},- timeout=5,- )- assert resp.status_code == HTTPStatus.OK, resp.text- return next(r["id"] for r in resp.json()["data"] if r["name"] == name)--def create_service_account(signoz: types.SigNoz, token: str, name: str, role: str = "signoz-viewer") -> str:"""Create a service account, assign a role, and return its ID."""resp = requests.post(diff --git a/tests/integration/tests/callbackauthn/02_saml.py b/tests/integration/tests/callbackauthn/02_saml.pyindex 492cbd7378..8e78b7f9fb 100644--- a/tests/integration/tests/callbackauthn/02_saml.py+++ b/tests/integration/tests/callbackauthn/02_saml.py@@ -13,12 +13,14 @@ from fixtures.auth import (USER_ADMIN_PASSWORD,add_license,assert_user_has_role,+ create_active_user,find_user_with_roles_by_email,)from fixtures.idp import (get_saml_domain,perform_saml_login,)+from fixtures.role import find_role_by_namefrom fixtures.types import Operation, SigNoz, TestContainerDocker, TestContainerIDP@@ -509,8 +511,12 @@ def test_saml_sso_login_activates_pending_invite_user(# Invite user as ADMINresponse = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={"email": email, "role": "ADMIN", "name": "SAML SSO Pending User"},+ signoz.self.host_configs["8080"].get("/api/v2/users"),+ json={+ "email": email,+ "displayName": "SAML SSO Pending User",+ "userRoles": [{"id": find_role_by_name(signoz, admin_token, "signoz-admin")}],+ },headers={"Authorization": f"Bearer {admin_token}"},timeout=2,)@@ -547,22 +553,14 @@ def test_saml_sso_deleted_user_gets_new_user_on_login(admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)# --- Step 1: Invite and activate via password reset ---- response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={"email": email, "role": "EDITOR", "name": "SAML SSO Lifecycle User"},- headers={"Authorization": f"Bearer {admin_token}"},- timeout=2,+ user_id = create_active_user(+ signoz,+ admin_token,+ email=email,+ role="signoz-editor",+ password="password123Z$",+ name="SAML SSO Lifecycle User",)- assert response.status_code == HTTPStatus.CREATED- user_id = response.json()["data"]["id"]- reset_token = response.json()["data"]["token"]-- response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),- json={"password": "password123Z$", "token": reset_token},- timeout=2,- )- assert response.status_code == HTTPStatus.NO_CONTENT# --- Step 2: Soft delete via DB using APIresponse = requests.delete(diff --git a/tests/integration/tests/callbackauthn/03_oidc.py b/tests/integration/tests/callbackauthn/03_oidc.pyindex ae1590ad99..900d6918fe 100644--- a/tests/integration/tests/callbackauthn/03_oidc.py+++ b/tests/integration/tests/callbackauthn/03_oidc.py@@ -17,6 +17,7 @@ from fixtures.idp import (get_oidc_domain,perform_oidc_login,)+from fixtures.role import find_role_by_namefrom fixtures.types import Operation, SigNoz, TestContainerDocker, TestContainerIDP@@ -464,8 +465,12 @@ def test_oidc_sso_login_activates_pending_invite_user(# Invite user as ADMINresponse = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={"email": email, "role": "ADMIN", "name": "OIDC SSO Pending User"},+ signoz.self.host_configs["8080"].get("/api/v2/users"),+ json={+ "email": email,+ "displayName": "OIDC SSO Pending User",+ "userRoles": [{"id": find_role_by_name(signoz, admin_token, "signoz-admin")}],+ },headers={"Authorization": f"Bearer {admin_token}"},timeout=2,)diff --git a/tests/integration/tests/dashboard/06_authz.py b/tests/integration/tests/dashboard/06_authz.pyindex f5189f6608..8dad70de74 100644--- a/tests/integration/tests/dashboard/06_authz.py+++ b/tests/integration/tests/dashboard/06_authz.py@@ -12,7 +12,7 @@ from fixtures.auth import (create_active_user,find_user_by_email,)-from fixtures.role import transaction_group+from fixtures.role import find_role_by_name, transaction_groupfrom fixtures.types import Operation, SigNoz, TestContainerDockerV2_BASE_URL = "/api/v2/dashboards"@@ -64,8 +64,8 @@ def test_setup_managed_role_users(existing_emails = {user["email"] for user in response.json()["data"]}for email, role, password, name in (- (_EDITOR_EMAIL, "EDITOR", _EDITOR_PASSWORD, "dashboard authz editor"),- (_VIEWER_EMAIL, "VIEWER", _VIEWER_PASSWORD, "dashboard authz viewer"),+ (_EDITOR_EMAIL, "signoz-editor", _EDITOR_PASSWORD, "dashboard authz editor"),+ (_VIEWER_EMAIL, "signoz-viewer", _VIEWER_PASSWORD, "dashboard authz viewer"),):if email not in existing_emails:create_active_user(signoz, admin_token, email=email, role=role, password=password, name=name)@@ -411,7 +411,7 @@ def test_setup_scoped_actor(],)- user_id = create_active_user(signoz, admin_token, email=_ACTOR_EMAIL, role="VIEWER", password=_ACTOR_PASSWORD, name="dashboard fga actor")+ user_id = create_active_user(signoz, admin_token, email=_ACTOR_EMAIL, role="signoz-viewer", password=_ACTOR_PASSWORD, name="dashboard fga actor")change_user_role(signoz, admin_token, user_id, "signoz-viewer", _ACTOR_ROLE_NAME)@@ -469,10 +469,9 @@ def test_publish_and_unpublish_require_update_on_the_dashboard(signoz: SigNoz,create_user_admin: Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- actor_role_id = find_role_id(admin_token, _ACTOR_ROLE_NAME)+ actor_role_id = find_role_by_name(signoz, admin_token, _ACTOR_ROLE_NAME)response = requests.get(signoz.self.host_configs["8080"].get(f"{V2_BASE_URL}?limit={MAX_LIST_LIMIT}"),@@ -579,7 +578,6 @@ def test_dashboard_authz_cleanup(signoz: SigNoz,create_user_admin: Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)actor = find_user_by_email(signoz, admin_token, _ACTOR_EMAIL)@@ -600,7 +598,7 @@ def test_dashboard_authz_cleanup(assert response.status_code == HTTPStatus.NO_CONTENT, f"remove role from user: {response.text}"response = requests.delete(- signoz.self.host_configs["8080"].get(f"/api/v1/roles/{find_role_id(admin_token, _ACTOR_ROLE_NAME)}"),+ signoz.self.host_configs["8080"].get(f"/api/v1/roles/{find_role_by_name(signoz, admin_token, _ACTOR_ROLE_NAME)}"),headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)diff --git a/tests/integration/tests/ingestionkeys/01_ingestion_keys.py b/tests/integration/tests/ingestionkeys/01_ingestion_keys.pyindex 0d3a371887..7e8a59fcdd 100644--- a/tests/integration/tests/ingestionkeys/01_ingestion_keys.py+++ b/tests/integration/tests/ingestionkeys/01_ingestion_keys.py@@ -10,7 +10,7 @@ from wiremock.client import ()from fixtures import types-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD, add_license+from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD, add_license, create_active_userfrom fixtures.gateway import (TEST_KEY_ID,common_gateway_headers,@@ -43,21 +43,13 @@ def test_create_editor_user("""Invite and register an editor user for gateway API tests."""admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- invite_response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={"email": GATEWAY_APIS_EDITOR_EMAIL, "role": "EDITOR"},- headers={"Authorization": f"Bearer {admin_token}"},- timeout=5,+ create_active_user(+ signoz,+ admin_token,+ email=GATEWAY_APIS_EDITOR_EMAIL,+ role="signoz-editor",+ password=GATEWAY_APIS_EDITOR_PASSWORD,)- assert invite_response.status_code == HTTPStatus.CREATED- reset_token = invite_response.json()["data"]["token"]-- response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),- json={"password": GATEWAY_APIS_EDITOR_PASSWORD, "token": reset_token},- timeout=5,- )- assert response.status_code == HTTPStatus.NO_CONTENT# ---------------------------------------------------------------------------diff --git a/tests/integration/tests/passwordauthn/01_register.py b/tests/integration/tests/passwordauthn/01_register.pyindex 0f97f234d8..9461c78d33 100644--- a/tests/integration/tests/passwordauthn/01_register.py+++ b/tests/integration/tests/passwordauthn/01_register.py@@ -15,6 +15,7 @@ from fixtures.auth import (find_user_with_roles_by_email,)from fixtures.logger import setup_logger+from fixtures.role import find_role_by_namelogger = setup_logger(__name__)@@ -82,31 +83,36 @@ def test_register(signoz: types.SigNoz, get_token: Callable[[str, str], str]) ->def test_invite(signoz: types.SigNoz, get_token: Callable[[str, str], str]) -> None:admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- # Generate an invite token for the editor user+ # Create the editor user as a pending inviteresponse = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={"email": USER_EDITOR_EMAIL, "role": "EDITOR", "name": USER_EDITOR_NAME},+ signoz.self.host_configs["8080"].get("/api/v2/users"),+ json={+ "email": USER_EDITOR_EMAIL,+ "displayName": USER_EDITOR_NAME,+ "userRoles": [{"id": find_role_by_name(signoz, admin_token, "signoz-editor")}],+ },timeout=2,headers={"Authorization": f"Bearer {admin_token}"},)-assert response.status_code == HTTPStatus.CREATED, response.text-- invited_user = response.json()["data"]- assert invited_user["email"] == USER_EDITOR_EMAIL- assert invited_user["role"] == "EDITOR"+ user_id = response.json()["data"]["id"]# Verify the user appears in the users list but as pending_invite statusfound_user = find_user_with_roles_by_email(signoz, admin_token, USER_EDITOR_EMAIL)assert found_user["status"] == "pending_invite"assert_user_has_role(found_user, "signoz-editor")- reset_token = invited_user["token"]+ response = requests.put(+ signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}/reset_password_tokens"),+ headers={"Authorization": f"Bearer {admin_token}"},+ timeout=2,+ )+ assert response.status_code == HTTPStatus.CREATED, response.text# Reset the password to complete the invite flow (activates the user and also grants authz)response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),- json={"password": USER_EDITOR_PASSWORD, "token": reset_token},+ signoz.self.host_configs["8080"].get("/api/v2/factor_password/reset"),+ json={"password": USER_EDITOR_PASSWORD, "token": response.json()["data"]["token"]},timeout=2,)assert response.status_code == HTTPStatus.NO_CONTENT@@ -130,18 +136,28 @@ def test_revoke_invite(signoz: types.SigNoz, get_token: Callable[[str, str], str# Invite the viewer userresponse = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={"email": USER_VIEWER_EMAIL, "role": "VIEWER"},+ signoz.self.host_configs["8080"].get("/api/v2/users"),+ json={+ "email": USER_VIEWER_EMAIL,+ "userRoles": [{"id": find_role_by_name(signoz, admin_token, "signoz-viewer")}],+ },timeout=2,headers={"Authorization": f"Bearer {admin_token}"},)assert response.status_code == HTTPStatus.CREATED, response.text- invited_user = response.json()["data"]- reset_token = invited_user["token"]+ user_id = response.json()["data"]["id"]++ response = requests.put(+ signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}/reset_password_tokens"),+ headers={"Authorization": f"Bearer {admin_token}"},+ timeout=2,+ )+ assert response.status_code == HTTPStatus.CREATED, response.text+ reset_token = response.json()["data"]["token"]# Delete the pending invite user (revoke the invite)response = requests.delete(- signoz.self.host_configs["8080"].get(f"/api/v2/users/{invited_user['id']}"),+ signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}"),timeout=2,headers={"Authorization": f"Bearer {admin_token}"},)@@ -149,7 +165,7 @@ def test_revoke_invite(signoz: types.SigNoz, get_token: Callable[[str, str], str# Try to use the reset token — should fail (user deleted)response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),+ signoz.self.host_configs["8080"].get("/api/v2/factor_password/reset"),json={"password": "password123Z$", "token": reset_token},timeout=2,)@@ -157,67 +173,83 @@ def test_revoke_invite(signoz: types.SigNoz, get_token: Callable[[str, str], strdef test_provision_user(signoz: types.SigNoz, get_token: Callable[[str, str], str]) -> None:- """- Simulates the upstream zeus provisioning flow:- 1. Invite a user as ADMIN (register already happened via test_register)- 2. List users to find the invited user's ID- 3. Get reset password token for that user- 4. Use the token to set the password and activate the user- 5. Verify the user can log in- """+ """Mirrors the zeus provisioning flow."""admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)provisioned_email = "[email protected]"provisioned_name = "zeus provisioned user"provisioned_password = "password123Z$"- # Step 1: Invite user as ADMIN (mirrors zeus inviteUserOnSigNoz)+ response = requests.get(+ signoz.self.host_configs["8080"].get("/api/v1/roles"),+ headers={"Authorization": f"Bearer {admin_token}"},+ timeout=5,+ )+ assert response.status_code == HTTPStatus.OK, response.text+ role_id = next(role["id"] for role in response.json()["data"] if role["name"] == "signoz-admin")++ create_payload = {+ "email": provisioned_email,+ "displayName": provisioned_name,+ "userRoles": [{"id": role_id}],+ }response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={- "email": provisioned_email,- "name": provisioned_name,- "role": "ADMIN",- },+ signoz.self.host_configs["8080"].get("/api/v2/users"),+ json=create_payload,headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)assert response.status_code == HTTPStatus.CREATED, response.text+ user_id = response.json()["data"]["id"]- # Step 2: List users to find the invited user's ID (mirrors zeus GET /api/v1/user)- response = requests.get(- signoz.self.host_configs["8080"].get("/api/v1/user"),+ response = requests.post(+ signoz.self.host_configs["8080"].get("/api/v2/users"),+ json=create_payload,headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)- assert response.status_code == HTTPStatus.OK- users = response.json()["data"]- found_user = next((u for u in users if u["email"] == provisioned_email), None)- assert found_user is not None- user_id = found_user["id"]+ assert response.status_code == HTTPStatus.CONFLICT, response.text- # Step 3: Get reset password token (mirrors zeus GET /api/v1/getResetPasswordToken/{id})response = requests.get(- signoz.self.host_configs["8080"].get(f"/api/v1/getResetPasswordToken/{user_id}"),+ signoz.self.host_configs["8080"].get("/api/v2/users"),headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)- assert response.status_code == HTTPStatus.OK+ assert response.status_code == HTTPStatus.OK, response.text+ existing_id = next(user["id"] for user in response.json()["data"] if user["email"] == provisioned_email.strip().lower())+ assert existing_id == user_id++ response = requests.put(+ signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}/reset_password_tokens"),+ headers={"Authorization": f"Bearer {admin_token}"},+ timeout=5,+ )+ assert response.status_code == HTTPStatus.CREATED, response.textreset_token = response.json()["data"]["token"]- assert reset_token is not Noneassert reset_token != ""- # Step 4: Use the token to set password and activate userresponse = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),+ signoz.self.host_configs["8080"].get("/api/v2/factor_password/reset"),json={"password": provisioned_password, "token": reset_token},timeout=5,)- assert response.status_code == HTTPStatus.NO_CONTENT+ assert response.status_code == HTTPStatus.NO_CONTENT, response.text- # Step 5: Verify the provisioned user can log in and is active with admin role- user_token = get_token(provisioned_email, provisioned_password)- assert user_token is not None+ response = requests.get(+ signoz.self.host_configs["8080"].get("/api/v2/sessions/context"),+ params={"email": provisioned_email, "ref": f"{signoz.self.host_configs['8080'].base()}"},+ timeout=5,+ )+ assert response.status_code == HTTPStatus.OK, response.text+ org_id = response.json()["data"]["orgs"][0]["id"]++ response = requests.post(+ signoz.self.host_configs["8080"].get("/api/v2/sessions/email_password"),+ json={"email": provisioned_email, "password": provisioned_password, "orgId": org_id},+ timeout=5,+ )+ assert response.status_code == HTTPStatus.OK, response.text+ assert response.json()["data"]["accessToken"] != ""provisioned_user = find_user_with_roles_by_email(signoz, admin_token, provisioned_email)assert provisioned_user["status"] == "active"diff --git a/tests/integration/tests/passwordauthn/03_password.py b/tests/integration/tests/passwordauthn/03_password.pyindex 006bd67ab5..b047c7641f 100644--- a/tests/integration/tests/passwordauthn/03_password.py+++ b/tests/integration/tests/passwordauthn/03_password.py@@ -5,7 +5,7 @@ import requestsfrom sqlalchemy import sqlfrom fixtures import types-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD, find_user_by_email+from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD, create_active_user, find_user_by_emailfrom fixtures.logger import setup_loggerlogger = setup_logger(__name__)@@ -17,24 +17,13 @@ PASSWORD_USER_PASSWORD = "password123Z$"def test_change_password(signoz: types.SigNoz, get_token: Callable[[str, str], str]) -> None:admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- # Create another admin user- response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={"email": PASSWORD_USER_EMAIL, "role": "ADMIN"},- timeout=2,- headers={"Authorization": f"Bearer {admin_token}"},+ create_active_user(+ signoz,+ admin_token,+ email=PASSWORD_USER_EMAIL,+ role="signoz-admin",+ password=PASSWORD_USER_PASSWORD,)- assert response.status_code == HTTPStatus.CREATED, response.text- invited_user = response.json()["data"]- reset_token = invited_user["token"]-- # Reset password to activate user- response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),- json={"password": PASSWORD_USER_PASSWORD, "token": reset_token},- timeout=2,- )- assert response.status_code == HTTPStatus.NO_CONTENT# Try logging in with the passwordtoken = get_token(PASSWORD_USER_EMAIL, PASSWORD_USER_PASSWORD)@@ -110,7 +99,7 @@ def test_reset_password(signoz: types.SigNoz, get_token: Callable[[str, str], st# Reset the password with a bad password which should failresponse = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),+ signoz.self.host_configs["8080"].get("/api/v2/factor_password/reset"),json={"password": "password", "token": token},timeout=2,)@@ -119,51 +108,19 @@ def test_reset_password(signoz: types.SigNoz, get_token: Callable[[str, str], st# Reset the password with a good passwordresponse = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),+ signoz.self.host_configs["8080"].get("/api/v2/factor_password/reset"),json={"password": "password123Z$NEWNEW#!", "token": token},timeout=2,)assert response.status_code == HTTPStatus.NO_CONTENT- token = get_token(PASSWORD_USER_EMAIL, "password123Z$NEWNEW#!")- assert token is not None---def test_reset_password_v2(signoz: types.SigNoz, get_token: Callable[[str, str], str]) -> None:- admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)-- found_user = find_user_by_email(signoz, admin_token, PASSWORD_USER_EMAIL)-- response = requests.put(- signoz.self.host_configs["8080"].get(f"/api/v2/users/{found_user['id']}/reset_password_tokens"),- headers={"Authorization": f"Bearer {admin_token}"},- timeout=2,- )- assert response.status_code == HTTPStatus.CREATED, response.text- token = response.json()["data"]["token"]-- # A password failing the strength policy is rejected without consuming the token- response = requests.post(- signoz.self.host_configs["8080"].get("/api/v2/factor_password/reset"),- json={"password": "password", "token": token},- timeout=2,- )- assert response.status_code == HTTPStatus.BAD_REQUEST, response.text-- response = requests.post(- signoz.self.host_configs["8080"].get("/api/v2/factor_password/reset"),- json={"password": "resetV2Password123Z$", "token": token},- timeout=2,- )- assert response.status_code == HTTPStatus.NO_CONTENT, response.text-- assert get_token(PASSWORD_USER_EMAIL, "resetV2Password123Z$") is not None+ assert get_token(PASSWORD_USER_EMAIL, "password123Z$NEWNEW#!") is not None# The token is single use, so replaying it no longer resolvesresponse = requests.post(signoz.self.host_configs["8080"].get("/api/v2/factor_password/reset"),- json={"password": "resetV2Password456Z$", "token": token},+ json={"password": "password123Z$REPLAY#!", "token": token},timeout=2,)assert response.status_code == HTTPStatus.NOT_FOUND, response.text@@ -204,7 +161,7 @@ def test_reset_password_with_no_password(signoz: types.SigNoz, get_token: Callab# Reset the password with a good passwordresponse = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),+ signoz.self.host_configs["8080"].get("/api/v2/factor_password/reset"),json={"password": "FINALPASSword123!#[", "token": token},timeout=2,)@@ -262,28 +219,14 @@ def test_forgot_password_creates_reset_token(signoz: types.SigNoz, get_token: Caforgot_email = "[email protected]"# Create a user specifically for testing forgot password- response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={- "email": forgot_email,- "role": "EDITOR",- "name": "forgotpassword user",- },- timeout=2,- headers={"Authorization": f"Bearer {admin_token}"},+ create_active_user(+ signoz,+ admin_token,+ email=forgot_email,+ role="signoz-editor",+ password="originalPassword123Z$",+ name="forgotpassword user",)- assert response.status_code == HTTPStatus.CREATED, response.text-- invited_user = response.json()["data"]- reset_token = invited_user["token"]-- # Activate user via reset password- response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),- json={"password": "originalPassword123Z$", "token": reset_token},- timeout=2,- )- assert response.status_code == HTTPStatus.NO_CONTENT# Get org IDresponse = requests.get(@@ -326,7 +269,7 @@ def test_forgot_password_creates_reset_token(signoz: types.SigNoz, get_token: Ca# Reset password with a valid strong passwordresponse = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),+ signoz.self.host_configs["8080"].get("/api/v2/factor_password/reset"),json={"password": "newSecurePassword123Z$!", "token": reset_token},timeout=2,)@@ -416,7 +359,7 @@ def test_reset_password_with_expired_token(signoz: types.SigNoz, get_token: Call# Try to use the expired token - should fail with 401 Unauthorizedresponse = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),+ signoz.self.host_configs["8080"].get("/api/v2/factor_password/reset"),json={"password": "expiredTokenPassword123Z$!", "token": reset_token},timeout=2,)diff --git a/tests/integration/tests/passwordauthn/04_role.py b/tests/integration/tests/passwordauthn/04_role.pyindex 308a87dbcc..1f6f799dd2 100644--- a/tests/integration/tests/passwordauthn/04_role.py+++ b/tests/integration/tests/passwordauthn/04_role.py@@ -12,6 +12,7 @@ from fixtures.auth import (change_user_role,create_active_user,)+from fixtures.role import find_role_by_nameROLECHANGE_USER_EMAIL = "[email protected]"ROLECHANGE_USER_PASSWORD = "password123Z$"@@ -23,26 +24,13 @@ def test_change_role():admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- # Create a new user as VIEWER- response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={"email": ROLECHANGE_USER_EMAIL, "role": "VIEWER"},- timeout=2,- headers={"Authorization": f"Bearer {admin_token}"},- )-- assert response.status_code == HTTPStatus.CREATED, response.text-- invited_user = response.json()["data"]- reset_token = invited_user["token"]-- # Activate user via reset password- response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),- json={"password": ROLECHANGE_USER_PASSWORD, "token": reset_token},- timeout=2,+ create_active_user(+ signoz,+ admin_token,+ email=ROLECHANGE_USER_EMAIL,+ role="signoz-viewer",+ password=ROLECHANGE_USER_PASSWORD,)- assert response.status_code == HTTPStatus.NO_CONTENT# Make some API calls as new usernew_user_token = get_token(ROLECHANGE_USER_EMAIL, ROLECHANGE_USER_PASSWORD)@@ -133,7 +121,7 @@ def test_assign_role_is_additive(signoz: types.SigNoz,get_token: Callable[[str, str], str],):- """Verify POST /api/v2/users/{id}/roles ADDS a role alongside existing ones and is idempotent."""+ """Verify POST /api/v2/user_roles ADDS a role alongside existing ones and is idempotent."""admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)response = requests.get(signoz.self.host_configs["8080"].get("/api/v2/users/me"),@@ -144,15 +132,17 @@ def test_assign_role_is_additive(me = response.json()["data"]user_id = me["id"]+ editor_role_id = find_role_by_name(signoz, admin_token, "signoz-editor")+# User currently has signoz-admin from test_change_role.# Assign signoz-editor — should be additive, admin stays.response = requests.post(- signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}/roles"),- json={"name": "signoz-editor"},+ signoz.self.host_configs["8080"].get("/api/v2/user_roles"),+ json={"userId": user_id, "roleId": editor_role_id},headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)- assert response.status_code == HTTPStatus.OK+ assert response.status_code == HTTPStatus.CREATEDresponse = requests.get(signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}/roles"),@@ -168,12 +158,12 @@ def test_assign_role_is_additive(# Idempotency: assigning the same role again succeeds without duplicatesresponse = requests.post(- signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}/roles"),- json={"name": "signoz-editor"},+ signoz.self.host_configs["8080"].get("/api/v2/user_roles"),+ json={"userId": user_id, "roleId": editor_role_id},headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)- assert response.status_code == HTTPStatus.OK+ assert response.status_code == HTTPStatus.CREATEDresponse = requests.get(signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}/roles"),@@ -225,7 +215,7 @@ def test_remove_role(signoz: types.SigNoz,get_token: Callable[[str, str], str],):- """Verify DELETE /api/v2/users/{id}/roles/{roleId} removes only the specified role."""+ """Verify DELETE /api/v2/user_roles/{id} removes only the specified role."""admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)response = requests.get(signoz.self.host_configs["8080"].get("/api/v2/users/me"),@@ -236,18 +226,11 @@ def test_remove_role(me = response.json()["data"]user_id = me["id"]- response = requests.get(- signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}/roles"),- headers={"Authorization": f"Bearer {admin_token}"},- timeout=5,- )- assert response.status_code == HTTPStatus.OK- roles = response.json()["data"]- editor_role_id = next((r for r in roles if r["name"] == "signoz-editor"), None)["id"]- assert editor_role_id is not None+ editor_entry_id = next((ur["id"] for ur in me["userRoles"] if ur["role"]["name"] == "signoz-editor"), None)+ assert editor_entry_id is not Noneresponse = requests.delete(- signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}/roles/{editor_role_id}"),+ signoz.self.host_configs["8080"].get(f"/api/v2/user_roles/{editor_entry_id}"),headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)@@ -296,7 +279,7 @@ def test_admin_cannot_assign_role_to_self(signoz: types.SigNoz,get_token: Callable[[str, str], str],):- """Verify POST /api/v2/users/{own_id}/roles is rejected (self-mutation guard)."""+ """Verify POST /api/v2/user_roles for the caller's own user is rejected (self-mutation guard)."""admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)response = requests.get(signoz.self.host_configs["8080"].get("/api/v2/users/me"),@@ -307,8 +290,8 @@ def test_admin_cannot_assign_role_to_self(admin_data = response.json()["data"]response = requests.post(- signoz.self.host_configs["8080"].get(f"/api/v2/users/{admin_data['id']}/roles"),- json={"name": "signoz-editor"},+ signoz.self.host_configs["8080"].get("/api/v2/user_roles"),+ json={"userId": admin_data["id"], "roleId": find_role_by_name(signoz, admin_token, "signoz-editor")},headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)@@ -319,7 +302,7 @@ def test_admin_cannot_remove_own_role(signoz: types.SigNoz,get_token: Callable[[str, str], str],):- """Verify DELETE /api/v2/users/{own_id}/roles/{roleId} is rejected (self-mutation guard)."""+ """Verify DELETE /api/v2/user_roles/{id} for the caller's own assignment is rejected (self-mutation guard)."""admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)response = requests.get(signoz.self.host_configs["8080"].get("/api/v2/users/me"),@@ -329,18 +312,11 @@ def test_admin_cannot_remove_own_role(assert response.status_code == HTTPStatus.OKadmin_data = response.json()["data"]- response = requests.get(- signoz.self.host_configs["8080"].get(f"/api/v2/users/{admin_data['id']}/roles"),- headers={"Authorization": f"Bearer {admin_token}"},- timeout=5,- )- assert response.status_code == HTTPStatus.OK- roles = response.json()["data"]- admin_role_id = next((r for r in roles if r["name"] == "signoz-admin"), None)["id"]- assert admin_role_id is not None+ admin_entry_id = next((ur["id"] for ur in admin_data["userRoles"] if ur["role"]["name"] == "signoz-admin"), None)+ assert admin_entry_id is not Noneresponse = requests.delete(- signoz.self.host_configs["8080"].get(f"/api/v2/users/{admin_data['id']}/roles/{admin_role_id}"),+ signoz.self.host_configs["8080"].get(f"/api/v2/user_roles/{admin_entry_id}"),headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)@@ -359,7 +335,7 @@ def test_editor_cannot_manage_roles(signoz,admin_token,email="[email protected]",- role="VIEWER",+ role="signoz-viewer",password=ROLECHANGE_USER_PASSWORD,name="viewer roleauth",)@@ -376,8 +352,8 @@ def test_editor_cannot_manage_roles(# POST assign role — forbiddenresponse = requests.post(- signoz.self.host_configs["8080"].get(f"/api/v2/users/{viewer_id}/roles"),- json={"name": "signoz-editor"},+ signoz.self.host_configs["8080"].get("/api/v2/user_roles"),+ json={"userId": viewer_id, "roleId": find_role_by_name(signoz, admin_token, "signoz-editor")},headers={"Authorization": f"Bearer {editor_token}"},timeout=5,)@@ -385,16 +361,15 @@ def test_editor_cannot_manage_roles(# DELETE remove role — forbiddenresponse = requests.get(- signoz.self.host_configs["8080"].get(f"/api/v2/users/{viewer_id}/roles"),+ signoz.self.host_configs["8080"].get(f"/api/v2/users/{viewer_id}"),headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)assert response.status_code == HTTPStatus.OK- viewer_roles = response.json()["data"]- viewer_role_id = next((r for r in viewer_roles if r["name"] == "signoz-viewer"), None)["id"]+ viewer_entry_id = next(ur["id"] for ur in response.json()["data"]["userRoles"] if ur["role"]["name"] == "signoz-viewer")response = requests.delete(- signoz.self.host_configs["8080"].get(f"/api/v2/users/{viewer_id}/roles/{viewer_role_id}"),+ signoz.self.host_configs["8080"].get(f"/api/v2/user_roles/{viewer_entry_id}"),headers={"Authorization": f"Bearer {editor_token}"},timeout=5,)diff --git a/tests/integration/tests/passwordauthn/05_duplicate_invite.py b/tests/integration/tests/passwordauthn/05_duplicate_invite.pyindex 424c2fb9fe..9a0e2dbdb6 100644--- a/tests/integration/tests/passwordauthn/05_duplicate_invite.py+++ b/tests/integration/tests/passwordauthn/05_duplicate_invite.py@@ -4,6 +4,7 @@ from http import HTTPStatusimport requestsfrom fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD+from fixtures.role import find_role_by_namefrom fixtures.types import SigNozDUPLICATE_USER_EMAIL = "[email protected]"@@ -20,38 +21,49 @@ def test_duplicate_user_invite_rejected("""admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)+ viewer_role_id = find_role_by_name(signoz, admin_token, "signoz-viewer")+# Invite a new userresponse = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={"email": DUPLICATE_USER_EMAIL, "role": "EDITOR"},+ signoz.self.host_configs["8080"].get("/api/v2/users"),+ json={+ "email": DUPLICATE_USER_EMAIL,+ "userRoles": [{"id": find_role_by_name(signoz, admin_token, "signoz-editor")}],+ },headers={"Authorization": f"Bearer {admin_token}"},timeout=2,)assert response.status_code == HTTPStatus.CREATED, response.text- invited_user = response.json()["data"]- reset_token = invited_user["token"]+ user_id = response.json()["data"]["id"]- # Invite the same email again — should fail+ # Invite the same email again while still pending — should failresponse = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={"email": DUPLICATE_USER_EMAIL, "role": "VIEWER"},+ signoz.self.host_configs["8080"].get("/api/v2/users"),+ json={"email": DUPLICATE_USER_EMAIL, "userRoles": [{"id": viewer_role_id}]},headers={"Authorization": f"Bearer {admin_token}"},timeout=2,)assert response.status_code == HTTPStatus.CONFLICT# activate the user+ response = requests.put(+ signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}/reset_password_tokens"),+ headers={"Authorization": f"Bearer {admin_token}"},+ timeout=2,+ )+ assert response.status_code == HTTPStatus.CREATED, response.text+response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),- json={"password": "password123Z$", "token": reset_token},+ signoz.self.host_configs["8080"].get("/api/v2/factor_password/reset"),+ json={"password": "password123Z$", "token": response.json()["data"]["token"]},timeout=2,)assert response.status_code == HTTPStatus.NO_CONTENT- # Try to invite the same email again — should fail+ # Try to invite the same email again once active — should failresponse = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={"email": DUPLICATE_USER_EMAIL, "role": "VIEWER"},+ signoz.self.host_configs["8080"].get("/api/v2/users"),+ json={"email": DUPLICATE_USER_EMAIL, "userRoles": [{"id": viewer_role_id}]},headers={"Authorization": f"Bearer {admin_token}"},timeout=2,)diff --git a/tests/integration/tests/passwordauthn/06_invite_status.py b/tests/integration/tests/passwordauthn/06_invite_status.pyindex a8c87df2a7..824dc1c6e0 100644--- a/tests/integration/tests/passwordauthn/06_invite_status.py+++ b/tests/integration/tests/passwordauthn/06_invite_status.py@@ -3,7 +3,12 @@ from http import HTTPStatusimport requests-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD, create_active_user+from fixtures.auth import (+ USER_ADMIN_EMAIL,+ USER_ADMIN_PASSWORD,+ assert_user_has_role,+ create_active_user,+)from fixtures.types import SigNoz@@ -22,71 +27,45 @@ def test_reinvite_deleted_user(admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)reinvite_user_email = "[email protected]"- reinvite_user_name = "reinvite user"- reinvite_user_role = "EDITOR"- reinvite_user_password = "password123Z$"-- # invite the user- response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={- "email": reinvite_user_email,- "role": reinvite_user_role,- "name": reinvite_user_name,- },- headers={"Authorization": f"Bearer {admin_token}"},- timeout=2,- )- assert response.status_code == HTTPStatus.CREATED, response.text- invited_user = response.json()["data"]- reset_token = invited_user["token"]-- # reset the password to make it active- response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),- json={"password": reinvite_user_password, "token": reset_token},- timeout=2,++ user_id = create_active_user(+ signoz,+ admin_token,+ email=reinvite_user_email,+ role="signoz-editor",+ password="password123Z$",+ name="reinvite user",)- assert response.status_code == HTTPStatus.NO_CONTENT# call the delete api which now soft deletes the userresponse = requests.delete(- signoz.self.host_configs["8080"].get(f"/api/v2/users/{invited_user['id']}"),+ signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}"),headers={"Authorization": f"Bearer {admin_token}"},timeout=2,)assert response.status_code == HTTPStatus.NO_CONTENT- # Re-invite the same email — should succeed- response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),- json={- "email": reinvite_user_email,- "role": "VIEWER",- "name": "reinvite user v2",- },- headers={"Authorization": f"Bearer {admin_token}"},- timeout=2,+ # Re-invite the same email — should succeed and create a different user+ reinvited_user_id = create_active_user(+ signoz,+ admin_token,+ email=reinvite_user_email,+ role="signoz-viewer",+ password="newPassword123Z$",+ name="reinvite user v2",)- assert response.status_code == HTTPStatus.CREATED, response.text- reinvited_user = response.json()["data"]- assert reinvited_user["role"] == "VIEWER"- assert reinvited_user["id"] != invited_user["id"] # confirms a new user was created-- reinvited_user_reset_password_token = reinvited_user["token"]-- response = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/resetPassword"),- json={- "password": "newPassword123Z$",- "token": reinvited_user_reset_password_token,- },+ assert reinvited_user_id != user_id++ response = requests.get(+ signoz.self.host_configs["8080"].get(f"/api/v2/users/{reinvited_user_id}"),+ headers={"Authorization": f"Bearer {admin_token}"},timeout=2,)- assert response.status_code == HTTPStatus.NO_CONTENT+ assert response.status_code == HTTPStatus.OK, response.text+ assert_user_has_role(response.json()["data"], "signoz-viewer")# Verify user can log in with new password- user_token = get_token("[email protected]", "newPassword123Z$")+ user_token = get_token(reinvite_user_email, "newPassword123Z$")assert user_token is not None@@ -105,7 +84,7 @@ def test_delete_user(signoz,admin_token,email="[email protected]",- role="EDITOR",+ role="signoz-editor",password="password123Z$",name="delete verify v2",)diff --git a/tests/integration/tests/passwordauthn/07_user_unique_index.py b/tests/integration/tests/passwordauthn/07_user_unique_index.pyindex 6671e1d1b3..d7397e7be0 100644--- a/tests/integration/tests/passwordauthn/07_user_unique_index.py+++ b/tests/integration/tests/passwordauthn/07_user_unique_index.py@@ -8,6 +8,7 @@ from sqlalchemy import sqlfrom sqlalchemy.exc import IntegrityErrorfrom fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD+from fixtures.role import find_role_by_namefrom fixtures.types import SigNozUNIQUE_INDEX_USER_EMAIL = "[email protected]"@@ -41,11 +42,11 @@ def test_unique_index_allows_multiple_deleted_rows(# Step 1: invite and delete the first userresp = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),+ signoz.self.host_configs["8080"].get("/api/v2/users"),json={"email": UNIQUE_INDEX_USER_EMAIL,- "role": "EDITOR",- "name": "unique index user v1",+ "displayName": "unique index user v1",+ "userRoles": [{"id": find_role_by_name(signoz, admin_token, "signoz-editor")}],},headers={"Authorization": f"Bearer {admin_token}"},timeout=2,@@ -62,11 +63,11 @@ def test_unique_index_allows_multiple_deleted_rows(# Step 2: re-invite and delete the same email (second deleted row)resp = requests.post(- signoz.self.host_configs["8080"].get("/api/v1/invite"),+ signoz.self.host_configs["8080"].get("/api/v2/users"),json={"email": UNIQUE_INDEX_USER_EMAIL,- "role": "EDITOR",- "name": "unique index user v2",+ "displayName": "unique index user v2",+ "userRoles": [{"id": find_role_by_name(signoz, admin_token, "signoz-editor")}],},headers={"Authorization": f"Bearer {admin_token}"},timeout=2,diff --git a/tests/integration/tests/querierauthz/01_service_scoping.py b/tests/integration/tests/querierauthz/01_service_scoping.pyindex 0e5e99abdf..2f13c26fcf 100644--- a/tests/integration/tests/querierauthz/01_service_scoping.py+++ b/tests/integration/tests/querierauthz/01_service_scoping.py@@ -41,7 +41,7 @@ def test_setup(transaction_group("read", "telemetryresource", "traces", ["builder_query/signoz.workspace.key.id/key-a"]),],)- user_id = create_active_user(signoz, admin_token, email=scoped_email, role="VIEWER", password=user_password)+ user_id = create_active_user(signoz, admin_token, email=scoped_email, role="signoz-viewer", password=user_password)change_user_role(signoz, admin_token, user_id, "signoz-viewer", scoped_role)diff --git a/tests/integration/tests/querierauthz/02_wildcard_scoping.py b/tests/integration/tests/querierauthz/02_wildcard_scoping.pyindex 5172dfc308..3d3b161cd4 100644--- a/tests/integration/tests/querierauthz/02_wildcard_scoping.py+++ b/tests/integration/tests/querierauthz/02_wildcard_scoping.py@@ -24,11 +24,11 @@ def test_setup(admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)create_role(admin_token, any_key_role, [transaction_group("read", "telemetryresource", "logs", ["builder_query/signoz.workspace.key.id/*"])])- any_user = create_active_user(signoz, admin_token, email=any_key_email, role="VIEWER", password=user_password)+ any_user = create_active_user(signoz, admin_token, email=any_key_email, role="signoz-viewer", password=user_password)change_user_role(signoz, admin_token, any_user, "signoz-viewer", any_key_role)create_role(admin_token, builder_all_role, [transaction_group("read", "telemetryresource", "logs", ["builder_query/*"])])- all_user = create_active_user(signoz, admin_token, email=builder_all_email, role="VIEWER", password=user_password)+ all_user = create_active_user(signoz, admin_token, email=builder_all_email, role="signoz-viewer", password=user_password)change_user_role(signoz, admin_token, all_user, "signoz-viewer", builder_all_role)diff --git a/tests/integration/tests/querierauthz/03_query_types.py b/tests/integration/tests/querierauthz/03_query_types.pyindex 75e60a9b46..3a9c56134a 100644--- a/tests/integration/tests/querierauthz/03_query_types.py+++ b/tests/integration/tests/querierauthz/03_query_types.py@@ -38,15 +38,15 @@ def test_setup(transaction_group("read", "telemetryresource", "meter-metrics", ["clickhouse_sql/*"]),],)- chsql_user = create_active_user(signoz, admin_token, email=chsql_email, role="VIEWER", password=user_password)+ chsql_user = create_active_user(signoz, admin_token, email=chsql_email, role="signoz-viewer", password=user_password)change_user_role(signoz, admin_token, chsql_user, "signoz-viewer", chsql_role)create_role(admin_token, key_a_role, [transaction_group("read", "telemetryresource", "traces", ["builder_query/signoz.workspace.key.id/key-a"])])- key_a_user = create_active_user(signoz, admin_token, email=key_a_email, role="VIEWER", password=user_password)+ key_a_user = create_active_user(signoz, admin_token, email=key_a_email, role="signoz-viewer", password=user_password)change_user_role(signoz, admin_token, key_a_user, "signoz-viewer", key_a_role)# A plain managed viewer (signoz-viewer) — for the meter-metrics/audit-logs policy checks.- create_active_user(signoz, admin_token, email=viewer_email, role="VIEWER", password=user_password)+ create_active_user(signoz, admin_token, email=viewer_email, role="signoz-viewer", password=user_password)def test_clickhouse_sql_requires_chsql_grant(diff --git a/tests/integration/tests/querierauthz/04_escaping.py b/tests/integration/tests/querierauthz/04_escaping.pyindex 2ee96225fb..3c3ef9e7c5 100644--- a/tests/integration/tests/querierauthz/04_escaping.py+++ b/tests/integration/tests/querierauthz/04_escaping.py@@ -24,7 +24,7 @@ def test_setup() -> None:admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)create_role(admin_token, spacey_role, [transaction_group("read", "telemetryresource", "logs", ["builder_query/signoz.workspace.key.id/key with space"])])- user_id = create_active_user(signoz, admin_token, email=spacey_email, role="VIEWER", password=user_password)+ user_id = create_active_user(signoz, admin_token, email=spacey_email, role="signoz-viewer", password=user_password)change_user_role(signoz, admin_token, user_id, "signoz-viewer", spacey_role)diff --git a/tests/integration/tests/querierauthz/05_check_api.py b/tests/integration/tests/querierauthz/05_check_api.pyindex 27d57c0ae2..4922c6bc7d 100644--- a/tests/integration/tests/querierauthz/05_check_api.py+++ b/tests/integration/tests/querierauthz/05_check_api.py@@ -21,7 +21,7 @@ def test_setup() -> None:admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)create_role(admin_token, keywild_role, [transaction_group("read", "telemetryresource", "logs", ["builder_query/signoz.workspace.key.id/*"])])- user_id = create_active_user(signoz, admin_token, email=keywild_email, role="VIEWER", password=user_password)+ user_id = create_active_user(signoz, admin_token, email=keywild_email, role="signoz-viewer", password=user_password)change_user_role(signoz, admin_token, user_id, "signoz-viewer", keywild_role)diff --git a/tests/integration/tests/role/01_register.py b/tests/integration/tests/role/01_register.pyindex 49b01fc04e..5eedb0a57d 100644--- a/tests/integration/tests/role/01_register.py+++ b/tests/integration/tests/role/01_register.py@@ -9,6 +9,7 @@ from fixtures import typesfrom fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD, add_licensefrom fixtures.role import (expected_managed_transaction_keys,+ find_role_by_name,flatten_transaction_groups,managed_role_names,)@@ -67,11 +68,10 @@ def test_managed_role_transactions_match_expected(signoz: SigNoz,create_user_admin: Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],role_name: str,):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- role_id = find_role_id(admin_token, role_name)+ role_id = find_role_by_name(signoz, admin_token, role_name)response = requests.get(signoz.self.host_configs["8080"].get(f"/api/v1/roles/{role_id}"),diff --git a/tests/integration/tests/role/02_crud.py b/tests/integration/tests/role/02_crud.pyindex 9401470680..9a14aeeb0d 100644--- a/tests/integration/tests/role/02_crud.py+++ b/tests/integration/tests/role/02_crud.py@@ -12,7 +12,7 @@ from fixtures.auth import (create_active_user,find_user_by_email,)-from fixtures.role import flatten_transaction_groups, transaction_group+from fixtures.role import find_role_by_name, flatten_transaction_groups, transaction_groupCRUD_ROLE_NAME = "crud-test-role"CRUD_ASSIGNEE_ROLE_NAME = "crud-assignee-role"@@ -61,10 +61,9 @@ def test_declarative_update_adds_and_removes_transactions(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- role_id = find_role_id(admin_token, CRUD_ROLE_NAME)+ role_id = find_role_by_name(signoz, admin_token, CRUD_ROLE_NAME)def put_transactions(groups: list[dict]) -> None:resp = requests.put(@@ -208,10 +207,9 @@ def test_managed_role_is_immutable(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- admin_role_id = find_role_id(admin_token, "signoz-admin")+ admin_role_id = find_role_by_name(signoz, admin_token, "signoz-admin")resp = requests.put(signoz.self.host_configs["8080"].get(f"/api/v1/roles/{admin_role_id}"),@@ -239,27 +237,27 @@ def test_delete_role_with_assignee_guarded(signoz,admin_token,email=CRUD_ASSIGNEE_USER_EMAIL,- role="VIEWER",+ role="signoz-viewer",password=CRUD_ASSIGNEE_USER_PASSWORD,name="crud-assignee-user",)resp = requests.post(- signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}/roles"),- json={"name": CRUD_ASSIGNEE_ROLE_NAME},+ signoz.self.host_configs["8080"].get("/api/v2/user_roles"),+ json={"userId": user_id, "roleId": role_id},headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)- assert resp.status_code == HTTPStatus.OK, resp.text+ assert resp.status_code == HTTPStatus.CREATED, resp.textresp = requests.delete(signoz.self.host_configs["8080"].get(f"/api/v1/roles/{role_id}"), headers={"Authorization": f"Bearer {admin_token}"}, timeout=5)assert resp.status_code == HTTPStatus.BAD_REQUEST, f"delete role with assignee: expected 400, got {resp.status_code}: {resp.text}"- resp = requests.get(signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}/roles"), headers={"Authorization": f"Bearer {admin_token}"}, timeout=5)+ resp = requests.get(signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}"), headers={"Authorization": f"Bearer {admin_token}"}, timeout=5)assert resp.status_code == HTTPStatus.OK, resp.text- entry = next(r for r in resp.json()["data"] if r["name"] == CRUD_ASSIGNEE_ROLE_NAME)+ entry = next(ur for ur in resp.json()["data"]["userRoles"] if ur["role"]["name"] == CRUD_ASSIGNEE_ROLE_NAME)resp = requests.delete(- signoz.self.host_configs["8080"].get(f"/api/v2/users/{user_id}/roles/{entry['id']}"),+ signoz.self.host_configs["8080"].get(f"/api/v2/user_roles/{entry['id']}"),headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)diff --git a/tests/integration/tests/role/03_fga.py b/tests/integration/tests/role/03_fga.pyindex 44f581ff36..1b31960960 100644--- a/tests/integration/tests/role/03_fga.py+++ b/tests/integration/tests/role/03_fga.py@@ -13,7 +13,7 @@ from fixtures.auth import (create_active_user,find_user_by_email,)-from fixtures.role import transaction_group+from fixtures.role import find_role_by_name, transaction_group_ACTOR_ROLE_NAME = "role-fga-actor"_ACTOR_USER_EMAIL = "[email protected]"@@ -57,7 +57,7 @@ def test_setup_actor_and_targets(signoz,admin_token,email=_ACTOR_USER_EMAIL,- role="VIEWER",+ role="signoz-viewer",password=_ACTOR_USER_PASSWORD,name="role-fga-test-user",)@@ -68,12 +68,11 @@ def test_read_scoped_to_granted_role(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)token = get_token(_ACTOR_USER_EMAIL, _ACTOR_USER_PASSWORD)- a_id = find_role_id(admin_token, _TARGET_A)- b_id = find_role_id(admin_token, _TARGET_B)+ a_id = find_role_by_name(signoz, admin_token, _TARGET_A)+ b_id = find_role_by_name(signoz, admin_token, _TARGET_B)resp = requests.get(signoz.self.host_configs["8080"].get(f"/api/v1/roles/{a_id}"), headers={"Authorization": f"Bearer {token}"}, timeout=5)assert resp.status_code == HTTPStatus.OK, f"read granted role: {resp.text}"@@ -101,11 +100,10 @@ def test_create_is_collection_scoped(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],create_role: Callable[..., str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- actor_id = find_role_id(admin_token, _ACTOR_ROLE_NAME)+ actor_id = find_role_by_name(signoz, admin_token, _ACTOR_ROLE_NAME)token = get_token(_ACTOR_USER_EMAIL, _ACTOR_USER_PASSWORD)resp = requests.post(@@ -138,12 +136,11 @@ def test_update_scoped_to_granted_role(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- actor_id = find_role_id(admin_token, _ACTOR_ROLE_NAME)- a_id = find_role_id(admin_token, _TARGET_A)- b_id = find_role_id(admin_token, _TARGET_B)+ actor_id = find_role_by_name(signoz, admin_token, _ACTOR_ROLE_NAME)+ a_id = find_role_by_name(signoz, admin_token, _TARGET_A)+ b_id = find_role_by_name(signoz, admin_token, _TARGET_B)resp = requests.put(signoz.self.host_configs["8080"].get(f"/api/v1/roles/{actor_id}"),@@ -184,12 +181,11 @@ def test_delete_scoped_to_granted_role(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- actor_id = find_role_id(admin_token, _ACTOR_ROLE_NAME)- a_id = find_role_id(admin_token, _TARGET_A)- b_id = find_role_id(admin_token, _TARGET_B)+ actor_id = find_role_by_name(signoz, admin_token, _ACTOR_ROLE_NAME)+ a_id = find_role_by_name(signoz, admin_token, _TARGET_A)+ b_id = find_role_by_name(signoz, admin_token, _TARGET_B)resp = requests.put(signoz.self.host_configs["8080"].get(f"/api/v1/roles/{actor_id}"),@@ -221,11 +217,10 @@ def test_revoke_read(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- actor_id = find_role_id(admin_token, _ACTOR_ROLE_NAME)- b_id = find_role_id(admin_token, _TARGET_B)+ actor_id = find_role_by_name(signoz, admin_token, _ACTOR_ROLE_NAME)+ b_id = find_role_by_name(signoz, admin_token, _TARGET_B)token = get_token(_ACTOR_USER_EMAIL, _ACTOR_USER_PASSWORD)resp = requests.put(@@ -261,7 +256,6 @@ def test_role_fga_cleanup(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)user = find_user_by_email(signoz, admin_token, _ACTOR_USER_EMAIL)@@ -279,7 +273,7 @@ def test_role_fga_cleanup(for name in (_ACTOR_ROLE_NAME, _TARGET_B, _CREATED_ROLE):resp = requests.delete(- signoz.self.host_configs["8080"].get(f"/api/v1/roles/{find_role_id(admin_token, name)}"),+ signoz.self.host_configs["8080"].get(f"/api/v1/roles/{find_role_by_name(signoz, admin_token, name)}"),headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)diff --git a/tests/integration/tests/savedview/02_authz.py b/tests/integration/tests/savedview/02_authz.pyindex 64b32bd066..c6b83e571c 100644--- a/tests/integration/tests/savedview/02_authz.py+++ b/tests/integration/tests/savedview/02_authz.py@@ -13,7 +13,7 @@ from fixtures.auth import (create_active_user,find_user_by_email,)-from fixtures.role import transaction_group+from fixtures.role import find_role_by_name, transaction_groupfrom fixtures.savedview import SAVED_VIEW_BASE, create_saved_view, find_saved_view_by_name_SAVED_VIEW_FGA_CUSTOM_ROLE_NAME = "saved-view-fga-readonly"@@ -57,7 +57,7 @@ def test_create_custom_role_readonly_view(signoz,admin_token,email=_SAVED_VIEW_FGA_CUSTOM_USER_EMAIL,- role="VIEWER",+ role="signoz-viewer",password=_SAVED_VIEW_FGA_CUSTOM_USER_PASSWORD,name="saved-view-fga-test-user",)@@ -152,10 +152,9 @@ def test_create_is_collection_scoped(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- role_id = find_role_id(admin_token, _SAVED_VIEW_FGA_CUSTOM_ROLE_NAME)+ role_id = find_role_by_name(signoz, admin_token, _SAVED_VIEW_FGA_CUSTOM_ROLE_NAME)target_id = find_saved_view_by_name(signoz, admin_token, _SAVED_VIEW_FGA_TARGET_NAME)["id"]resp = requests.put(@@ -184,10 +183,9 @@ def test_update_scoped_to_granted_view(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- role_id = find_role_id(admin_token, _SAVED_VIEW_FGA_CUSTOM_ROLE_NAME)+ role_id = find_role_by_name(signoz, admin_token, _SAVED_VIEW_FGA_CUSTOM_ROLE_NAME)target_id = find_saved_view_by_name(signoz, admin_token, _SAVED_VIEW_FGA_TARGET_NAME)["id"]other_id = find_saved_view_by_name(signoz, admin_token, _SAVED_VIEW_FGA_OTHER_NAME)["id"]@@ -242,10 +240,9 @@ def test_delete_scoped_to_granted_view(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- role_id = find_role_id(admin_token, _SAVED_VIEW_FGA_CUSTOM_ROLE_NAME)+ role_id = find_role_by_name(signoz, admin_token, _SAVED_VIEW_FGA_CUSTOM_ROLE_NAME)target_id = find_saved_view_by_name(signoz, admin_token, _SAVED_VIEW_FGA_TARGET_NAME)["id"]other_id = find_saved_view_by_name(signoz, admin_token, _SAVED_VIEW_FGA_OTHER_NAME)["id"]@@ -279,10 +276,9 @@ def test_revoke_read_scoped(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- role_id = find_role_id(admin_token, _SAVED_VIEW_FGA_CUSTOM_ROLE_NAME)+ role_id = find_role_by_name(signoz, admin_token, _SAVED_VIEW_FGA_CUSTOM_ROLE_NAME)other_id = find_saved_view_by_name(signoz, admin_token, _SAVED_VIEW_FGA_OTHER_NAME)["id"]resp = requests.put(@@ -319,7 +315,6 @@ def test_saved_view_fga_cleanup(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)user = find_user_by_email(signoz, admin_token, _SAVED_VIEW_FGA_CUSTOM_USER_EMAIL)@@ -336,7 +331,7 @@ def test_saved_view_fga_cleanup(assert resp.status_code == HTTPStatus.NO_CONTENT, f"remove role from user: {resp.text}"resp = requests.delete(- signoz.self.host_configs["8080"].get(f"/api/v1/roles/{find_role_id(admin_token, _SAVED_VIEW_FGA_CUSTOM_ROLE_NAME)}"),+ signoz.self.host_configs["8080"].get(f"/api/v1/roles/{find_role_by_name(signoz, admin_token, _SAVED_VIEW_FGA_CUSTOM_ROLE_NAME)}"),headers={"Authorization": f"Bearer {admin_token}"},timeout=5,)diff --git a/tests/integration/tests/serviceaccount/06_fga.py b/tests/integration/tests/serviceaccount/06_fga.pyindex 4ee1e2aa54..1838018203 100644--- a/tests/integration/tests/serviceaccount/06_fga.py+++ b/tests/integration/tests/serviceaccount/06_fga.py@@ -13,7 +13,7 @@ from fixtures.auth import (create_active_user,find_user_by_email,)-from fixtures.role import transaction_group+from fixtures.role import find_role_by_name, transaction_groupfrom fixtures.serviceaccount import (SERVICE_ACCOUNT_BASE,create_service_account,@@ -70,7 +70,7 @@ def test_create_custom_role_readonly_sa(signoz,admin_token,email=_SA_FGA_CUSTOM_USER_EMAIL,- role="VIEWER",+ role="signoz-viewer",password=_SA_FGA_CUSTOM_USER_PASSWORD,name="sa-fga-test-user",)@@ -116,12 +116,11 @@ def test_write_forbidden_without_grant(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)token = get_token(_SA_FGA_CUSTOM_USER_EMAIL, _SA_FGA_CUSTOM_USER_PASSWORD)target_id = find_service_account_by_name(signoz, admin_token, _SA_FGA_TARGET_SA_NAME)["id"]- viewer_role_id = find_role_id(admin_token, "signoz-viewer")+ viewer_role_id = find_role_by_name(signoz, admin_token, "signoz-viewer")resp = requests.put(signoz.self.host_configs["8080"].get(f"{SERVICE_ACCOUNT_BASE}/{target_id}"),@@ -144,10 +143,9 @@ def test_update_scoped_to_granted_sa(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- role_id = find_role_id(admin_token, _SA_FGA_CUSTOM_ROLE_NAME)+ role_id = find_role_by_name(signoz, admin_token, _SA_FGA_CUSTOM_ROLE_NAME)target_id = find_service_account_by_name(signoz, admin_token, _SA_FGA_TARGET_SA_NAME)["id"]other_id = find_service_account_by_name(signoz, admin_token, _SA_FGA_OTHER_SA_NAME)["id"]@@ -191,14 +189,13 @@ def test_attach_detach_dual_scoped(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- role_id = find_role_id(admin_token, _SA_FGA_CUSTOM_ROLE_NAME)+ role_id = find_role_by_name(signoz, admin_token, _SA_FGA_CUSTOM_ROLE_NAME)target_id = find_service_account_by_name(signoz, admin_token, _SA_FGA_TARGET_SA_NAME)["id"]other_id = find_service_account_by_name(signoz, admin_token, _SA_FGA_OTHER_SA_NAME)["id"]- editor_role_id = find_role_id(admin_token, "signoz-editor")- viewer_role_id = find_role_id(admin_token, "signoz-viewer")+ editor_role_id = find_role_by_name(signoz, admin_token, "signoz-editor")+ viewer_role_id = find_role_by_name(signoz, admin_token, "signoz-viewer")# attach/detach granted on the target SA id AND the signoz-editor role name only.resp = requests.put(@@ -261,10 +258,9 @@ def test_revoke_read_scoped(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- role_id = find_role_id(admin_token, _SA_FGA_CUSTOM_ROLE_NAME)+ role_id = find_role_by_name(signoz, admin_token, _SA_FGA_CUSTOM_ROLE_NAME)target_id = find_service_account_by_name(signoz, admin_token, _SA_FGA_TARGET_SA_NAME)["id"]resp = requests.put(@@ -284,10 +280,9 @@ def test_delete_custom_role_cleanup(signoz: types.SigNoz,create_user_admin: types.Operation, # pylint: disable=unused-argumentget_token: Callable[[str, str], str],- find_role_id: Callable[[str, str], str],):admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)- role_id = find_role_id(admin_token, _SA_FGA_CUSTOM_ROLE_NAME)+ role_id = find_role_by_name(signoz, admin_token, _SA_FGA_CUSTOM_ROLE_NAME)user = find_user_by_email(signoz, admin_token, _SA_FGA_CUSTOM_USER_EMAIL)resp = requests.get(signoz.self.host_configs["8080"].get(f"/api/v2/users/{user['id']}/roles"), headers={"Authorization": f"Bearer {admin_token}"}, timeout=5)