seasharp/basicswap_miserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: Define default chart api key in one place.

Browse Source
This commit is contained in:
tecnovert 2023-12-22 15:11:36 +02:00
parent d6ed5ba24c
commit 0a12625290
No known key found for this signature in database
GPG Key ID: 8ED6D8750C4E3F93
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -9,3 +9,6 @@ __pycache__
.tox .tox
.eggs .eggs
*~ *~
# geckodriver.log
*.log

7
basicswap/ui/page_offers.py
View File

@ -41,6 +41,9 @@ from basicswap.chainparams import (
) )
default_chart_api_key = '95dd900af910656e0e17c41f2ddc5dba77d01bf8b0e7d2787634a16bd976c553'
def value_or_none(v): def value_or_none(v):
if v == -1 or v == '-1': if v == -1 or v == '-1':
return None return None
@ -445,7 +448,7 @@ def page_newoffer(self, url_split, post_string):
chart_api_key = swap_client.settings.get('chart_api_key', '') chart_api_key = swap_client.settings.get('chart_api_key', '')
if chart_api_key == '': if chart_api_key == '':
chart_api_key_enc = swap_client.settings.get('chart_api_key_enc', '') chart_api_key_enc = swap_client.settings.get('chart_api_key_enc', '')
chart_api_key = '95dd900af910656e0e17c41f2ddc5dba77d01bf8b0e7d2787634a16bd976c553' if chart_api_key_enc == '' else bytes.fromhex(chart_api_key_enc).decode('utf-8') chart_api_key = default_chart_api_key if chart_api_key_enc == '' else bytes.fromhex(chart_api_key_enc).decode('utf-8')
return self.render_template(template, { return self.render_template(template, {
'messages': messages, 'messages': messages,
@ -746,7 +749,7 @@ def page_offers(self, url_split, post_string, sent=False):
chart_api_key = swap_client.settings.get('chart_api_key', '') chart_api_key = swap_client.settings.get('chart_api_key', '')
if chart_api_key == '': if chart_api_key == '':
chart_api_key_enc = swap_client.settings.get('chart_api_key_enc', '') chart_api_key_enc = swap_client.settings.get('chart_api_key_enc', '')
chart_api_key = 'cd7600e7b5fdd99c6f900673ff0ee8f64d6d4219a4bb87191ad4a2e3fc65d7f4' if chart_api_key_enc == '' else bytes.fromhex(chart_api_key_enc).decode('utf-8') chart_api_key = default_chart_api_key if chart_api_key_enc == '' else bytes.fromhex(chart_api_key_enc).decode('utf-8')
template = server.env.get_template('offers.html') template = server.env.get_template('offers.html')
return self.render_template(template, { return self.render_template(template, {

3
tests/basicswap/selenium/test_settings.py
View File

@ -14,6 +14,7 @@ from selenium.webdriver.support.select import Select
from selenium.webdriver.support import expected_conditions as EC from selenium.webdriver.support import expected_conditions as EC
from util import get_driver from util import get_driver
from basicswap.ui.page_offers import default_chart_api_key
def test_settings(driver): def test_settings(driver):
@ -77,7 +78,7 @@ def test_settings(driver):
chart_api_key = bytes.fromhex(settings.get('chart_api_key_enc', '')).decode('utf-8') chart_api_key = bytes.fromhex(settings.get('chart_api_key_enc', '')).decode('utf-8')
assert (chart_api_key == difficult_text) assert (chart_api_key == difficult_text)
hex_text = '95dd900af910656e0e17c41f2ddc5dba77d01bf8b0e7d2787634a16bd976c553' hex_text = default_chart_api_key
el = driver.find_element(By.NAME, 'chartapikey') el = driver.find_element(By.NAME, 'chartapikey')
el.clear() el.clear()
el.send_keys(hex_text) el.send_keys(hex_text)