Merge pull request #3261 from consideRatio/pr/fix-for-github-allowed-…

…teams basehub: fix bug in profile list filtering influencing a few users
2i2c-org · Oct 12, 2023 · d925047 · d925047
2 parents 307bbcf + aa09762
commit d925047
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml
@@ -764,8 +764,15 @@ jupyterhub:
                     allowed_profiles.append(profile)
                     continue
 
-                access_token = auth_state["token_response"]["access_token"]
-                token_type = auth_state["token_response"]["token_type"]
+                if "token_response" in auth_state:
+                    access_token = auth_state["token_response"]["access_token"]
+                    token_type = auth_state["token_response"]["token_type"]
+                else:
+                    # token_response was introduced to auth_state in
+                    # oauthenticator 16, so this is adjusting to an auth_state
+                    # set by oauthenticator 15
+                    access_token = auth_state["access_token"]
+                    token_type = "token"
                 for allowed_org in allowed_orgs:
                     user_in_allowed_org = await spawner.authenticator._check_membership_allowed_organizations(
                         allowed_org, spawner.user.name, access_token, token_type