mirror of
https://github.com/OpenBankProject/API-Manager.git
synced 2026-02-06 14:46:45 +00:00
Hard Coded API_VERSION
This commit is contained in:
commit
4b66ccf852
@ -27,7 +27,7 @@ class AccountListView(IndexAccountsView, LoginRequiredMixin, FormView ):
|
||||
#self.bankids = self.get_banks()
|
||||
accounts_list = []
|
||||
#for bank_id in self.bankids:
|
||||
urlpath = '/my/accounts'
|
||||
urlpath = 'v5.1.0/my/accounts'
|
||||
result = api.get(urlpath)
|
||||
if 'accounts' in result:
|
||||
accounts_list.extend(result['accounts'])
|
||||
@ -55,7 +55,7 @@ class ExportCsvView(LoginRequiredMixin, View):
|
||||
self.bankids = get_banks(self.request)
|
||||
accounts_list = []
|
||||
for bank_id in self.bankids:
|
||||
urlpath = 'banks/{}/accounts'.format(bank_id)
|
||||
urlpath = 'v5.1.0/banks/{}/accounts'.format(bank_id)
|
||||
result = api.get(urlpath)
|
||||
if 'accounts' in result:
|
||||
accounts_list.extend(result['accounts'])
|
||||
|
||||
@ -259,8 +259,8 @@ API_HOST = 'http://127.0.0.1:8080'
|
||||
API_EXPLORER_HOST = 'http://127.0.0.1:8082'
|
||||
# Only override this if you have a separate portal instance
|
||||
API_PORTAL = API_HOST
|
||||
API_BASE_PATH = '/obp/v'
|
||||
API_VERSION = '5.1.0'
|
||||
API_BASE_PATH = '/obp/'
|
||||
#API_VERSION = '5.1.0'
|
||||
|
||||
# URL to API Tester
|
||||
API_TESTER_URL = 'https://www.example.com'
|
||||
@ -319,10 +319,11 @@ except ImportError:
|
||||
# DO NOT TRY TO DO SO YOU WILL BE IGNORED!
|
||||
|
||||
# Settings here might use parts overwritten in local settings
|
||||
API_ROOT = API_HOST + API_BASE_PATH + API_VERSION
|
||||
#API_ROOT = API_HOST + API_BASE_PATH + API_VERSION
|
||||
API_ROOT = API_HOST + API_BASE_PATH
|
||||
# For some reason, swagger is not available at the latest API version
|
||||
API_URL_SWAGGER = API_HOST + '/obp/v1.4.0/resource-docs/v' + API_VERSION + '/swagger' # noqa
|
||||
|
||||
#API_URL_SWAGGER = API_HOST + '/obp/v1.4.0/resource-docs/v' + API_VERSION + '/swagger' # noqa
|
||||
API_URL_SWAGGER = API_HOST + '/obp/v1.4.0/resource-docs/v5.1.0/swagger' # noqa
|
||||
if not OAUTH_CONSUMER_KEY:
|
||||
raise ImproperlyConfigured('Missing settings for OAUTH_CONSUMER_KEY')
|
||||
if not OAUTH_CONSUMER_SECRET:
|
||||
|
||||
@ -44,7 +44,7 @@ class IndexBanksView(LoginRequiredMixin, FormView):
|
||||
def form_valid(self, form):
|
||||
try:
|
||||
data = form.cleaned_data
|
||||
urlpath = '/banks'
|
||||
urlpath = 'v5.1.0/banks'
|
||||
payload ={
|
||||
"id": data["bank_id"],
|
||||
"bank_code": data["bank_code"],
|
||||
|
||||
@ -9,7 +9,7 @@ from django.contrib import messages
|
||||
from obp.api import API, APIError, LOGGER
|
||||
from django.core.cache import cache
|
||||
|
||||
USER_CURRENT = "/users/current"
|
||||
USER_CURRENT = "v5.1.0/users/current"
|
||||
|
||||
def api_root(request):
|
||||
"""Returns the configured API_ROOT"""
|
||||
|
||||
@ -156,7 +156,7 @@ class API(object):
|
||||
def get_bank_id_choices(self):
|
||||
"""Gets a list of bank ids and bank ids as used by form choices"""
|
||||
choices = [('', _('Choose ...'))]
|
||||
result = self.get('/banks')
|
||||
result = self.get('v5.1.0/banks')
|
||||
for bank in sorted(result['banks'], key=lambda d: d['id']) :
|
||||
choices.append((bank['id'], bank['id']))
|
||||
return choices
|
||||
|
||||
@ -29,7 +29,7 @@ class LoginToDjangoMixin(object):
|
||||
# Here, we already get the Token for the api call.
|
||||
api = API(self.request.session.get('obp'))
|
||||
try:
|
||||
data = api.get('/users/current')
|
||||
data = api.get('v5.1.0/users/current')
|
||||
except APIError as err:
|
||||
messages.error(self.request, err)
|
||||
except Exception as err:
|
||||
|
||||
@ -23,7 +23,7 @@ class SystemView(LoginRequiredMixin, FormView):
|
||||
api = API(self.request.session.get('obp'))
|
||||
try:
|
||||
system_view = []
|
||||
urlpath = '/system-views/owner'
|
||||
urlpath = 'v5.1.0/system-views/owner'
|
||||
result = api.get(urlpath)
|
||||
system_view = result
|
||||
except APIError as err:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user