Merge 0e4d924433 into 3b36ab17e4

src/@types/api/pokerogue-account-api.ts

@@ -15,10 +15,3 @@ export interface AccountRegisterRequest {
   username: string;
   password: string;
 }
-
-export interface AccountChangePwRequest {
-  password: string;
-}
-export interface AccountChangePwResponse {
-  success: boolean;
-}

src/enums/ui-mode.ts

@@ -43,6 +43,5 @@ export enum UiMode {
   TEST_DIALOGUE,
   AUTO_COMPLETE,
   ADMIN,
-  MYSTERY_ENCOUNTER,
+  MYSTERY_ENCOUNTER
-  CHANGE_PASSWORD_FORM,
 }

src/plugins/api/pokerogue-account-api.ts

@@ -1,7 +1,6 @@
 import { ApiBase } from "#api/api-base";
 import { SESSION_ID_COOKIE_NAME } from "#app/constants";
 import type {
-  AccountChangePwRequest,
   AccountInfoResponse,
   AccountLoginRequest,
   AccountLoginResponse,
@@ -96,19 +95,4 @@ export class PokerogueAccountApi extends ApiBase {
 
     removeCookie(SESSION_ID_COOKIE_NAME); // we are always clearing the cookie.
   }
-
-  public async changePassword(changePwData: AccountChangePwRequest) {
-    try {
-      const response = await this.doPost("/account/changepw", changePwData, "form-urlencoded");
-      if (response.ok) {
-        return null;
-      }
-      console.warn("Change password failed!", response.status, response.statusText);
-      return response.text();
-    } catch (err) {
-      console.warn("Change password failed!", err);
-    }
-
-    return "Unknown error!";
-  }
 }

src/ui/change-password-form-ui-handler.ts

@@ -1,124 +0,0 @@
-import { globalScene } from "#app/global-scene";
-import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
-import { UiMode } from "#enums/ui-mode";
-import type { InputFieldConfig } from "#ui/form-modal-ui-handler";
-import { FormModalUiHandler } from "#ui/form-modal-ui-handler";
-import type { ModalConfig } from "#ui/modal-ui-handler";
-import i18next from "i18next";
-
-export class ChangePasswordFormUiHandler extends FormModalUiHandler {
-  private readonly ERR_PASSWORD: string = "invalid password";
-  private readonly ERR_ACCOUNT_EXIST: string = "account doesn't exist";
-  private readonly ERR_PASSWORD_MISMATCH: string = "password doesn't match";
-
-  constructor(mode: UiMode | null = null) {
-    super(mode);
-  }
-
-  setup(): void {
-    super.setup();
-  }
-
-  override getModalTitle(_config?: ModalConfig): string {
-    return i18next.t("menu:changePassword");
-  }
-
-  override getWidth(_config?: ModalConfig): number {
-    return 160;
-  }
-
-  override getMargin(_config?: ModalConfig): [number, number, number, number] {
-    return [0, 0, 48, 0];
-  }
-
-  override getButtonLabels(_config?: ModalConfig): string[] {
-    return [i18next.t("settings:buttonSubmit"), i18next.t("menu:cancel")];
-  }
-
-  override getReadableErrorMessage(error: string): string {
-    const colonIndex = error?.indexOf(":");
-    if (colonIndex > 0) {
-      error = error.slice(0, colonIndex);
-    }
-    switch (error) {
-      case this.ERR_PASSWORD:
-        return i18next.t("menu:invalidRegisterPassword");
-      case this.ERR_ACCOUNT_EXIST:
-        return i18next.t("menu:accountNonExistent");
-      case this.ERR_PASSWORD_MISMATCH:
-        return i18next.t("menu:passwordNotMatchingConfirmPassword");
-    }
-
-    return super.getReadableErrorMessage(error);
-  }
-
-  override getInputFieldConfigs(): InputFieldConfig[] {
-    const inputFieldConfigs: InputFieldConfig[] = [];
-    inputFieldConfigs.push({
-      label: i18next.t("menu:password"),
-      isPassword: true,
-    });
-    inputFieldConfigs.push({
-      label: i18next.t("menu:confirmPassword"),
-      isPassword: true,
-    });
-    return inputFieldConfigs;
-  }
-
-  override show(args: [ModalConfig, ...any]): boolean {
-    if (super.show(args)) {
-      const config = args[0];
-      const originalSubmitAction = this.submitAction;
-      this.submitAction = () => {
-        if (globalScene.tweens.getTweensOf(this.modalContainer).length === 0) {
-          // Prevent overlapping overrides on action modification
-          this.submitAction = originalSubmitAction;
-          this.sanitizeInputs();
-          globalScene.ui.setMode(UiMode.LOADING, { buttonActions: [] });
-          const onFail = (error: string | null) => {
-            globalScene.ui.setMode(UiMode.CHANGE_PASSWORD_FORM, Object.assign(config, { errorMessage: error?.trim() }));
-            globalScene.ui.playError();
-          };
-          const [passwordInput, confirmPasswordInput] = this.inputs;
-          if (!passwordInput?.text) {
-            return onFail(this.getReadableErrorMessage("invalid password"));
-          }
-          if (passwordInput.text !== confirmPasswordInput.text) {
-            return onFail(this.ERR_PASSWORD_MISMATCH);
-          }
-
-          pokerogueApi.account.changePassword({ password: passwordInput.text }).then(error => {
-            if (!error && originalSubmitAction) {
-              globalScene.ui.playSelect();
-              originalSubmitAction();
-              // Only clear inputs if the action was successful
-              for (const input of this.inputs) {
-                input.setText("");
-              }
-            } else {
-              onFail(error);
-            }
-          });
-        }
-      };
-      // Upon pressing cancel, the inputs should be cleared
-      const originalCancelAction = this.cancelAction;
-      this.cancelAction = () => {
-        globalScene.ui.playSelect();
-        for (const input of this.inputs) {
-          input.setText("");
-        }
-        originalCancelAction?.();
-      };
-
-      return true;
-    }
-
-    return false;
-  }
-
-  override clear() {
-    super.clear();
-    this.setMouseCursorStyle("default"); //reset cursor
-  }
-}

