Browse Source

nit: Update fly build config (#52301)

cleans up the build_config method
Nathan Hsieh 1 year ago
parent
commit
2dbcac98f6

+ 2 - 8
src/sentry/auth/providers/fly/provider.py

@@ -45,19 +45,13 @@ class FlyOAuth2Provider(OAuth2Provider):
         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):
         """

+ 2 - 26
tests/sentry/auth/providers/fly/test_provider.py

@@ -27,32 +27,8 @@ class FlyOAuth2ProviderTest(TestCase):
 
     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):