Skip to content

[ACR] Login sends both access and refresh token #50

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
DavidObando merged 1 commit into from
Jul 6, 2017
Merged

[ACR] Login sends both access and refresh token #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/azure-cli-core/azure/cli/core/_profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,10 @@ def get_refresh_token(self, resource=CLOUD.endpoints.active_directory_resource_i
if user_type == _USER:
_, _, token_entry = self._creds_cache.retrieve_token_for_user(
username_or_sp_id, account[_TENANT_ID], resource)
return None, token_entry[_REFRESH_TOKEN], str(account[_TENANT_ID])
return None, token_entry[_REFRESH_TOKEN], token_entry[_ACCESS_TOKEN], str(account[_TENANT_ID])

sp_secret = self._creds_cache.retrieve_secret_of_service_principal(username_or_sp_id)
return username_or_sp_id, sp_secret, str(account[_TENANT_ID])
return username_or_sp_id, sp_secret, None, str(account[_TENANT_ID])

def get_raw_token(self, resource=CLOUD.endpoints.active_directory_resource_id,
subscription=None):
Expand Down
5 changes: 3 additions & 2 deletions src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/_docker_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,15 @@ def _get_login_token(login_server, only_refresh_token=True, repository=None):

from azure.cli.core._profile import Profile
profile = Profile()
sp_id, refresh, tenant = profile.get_refresh_token()
sp_id, refresh, access, tenant = profile.get_refresh_token()

headers = {'Content-Type': 'application/x-www-form-urlencoded'}
if sp_id is None:
content = {
'grant_type': 'refresh_token',
'grant_type': 'access_token_refresh_token',
'service': params['service'],
'tenant': tenant,
'access_token': access,
Copy link

@djyou djyou Jun 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to send both access and refresh tokens or just either one of them? Just some NIT comments: If it is either one of them, can we make grant_type explicitly access_token or refresh_token so it would be clear what I am sending and what I will receive back? Then we can have one token field which can be access or refresh token.

Copy link
Author

@DavidObando DavidObando Jun 21, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll need to send both.

'refresh_token': refresh
}
else:
Expand Down