Username show

loon/mqtt/handlers/change_password_request.py

@@ -8,10 +8,17 @@ from loon.web.users.models import User
 
 
 async def change_password_handler(client, userdata, msg, data):
-    if msg.topic != "loon/register/change_password":
+    prefix = "loon/auth/register/"
+
+    if not msg.topic.startswith(prefix):
+        return
+
+    rest = msg.topic[len(prefix):]
+    uuid, _, subtopic = rest.partition("/")
+
+    if not uuid or subtopic != "change_password":
         return
 
-    uuid = data["uuid"]
     password = data["password"]
 
     with Session(engine) as session:
@@ -19,7 +26,7 @@ async def change_password_handler(client, userdata, msg, data):
         user = session.exec(statement).first()
 
         if user is None:
-            client.publish(f"loon/register/{uuid}/response",
+            client.publish(f"loon/auth/register/{uuid}/response",
                            json.dumps({"success": False, "error": "The user is not registered!"}))
             return
 
@@ -32,9 +39,9 @@ async def change_password_handler(client, userdata, msg, data):
             session.commit()
         except IntegrityError:
             session.rollback()
-            client.publish(f"loon/register/{uuid}/response",
+            client.publish(f"loon/auth/register/{uuid}/response",
                            json.dumps({"success": False, "error": "The user is not registered!"}))
 
             return
 
-    client.publish(f"loon/register/{uuid}/response", json.dumps({"success": True, "error": None}))
+    client.publish(f"loon/auth/register/{uuid}/response", json.dumps({"success": True, "error": None}))

loon/mqtt/handlers/register_request.py

@@ -8,10 +8,17 @@ from loon.web.users.models import User
 
 
 async def register_request_handler(client, userdata, msg, data):
-    if msg.topic != "loon/register/request":
+    prefix = "loon/auth/register/"
+
+    if not msg.topic.startswith(prefix):
+        return
+
+    rest = msg.topic[len(prefix):]
+    uuid, _, subtopic = rest.partition("/")
+
+    if not uuid or subtopic != "request":
         return
 
-    uuid = data["uuid"]
     password = data["password"]
     internal_username = data["internalUsername"]
 
@@ -20,7 +27,7 @@ async def register_request_handler(client, userdata, msg, data):
         user = session.exec(statement).first()
 
         if user is not None:
-            client.publish(f"loon/register/{uuid}/response",
+            client.publish(f"loon/auth/register/{uuid}/response",
                            json.dumps({"success": False, "error": "The user is already registered!"}))
             return
 
@@ -28,7 +35,7 @@ async def register_request_handler(client, userdata, msg, data):
         user = session.exec(statement).first()
 
         if user is not None:
-            client.publish(f"loon/register/{uuid}/response",
+            client.publish(f"loon/auth/register/{uuid}/response",
                            json.dumps({"success": False, "error": f"The {internal_username} is taken!"}))
             return
 
@@ -38,9 +45,9 @@ async def register_request_handler(client, userdata, msg, data):
             session.commit()
         except IntegrityError:
             session.rollback()
-            client.publish(f"loon/register/{uuid}/response",
+            client.publish(f"loon/auth/register/{uuid}/response",
                            json.dumps({"success": False, "error": "The user is already registered!"}))
 
             return
 
-    client.publish(f"loon/register/{uuid}/response", json.dumps({"success": True, "error": None}))
+    client.publish(f"loon/auth/register/{uuid}/response", json.dumps({"success": True, "error": None}))

loon/mqtt/handlers/show_username_request.py

@@ -0,0 +1,32 @@
+import json
+
+from sqlmodel import Session, select
+
+from loon.web.db import engine
+from loon.web.users.models import User
+
+
+async def show_username_handler(client, userdata, msg, data):
+    prefix = "loon/auth/show_username/"
+
+    if not msg.topic.startswith(prefix):
+        return
+
+    rest = msg.topic[len(prefix):]
+    uuid, _, subtopic = rest.partition("/")
+
+    if not uuid or subtopic:
+        return
+
+    with Session(engine) as session:
+        user = session.exec(select(User).where(User.uuid == uuid)).first()
+
+        if user is None:
+            client.publish(f"loon/auth/show_username/{uuid}/response",
+                           json.dumps({"success": False, "error": "The user is not registered!"}))
+            return
+
+        internal_username = user.internal_username
+
+    client.publish(f"loon/auth/show_username/{uuid}/response",
+                   json.dumps({"success": True, "error": None, "internalUsername": internal_username}))

loon/mqtt/manager.py

@@ -11,11 +11,12 @@ from loon.mqtt.handlers.marquee import marquee_handler
 from loon.mqtt.handlers.player import player_handler
 from loon.mqtt.handlers.register_request import register_request_handler
 from loon.mqtt.handlers.server import server_handler
+from loon.mqtt.handlers.show_username_request import show_username_handler
 from loon.mqtt.handlers.world import world_handler
 
 
 class MQTTManager:
-    BASE_HANDLERS = [player_handler, register_request_handler, world_handler, server_handler, marquee_handler, change_password_handler]
+    BASE_HANDLERS = [player_handler, register_request_handler, world_handler, server_handler, marquee_handler, change_password_handler, show_username_handler]
 
     def __init__(self, inject_handlers = None):
         if inject_handlers is None:
@@ -59,7 +60,8 @@ class MQTTManager:
     def on_topic(self, client, userdata, msg):
         async def handle_message():
             try:
-                data = json.loads(msg.payload.decode())
+                raw = msg.payload.decode()
+                data = json.loads(raw) if raw.strip() else {}
             except json.decoder.JSONDecodeError:
                 return