Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(setup-wizard): Always create a new user API token #69388

Merged
merged 3 commits into from
Apr 22, 2024
Merged

fix(setup-wizard): Always create a new user API token #69388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b06225a
ref: Add test case repro inc-727
HazAT Apr 22, 2024
20c76af
fix(setup-wizard): Always create a new user API token
Lms24 Apr 22, 2024
29e3b78
fix test(?)
Lms24 Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/sentry/web/frontend/setup_wizard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,15 +154,12 @@ def get_token(mappings: list[OrganizationMapping], user: RpcUser):
return token

# Otherwise, generate a user token
tokens = ApiToken.objects.filter(user_id=user.id)
token = next((token for token in tokens if "project:releases" in token.get_scopes()), None)
if token is None:
token = ApiToken.objects.create(
user_id=user.id,
scope_list=["project:releases"],
token_type=AuthTokenType.USER,
expires_at=None,
)
token = ApiToken.objects.create(
user_id=user.id,
scope_list=["project:releases"],
token_type=AuthTokenType.USER,
expires_at=None,
)
return serialize(token)


Expand Down
14 changes: 4 additions & 10 deletions tests/sentry/web/frontend/test_setup_wizard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
from django.urls import reverse

from sentry.api.endpoints.setup_wizard import SETUP_WIZARD_CACHE_KEY
from sentry.api.serializers import serialize
from sentry.cache import default_cache
from sentry.models.apitoken import ApiToken
from sentry.models.projectkey import ProjectKey
from sentry.silo.base import SiloMode
from sentry.testutils.cases import PermissionTestCase
Expand Down Expand Up @@ -90,13 +88,6 @@ def test_project_multiple_keys(self):
assert len(cached.get("projects")[0].get("keys")) == 2

def test_return_user_auth_token_if_multiple_orgs(self):
user_api_token = ApiToken.objects.create_or_update(
user=self.user,
scope_list=["project:releases"],
refresh_token=None,
expires_at=None,
)[0]

self.org = self.create_organization(name="org1", owner=self.user)
self.org2 = self.create_organization(name="org2", owner=self.user)
self.team = self.create_team(organization=self.org, name="Mariachi Band")
Expand All @@ -116,7 +107,10 @@ def test_return_user_auth_token_if_multiple_orgs(self):
self.assertTemplateUsed(resp, "sentry/setup-wizard.html")
cached = default_cache.get(key)

assert cached.get("apiKeys") == serialize(user_api_token)
assert cached.get("apiKeys") is not None

token = cached.get("apiKeys")["token"]
assert token.startswith("sntryu_")

def test_return_org_auth_token_if_one_org(self):
self.org = self.create_organization(owner=self.user)
Expand Down
Loading