Skip to content

[SSH] Serialize AT token_type and expose in result #95

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
bgavrilMS merged 4 commits into from
Sep 24, 2019
+4 −1
Merged

[SSH] Serialize AT token_type and expose in result #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5fff3b4
Serialize AT token_type and expose in result
bgavrilMS Sep 23, 2019
9bb023d
Address PR Comments
bgavrilMS Sep 23, 2019
553d576
Fix test
bgavrilMS Sep 23, 2019
d131202
Remove noise
rayluo Sep 23, 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
2 changes: 1 addition & 1 deletion msal/application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ def _acquire_token_silent_from_cache_and_possibly_refresh_it(
logger.debug("Cache hit an AT")
return { # Mimic a real response
"access_token": entry["secret"],
"token_type": "Bearer",
"token_type": entry.get("token_type", "Bearer"),
"expires_in": int(expires_in), # OAuth2 specs defines it as int
}
return self._acquire_token_silent_by_finding_rt_belongs_to_me_or_my_family(
Expand Down
1 change: 1 addition & 0 deletions msal/token_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ def __add(self, event, now=None):
"client_id": event.get("client_id"),
"target": target,
"realm": realm,
"token_type": response.get("token_type", "Bearer"),
"cached_at": str(now), # Schema defines it as a string
"expires_on": str(now + expires_in), # Same here
"extended_expires_on": str(now + ext_expires_in) # Same here
Expand Down
2 changes: 2 additions & 0 deletions tests/test_token_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ def testAddByAad(self):
'realm': 'contoso',
'secret': 'an access token',
'target': 's2 s1 s3',
'token_type': 'some type',
},
self.cache._cache["AccessToken"].get(
'uid.utid-login.example.com-accesstoken-my_client_id-contoso-s2 s1 s3')
Expand Down Expand Up @@ -155,6 +156,7 @@ def testAddByAdfs(self):
'realm': 'adfs',
'secret': 'an access token',
'target': 's2 s1 s3',
'token_type': 'some type',
},
self.cache._cache["AccessToken"].get(
'subject-fs.msidlab8.com-accesstoken-my_client_id-adfs-s2 s1 s3')
Expand Down