Merge pull request #85 from PengfeiLi0218/master

Throw 500 error, when grant some roles to some users #83
OpenBankProject · Feb 27, 2019 · dd6d54e · dd6d54e
2 parents b8c0622 + f74e030
commit dd6d54e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 21 deletions.
diff --git a/apimanager/consumers/views.py b/apimanager/consumers/views.py
@@ -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(
@@ -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
 
 

diff --git a/apimanager/obp/directlogin.py b/apimanager/obp/directlogin.py
@@ -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']
 

diff --git a/apimanager/users/views.py b/apimanager/users/views.py
@@ -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)