+
+
+
+
+
+
+ {#if privateRejected}
+
{privacyRejectionMessage}
+ {/if}
+
+
+
+
+
+
+
+
+
+ {#if isAIGeneratedBase}
+
+
+
+
diff --git a/frontend/src/data/datafunctions.ts b/frontend/src/data/datafunctions.ts
index 9c97678..68b8451 100644
--- a/frontend/src/data/datafunctions.ts
+++ b/frontend/src/data/datafunctions.ts
@@ -1,6 +1,13 @@
import axios from "axios";
import { BACKEND_URL } from "./envconfig";
-import { userCoreID } from "./stores";
+import { userCoreID, apiKey } from "./stores";
+
+const MIN_ID_LENGTH: number = 3;
+export const idNotFound = (id): boolean => (id === null || id === undefined || id === "undefined" || id === "null" || id.length < MIN_ID_LENGTH);
+
+export function hasAPIKey(): boolean {
+ return !idNotFound(apiKey.get());
+}
export async function retrieveUserCoreID() {
try {
@@ -51,3 +58,19 @@ export async function retrieveUserDetails() {
console.log("Error retrieving user details: " + error);
}
}
+
+export async function retrieveAPIKey() {
+ try {
+ const response = await axios.get(`${BACKEND_URL}/user/get_apikey`, {
+ withCredentials: true
+ });
+
+ const API_KEY: string = response.data;
+
+ // Update stored api key
+ apiKey.set(API_KEY);
+ return API_KEY;
+ } catch (error) {
+ console.log("Error retrieving user api key: " + error);
+ }
+}
diff --git a/frontend/src/data/stores.ts b/frontend/src/data/stores.ts
index 451c5fe..b667cb8 100644
--- a/frontend/src/data/stores.ts
+++ b/frontend/src/data/stores.ts
@@ -54,6 +54,7 @@ export const userAuthID = persistentAtom("user_id");
// CORE STORES
// stores relating to the core of the application
+export const apiKey = persistentAtom("api_key");
const user_core_id = persistentAtom("user_core_id"); // this one's an int
// probably don't RELY on this TOO much except as a cache. Functional is more secure
diff --git a/frontend/src/scripts/updatestate.ts b/frontend/src/scripts/updatestate.ts
index b7eaf28..3cb0768 100644
--- a/frontend/src/scripts/updatestate.ts
+++ b/frontend/src/scripts/updatestate.ts
@@ -6,9 +6,12 @@ import { BACKEND_URL } from "$lib/data/envconfig";
import {
githubStars,
authState, authentication, coreRegistration, userAuthID,
- userCoreID
+ userCoreID,
+ apiKey
} from "$lib/data/stores";
+import { retrieveAPIKey, idNotFound } from "$lib/data/datafunctions";
+
// when to update all major values (where 'major' is defined by whether the whole site will break without correctly setting these values)
export default async function update() {
await updateAuthentication();
@@ -49,10 +52,6 @@ export async function updateAuthentication() {
console.log("Getting ID...");
console.log("userAuthID: " + userAuthID.get());
- // I FUCKING HATE JS WITH ITS BULLSHIT
- const MIN_ID_LENGTH: number = 3;
- const idNotFound = (id) => (id === null || id === undefined || id === "undefined" || id === "null" || id.length < MIN_ID_LENGTH);
-
function onUserAuthIDNotFound() {
console.log("No userAuthID found");
authentication.setIsAuthenticated(false);
@@ -134,4 +133,13 @@ function postAuthentication() {
// activate the registration
coreRegistration.activateRegistration();
}
+
+ // Check for and update API Key
+ retrieveAPIKey()
+ .then((api_key) => {
+ // It's already set by the function, so no need to do it again
+ console.log("API Key Retrieved.");
+ }).catch((error) => {
+ console.log("Error retrieving API Key: " + error.toString());
+ });
}
diff --git a/frontend/svelte.config.js b/frontend/svelte.config.js
index 522c1ef..86a17d3 100644
--- a/frontend/svelte.config.js
+++ b/frontend/svelte.config.js
@@ -1,5 +1,9 @@
import { vitePreprocess } from '@astrojs/svelte';
+import { preprocessMeltUI, sequence } from '@melt-ui/pp'
export default {
- preprocess: vitePreprocess(),
+ preprocess: sequence([
+ vitePreprocess(),
+ preprocessMeltUI()
+ ]),
}