Skip to content

Open source AI coding agent. Designed for large projects and real world tasks.

cors config for app UI, fixes for org queries

Dane Schneider6766baa77aec
diff --git a/app/server/db/auth_helpers.go b/app/server/db/auth_helpers.go
index c9019671..b1b8967d 100644
--- a/app/server/db/auth_helpers.go
+++ b/app/server/db/auth_helpers.go
@@ -5,6 +5,7 @@ import (
"database/sql"
"encoding/hex"
"fmt"
+ "log"
"time"
"github.com/google/uuid"
@@ -33,6 +34,7 @@ func ValidateAuthToken(token string) (*AuthToken, error) {
uid, err := uuid.Parse(token)
if err != nil {
+ log.Println("error parsing token", err)
return nil, errors.New("invalid token")
}
@@ -46,6 +48,7 @@ func ValidateAuthToken(token string) (*AuthToken, error) {
if err != nil {
if err == sql.ErrNoRows {
+ log.Println("auth token error - no rows found")
return nil, errors.New("invalid token")
}
diff --git a/app/server/db/data_models.go b/app/server/db/data_models.go
index a8234aec..92264de8 100644
--- a/app/server/db/data_models.go
+++ b/app/server/db/data_models.go
@@ -28,7 +28,6 @@ type Org struct {
AutoAddDomainUsers bool `db:"auto_add_domain_users"`
OwnerId string `db:"owner_id"`
IsTrial bool `db:"is_trial"`
- StripeCustomerId *string `db:"stripe_customer_id"`
CreatedAt time.Time `db:"created_at"`
UpdatedAt time.Time `db:"updated_at"`
diff --git a/app/server/db/db.go b/app/server/db/db.go
index d43aeddd..b2088b68 100644
--- a/app/server/db/db.go
+++ b/app/server/db/db.go
@@ -86,7 +86,7 @@ func migrationsUp(dir string) error {
// Uncomment below (and update migration version) to reset migration state to a specific version after a failure
// if os.Getenv("GOENV") == "development" {
- // migrateVersion := 2024060700
+ // migrateVersion := 2024081400
// if err := m.Force(migrateVersion); err != nil {
// return fmt.Errorf("error forcing migration version: %v", err)
// }
diff --git a/app/server/db/org_helpers.go b/app/server/db/org_helpers.go
index 51380282..49726862 100644
--- a/app/server/db/org_helpers.go
+++ b/app/server/db/org_helpers.go
@@ -11,6 +11,8 @@ import (
"github.com/plandex/plandex/shared"
)
+const orgFields = "id, name, domain, auto_add_domain_users, owner_id, is_trial, created_at, updated_at"
+
func GetAccessibleOrgsForUser(user *User) ([]*Org, error) {
// direct access
var orgUsers []*OrgUser
@@ -28,7 +30,8 @@ func GetAccessibleOrgsForUser(user *User) ([]*Org, error) {
}
if len(orgIds) > 0 {
- err = Conn.Select(&orgs, "SELECT * FROM orgs WHERE id = ANY($1)", pq.Array(orgIds))
+ query := fmt.Sprintf("SELECT %s FROM orgs WHERE id = ANY($1)", orgFields)
+ err = Conn.Select(&orgs, query, pq.Array(orgIds))
if err != nil {
return nil, fmt.Errorf("error getting orgs for user: %v", err)
@@ -54,7 +57,8 @@ func GetAccessibleOrgsForUser(user *User) ([]*Org, error) {
if len(orgIds) > 0 {
var orgsFromInvites []*Org
- err = Conn.Select(&orgsFromInvites, "SELECT * FROM orgs WHERE id = ANY($1)", pq.Array(orgIds))
+ query := fmt.Sprintf("SELECT %s FROM orgs WHERE id = ANY($1)", orgFields)
+ err = Conn.Select(&orgsFromInvites, query, pq.Array(orgIds))
if err != nil {
return nil, fmt.Errorf("error getting orgs from invites: %v", err)
}
@@ -66,7 +70,8 @@ func GetAccessibleOrgsForUser(user *User) ([]*Org, error) {
func GetOrg(orgId string) (*Org, error) {
var org Org
- err := Conn.Get(&org, "SELECT * FROM orgs WHERE id = $1", orgId)
+ query := fmt.Sprintf("SELECT %s FROM orgs WHERE id = $1", orgFields)
+ err := Conn.Get(&org, query, orgId)
if err != nil {
if err == sql.ErrNoRows {
@@ -127,7 +132,8 @@ func CreateOrg(req *shared.CreateOrgRequest, userId string, domain *string, tx *
func GetOrgForDomain(domain string) (*Org, error) {
var org Org
- err := Conn.Get(&org, "SELECT * FROM orgs WHERE domain = $1", domain)
+ query := fmt.Sprintf("SELECT %s FROM orgs WHERE domain = $1", orgFields)
+ err := Conn.Get(&org, query, domain)
if err != nil {
if err == sql.ErrNoRows {
diff --git a/app/server/go.mod b/app/server/go.mod
index 9d1ec75a..b29b577b 100644
--- a/app/server/go.mod
+++ b/app/server/go.mod
@@ -39,6 +39,7 @@ require (
github.com/golang-migrate/migrate/v4 v4.17.1
github.com/jmoiron/sqlx v1.4.0
github.com/lib/pq v1.10.9
+ github.com/rs/cors v1.11.0
github.com/smacker/go-tree-sitter v0.0.0-20240625050157-a31a98a7c0f6
)
diff --git a/app/server/go.sum b/app/server/go.sum
index af0d3f6f..13a90343 100644
--- a/app/server/go.sum
+++ b/app/server/go.sum
@@ -85,6 +85,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po=
+github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
github.com/sashabaranov/go-openai v1.27.0 h1:L3hO6650YUbKrbGUC6yCjsUluhKZ9h1/jcgbTItI8Mo=
github.com/sashabaranov/go-openai v1.27.0/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
github.com/smacker/go-tree-sitter v0.0.0-20240625050157-a31a98a7c0f6 h1:mtD4ESyObQZnRVxHFcaYp2d7jMBDa4WJRXSB1Vszj+A=
diff --git a/app/server/setup/setup.go b/app/server/setup/setup.go
index 5308db54..ef5720fe 100644
--- a/app/server/setup/setup.go
+++ b/app/server/setup/setup.go
@@ -54,14 +54,14 @@ func StartServer(r *mux.Router) {
var corsHandler http.Handler
if os.Getenv("GOENV") == "development" {
corsHandler = cors.New(cors.Options{
- AllowedOrigins: []string{"http://localhost"},
+ AllowedOrigins: []string{"*"},
AllowedMethods: []string{"GET", "POST", "PUT", "DELETE"},
AllowedHeaders: []string{"Content-Type", "Authorization"},
AllowCredentials: true,
}).Handler(r)
} else {
corsHandler = cors.New(cors.Options{
- AllowedOrigins: []string{"http://app.plandex.ai", "http://localhost"},
+ AllowedOrigins: []string{"http://app.plandex.ai", "http://localhost:55000"},
AllowedMethods: []string{"GET", "POST", "PUT", "DELETE"},
AllowedHeaders: []string{"Content-Type", "Authorization"},
AllowCredentials: true,
@@ -98,4 +98,3 @@ func startServer(port string, handler http.Handler) {
log.Fatalf("Failed to start server on port %s: %v", port, err)
}
}
-