External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix failing tests related to 2c4f7911a6

Browse Source
This commit is contained in:
Ryan Petrello
2018-08-10 12:27:45 -04:00
parent 18f6f68540
commit 8723508225
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/api/serializers.py
View File

@@ -1067,10 +1067,8 @@ class BaseOAuth2TokenSerializer(BaseSerializer):
).format(self.ALLOWED_SCOPES)) ).format(self.ALLOWED_SCOPES))
return value return value
def create(self, validated_data, from_command_line=False): def create(self, validated_data):
if not from_command_line: validated_data['user'] = self.context['request'].user
current_user = self.context['request'].user
validated_data['user'] = current_user
try: try:
return super(BaseOAuth2TokenSerializer, self).create(validated_data) return super(BaseOAuth2TokenSerializer, self).create(validated_data)
except oauth2.AccessDeniedError as e: except oauth2.AccessDeniedError as e:
@@ -1088,7 +1086,6 @@ class UserAuthorizedTokenSerializer(BaseOAuth2TokenSerializer):
def create(self, validated_data): def create(self, validated_data):
current_user = self.context['request'].user current_user = self.context['request'].user
validated_data['user'] = current_user
validated_data['token'] = generate_token() validated_data['token'] = generate_token()
validated_data['expires'] = now() + timedelta( validated_data['expires'] = now() + timedelta(
seconds=settings.OAUTH2_PROVIDER['ACCESS_TOKEN_EXPIRE_SECONDS'] seconds=settings.OAUTH2_PROVIDER['ACCESS_TOKEN_EXPIRE_SECONDS']
@@ -1109,7 +1106,6 @@ class OAuth2TokenSerializer(BaseOAuth2TokenSerializer):
def create(self, validated_data): def create(self, validated_data):
current_user = self.context['request'].user current_user = self.context['request'].user
validated_data['user'] = current_user
validated_data['token'] = generate_token() validated_data['token'] = generate_token()
validated_data['expires'] = now() + timedelta( validated_data['expires'] = now() + timedelta(
seconds=settings.OAUTH2_PROVIDER['ACCESS_TOKEN_EXPIRE_SECONDS'] seconds=settings.OAUTH2_PROVIDER['ACCESS_TOKEN_EXPIRE_SECONDS']
@@ -1140,7 +1136,6 @@ class UserPersonalTokenSerializer(BaseOAuth2TokenSerializer):
read_only_fields = ('user', 'token', 'expires', 'application') read_only_fields = ('user', 'token', 'expires', 'application')
def create(self, validated_data): def create(self, validated_data):
validated_data['user'] = self.context['request'].user
validated_data['token'] = generate_token() validated_data['token'] = generate_token()
validated_data['expires'] = now() + timedelta( validated_data['expires'] = now() + timedelta(
seconds=settings.OAUTH2_PROVIDER['ACCESS_TOKEN_EXPIRE_SECONDS'] seconds=settings.OAUTH2_PROVIDER['ACCESS_TOKEN_EXPIRE_SECONDS']

8
awx/main/management/commands/create_oauth2_token.py
View File

@@ -24,5 +24,11 @@ class Command(BaseCommand):
raise CommandError('The user does not exist.') raise CommandError('The user does not exist.')
config = {'user': user, 'scope':'write'} config = {'user': user, 'scope':'write'}
serializer_obj = OAuth2TokenSerializer() serializer_obj = OAuth2TokenSerializer()
token_record = serializer_obj.create(config, True)
class FakeRequest(object):
def __init__(self):
self.user = user
serializer_obj.context['request'] = FakeRequest()
token_record = serializer_obj.create(config)
self.stdout.write(token_record.token) self.stdout.write(token_record.token)