Skip to content

Bringing 2 more PRs into pending release-0.4.1 branch #65

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 5 commits into from
Jun 18, 2019
Merged

Bringing 2 more PRs into pending release-0.4.1 branch #65

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2791b62
* Pass through verify, timeout and proxies flag
May 20, 2019
f49436f
Shorten a line to within 80 chars
rayluo Jun 18, 2019
d79cc5a
Merge pull request #61 from roederja2/pass_through_verify
rayluo Jun 18, 2019
002a135
Change an optional scopes parameter to be required
rayluo Jun 18, 2019
54dc244
Merge pull request #64 from AzureAD/scopes-are-required-in-username-p…
rayluo Jun 18, 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
5 changes: 3 additions & 2 deletions msal/application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,8 @@ def _get_authority_aliases(self, instance):
if not self.authority_groups:
resp = requests.get(
"https://login.microsoftonline.com/common/discovery/instance?api-version=1.1&authorization_endpoint=https://login.microsoftonline.com/common/oauth2/authorize",
headers={'Accept': 'application/json'})
headers={'Accept': 'application/json'},
verify=self.verify, proxies=self.proxies, timeout=self.timeout)
resp.raise_for_status()
self.authority_groups = [
set(group['aliases']) for group in resp.json()['metadata']]
Expand Down Expand Up @@ -511,7 +512,7 @@ def acquire_token_by_device_flow(self, flow, **kwargs):
**kwargs)

def acquire_token_by_username_password(
self, username, password, scopes=None, **kwargs):
self, username, password, scopes, **kwargs):
"""Gets a token for a given resource via user credentails.

See this page for constraints of Username Password Flow.
Expand Down