fix bug
Showing
2 changed files
with
8 additions
and
8 deletions
| ... | @@ -52,8 +52,8 @@ class IWALoginView(IWABaseView, GenericView): | ... | @@ -52,8 +52,8 @@ class IWALoginView(IWABaseView, GenericView): |
| 52 | 52 | ||
| 53 | def post(self, request, *args, **kwargs): | 53 | def post(self, request, *args, **kwargs): |
| 54 | code = request.data.get('code', '') | 54 | code = request.data.get('code', '') |
| 55 | redirect_uri = request.data.get('redirect_uri', '') | 55 | # redirect_uri = request.data.get('redirect_uri', '') |
| 56 | q_number = self.get_q_number(conf.IWA_URL, code, redirect_uri, client_id_base64) | 56 | q_number = self.get_q_number(conf.IWA_URL, code, conf.IWA_REDIRECT_URI, client_id_base64) |
| 57 | 57 | ||
| 58 | is_valid, data = self.validate(q_number) | 58 | is_valid, data = self.validate(q_number) |
| 59 | 59 | ... | ... |
| ... | @@ -113,24 +113,24 @@ class IWABaseView: | ... | @@ -113,24 +113,24 @@ class IWABaseView: |
| 113 | @staticmethod | 113 | @staticmethod |
| 114 | def get_token(iwa_url_base, code, redirect_uri, client_id_base64): | 114 | def get_token(iwa_url_base, code, redirect_uri, client_id_base64): |
| 115 | headers = { | 115 | headers = { |
| 116 | 'authorization': 'Basic {0}'.format(client_id_base64), # client_id:secret做base64encode | 116 | 'Authorization': 'Basic {0}'.format(client_id_base64), # client_id:secret做base64encode |
| 117 | 'content-type': 'application/x-www-form-urlencoded', | 117 | 'Content-type': 'application/x-www-form-urlencoded', |
| 118 | } | 118 | } |
| 119 | get_params_dict = { | 119 | get_params_dict = { |
| 120 | 'grant_type': 'authorization_code', | 120 | 'grant_type': 'authorization_code', |
| 121 | 'code': code, | 121 | 'code': code, |
| 122 | 'redirect_uri': redirect_uri, | 122 | 'redirect_uri': redirect_uri, |
| 123 | } | 123 | } |
| 124 | get_params_str = '&'.join(['{0}={1}'.format(k, v) for k, v in get_params_dict.items()]) | 124 | # get_params_str = '&'.join(['{0}={1}'.format(k, v) for k, v in get_params_dict.items()]) |
| 125 | iwa_token_url = '{0}access_token?{1}'.format(iwa_url_base, get_params_str) | 125 | iwa_token_url = '{0}access_token'.format(iwa_url_base) |
| 126 | res = requests.post(iwa_token_url, headers=headers) | 126 | res = requests.post(url=iwa_token_url, headers=headers, data=get_params_dict) |
| 127 | 127 | ||
| 128 | return res.json().get('access_token', '') | 128 | return res.json().get('access_token', '') |
| 129 | 129 | ||
| 130 | def get_q_number(self, iwa_url_base, code, redirect_uri, client_id_base64): | 130 | def get_q_number(self, iwa_url_base, code, redirect_uri, client_id_base64): |
| 131 | access_token = self.get_token(iwa_url_base, code, redirect_uri, client_id_base64) | 131 | access_token = self.get_token(iwa_url_base, code, redirect_uri, client_id_base64) |
| 132 | headers = { | 132 | headers = { |
| 133 | 'authorization', 'Bearer {0}'.format(access_token) | 133 | 'Authorization', 'Bearer {0}'.format(access_token) |
| 134 | } | 134 | } |
| 135 | iwa_user_url = '{0}userinfo'.format(iwa_url_base) | 135 | iwa_user_url = '{0}userinfo'.format(iwa_url_base) |
| 136 | res = requests.get(iwa_user_url, headers=headers) | 136 | res = requests.get(iwa_user_url, headers=headers) | ... | ... |
-
Please register or sign in to post a comment