From 25142661db0c6a11b6d1871fb60996e08479941c Mon Sep 17 00:00:00 2001
From: Titouan Rigoudy <titouan.rigoudy@gmail.com>
Date: Thu, 23 Sep 2021 23:28:44 +0200
Subject: [PATCH] Handle LoginStatusResponse.

---
 src/modules/login/message.ts | 83 ++++++++++++++++--------------------
 src/modules/login/slice.ts   |  6 ++-
 2 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/src/modules/login/message.ts b/src/modules/login/message.ts
index 4f165d7..0e9949d 100644
--- a/src/modules/login/message.ts
+++ b/src/modules/login/message.ts
@@ -10,61 +10,50 @@ function loginStatusRequest(): SocketMessage {
   return "LoginStatusRequest";
 }
 
-// TODO: Adapt to new response format.
-function handleLoginStatusResponse(dispatch: AppDispatch, outerFields: any[]) {
-  if (outerFields.length !== 1) {
-    console.log("LoginStatusResponse has wrong number of fields:", outerFields);
+function handleLoginStatusResponse(dispatch: AppDispatch, response: any) {
+  if ("Pending" in response) {
+    // TODO: Adapt to new response format.
+    const [username] = response["Pending"];
+    dispatch(
+      loginSetState({
+        status: LoginStatus.Pending,
+        username,
+      })
+    );
     return;
   }
 
-  const { variant, fields } = outerFields[0];
-  switch (variant) {
-    case "Pending": {
-      const [username] = fields;
-      dispatch(
-        loginSetState({
-          status: LoginStatus.Pending,
-          username,
-        })
-      );
-      break;
-    }
-    case "Success": {
-      const [username, motd] = fields;
-      dispatch(
-        loginSetState({
-          status: LoginStatus.Success,
-          username,
-          motd,
-        })
-      );
-      break;
-    }
-
-    case "Failure": {
-      const [username, reason] = fields;
-      dispatch(
-        loginSetState({
-          status: LoginStatus.Failure,
-          username,
-          reason,
-        })
-      );
-      break;
-    }
+  if ("Success" in response) {
+    const { user_name, motd } = response["Success"];
+    dispatch(
+      loginSetState({
+        status: LoginStatus.Success,
+        username: user_name,
+        motd,
+      })
+    );
+    return;
+  }
 
-    default:
-      console.log("LoginStatusResponse field has wrong shape:", outerFields[0]);
-      break;
+  if ("Failure" in response) {
+    const { user_name, reason } = response["Failure"];
+    dispatch(
+      loginSetState({
+        status: LoginStatus.Failure,
+        username: user_name,
+        reason,
+      })
+    );
+    return;
   }
+
+  console.log("LoginStatusResponse field has wrong shape:", response);
 }
 
 export const loginSocketMessageMiddleware: SocketMessageMiddleware = {
-  handleMessage: (dispatch, { variant, fields }) => {
-    switch (variant) {
-      case "LoginStatusResponse":
-        handleLoginStatusResponse(dispatch, fields);
-        break;
+  handleMessage: (dispatch, message) => {
+    if ("LoginStatusResponse" in message) {
+      handleLoginStatusResponse(dispatch, message["LoginStatusResponse"]);
     }
   },
 
diff --git a/src/modules/login/slice.ts b/src/modules/login/slice.ts
index 017ba10..bff3b3e 100644
--- a/src/modules/login/slice.ts
+++ b/src/modules/login/slice.ts
@@ -32,7 +32,11 @@ export const loginSlice = createSlice({
       state: LoginSliceState,
       action: PayloadAction<LoginSliceState>
     ) => {
-      state = action.payload;
+      const newState = action.payload;
+      state.status = newState.status;
+      state.username = newState.username;
+      state.motd = newState.motd;
+      state.reason = newState.reason;
     },
   },
 });