|
@@ -27,15 +27,15 @@ class Oa2View(View):
|
|
|
|
|
|
def validation(self, request_dict, operation):
|
|
|
response = ResObject()
|
|
|
- if operation == 'getAuthCode': # 获取用户验证码
|
|
|
- return self.get_auth_code(request_dict, response)
|
|
|
+ if operation == 'getAuthCodeAndToken': # 获取用户验证码和令牌
|
|
|
+ return self.get_auth_code_and_token(request_dict, response)
|
|
|
elif operation == 'getTokenWithAuthCode': # 根据用户验证码获取访问令牌
|
|
|
return self.get_token_with_auth_code(request_dict, response)
|
|
|
else:
|
|
|
return self.print_url(operation, request_dict, response)
|
|
|
|
|
|
@staticmethod
|
|
|
- def get_auth_code(request_dict, response):
|
|
|
+ def get_auth_code_and_token(request_dict, response):
|
|
|
user_id = request_dict.get('user_id', None)
|
|
|
region_code = request_dict.get('region_code', None)
|
|
|
if not all([user_id, region_code]):
|
|
@@ -57,7 +57,9 @@ class Oa2View(View):
|
|
|
user_qs.update(access_token=access_token, refresh_token=refresh_token, region_code=region_code,
|
|
|
user_authorization_code=user_authorization_code, updTime=now_time)
|
|
|
res = {
|
|
|
- 'user_authorization_code': user_authorization_code
|
|
|
+ 'user_authorization_code': user_authorization_code,
|
|
|
+ 'access_token': access_token,
|
|
|
+ 'refresh_token': refresh_token
|
|
|
}
|
|
|
return response.json(0, res)
|
|
|
except Exception as e:
|