Light Mode

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 46d1d76

Browse files
committed
FIX: sonarcloud
1 parent feca2f3 commit 46d1d76

File tree

10 files changed

+62
-53
lines changed
  • apimanager
    • apimanager
      • settings.py
    • config
      • static/config/js
        • config.js
      • views.py
    • connectormethod
      • views.py
    • customers
      • forms.py
      • views.py
    • dynamicendpoints
      • static/dynamicendpoints/js
        • dynamicendpoints.js
      • views.py
    • entitlementrequests
      • views.py
    • methodrouting
      • views.py

10 files changed

+62
-53
lines changed

apimanager/apimanager/settings.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,9 @@
304304
VERIFY = True
305305
CALLBACK_BASE_URL = ""
306306

307+
# Global
308+
UNDEFINED = ""
309+
307310
# Local settings can replace any value ABOVE
308311
try:
309312
from apimanager.local_settings import * # noqa

apimanager/config/static/config/js/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $(document).ready(function($) {
55
}
66
json = json.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>');
77
return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function (match) {
8-
var cls = 'number';
8+
let cls = 'number';
99
if (/^"/.test(match)) {
1010
if (/:$/.test(match)) {
1111
cls = 'key';

apimanager/config/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ def get_context_data(self, **kwargs):
2525
except APIError as err:
2626
messages.error(self.request, err)
2727
config = {}
28-
except:
29-
messages.error(self.request, "Unknown Error")
28+
except Exception as err:
29+
messages.error(self.request, err)
3030
config = {}
3131

3232
context.update({

apimanager/connectormethod/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def get_context_data(self, **kwargs):
3434
connectormethod=response['connector_methods']
3535
except APIError as err:
3636
messages.error(self.request, err)
37-
except BaseException as err:
38-
error_once_only(self.request, (Exception("Unknown Error. Details:" + str(err))))
37+
except Exception as err:
38+
error_once_only(self.request, err)
3939
else:
4040
default_connector_method_endpoint = {
4141
"connector_method_name": "Method Name",

apimanager/customers/forms.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
from obp.api import APIError
1111

12+
PLACEHOLDER = "2013-01-22T00:08:00Z"
1213

1314
class CreateCustomerForm(forms.Form):
1415
bank_id = forms.ChoiceField(
@@ -83,7 +84,7 @@ class CreateCustomerForm(forms.Form):
8384
input_formats=[settings.API_DATETIMEFORMAT],
8485
widget=forms.DateTimeInput(
8586
attrs={
86-
'placeholder': '2013-01-22T00:08:00Z',
87+
'placeholder': PLACEHOLDER,
8788
'class': 'form-control',
8889
}
8990
),
@@ -94,7 +95,7 @@ class CreateCustomerForm(forms.Form):
9495
input_formats=[settings.API_DATETIMEFORMAT],
9596
widget=forms.DateTimeInput(
9697
attrs={
97-
'placeholder': '2013-01-22T00:08:00Z',
98+
'placeholder': PLACEHOLDER,
9899
'class': 'form-control',
99100
}
100101
),
@@ -125,7 +126,7 @@ class CreateCustomerForm(forms.Form):
125126
label=_('Date of Birth of Dependants'),
126127
widget=forms.TextInput(
127128
attrs={
128-
'placeholder': '2013-01-22T00:08:00Z, 2010-01-22T00:08:00Z',
129+
'placeholder': f'{PLACEHOLDER}, 2010-01-22T00:08:00Z',
129130
'class': 'form-control',
130131
}
131132
),
@@ -206,7 +207,7 @@ class CreateCustomerForm(forms.Form):
206207
input_formats=[settings.API_DATETIMEFORMAT],
207208
widget=forms.DateTimeInput(
208209
attrs={
209-
'placeholder': '2013-01-22T00:08:00Z',
210+
'placeholder': PLACEHOLDER,
210211
'class': 'form-control',
211212
}
212213
),

apimanager/customers/views.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ def get_form(self, *args, **kwargs):
3535
fields['bank_id'].choices = self.api.get_bank_id_choices()
3636
except APIError as err:
3737
messages.error(self.request, err)
38-
except:
39-
messages.error(self.request, "Unknown Error")
38+
except Exception as err:
39+
messages.error(self.request, err)
4040
fields['last_ok_date'].initial =\
4141
datetime.datetime.now().strftime(settings.API_DATETIMEFORMAT)
4242
return form
@@ -78,8 +78,8 @@ def form_valid(self, form):
7878
except APIError as err:
7979
messages.error(self.request, err)
8080
return super(CreateView, self).form_invalid(form)
81-
except:
82-
messages.error(self.request, "Unknown Error")
81+
except Exception as err:
82+
messages.error(self.request, err)
8383
return super(CreateView, self).form_invalid(form)
8484
msg = 'Customer number {} for user {} has been created successfully!'.format( # noqa
8585
result['customer_number'], data['username'])

apimanager/dynamicendpoints/static/dynamicendpoints/js/dynamicendpoints.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $(document).ready(function($) {
77

88
//each dynamic_endpoint will have each own json_editor, and will put data into it when click `parameter` box
99
//and will use the data from click `save` button.
10-
var json_editors = []
10+
let json_editors = []
1111
$('.parameters').click(function() {
1212
let runner = $(this).parent().parent().parent();
1313
let json_editor_id= $(runner).find('.jsoneditor_div')[0].id;

apimanager/dynamicendpoints/views.py

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
from django.urls import reverse_lazy
1414
from django.views.decorators.csrf import csrf_exempt
1515

16+
DEFINITIONS_USER = "#/definitions/user"
17+
UNEXPECTED_ERROR = "unexpected error"
18+
RESPONSES_UNEXPECTED_ERROR = "#/responses/unexpectedError"
19+
DEFINITIONS_API_ERROR = "#/definitions/APIError"
1620

1721
class IndexView(LoginRequiredMixin, FormView):
1822
"""Index view for config"""
@@ -33,8 +37,8 @@ def get_context_data(self, **kwargs):
3337
dynamic_endpoints=response['dynamic_endpoints']
3438
except APIError as err:
3539
messages.error(self.request, err)
36-
except BaseException as err:
37-
error_once_only(self.request, (Exception("Unknown Error. Details:" + str(err))))
40+
except Exception as err:
41+
messages.error(self.request, err)
3842
else:
3943
# set the default endpoint there, the first item will be the new endpoint.
4044
default_dynamic_endpoint = {
@@ -64,20 +68,20 @@ def get_context_data(self, **kwargs):
6468
"in":"body",
6569
"required":True,
6670
"schema":{
67-
"$ref":"#/definitions/user"
71+
"$ref":DEFINITIONS_USER
6872
}
6973
}],
7074
"responses":{
7175
"201":{
7276
"description":"create user successful and return created user object",
7377
"schema":{
74-
"$ref":"#/definitions/user"
78+
"$ref": DEFINITIONS_USER
7579
}
7680
},
7781
"500":{
78-
"description":"unexpected error",
82+
"description":UNEXPECTED_ERROR,
7983
"schema":{
80-
"$ref":"#/responses/unexpectedError"
84+
"$ref":RESPONSES_UNEXPECTED_ERROR
8185
}
8286
}
8387
}
@@ -94,7 +98,7 @@ def get_context_data(self, **kwargs):
9498
"200":{
9599
"description":"the successful get requested user by user ID",
96100
"schema":{
97-
"$ref":"#/definitions/user"
101+
"$ref":DEFINITIONS_USER
98102
}
99103
},
100104
"400":{
@@ -106,13 +110,13 @@ def get_context_data(self, **kwargs):
106110
"404":{
107111
"description":"user not found",
108112
"schema":{
109-
"$ref":"#/definitions/APIError"
113+
"$ref":DEFINITIONS_API_ERROR
110114
}
111115
},
112116
"500":{
113-
"description":"unexpected error",
117+
"description":UNEXPECTED_ERROR,
114118
"schema":{
115-
"$ref":"#/responses/unexpectedError"
119+
"$ref":RESPONSES_UNEXPECTED_ERROR
116120
}
117121
}
118122
}
@@ -126,13 +130,13 @@ def get_context_data(self, **kwargs):
126130
"200":{
127131
"description":"get all users",
128132
"schema":{
129-
"$ref":"#/definitions/users"
133+
"$ref":DEFINITIONS_USER
130134
}
131135
},
132136
"404":{
133137
"description":"user not found",
134138
"schema":{
135-
"$ref":"#/definitions/APIError"
139+
"$ref":DEFINITIONS_API_ERROR
136140
}
137141
}
138142
}
@@ -145,20 +149,20 @@ def get_context_data(self, **kwargs):
145149
"in":"body",
146150
"required":True,
147151
"schema":{
148-
"$ref":"#/definitions/user"
152+
"$ref":DEFINITIONS_USER
149153
}
150154
}],
151155
"responses":{
152156
"200":{
153157
"description":"create user successful and return created user object",
154158
"schema":{
155-
"$ref":"#/definitions/user"
159+
"$ref":DEFINITIONS_USER
156160
}
157161
},
158162
"500":{
159-
"description":"unexpected error",
163+
"description":UNEXPECTED_ERROR,
160164
"schema":{
161-
"$ref":"#/responses/unexpectedError"
165+
"$ref":RESPONSES_UNEXPECTED_ERROR
162166
}
163167
}
164168
}
@@ -182,9 +186,9 @@ def get_context_data(self, **kwargs):
182186
}
183187
},
184188
"500":{
185-
"description":"unexpected error",
189+
"description":UNEXPECTED_ERROR,
186190
"schema":{
187-
"$ref":"#/responses/unexpectedError"
191+
"$ref":RESPONSES_UNEXPECTED_ERROR
188192
}
189193
}
190194
}
@@ -218,7 +222,7 @@ def get_context_data(self, **kwargs):
218222
"description":"array of users",
219223
"type":"array",
220224
"items":{
221-
"$ref":"#/definitions/user"
225+
"$ref":DEFINITIONS_USER
222226
}
223227
},
224228
"APIError":{
@@ -238,15 +242,15 @@ def get_context_data(self, **kwargs):
238242
},
239243
"responses":{
240244
"unexpectedError":{
241-
"description":"unexpected error",
245+
"description":UNEXPECTED_ERROR,
242246
"schema":{
243-
"$ref":"#/definitions/APIError"
247+
"$ref":DEFINITIONS_API_ERROR
244248
}
245249
},
246250
"invalidRequest":{
247251
"description":"invalid request",
248252
"schema":{
249-
"$ref":"#/definitions/APIError"
253+
"$ref":DEFINITIONS_API_ERROR
250254
}
251255
}
252256
},

apimanager/entitlementrequests/views.py

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from django.conf import settings
1313
from django.urls import reverse
1414
from django.http import HttpResponseRedirect
15+
from apimanager.settings import UNDEFINED
1516

1617

1718

@@ -44,8 +45,8 @@ def get_context_data(self, **kwargs):
4445
entitlement_requests = sorted(entitlement_requests, key=lambda k: k['created'], reverse=True)
4546
except APIError as err:
4647
messages.error(self.request, err)
47-
except:
48-
messages.error(self.request, "Unknown Error")
48+
except Exception as err:
49+
messages.error(self.request, err)
4950

5051
context.update({
5152
'entitlementrequests': entitlement_requests,
@@ -66,12 +67,12 @@ def post(self, request, *args, **kwargs):
6667
messages.error(self.request, response['message'])
6768
else:
6869
msg = 'Entitlement Request with role {} has been deleted.'.format(
69-
request.POST.get('role_name', ''))
70+
request.POST.get('role_name', UNDEFINED))
7071
messages.success(request, msg)
7172
except APIError as err:
7273
messages.error(request, err)
73-
except:
74-
messages.error(self.request, "Unknown Error")
74+
except Exception as err:
75+
messages.error(self.request, err)
7576

7677
return HttpResponseRedirect(reverse('entitlementrequests-index'))
7778

@@ -86,32 +87,32 @@ def post(self, request, *args, **kwargs):
8687
try:
8788
urlpath = '/users/{}/entitlements'.format(kwargs['user_id'])
8889
payload = {
89-
'bank_id': request.POST.get('bank_id', ''),
90-
'role_name': request.POST.get('role_name', ''),
90+
'bank_id': request.POST.get('bank_id', UNDEFINED),
91+
'role_name': request.POST.get('role_name', UNDEFINED),
9192
}
9293
response = api.post(urlpath, payload=payload)
9394
if 'code' in response and response['code'] >= 400:
9495
messages.error(self.request, response['message'])
9596
else:
96-
msg = 'Entitlement with role {} has been added.'.format(request.POST.get('role_name', ''))
97+
msg = 'Entitlement with role {} has been added.'.format(request.POST.get('role_name', UNDEFINED))
9798
messages.success(request, msg)
9899
except APIError as err:
99100
messages.error(request, err)
100-
except:
101-
messages.error(self.request, "Unknown Error")
101+
except Exception as err:
102+
messages.error(self.request, err)
102103

103104
try:
104-
urlpath = '/entitlement-requests/{}'.format(request.POST.get('entitlement_request_id', ''))
105+
urlpath = '/entitlement-requests/{}'.format(request.POST.get('entitlement_request_id', UNDEFINED))
105106
response = api.delete(urlpath)
106107
if 'code' in response and response['code'] >= 400:
107108
messages.error(self.request, response['message'])
108109
else:
109110
msg = 'Entitlement Request with role {} has been deleted.'.format(
110-
request.POST.get('role_name', ''))
111+
request.POST.get('role_name', UNDEFINED))
111112
messages.success(request, msg)
112113
except APIError as err:
113114
messages.error(request, err)
114-
except:
115-
messages.error(self.request, "Unknown Error")
115+
except Exception as err:
116+
messages.error(self.request, err)
116117

117-
return HttpResponseRedirect(reverse('entitlementrequests-index'))
118+
return HttpResponseRedirect(reverse('entitlementrequests-index'))

apimanager/methodrouting/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def get_context_data(self, **kwargs):
3838
except APIError as err:
3939
messages.error(self.request, err)
4040
except BaseException as err:
41-
error_once_only(self.request, (Exception("Unknown Error. Details:" + str(err))))
41+
error_once_only(self.request, err)
4242
else:
4343
for i in range(len(method_routings)):
4444
#if the parameters are empty, we provide the example value.
@@ -100,4 +100,4 @@ def methodrouting_delete(request):
100100

101101
urlpath = '/management/method_routings/{}'.format(method_routing_id)
102102
result = api.delete(urlpath)
103-
return result
103+
return result

0 commit comments

Comments
(0)