Merge pull request #187 from AzureAD/saml1.1test

Adding saml token types
AzureAD · Jan 24, 2019 · 2f32ef2 · 2f32ef2
2 parents 4d92743 + 8dbc002
commit 2f32ef2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/adal/constants.py b/adal/constants.py
@@ -173,6 +173,8 @@ class Saml(object):
 
     TokenTypeV1 = 'urn:oasis:names:tc:SAML:1.0:assertion'
     TokenTypeV2 = 'urn:oasis:names:tc:SAML:2.0:assertion'
+    OasisWssSaml11TokenProfile11 = "http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1"
+    OasisWssSaml2TokenProfile2 = "http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"
 
 
 class XmlNamespaces(object):

diff --git a/adal/token_request.py b/adal/token_request.py
@@ -55,10 +55,10 @@ def add_parameter_if_available(parameters, key, value):
 
 def _get_saml_grant_type(wstrust_response):
     token_type = wstrust_response.token_type
-    if token_type == SAML.TokenTypeV1:
+    if token_type == SAML.TokenTypeV1 or token_type == SAML.OasisWssSaml11TokenProfile11:
         return OAUTH2_GRANT_TYPE.SAML1
 
-    elif token_type == SAML.TokenTypeV2:
+    elif token_type == SAML.TokenTypeV2 or token_type == SAML.OasisWssSaml2TokenProfile2:
         return OAUTH2_GRANT_TYPE.SAML2
 
     else: