Initial implementation completion and refactor (#6806)

webclient/src/websocket/commands/session/activate.ts

@@ -2,6 +2,8 @@ import { AccountActivationParams } from 'store';
 import { StatusEnum, WebSocketConnectOptions } from 'types';
 
 import webClient from '../../WebClient';
+import { BackendService } from '../../services/BackendService';
+import { ProtoController } from '../../services/ProtoController';
 import { SessionPersistence } from '../../persistence';
 
 import { disconnect, login, updateStatus } from './';
@@ -9,23 +11,21 @@ import { disconnect, login, updateStatus } from './';
 export function activate(options: WebSocketConnectOptions, passwordSalt?: string): void {
   const { userName, token } = options as unknown as AccountActivationParams;
 
-  const accountActivationConfig = {
+  BackendService.sendSessionCommand('Command_Activate', {
     ...webClient.clientConfig,
     userName,
     token,
-  };
-
-  const command = webClient.protobuf.controller.Command_Activate.create(accountActivationConfig);
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_Activate.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    if (raw.responseCode === webClient.protobuf.controller.Response.ResponseCode.RespActivationAccepted) {
-      SessionPersistence.accountActivationSuccess();
-      login(options, passwordSalt);
-    } else {
+  }, {
+    onResponseCode: {
+      [ProtoController.root.Response.ResponseCode.RespActivationAccepted]: () => {
+        SessionPersistence.accountActivationSuccess();
+        login(options, passwordSalt);
+      },
+    },
+    onError: () => {
       updateStatus(StatusEnum.DISCONNECTED, 'Account Activation Failed');
       disconnect();
       SessionPersistence.accountActivationFailed();
-    }
+    },
   });
 }