The only tool you need to know what is happening and how to fix it.
Go alertingexception-trackerissue-trackinglogsmetricsmonitoringobservability-platformopen-telemetryotelsession-replaytelemetrytraces
backend cleaup + cloud mode added
ddux5ca55eda3931
diff --git a/backend/app/controllers/auth.controller.go b/backend/app/controllers/auth.controller.goindex eb46c63e..e6f3dc52 100644--- a/backend/app/controllers/auth.controller.go+++ b/backend/app/controllers/auth.controller.go@@ -2,18 +2,30 @@ package controllersimport ("backend/app/cache"+ "backend/app/middleware""backend/app/models"- "backend/app/pgdb""backend/app/repositories""backend/app/services"- "database/sql""net/http"+ "os""github.com/gin-gonic/gin")type authController struct{}+func (a authController) HasOrganizations(c *gin.Context) {+ tx := middleware.GetTx(c)+ hasOrganizations, err := repositories.OrganizationRepository.HasOrganizations(tx)++ if err != nil {+ c.AbortWithError(http.StatusInternalServerError, err)+ return+ }++ c.JSON(http.StatusOK, gin.H{"hasOrganizations": hasOrganizations})+}+func (a authController) Login(c *gin.Context) {var request models.LoginRequestif err := c.ShouldBindJSON(&request); err != nil {@@ -21,47 +33,40 @@ func (a authController) Login(c *gin.Context) {return}- result, err := pgdb.ExecuteTransaction(func(tx *sql.Tx) (*models.LoginResponse, error) {- user, err := repositories.UserRepository.FindByEmail(tx, request.Email)- if err != nil {- return nil, err- }- if user == nil {- return nil, nil- }+ tx := middleware.GetTx(c)- if !services.CheckPassword(request.Password, user.Password) {- return nil, nil- }-- token, err := services.GenerateToken(user.Id, user.Email)- if err != nil {- return nil, err- }-- projects, err := repositories.ProjectRepository.FindAllWithBackendUrlByUserId(tx, user.Id)- if err != nil {- return nil, err- }+ user, err := repositories.UserRepository.FindByEmail(tx, request.Email)+ if err != nil {+ c.AbortWithError(http.StatusInternalServerError, err)+ return+ }+ if user == nil {+ c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid email or password"})+ return+ }- return &models.LoginResponse{- Token: token,- User: user.ToResponse(),- Projects: projects,- }, nil- })+ if !services.CheckPassword(request.Password, user.Password) {+ c.AbortWithError(http.StatusInternalServerError, err)+ return+ }+ token, err := services.GenerateToken(user.Id, user.Email)if err != nil {c.AbortWithError(http.StatusInternalServerError, err)return}- if result == nil {- c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid email or password"})+ projects, err := repositories.ProjectRepository.FindAllWithBackendUrlByUserId(tx, user.Id)+ if err != nil {+ c.AbortWithError(http.StatusInternalServerError, err)return}- c.JSON(http.StatusOK, result)+ c.JSON(http.StatusOK, &models.LoginResponse{+ Token: token,+ User: user.ToResponse(),+ Projects: projects,+ })}func (a authController) Register(c *gin.Context) {@@ -71,115 +76,92 @@ func (a authController) Register(c *gin.Context) {return}- result, err := pgdb.ExecuteTransaction(func(tx *sql.Tx) (*models.RegisterResponse, error) {- exists, err := repositories.UserRepository.EmailExists(tx, request.Email)- if err != nil {- return nil, err- }- if exists {- return nil, &EmailExistsError{}- }-- hashedPassword, err := services.HashPassword(request.Password)- if err != nil {- return nil, err- }-- user, err := repositories.UserRepository.Create(tx, request.Email, request.Name, hashedPassword)- if err != nil {- return nil, err- }-- org, err := repositories.OrganizationRepository.Create(tx, request.OrganizationName)- if err != nil {- return nil, err- }-- _, err = repositories.OrganizationRepository.AddUser(tx, org.Id, user.Id, "owner")- if err != nil {- return nil, err- }+ tx := middleware.GetTx(c)- project, err := repositories.ProjectRepository.CreateWithOrganization(tx, request.ProjectName, request.Framework, org.Id)- if err != nil {- return nil, err- }+ // if we're not in the cloud mode only a single organization is allowed+ if os.Getenv("CLOUD_MODE") != "true" {+ hasOrganizations, err := repositories.OrganizationRepository.HasOrganizations(tx)- token, err := services.GenerateToken(user.Id, user.Email)if err != nil {- return nil, err+ c.AbortWithError(http.StatusInternalServerError, err)+ return}- projects, err := repositories.ProjectRepository.FindAllWithBackendUrlByUserId(tx, user.Id)- if err != nil {- return nil, err+ if hasOrganizations {+ c.JSON(http.StatusConflict, gin.H{"error": "You already have an Organization registered. Please use login."})+ return}+ }- return &models.RegisterResponse{- Token: token,- User: user.ToResponse(),- Project: *project.ToProjectWithBackendUrl(),- Projects: projects,- }, nil- })-+ exists, err := repositories.UserRepository.EmailExists(tx, request.Email)if err != nil {- if _, ok := err.(*EmailExistsError); ok {- c.JSON(http.StatusConflict, gin.H{"error": "Email already exists"})- return- }- c.JSON(http.StatusInternalServerError, gin.H{"error": "Internal server error"})+ c.AbortWithError(http.StatusInternalServerError, err)+ return+ }+ if exists {+ c.JSON(http.StatusConflict, gin.H{"error": "Email already exists"})return}- // Add project to cache- cache.ProjectCache.AddProject(&models.Project{- Id: result.Project.Id,- Name: result.Project.Name,- Token: result.Project.Token,- Framework: result.Project.Framework,- OrganizationId: result.Project.OrganizationId,- })+ hashedPassword, err := services.HashPassword(request.Password)+ if err != nil {+ c.AbortWithError(http.StatusInternalServerError, err)+ return+ }- c.JSON(http.StatusCreated, result)-}+ user, err := repositories.UserRepository.Create(tx, request.Email, request.Name, hashedPassword)+ if err != nil {+ c.AbortWithError(http.StatusInternalServerError, err)+ return+ }-func (a authController) Me(c *gin.Context) {- userId, exists := c.Get("userId")- if !exists {- c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})+ org, err := repositories.OrganizationRepository.Create(tx, request.OrganizationName)+ if err != nil {+ c.AbortWithError(http.StatusInternalServerError, err)return}- result, err := pgdb.ExecuteTransaction(func(tx *sql.Tx) (*models.UserResponse, error) {- user, err := repositories.UserRepository.FindById(tx, userId.(int))- if err != nil {- return nil, err- }- if user == nil {- return nil, nil- }- response := user.ToResponse()- return &response, nil- })+ _, err = repositories.OrganizationRepository.AddUser(tx, org.Id, user.Id, "owner")+ if err != nil {+ c.AbortWithError(http.StatusInternalServerError, err)+ return+ }+ project, err := repositories.ProjectRepository.CreateWithOrganization(tx, request.ProjectName, request.Framework, org.Id)if err != nil {c.AbortWithError(http.StatusInternalServerError, err)return}- if result == nil {- c.JSON(http.StatusNotFound, gin.H{"error": "User not found"})+ token, err := services.GenerateToken(user.Id, user.Email)+ if err != nil {+ c.AbortWithError(http.StatusInternalServerError, err)return}- c.JSON(http.StatusOK, result)-}+ projects, err := repositories.ProjectRepository.FindAllWithBackendUrlByUserId(tx, user.Id)+ if err != nil {+ c.AbortWithError(http.StatusInternalServerError, err)+ return+ }-type EmailExistsError struct{}+ // cache can get out of sync here+ // the transaction for creating the project is not guaranteed to have+ // finished when this is inserted into cache+ cache.ProjectCache.AddProject(&models.Project{+ Id: project.Id,+ Name: project.Name,+ Token: project.Token,+ Framework: project.Framework,+ OrganizationId: project.OrganizationId,+ })-func (e *EmailExistsError) Error() string {- return "email already exists"+ c.JSON(http.StatusCreated, &models.RegisterResponse{+ Token: token,+ User: user.ToResponse(),+ Project: *project.ToProjectWithBackendUrl(),+ Projects: projects,+ })}var AuthController = authController{}diff --git a/backend/app/controllers/routes.go b/backend/app/controllers/routes.goindex df0591b7..edb6c8e5 100644--- a/backend/app/controllers/routes.go+++ b/backend/app/controllers/routes.go@@ -3,6 +3,7 @@ package controllersimport ("backend/app/controllers/clientcontrollers""backend/app/middleware"+ "os""github.com/gin-gonic/gin")@@ -62,7 +63,10 @@ func RegisterControllers(router *gin.RouterGroup) {router.POST("/exception-stack-traces/:hash", middleware.UseAppAuth, middleware.RequireProjectAccess, ExceptionStackTraceController.FindByHash)// Auth- router.POST("/login", AuthController.Login)- router.POST("/register", AuthController.Register)- router.GET("/me", middleware.UseAppAuth, AuthController.Me)+ router.POST("/login", middleware.Transactional, AuthController.Login)+ router.POST("/register", middleware.Transactional, AuthController.Register)++ if os.Getenv("CLOUD_MODE") != "true" {+ router.GET("/has-organizations", middleware.Transactional, AuthController.HasOrganizations)+ }}diff --git a/backend/app/middleware/transactional.middleware.go b/backend/app/middleware/transactional.middleware.gonew file mode 100644index 00000000..4d0fcf10--- /dev/null+++ b/backend/app/middleware/transactional.middleware.go@@ -0,0 +1,48 @@+package middleware++import (+ "backend/app/pgdb"+ "database/sql"+ "net/http"++ "github.com/gin-gonic/gin"+)++const TransactionContextKey = "dbTx"++func Transactional(c *gin.Context) {+ txHandle, err := pgdb.DB.Begin()++ if err != nil {+ c.AbortWithStatus(http.StatusInternalServerError)+ panic(err)+ }++ defer func() {+ if r := recover(); r != nil {+ txHandle.Rollback()+ c.AbortWithStatus(http.StatusInternalServerError)+ panic(r)+ }+ }()++ c.Set(TransactionContextKey, txHandle)++ c.Next()++ if status := c.Writer.Status(); status == http.StatusOK || status == http.StatusCreated || status == http.StatusSeeOther {+ if err := txHandle.Commit(); err != nil {+ c.AbortWithStatus(http.StatusInternalServerError)+ panic(err)+ }+ } else {+ txHandle.Rollback()+ }+}++func GetTx(c *gin.Context) *sql.Tx {+ if id, exists := c.Get(TransactionContextKey); exists {+ return id.(*sql.Tx)+ }+ return nil+}diff --git a/backend/app/repositories/organization.repository.go b/backend/app/repositories/organization.repository.goindex 792a9971..9e5bd417 100644--- a/backend/app/repositories/organization.repository.go+++ b/backend/app/repositories/organization.repository.go@@ -23,6 +23,22 @@ func (r *organizationRepository) Create(tx *sql.Tx, name string) (*models.Organireturn org, nil}+func (r *organizationRepository) HasOrganizations(tx *sql.Tx) (bool, error) {+ result, err := lit.SelectSingle[CountResult](+ tx,+ `SELECT COUNT(*) as count+ FROM organizations`,+ )+ if err != nil {+ return false, err+ }+ if result == nil {+ return false, nil+ }++ return result.Count > 0, nil+}+func (r *organizationRepository) FindById(tx *sql.Tx, id int) (*models.Organization, error) {return lit.SelectSingle[models.Organization](tx,diff --git a/frontend/src/app.d.ts b/frontend/src/app.d.tsindex 2904e140..eb516f13 100644--- a/frontend/src/app.d.ts+++ b/frontend/src/app.d.ts@@ -10,6 +10,7 @@ declare global {}const __APP_VERSION__: string;+ const __CLOUD_MODE__: string;}export {};diff --git a/frontend/src/lib/state/auth.svelte.ts b/frontend/src/lib/state/auth.svelte.tsindex 394df9ff..d7cbd0cd 100644--- a/frontend/src/lib/state/auth.svelte.ts+++ b/frontend/src/lib/state/auth.svelte.ts@@ -1,5 +1,4 @@import { clearNavDepth } from '$lib/utils/back-navigation';-import { userState } from './user.svelte';class AuthState {token = $state<string | null>(localStorage.getItem('AUTH_TOKEN'));@@ -24,7 +23,6 @@ class AuthState {logout() {this.token = null;- userState.clear();clearNavDepth();}}diff --git a/frontend/src/lib/state/user.svelte.ts b/frontend/src/lib/state/user.svelte.tsdeleted file mode 100644index e7eadf4a..00000000--- a/frontend/src/lib/state/user.svelte.ts+++ /dev/null@@ -1,60 +0,0 @@-export interface User {- id: number;- email: string;- name: string;- createdAt: string;-}--const USER_STORAGE_KEY = 'AUTH_USER';--class UserState {- user = $state<User | null>(null);-- constructor() {- // Load from localStorage on init- const stored = localStorage.getItem(USER_STORAGE_KEY);- if (stored) {- try {- this.user = JSON.parse(stored);- } catch {- this.user = null;- }- }-- $effect.root(() => {- $effect(() => {- if (this.user) {- localStorage.setItem(USER_STORAGE_KEY, JSON.stringify(this.user));- } else {- localStorage.removeItem(USER_STORAGE_KEY);- }- });- });- }-- setUser(user: User) {- this.user = user;- }-- clear() {- this.user = null;- }-- async loadUser() {- try {- const response = await fetch('/api/me', {- headers: {- 'Authorization': `Bearer ${localStorage.getItem('AUTH_TOKEN')}`- }- });- if (response.ok) {- const user = await response.json();- this.setUser(user);- }- } catch {- // Ignore errors- }- }-}--export const userState = new UserState();diff --git a/frontend/src/routes/login/+page.svelte b/frontend/src/routes/login/+page.svelteindex 79fe140d..3c94fe75 100644--- a/frontend/src/routes/login/+page.svelte+++ b/frontend/src/routes/login/+page.svelte@@ -7,15 +7,39 @@import { Alert, AlertDescription, AlertTitle } from "$lib/components/ui/alert";import { CircleAlert } from "@lucide/svelte";import { authState } from '$lib/state/auth.svelte';- import { userState } from '$lib/state/user.svelte';import { projectsState } from '$lib/state/projects.svelte';import { themeState } from '$lib/state/theme.svelte';+ import { toast } from 'svelte-sonner';let email = $state('');let password = $state('');let error = $state('');let loading = $state(false);+ if (!__CLOUD_MODE__) {+ $effect(() => {+ // if we're not in the cloud mode we have to check if an organization exists and if it does not we need to take the user to the register page++ loading = true;+ fetch('/api/has-organizations', {+ method: 'GET',+ })+ .then(response => response.json())+ .then((response) => {+ if (response.hasOrganizations) {+ loading = false+ } else {+ goto("/register")+ }+ }).catch(() => {+ toast.error("An unexpected error has occured. The page will refresh in 5 seconds.")+ setTimeout(() => {+ window.location.reload()+ }, 5000)+ });+ })+ }+async function handleLogin() {loading = true;error = '';@@ -36,7 +60,6 @@const data = await response.json();authState.setToken(data.token);- userState.setUser(data.user);projectsState.setProjects(data.projects);goto('/');@@ -89,10 +112,15 @@</Button></form></CardContent>- <CardFooter class="flex flex-col justify-center">- <p class="text-sm text-muted-foreground">- Don't have an account? <a href="/register" class="text-primary hover:underline">Create account</a>- </p>- </CardFooter>++ <!-- If the backend is running in the cloud mode we'll allow registration to take place -->+ <!-- If we're running in the self hosted mode - we will not allow register -->+ {#if __CLOUD_MODE__}+ <CardFooter class="flex flex-col justify-center">+ <p class="text-sm text-muted-foreground">+ Don't have an account? <a href="/register" class="text-primary hover:underline">Create account</a>+ </p>+ </CardFooter>+ {/if}</Card></div>diff --git a/frontend/src/routes/register/+page.svelte b/frontend/src/routes/register/+page.svelteindex 1dd8cd0a..e28a4f76 100644--- a/frontend/src/routes/register/+page.svelte+++ b/frontend/src/routes/register/+page.svelte@@ -8,9 +8,9 @@import * as Select from "$lib/components/ui/select";import { CircleAlert } from "@lucide/svelte";import { authState } from '$lib/state/auth.svelte';- import { userState } from '$lib/state/user.svelte';import { projectsState } from '$lib/state/projects.svelte';import { themeState } from '$lib/state/theme.svelte';+ import { toast } from 'svelte-sonner';let email = $state('');let name = $state('');@@ -22,6 +22,30 @@let error = $state('');let loading = $state(false);+ if (!__CLOUD_MODE__) {+ $effect(() => {+ // if we're not in the cloud mode we have to check if an organization exists and if it does we should go to the login page++ loading = true;+ fetch('/api/has-organizations', {+ method: 'GET',+ })+ .then(response => response.json())+ .then((response) => {+ if (response.hasOrganizations) {+ loading = false+ } else {+ goto("/register")+ }+ }).catch(() => {+ toast.error("An unexpected error has occured. The page will refresh in 5 seconds.")+ setTimeout(() => {+ window.location.reload()+ }, 5000)+ });+ })+ }+const frameworks = [{ value: 'gin', label: 'Gin (Go)' },{ value: 'echo', label: 'Echo (Go)' },@@ -67,7 +91,6 @@const data = await response.json();authState.setToken(data.token);- userState.setUser(data.user);projectsState.setProjects(data.projects);goto('/connection');@@ -162,10 +185,13 @@</Button></form></CardContent>- <CardFooter class="flex flex-col justify-center">- <p class="text-sm text-muted-foreground">- Already have an account? <a href="/login" class="text-primary hover:underline">Login</a>- </p>- </CardFooter>++ {#if __CLOUD_MODE__}+ <CardFooter class="flex flex-col justify-center">+ <p class="text-sm text-muted-foreground">+ Already have an account? <a href="/login" class="text-primary hover:underline">Login</a>+ </p>+ </CardFooter>+ {/if}</Card></div>diff --git a/frontend/vite.config.ts b/frontend/vite.config.tsindex a75b7131..c3e0f6bf 100644--- a/frontend/vite.config.ts+++ b/frontend/vite.config.ts@@ -1,21 +1,26 @@import tailwindcss from '@tailwindcss/vite';import { sveltekit } from '@sveltejs/kit/vite';-import { defineConfig } from 'vite';+import { defineConfig, loadEnv } from 'vite';import { readFileSync } from 'fs';const pkg = JSON.parse(readFileSync('./package.json', 'utf-8'));-export default defineConfig({- plugins: [tailwindcss(), sveltekit()],- define: {- __APP_VERSION__: JSON.stringify(process.env.PUBLIC_APP_VERSION || pkg.version)- },- server: {- proxy: {- '/api': {- target: 'http://localhost:8082',- changeOrigin: true,- // rewrite: (path) => path.replace(/^\/api/, '')+export default defineConfig(({ mode }) => {+ const env = loadEnv(mode, process.cwd(), '');++ return {+ plugins: [tailwindcss(), sveltekit()],+ define: {+ __APP_VERSION__: JSON.stringify(env.PUBLIC_APP_VERSION || pkg.version),+ __CLOUD_MODE__: env.CLOUD_MODE+ },+ server: {+ proxy: {+ '/api': {+ target: 'http://localhost:8082',+ changeOrigin: true,+ // rewrite: (path) => path.replace(/^\/api/, '')+ }}}}