Skip to content

Adjusting token cache format #19

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 8 commits into from
Mar 4, 2019
Merged

Adjusting token cache format #19

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0b0a583
Handle potential race-condition in RT updating
rayluo Feb 7, 2019
e8e35ba
Per Unified Schema, change target to be an unsorted string
rayluo Feb 9, 2019
4a5255c
Remove optional field client_info
rayluo Feb 15, 2019
63bf224
Add test cases for TokenCache and SerializableTokenCache
rayluo Feb 9, 2019
a0eab4e
Adjusting IdToken key, RT target behavior, and authority_type value
rayluo Feb 26, 2019
31bc31e
Schema defines cached_at, expires_on, ext_expires_on as string
rayluo Feb 26, 2019
adcb637
Indentation in serialization for easier debugging
rayluo Feb 26, 2019
9110eca
Use case-sensitive scope, reference SerializableTokenCache, and log b…
rayluo Feb 27, 2019
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
Prev Previous commit
Next Next commit
Adjusting IdToken key, RT target behavior, and authority_type value
  • Loading branch information
@rayluo
rayluo committed Mar 1, 2019
commit a0eab4e3e9f69546d164edb4c1433630103faeb3
7 changes: 5 additions & 2 deletions msal/token_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ def add(self, event, now=None):
"local_account_id": decoded_id_token.get(
"oid", decoded_id_token.get("sub")),
"username": decoded_id_token.get("preferred_username"),
"authority_type": "AAD", # Always AAD?
"authority_type":
"ADFS" if realm == "adfs"
else "MSSTS", # MSSTS means AAD v2 for both AAD & MSA
# "client_info": response.get("client_info"), # Optional
}

Expand All @@ -126,6 +128,7 @@ def add(self, event, now=None):
self.CredentialType.ID_TOKEN,
event.get("client_id", ""),
realm or "",
"" # Albeit irrelevant, schema requires an empty scope here
]).lower()
self._cache.setdefault(self.CredentialType.ID_TOKEN, {})[key] = {
"credential_type": self.CredentialType.ID_TOKEN,
Expand Down Expand Up @@ -164,7 +167,7 @@ def _build_rt_key(
cls.CredentialType.REFRESH_TOKEN,
client_id or "",
"", # RT is cross-tenant in AAD
target,
target or "", # raw value could be None if deserialized from other SDK
]).lower()

def remove_rt(self, rt_item):
Expand Down
4 changes: 2 additions & 2 deletions tests/test_token_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def testAdd(self):
'realm': 'contoso',
'local_account_id': "object1234",
'username': "John Doe",
'authority_type': "AAD",
'authority_type': "MSSTS",
},
self.cache._cache["Account"].get('uid.utid-login.example.com-contoso')
)
Expand All @@ -86,7 +86,7 @@ def testAdd(self):
'client_id': 'my_client_id',
},
self.cache._cache["IdToken"].get(
'uid.utid-login.example.com-idtoken-my_client_id-contoso')
'uid.utid-login.example.com-idtoken-my_client_id-contoso-')
)


Expand Down