Merge branch 'dev' into expires-on

# Conflicts:
#	src/azure-cli-core/azure/cli/core/adal_authentication.py

src/azure-cli-core/azure/cli/core/adal_authentication.py

@@ -221,6 +221,19 @@ def _try_scopes_to_resource(scopes):
     return scopes_to_resource(scopes)
 
 
+class BasicTokenCredential:
+    # pylint:disable=too-few-public-methods
+    """A Track 2 implementation of msrest.authentication.BasicTokenAuthentication.
+    This credential shouldn't be used by any command module, expect azure-cli-core.
+    """
+    def __init__(self, access_token):
+        self.access_token = access_token
+
+    def get_token(self, *scopes, **kwargs):  # pylint:disable=unused-argument
+        # Because get_token can't refresh the access token, always mark the token as unexpired
+        return AccessToken(self.access_token, int(time.time() + 3600))
+
+
 def _timestamp(dt):
     # datetime.datetime can't be patched:
     #   TypeError: can't set attributes of built-in/extension type 'datetime.datetime'