extra info status for basic stuff (emailverified, birthdayentered,

countryentered) so that the cache doesn't mess stuff up

Author: Ianyourgod

src/resources/authentication.js

@@ -176,35 +176,30 @@ class Authentication {
             }
         });
     }
-    static usernameFromCode(username, token, clear_cache = false) {
+    static async usernameFromCode(_username, token) {
         // name is a misnomer, was just to lazy to change after new api update.
         // TODO: make this less misleading
-        return new Promise((resolve, reject) => {
-            const cc = clear_cache
-                ? {
-                      cache: "reload",
-                  }
-                : {};
-            fetch(
-                `${ProjectApi.OriginApiUrl}/api/v1/users/userfromcode?username=${username}&token=${token}`,
-                cc,
-            )
-                .then((r) =>
-                    r
-                        .json()
-                        .then((j) => {
-                            if (j.error) return reject(j.error);
-                            resolve({
-                                username: j.username,
-                                isAdmin: j.admin,
-                                isApprover: j.approver,
-                                ...j,
-                            });
-                        })
-                        .catch(reject),
-                )
-                .catch(reject);
-        });
+        const j = await fetch(
+            `${ProjectApi.OriginApiUrl}/api/v1/users/userfromcode?token=${token}`,
+        ).then((r) => r.json());
+
+        if (j.error) throw j.error;
+
+        if (!j.birthdayEntered || !j.countryEntered || !j.isEmailVerified) {
+            const extra = await fetch(
+                `${ProjectApi.OriginApiUrl}/api/v1/users/extrainfostatus?token=${token}`,
+            ).then((r) => r.json());
+
+            j.birthdayEntered = extra.birthdayEntered;
+            j.countryEntered = extra.countryEntered;
+            j.isEmailVerified = extra.isEmailVerified;
+        }
+
+        return {
+            isAdmin: j.admin,
+            isApprover: j.approver,
+            ...j,
+        };
     }
 
     static changePassword(username, token, oldPassword, newPassword) {

src/resources/projectapi.js

@@ -1355,13 +1355,6 @@ class ProjectApi {
                                 return;
                             }
 
-                            // clear cache
-                            Authentication.usernameFromCode(
-                                this.username,
-                                this.token,
-                                true,
-                            );
-
                             resolve();
                         })
                         .catch((err) => {
@@ -2075,13 +2068,6 @@ class ProjectApi {
                                 return;
                             }
 
-                            // clear cache
-                            Authentication.usernameFromCode(
-                                this.username,
-                                this.token,
-                                true,
-                            );
-
                             resolve();
                         })
                         .catch((err) => {
@@ -2189,13 +2175,6 @@ class ProjectApi {
                                 return;
                             }
 
-                            // clear cache
-                            Authentication.usernameFromCode(
-                                this.username,
-                                this.token,
-                                true,
-                            );
-
                             resolve();
                         })
                         .catch((err) => {
@@ -2543,13 +2522,6 @@ class ProjectApi {
                                 return;
                             }
 
-                            // clear cache
-                            Authentication.usernameFromCode(
-                                this.username,
-                                this.token,
-                                true,
-                            );
-
                             resolve();
                         })
                         .catch((err) => {

src/routes/messages/+page.svelte

@@ -225,10 +225,7 @@
         markPolicyAsRead("TOS");
         markPolicyAsRead("guidelines");
 
-        ProjectClient.markAllMessagesAsRead().then(() => {
-            // clear cache
-            Authentication.usernameFromCode(this.username, this.token, true);
-        });
+        ProjectClient.markAllMessagesAsRead();
 
         readMessages = readMessages.concat(
             messages.map((message) => message.id),

src/routes/settings/+page.svelte

@@ -324,13 +324,6 @@
                 localStorage.setItem("username", username);
                 localStorage.setItem("token", token);
 
-                // clear cache
-                Authentication.usernameFromCode(
-                    this.username,
-                    this.token,
-                    true,
-                );
-
                 resolve();
             });
         });
@@ -364,13 +357,6 @@
             if (!remove) return;
             ProjectClient.removeOAuthMethod(method)
                 .then(() => {
-                    // clear cache
-                    Authentication.usernameFromCode(
-                        this.username,
-                        this.token,
-                        true,
-                    );
-
                     loginMethods = loginMethods.filter((m) => m !== method);
                 })
                 .catch(alert);

src/routes/standing/+page.svelte

@@ -1,7 +1,7 @@
 <script>
     import { page } from "$app/stores";
     import { onMount } from "svelte";
-    import { browser } from '$app/environment';
+    import { browser } from "$app/environment";
     import { PUBLIC_API_URL, PUBLIC_STUDIO_URL } from "$env/static/public";
 
     import Authentication from "../../resources/authentication.js";
@@ -23,8 +23,12 @@
     let loggedInUsername = null;
     let token = null;
 
-    const displayAccountDeleted = browser ? $page.url.searchParams.get("deleted") : null;
-    const deletedUsername = browser ? $page.url.searchParams.get("username") : null;
+    const displayAccountDeleted = browser
+        ? $page.url.searchParams.get("deleted")
+        : null;
+    const deletedUsername = browser
+        ? $page.url.searchParams.get("username")
+        : null;
     let accountStanding = 1;
 
     let currentLang = "en";
@@ -67,7 +71,7 @@
     });
     Authentication.onAuthentication((username, privateCode) => {
         loggedIn = null;
-        Authentication.usernameFromCode(privateCode)
+        Authentication.usernameFromCode(username, privateCode)
             .then(({ standing }) => {
                 loggedIn = true;
                 loggedInChange(username, token, standing);

src/routes/unfinishedsignup/+page.svelte

@@ -104,13 +104,6 @@
         finishSignup()
             .then(
                 async () => {
-                    // clear cache
-                    await Authentication.usernameFromCode(
-                        this.username,
-                        this.token,
-                        true,
-                    );
-
                     if (embed) {
                         const opener = window.opener || window.parent;