src/ui/form-modal-ui-handler.ts

@@ -19,7 +19,6 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
   protected inputs: InputText[];
   protected errorMessage: Phaser.GameObjects.Text;
   protected submitAction: Function | null;
-  protected cancelAction: (() => void) | null;
   protected tween: Phaser.Tweens.Tween;
   protected formLabels: Phaser.GameObjects.Text[];
 
@@ -127,37 +126,22 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
     });
   }
 
-  override show(args: any[]): boolean {
+  show(args: any[]): boolean {
     if (super.show(args)) {
       this.inputContainers.map(ic => ic.setVisible(true));
 
       const config = args[0] as FormModalConfig;
 
       this.submitAction = config.buttonActions.length ? config.buttonActions[0] : null;
-      this.cancelAction = config.buttonActions[1] ?? null;
-
-      // #region: Override button pointerDown
-      // Override the pointerDown event for the buttonBgs to call the `submitAction` and `cancelAction`
-      // properties that we set above, allowing their behavior to change after this method terminates
-      // Some subclasses use this to add behavior to the submit and cancel action
 
+      if (this.buttonBgs.length) {
         this.buttonBgs[0].off("pointerdown");
         this.buttonBgs[0].on("pointerdown", () => {
           if (this.submitAction && globalScene.tweens.getTweensOf(this.modalContainer).length === 0) {
             this.submitAction();
           }
         });
-      const cancelBg = this.buttonBgs[1];
-      if (cancelBg) {
-        cancelBg.off("pointerdown");
-        cancelBg.on("pointerdown", () => {
-          // The seemingly redundant cancelAction check is intentionally left in as a defensive programming measure
-          if (this.cancelAction && globalScene.tweens.getTweensOf(this.modalContainer).length === 0) {
-            this.cancelAction();
       }
-        });
-      }
-      //#endregion: Override pointerDown events
 
       this.modalContainer.y += 24;
       this.modalContainer.setAlpha(0);

src/ui/menu-ui-handler.ts

@@ -311,17 +311,6 @@ export class MenuUiHandler extends MessageUiHandler {
         },
         keepOpen: true,
       },
-      {
-        // Note: i18n key is under `menu`, not `menuUiHandler` to avoid duplication
-        label: i18next.t("menu:changePassword"),
-        handler: () => {
-          ui.setOverlayMode(UiMode.CHANGE_PASSWORD_FORM, {
-            buttonActions: [() => ui.revertMode(), () => ui.revertMode()],
-          });
-          return true;
-        },
-        keepOpen: true,
-      },
       {
         label: i18next.t("menuUiHandler:consentPreferences"),
         handler: () => {

src/ui/modal-ui-handler.ts

@@ -7,7 +7,7 @@ import { UiHandler } from "#ui/ui-handler";
 import { addWindow, WindowVariant } from "#ui/ui-theme";
 
 export interface ModalConfig {
-  buttonActions: ((...args: any[]) => any)[];
+  buttonActions: Function[];
 }
 
 export abstract class ModalUiHandler extends UiHandler {

src/ui/ui.ts

@@ -13,7 +13,6 @@ import { BallUiHandler } from "#ui/ball-ui-handler";
 import { BattleMessageUiHandler } from "#ui/battle-message-ui-handler";
 import type { BgmBar } from "#ui/bgm-bar";
 import { GameChallengesUiHandler } from "#ui/challenges-select-ui-handler";
-import { ChangePasswordFormUiHandler } from "#ui/change-password-form-ui-handler";
 import { CommandUiHandler } from "#ui/command-ui-handler";
 import { ConfirmUiHandler } from "#ui/confirm-ui-handler";
 import { EggGachaUiHandler } from "#ui/egg-gacha-ui-handler";
@@ -103,7 +102,6 @@ const noTransitionModes = [
   UiMode.ADMIN,
   UiMode.MYSTERY_ENCOUNTER,
   UiMode.RUN_INFO,
-  UiMode.CHANGE_PASSWORD_FORM,
 ];
 
 export class UI extends Phaser.GameObjects.Container {
@@ -174,7 +172,6 @@ export class UI extends Phaser.GameObjects.Container {
       new AutoCompleteUiHandler(),
       new AdminUiHandler(),
       new MysteryEncounterUiHandler(),
-      new ChangePasswordFormUiHandler(),
     ];
   }