Adjustments to the registration page ref: OwlBoard/backend#39

src/lib/libauth.ts

@@ -7,11 +7,16 @@ export interface libauthResponse {
     serverAuthCheckResponseCode?: number;
 }
 
+interface uuidCheckRes {
+    uuidValue?: string;
+    uuidPresent?: boolean;
+}
+
 export async function checkAuth(): Promise<libauthResponse> {
     let result: libauthResponse = {};
     const uuidCheck = await checkUuid();
-    result.uuidPresent = uuidCheck.uuidPresent;
-    result.uuidValue = uuidCheck.uuidValue;
+    result.uuidPresent = uuidCheck?.uuidPresent;
+    result.uuidValue = uuidCheck?.uuidValue;
     
     const serverCheck = await checkServerAuth();
     result.serverAuthCheck = serverCheck.authOk;
@@ -20,26 +25,33 @@ export async function checkAuth(): Promise<libauthResponse> {
     return result
 }
 
-export async function checkUuid() {
+export async function checkUuid(): Promise<uuidCheckRes> {
     let uuid_value: string = '';
-    uuid.subscribe((value => uuid_value = value))
+    const unsubscribe = uuid.subscribe(value => {
+        uuid_value = value;
+    });
+    let res: uuidCheckRes = {
+        uuidValue: uuid_value
+    }
     console.log("uuid-value is: ", uuid_value)
     if (uuid_value && uuid_value != 'null') {
-        return {
+        res = {
             uuidPresent: true,
             uuidValue: uuid_value,
         }
-    }
-    return {
+    } else {
+    res =  {
         uuidPresent: false,
-        uuidValue: '',
+        uuidValue: uuid_value,
     }
-}
+    
+}unsubscribe()
+return res;}
 
 export async function checkServerAuth() {
     let uuid_value: string = '';
     uuid.subscribe((value => uuid_value = value))
-    const url = "https://owlboard.info/api/v2/auth/check"
+    const url = "https://owlboard.info/api/v2/user/checkAuth"
     const options = {
         method: 'GET',
         headers: {
@@ -48,7 +60,7 @@ export async function checkServerAuth() {
     };
     const res = await fetch(url, options)
     let ok: boolean;
-    if (res.status === 200) {
+    if (res.status !== 401) {
         ok = true;
     } else {
         ok = false;

src/routes/more/reg/+page.svelte

@@ -9,7 +9,7 @@
   const title = 'Register';
 
   let state = 'unreg';
-  let isLoading = false;
+  let isLoading = true;
   let inputValue = '';
 
   function handleInput(event) {
@@ -46,14 +46,16 @@
     } else if (auth.uuidPresent === true) {
       state = 'reg';
     }
+    isLoading = false;
   });
 </script>
 
-{#if isLoading}
-  <Loading />
-{/if}
+
 
 <Header {title} />
+{#if isLoading}
+  <Loading />
+{:else}
 {#if state == 'unreg'}
   <p>The staff version of OwlBoard offers several extra features:</p>
   <ul>
@@ -92,6 +94,7 @@
     browser.
   </p>
 {/if}
+{/if}
 <Nav />
 
 <style>