diff --git a/src/sentry/auth/providers/fly/provider.py b/src/sentry/auth/providers/fly/provider.py index 934f5771e51a98..fbb5a52a8cd815 100644 --- a/src/sentry/auth/providers/fly/provider.py +++ b/src/sentry/auth/providers/fly/provider.py @@ -45,19 +45,13 @@ def get_refresh_token_url(self): return ACCESS_TOKEN_URL @classmethod - def build_config(self, state: Any, organization: Optional[Any] = None): + def build_config(self, resource: Optional[Any] = None): """ On configuration, we determine which provider organization to configure sentry SSO for. This configuration is then stored and passed into the pipeline instances during SSO to determine whether the Auth'd user has the appropriate access to the provider org """ - org = organization - if not organization: - data = state["data"] - # TODO: determine which org to configure SSO for - org = data["user"]["organizations"][0] - - return {"org": {"id": cast(Dict, org).get("id")}} + return {"org": {"id": cast(Dict, resource).get("id")}} def build_identity(self, state): """ diff --git a/tests/sentry/auth/providers/fly/test_provider.py b/tests/sentry/auth/providers/fly/test_provider.py index 690c1ac5d099db..136dd878ff0431 100644 --- a/tests/sentry/auth/providers/fly/test_provider.py +++ b/tests/sentry/auth/providers/fly/test_provider.py @@ -27,32 +27,8 @@ def test_refresh_identity_without_refresh_token(self): def test_build_config(self): provider = self.auth_provider.get_provider() - state = { - "state": "9da4041848844e8088864eaea3c3a705", - "data": { - "access_token": "fo1_6xgeCrB8ew8vFQ86vdaakBSFTVDGCzOUvebUbvgPGhI", - "token_type": "Bearer", - "expires_in": 7200, - "refresh_token": "PmUkAB75UPLKGZplERMq8WwOHnsTllZ5HveY4RvNUTk", - "scope": "read", - "created_at": 1686786353, - "user": { - "resource_owner_id": "k9d01lp82rky6vo2", - "scope": ["read"], - "expires_in": 7200, - "application": {"uid": "elMJpuhA5bXbR59ZaKdXrxXGFVKTypGHuJ4h6Rfw1Qk"}, - "created_at": 1686786353, - "user_id": "k9d01lp82rky6vo2", - "user_name": "Nathan", - "email": "k9d01lp82rky6vo2@customer.fly.io", - "organizations": [ - {"id": "nathans-org", "role": "member"}, - {"id": "0vogzmzoj1k5xp29", "role": "admin"}, - ], - }, - }, - } - result = provider.build_config(state) + resource = {"id": "nathans-org", "role": "member"} + result = provider.build_config(resource=resource) assert result == {"org": {"id": "nathans-org"}} def test_build_identity(self):