From 92c74f180c97371e491a27bef063331b36dec9f2 Mon Sep 17 00:00:00 2001 From: Adam Saudagar Date: Sun, 28 Mar 2021 11:32:39 +0530 Subject: [PATCH] let server create uid instead of client, keeping session creating code on oneside --- fishy/constants.py | 2 +- fishy/helper/helper.py | 4 ++-- fishy/web/web.py | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/fishy/constants.py b/fishy/constants.py index 3080fd0..7940ae0 100644 --- a/fishy/constants.py +++ b/fishy/constants.py @@ -1,3 +1,3 @@ -apiversion = 1 +apiversion = 2 chalutier = ("Chalutier", "https://www.esoui.com/downloads/dl2934/1616505502-Chalutier_1.1.1.zip", 111) lam2 = ("LibAddonMenu-2.0", "https://www.esoui.com/downloads/dl7/LibAddonMenu-2.0r32.zip", 32) diff --git a/fishy/helper/helper.py b/fishy/helper/helper.py index c772edf..fb0b591 100644 --- a/fishy/helper/helper.py +++ b/fishy/helper/helper.py @@ -56,8 +56,8 @@ def initialize_uid(): if config.get("uid") is not None: return - new_uid = _create_new_uid() - if web.register_user(new_uid): + new_uid = web.register_user() + if new_uid is not None: config.set("uid", new_uid) else: logging.error("Couldn't register uid, some features might not work") diff --git a/fishy/web/web.py b/fishy/web/web.py index a3982a9..2847511 100644 --- a/fishy/web/web.py +++ b/fishy/web/web.py @@ -42,12 +42,13 @@ def logout(): return result["success"] -@fallback(False) -def register_user(new_uid): +@fallback(None) +def register_user(): ip = get_ip(GoogleDnsProvider) - body = {"uid": new_uid, "ip": ip, "apiversion":apiversion} + body = {"ip": ip, "apiversion": apiversion} response = requests.post(urls.user, json=body) - return response.ok and response.json()["success"] + result = response.json() + return result["uid"] @fallback(None)