Skip to content
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

Throw 500 error, when grant some roles to some users #83 #85

Merged
merged 3 commits into from
Feb 27, 2019
+27 −21
Merged

Throw 500 error, when grant some roles to some users #83 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa61cfa
Throw 500 error, when grant some roles to some users #83
PengfeiLi0218 Feb 20, 2019
10b0034
Throw 500 error, when grant some roles to some users #83
PengfeiLi0218 Feb 23, 2019
f74e030
Unknown error text is shown at consumer page
PengfeiLi0218 Feb 27, 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
31 changes: 17 additions & 14 deletions apimanager/consumers/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ def form_valid(self, form):
except APIError as err:
messages.error(self.request, err)
return super(DetailView, self).form_invalid(form)
except:
messages.error(self.request, "Unknown")
except Exception as err:
messages.error(self.request, "{}".format(err))
return super(DetailView, self).form_invalid(form)

msg = 'calls limit of consumer {} has been updated successfully.'.format(
Expand All @@ -152,22 +152,25 @@ def get_context_data(self, **kwargs):
consumer['created'] = datetime.strptime(
consumer['created'], settings.API_DATETIMEFORMAT)

call_limits_urlpath = '/management/consumers/{}/consumer/calls_limit'.format(self.kwargs['consumer_id'])
call_limits_urlpath = '/management/consumers/{}/consumer/call-limits'.format(self.kwargs['consumer_id'])
consumer_call_limtis = api.get(call_limits_urlpath)
consumer['per_minute_call_limit'] = consumer_call_limtis['per_minute_call_limit']
consumer['per_hour_call_limit'] = consumer_call_limtis['per_hour_call_limit']
consumer['per_day_call_limit'] = consumer_call_limtis['per_day_call_limit']
consumer['per_week_call_limit'] = consumer_call_limtis['per_week_call_limit']
consumer['per_month_call_limit'] = consumer_call_limtis['per_month_call_limit']
if 'code' in consumer_call_limtis and consumer_call_limtis['code'] > 400:
messages.error(self.request, "{}".format(consumer_call_limtis['message']))
else:
consumer['per_minute_call_limit'] = consumer_call_limtis['per_minute_call_limit']
consumer['per_hour_call_limit'] = consumer_call_limtis['per_hour_call_limit']
consumer['per_day_call_limit'] = consumer_call_limtis['per_day_call_limit']
consumer['per_week_call_limit'] = consumer_call_limtis['per_week_call_limit']
consumer['per_month_call_limit'] = consumer_call_limtis['per_month_call_limit']

except APIError as err:
messages.error(self.request, err)
except:
messages.error(self.request, "Unknown")

context.update({
'consumer': consumer
})
except Exception as err:
messages.error(self.request, "{}".format(err))
finally:
context.update({
'consumer': consumer
})
return context


Expand Down
2 changes: 1 addition & 1 deletion apimanager/obp/directlogin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def login_to_api(self, data):

result = response.json()
if response.status_code != 201:
raise AuthenticatorError(result['error'])
raise AuthenticatorError(result['message'])
else:
self.token = result['token']

Expand Down
15 changes: 9 additions & 6 deletions apimanager/users/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,15 @@ def form_valid(self, form):
except:
messages.error(self.request, 'Unknown Error')
return super(DetailView, self).form_invalid(form)

msg = 'Entitlement with role {} has been added.'.format(
entitlement['role_name'])
messages.success(self.request, msg)
self.success_url = self.request.path
return super(DetailView, self).form_valid(form)
if 'code' in entitlement and entitlement['code']>=400:
messages.error(self.request, entitlement['message'])
return super(DetailView, self).form_invalid(form)
else:
msg = 'Entitlement with role {} has been added.'.format(
entitlement['role_name'])
messages.success(self.request, msg)
self.success_url = self.request.path
return super(DetailView, self).form_valid(form)

def get_context_data(self, **kwargs):
context = super(DetailView, self).get_context_data(**kwargs)
Expand Down