From 7f74ddef2e6fdefe9559e46331b78b22ed43c348 Mon Sep 17 00:00:00 2001
From: Adrien <adrien.bouvais.pro@gmail.com>
Date: Sat, 1 Jun 2024 19:05:54 +0200
Subject: [PATCH] fix

---
 Authentification.go              | 10 ++++------
 Chat.go                          |  1 -
 MyUtils.go                       |  1 -
 Stripe.go                        |  2 --
 main.go                          |  5 -----
 views/partials/message-bot.html  |  2 +-
 views/partials/message-user.html |  2 +-
 7 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/Authentification.go b/Authentification.go
index af36fa6..bcd18bd 100644
--- a/Authentification.go
+++ b/Authentification.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"os"
 
 	"github.com/edgedb/edgedb-go"
 	"github.com/gofiber/fiber/v2"
@@ -30,9 +31,6 @@ type TokenResponse struct {
 	ProviderToken string `json:"provider_token"`
 }
 
-// TODO add to env
-const EDGEDB_AUTH_BASE_URL = "https://jade-hackathon--mrbounty.c-40.i.aws.edgedb.cloud/db/main/ext/auth"
-
 func getGoogleUserProfile(providerToken string) (string, string, string) {
 	// Fetch the discovery document
 	resp, err := http.Get("https://accounts.google.com/.well-known/openid-configuration")
@@ -158,7 +156,7 @@ func handleUiSignIn(c *fiber.Ctx) error {
 		Secure:   true,
 	})
 
-	return c.Redirect(fmt.Sprintf("%s/ui/signup?challenge=%s", EDGEDB_AUTH_BASE_URL, challenge), fiber.StatusTemporaryRedirect)
+	return c.Redirect(fmt.Sprintf("%s/ui/signup?challenge=%s", os.Getenv("EDGEDB_AUTH_BASE_URL"), challenge), fiber.StatusTemporaryRedirect)
 }
 
 func handleCallbackSignup(c *fiber.Ctx) error {
@@ -174,7 +172,7 @@ func handleCallbackSignup(c *fiber.Ctx) error {
 		panic("Could not find 'verifier' in the cookie store. Is this the same user agent/browser that started the authorization flow?")
 	}
 
-	codeExchangeURL := fmt.Sprintf("%s/token?code=%s&verifier=%s", EDGEDB_AUTH_BASE_URL, code, verifier)
+	codeExchangeURL := fmt.Sprintf("%s/token?code=%s&verifier=%s", os.Getenv("EDGEDB_AUTH_BASE_URL"), code, verifier)
 	resp, err := http.Get(codeExchangeURL)
 	if err != nil {
 		fmt.Println("Error exchanging code for access token")
@@ -281,7 +279,7 @@ func handleCallback(c *fiber.Ctx) error {
 		panic("Could not find 'verifier' in the cookie store. Is this the same user agent/browser that started the authorization flow?")
 	}
 
-	codeExchangeURL := fmt.Sprintf("%s/token?code=%s&verifier=%s", EDGEDB_AUTH_BASE_URL, code, verifier)
+	codeExchangeURL := fmt.Sprintf("%s/token?code=%s&verifier=%s", os.Getenv("EDGEDB_AUTH_BASE_URL"), code, verifier)
 	resp, err := http.Get(codeExchangeURL)
 	if err != nil {
 		fmt.Println("Error exchanging code for access token")
diff --git a/Chat.go b/Chat.go
index 2277f79..227b87c 100644
--- a/Chat.go
+++ b/Chat.go
@@ -443,7 +443,6 @@ func generateLimitReachedChatHTML(c *fiber.Ctx) string {
 
 	clientSecretSession := CreateClientSecretSession(c)
 
-	// TODO Replace by live API call
 	stripeTable := `
 	<stripe-pricing-table 
 	pricing-table-id="prctbl_1PJAxDP2nW0okNQyY0Q3mbg4"
diff --git a/MyUtils.go b/MyUtils.go
index ba8f82b..9b1d5bd 100644
--- a/MyUtils.go
+++ b/MyUtils.go
@@ -209,7 +209,6 @@ func Message2RequestMessage(messages []Message, context string) []RequestMessage
 }
 
 func GetAvailableModels(c *fiber.Ctx) []ModelInfo {
-	// TODO Filter if key is not available
 	var models []ModelInfo
 	err := edgeGlobalClient.WithGlobals(map[string]interface{}{"ext::auth::client_token": c.Cookies("jade-edgedb-auth-token")}).Query(edgeCtx, `
 		SELECT ModelInfo {
diff --git a/Stripe.go b/Stripe.go
index 1b4718d..5b00a7b 100644
--- a/Stripe.go
+++ b/Stripe.go
@@ -29,7 +29,6 @@ func generatePricingTableChatHTML(c *fiber.Ctx) string {
 
 	clientSecretSession := CreateClientSecretSession(c)
 
-	// TODO Replace by live API call
 	stripeTable := `
 	<stripe-pricing-table 
 	pricing-table-id="prctbl_1PJAxDP2nW0okNQyY0Q3mbg4"
@@ -85,7 +84,6 @@ func CreateNewStripeCustomer(name string, email string) string {
 }
 
 func IsCurrentUserSubscribed(c *fiber.Ctx) (bool, bool) {
-	// TODO Change to add both plan
 	var user User
 	err := edgeGlobalClient.WithGlobals(map[string]interface{}{"ext::auth::client_token": c.Cookies("jade-edgedb-auth-token")}).QuerySingle(edgeCtx, "SELECT global currentUser { stripe_id } LIMIT 1;", &user)
 	if err != nil {
diff --git a/main.go b/main.go
index d920a2f..90ce066 100644
--- a/main.go
+++ b/main.go
@@ -166,11 +166,6 @@ func main() {
 	}
 }
 
-// The route to add keys, idk where to put it so it's here
-// Deserve a good REDO lol
-// I mean, look at this shit...
-// 300 lines, I'm sure it can be done in 50
-// TODO	REDO and maybe find it a better place
 func addKeys(c *fiber.Ctx) error {
 	openaiKey := c.FormValue("openai_key")
 	anthropicKey := c.FormValue("anthropic_key")
diff --git a/views/partials/message-bot.html b/views/partials/message-bot.html
index c3de222..cddda32 100644
--- a/views/partials/message-bot.html
+++ b/views/partials/message-bot.html
@@ -22,7 +22,7 @@
             {% endif %}
         </div>
 
-        <div class="column" id="content-column">
+        <div class="column" id="content-column" style="width: 100px;">
             {% if not IsPlaceholder %}
             <div class="{% if not notFlex%} is-flex {% endif %} is-align-items-start">
                 <div class="message-content" style="width: 100%; overflow-y: hidden;"
diff --git a/views/partials/message-user.html b/views/partials/message-user.html
index 3e54e6f..0182797 100644
--- a/views/partials/message-user.html
+++ b/views/partials/message-user.html
@@ -6,7 +6,7 @@
             </figure>
         </div>
 
-        <div class="column" id="content-column">
+        <div class="column" id="content-column" style="width: 100px;">
             <div class="is-flex is-align-items-start">
                 <div class="message-content" style="width: 100%; overflow-y: hidden;">
                     <div class="message-header">