Skip to content

Making cache_location mandatory #24

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
merged 6 commits into from
Jul 10, 2019
Merged

Making cache_location mandatory #24

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
65bcbd1
Making cache_location mandatory
rayluo Jul 9, 2019
f09a8f6
Experimental
rayluo Jul 10, 2019
083e626
More experiment for the LICENSE error on OSX
rayluo Jul 10, 2019
8055784
Update setup.py
rayluo Jul 10, 2019
9da8eb8
Rollback unnecessary changes as they've been fixed at upstream
rayluo Jul 10, 2019
2c534ee
Rollback unnecessary changes as they've been fixed at upstream
rayluo Jul 10, 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
16 changes: 7 additions & 9 deletions msal_extensions/token_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ def _mkdir_p(path):
class FileTokenCache(msal.SerializableTokenCache):
"""Implements basic unprotected SerializableTokenCache to a plain-text file."""
def __init__(self,
cache_location=os.path.join(
os.getenv('LOCALAPPDATA', os.path.expanduser('~')),
'.IdentityService',
'msal.cache'),
cache_location,
lock_location=None):
super(FileTokenCache, self).__init__()
self._cache_location = cache_location
Expand Down Expand Up @@ -121,19 +118,19 @@ def find(self, credential_type, **kwargs): # pylint: disable=arguments-differ

class UnencryptedTokenCache(FileTokenCache):
"""An unprotected token cache to default to when no-platform specific option is available."""
def __init__(self, **kwargs):
def __init__(self, cache_location, **kwargs):
warnings.warn("You are using an unprotected token cache, "
"because an encrypted option is not available for {}".format(sys.platform),
RuntimeWarning)
super(UnencryptedTokenCache, self).__init__(**kwargs)
super(UnencryptedTokenCache, self).__init__(cache_location, **kwargs)


class WindowsTokenCache(FileTokenCache):
"""A SerializableTokenCache implementation which uses Win32 encryption APIs to protect your
tokens.
"""
def __init__(self, entropy='', **kwargs):
super(WindowsTokenCache, self).__init__(**kwargs)
def __init__(self, cache_location, entropy='', **kwargs):
super(WindowsTokenCache, self).__init__(cache_location, **kwargs)
self._dp_agent = WindowsDataProtectionAgent(entropy=entropy)

def _write(self, contents):
Expand All @@ -152,10 +149,11 @@ class OSXTokenCache(FileTokenCache):
"""

def __init__(self,
cache_location,
service_name='Microsoft.Developer.IdentityService',
account_name='MSALCache',
**kwargs):
super(OSXTokenCache, self).__init__(**kwargs)
super(OSXTokenCache, self).__init__(cache_location, **kwargs)
self._service_name = service_name
self._account_name = account_name

Expand Down