29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
--- a/src/external_plugins/client-config.py
|
|
+++ b/src/external_plugins/client-config.py
|
|
@@ -17,0 +18,7 @@
|
|
+def normalize_client_config(config, plugins, abbr):
|
|
+ if not config["api_host"].startswith(("http://", "https://")):
|
|
+ config["api_host"] = f"https://{config['api_host']}"
|
|
+ config["abbr"] = abbr
|
|
+ config["plugins"] = plugins
|
|
+ return config
|
|
+
|
|
+
|
|
@@ -24 +31 @@
|
|
- return json.loads(config)
|
|
+ return normalize_client_config(json.loads(config), app.config.plugins, app.config.abbr)
|
|
@@ -37 +44 @@
|
|
- config = json.loads(t[0][0])
|
|
+ config = normalize_client_config(json.loads(t[0][0]), app.config.plugins, app.config.abbr)
|
|
@@ -298 +305 @@
|
|
- "api_host": config["domain"],
|
|
+ "api_host": f"https://{config['domain']}",
|
|
@@ -306,0 +314,6 @@
|
|
+ else:
|
|
+ frontend_conf = json.loads(t[0][2])
|
|
+ if frontend_conf.get("abbr") != config["abbr"] or frontend_conf.get("plugins") != config["plugins"]:
|
|
+ frontend_conf["abbr"] = config["abbr"]
|
|
+ frontend_conf["plugins"] = config["plugins"]
|
|
+ frontend_conf = convertQuotation(json.dumps(frontend_conf))
|
|
+ cur.execute(f"UPDATE settings SET sval = '{frontend_conf}' WHERE skey = 'client-config/meta'")
|