Skip to content

Do not write null into family_id #50

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

Merged
rayluo merged 1 commit into from
Jun 1, 2019
Merged

Do not write null into family_id #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Older apps on macOS may crash on NSNull from JSON
  • Loading branch information
@rayluo
rayluo committed May 31, 2019
commit 425dde816c0939041e120cb2c401b6a95224f103
6 changes: 4 additions & 2 deletions msal/token_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,13 @@ def add(self, event, now=None):
self._cache.setdefault(self.CredentialType.REFRESH_TOKEN, {})[key] = rt

key = self._build_appmetadata_key(environment, event.get("client_id"))
self._cache.setdefault(self.CredentialType.APP_METADATA, {})[key] = {
app_metadata = {
"client_id": event.get("client_id"),
"environment": environment,
"family_id": response.get("foci"), # None is also valid
}
if "foci" in response:
app_metadata["family_id"] = response.get("foci")
self._cache.setdefault(self.CredentialType.APP_METADATA, {})[key] = app_metadata

def modify(self, credential_type, old_entry, new_key_value_pairs=None):
# Modify the specified old_entry with new_key_value_pairs,
Expand Down
1 change: 0 additions & 1 deletion tests/test_token_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ def testAdd(self):
{
"client_id": "my_client_id",
'environment': 'login.example.com',
"family_id": None,
},
self.cache._cache.get("AppMetadata", {}).get(
"appmetadata-login.example.com-my_client_id")
Expand Down