Refresh user name cache after set username

hanydd · Oct 27, 2024 · ae2368e · ae2368e
1 parent dd05f0d
commit ae2368e
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 8 deletions.
diff --git a/src/popup/UserWork.tsx b/src/popup/UserWork.tsx
@@ -3,7 +3,7 @@ import { Spin } from "antd";
 import { MessageInstance } from "antd/es/message/interface";
 import * as React from "react";
 import Config from "../config";
-import { asyncRequestToServer } from "../requests/requests";
+import { getUserInfo, setUsername } from "../requests/user";
 import { getErrorMessage, getFormattedHours } from "../utils/formating";
 import { getHash } from "../utils/hash";
 
@@ -40,12 +40,7 @@ class UserWork extends React.Component<UserWorkProps, UserWorkState> {
         this.userNameInputRef = React.createRef<HTMLInputElement>();
 
         getHash(Config.config.userID)
-            .then((hash) =>
-                asyncRequestToServer("GET", "/api/userInfo", {
-                    publicUserID: hash,
-                    values: ["userName", "viewCount", "minutesSaved", "vip", "permissions", "segmentCount"],
-                })
-            )
+            .then((hash) => getUserInfo(hash))
             .then((res) => {
                 if (res.status === 200) {
                     const userInfo = JSON.parse(res.responseText);
@@ -84,7 +79,7 @@ class UserWork extends React.Component<UserWorkProps, UserWorkState> {
 
         this.setState({ usernameLoading: true });
 
-        asyncRequestToServer("POST", "/api/setUsername?userID=" + Config.config.userID + "&username=" + inputUserName)
+        setUsername(inputUserName)
             .then((response) => {
                 if (response.status == 200) {
                     this.setState({ editingUsername: false, userName: inputUserName });

diff --git a/src/requests/user.ts b/src/requests/user.ts
@@ -0,0 +1,30 @@
+import Config from "../config";
+import { getHash } from "../utils/hash";
+import { FetchResponse } from "./background-request-proxy";
+import { asyncRequestToServer } from "./requests";
+
+export async function setUsername(inputUserName: string): Promise<FetchResponse> {
+    const response = asyncRequestToServer(
+        "POST",
+        "/api/setUsername?userID=" + Config.config.userID + "&username=" + inputUserName
+    );
+
+    getUserInfo("", true);
+
+    return response;
+}
+
+export async function getUserInfo(userID: string, ignoreServerCache: boolean = false): Promise<FetchResponse> {
+    if (!userID) {
+        userID = await getHash(Config.config.userID);
+    }
+    return asyncRequestToServer(
+        "GET",
+        "/api/userInfo",
+        {
+            publicUserID: userID,
+            values: ["userName", "viewCount", "minutesSaved", "vip", "permissions", "segmentCount"],
+        },
+        ignoreServerCache
+    );
+}