Skip to content

The only tool you need to know what is happening and how to fix it.

bug fixes

dduxa70dc4423ad7
diff --git a/backend/app/migrations/pg/0030_add_oauth_provider_to_users.up.sql b/backend/app/migrations/pg/0031_add_oauth_provider_to_users.up.sql
similarity index 100%
rename from backend/app/migrations/pg/0030_add_oauth_provider_to_users.up.sql
rename to backend/app/migrations/pg/0031_add_oauth_provider_to_users.up.sql
diff --git a/backend/app/migrations/pg/0031_add_oauth_user_id_to_users.up.sql b/backend/app/migrations/pg/0032_add_oauth_user_id_to_users.up.sql
similarity index 100%
rename from backend/app/migrations/pg/0031_add_oauth_user_id_to_users.up.sql
rename to backend/app/migrations/pg/0032_add_oauth_user_id_to_users.up.sql
diff --git a/backend/app/migrations/pg/0032_add_avatar_url_to_users.up.sql b/backend/app/migrations/pg/0033_add_avatar_url_to_users.up.sql
similarity index 100%
rename from backend/app/migrations/pg/0032_add_avatar_url_to_users.up.sql
rename to backend/app/migrations/pg/0033_add_avatar_url_to_users.up.sql
diff --git a/backend/app/migrations/pg/0033_create_users_oauth_index.up.sql b/backend/app/migrations/pg/0034_create_users_oauth_index.up.sql
similarity index 100%
rename from backend/app/migrations/pg/0033_create_users_oauth_index.up.sql
rename to backend/app/migrations/pg/0034_create_users_oauth_index.up.sql
diff --git a/backend/app/migrations/sqlite/0005_add_oauth_provider_to_users.up.sql b/backend/app/migrations/sqlite/0006_add_oauth_provider_to_users.up.sql
similarity index 100%
rename from backend/app/migrations/sqlite/0005_add_oauth_provider_to_users.up.sql
rename to backend/app/migrations/sqlite/0006_add_oauth_provider_to_users.up.sql
diff --git a/backend/app/migrations/sqlite/0006_add_oauth_user_id_to_users.up.sql b/backend/app/migrations/sqlite/0007_add_oauth_user_id_to_users.up.sql
similarity index 100%
rename from backend/app/migrations/sqlite/0006_add_oauth_user_id_to_users.up.sql
rename to backend/app/migrations/sqlite/0007_add_oauth_user_id_to_users.up.sql
diff --git a/backend/app/migrations/sqlite/0007_add_avatar_url_to_users.up.sql b/backend/app/migrations/sqlite/0008_add_avatar_url_to_users.up.sql
similarity index 100%
rename from backend/app/migrations/sqlite/0007_add_avatar_url_to_users.up.sql
rename to backend/app/migrations/sqlite/0008_add_avatar_url_to_users.up.sql
diff --git a/backend/app/migrations/sqlite/0008_create_users_oauth_index.up.sql b/backend/app/migrations/sqlite/0009_create_users_oauth_index.up.sql
similarity index 100%
rename from backend/app/migrations/sqlite/0008_create_users_oauth_index.up.sql
rename to backend/app/migrations/sqlite/0009_create_users_oauth_index.up.sql
diff --git a/examples/devtesting-embedded/go.mod b/examples/devtesting-embedded/go.mod
index bb8e841e..a6ea6c02 100644
--- a/examples/devtesting-embedded/go.mod
+++ b/examples/devtesting-embedded/go.mod
@@ -17,6 +17,7 @@ require (
)
require (
+ cloud.google.com/go/compute/metadata v0.9.0 // indirect
github.com/ClickHouse/ch-go v0.69.0 // indirect
github.com/ClickHouse/clickhouse-go/v2 v2.42.0 // indirect
github.com/andybalholm/brotli v1.2.0 // indirect
@@ -48,6 +49,7 @@ require (
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.13 // indirect
github.com/gin-contrib/sse v1.1.1 // indirect
+ github.com/go-chi/chi/v5 v5.2.2 // indirect
github.com/go-faster/city v1.0.1 // indirect
github.com/go-faster/errors v0.7.1 // indirect
github.com/go-logr/logr v1.4.3 // indirect
@@ -60,6 +62,9 @@ require (
github.com/goccy/go-yaml v1.19.2 // indirect
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
github.com/golang-migrate/migrate/v4 v4.19.1 // indirect
+ github.com/gorilla/mux v1.7.4 // indirect
+ github.com/gorilla/securecookie v1.1.2 // indirect
+ github.com/gorilla/sessions v1.4.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
github.com/joho/godotenv v1.5.1 // indirect
github.com/json-iterator/go v1.1.12 // indirect
@@ -68,6 +73,7 @@ require (
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/lib/pq v1.10.9 // indirect
+ github.com/markbates/goth v1.82.0 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -94,6 +100,7 @@ require (
golang.org/x/crypto v0.49.0 // indirect
golang.org/x/mod v0.33.0 // indirect
golang.org/x/net v0.52.0 // indirect
+ golang.org/x/oauth2 v0.35.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.42.0 // indirect
golang.org/x/text v0.35.0 // indirect
diff --git a/examples/devtesting-embedded/go.sum b/examples/devtesting-embedded/go.sum
index bf74ab88..7833664b 100644
--- a/examples/devtesting-embedded/go.sum
+++ b/examples/devtesting-embedded/go.sum
@@ -1,3 +1,5 @@
+cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
+cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
github.com/ClickHouse/ch-go v0.69.0 h1:nO0OJkpxOlN/eaXFj0KzjTz5p7vwP1/y3GN4qc5z/iM=
@@ -95,6 +97,8 @@ github.com/gin-contrib/sse v1.1.1 h1:uGYpNwTacv5R68bSGMapo62iLTRa9l5zxGCps4hK6ko
github.com/gin-contrib/sse v1.1.1/go.mod h1:QXzuVkA0YO7o/gun03UI1Q+FTI8ZV/n5t03kIQAI89s=
github.com/gin-gonic/gin v1.12.0 h1:b3YAbrZtnf8N//yjKeU2+MQsh2mY5htkZidOM7O0wG8=
github.com/gin-gonic/gin v1.12.0/go.mod h1:VxccKfsSllpKshkBWgVgRniFFAzFb9csfngsqANjnLc=
+github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618=
+github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw=
github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw=
github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg=
@@ -133,9 +137,17 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
+github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
+github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
+github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ=
+github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c=
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
@@ -162,6 +174,8 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/markbates/goth v1.82.0 h1:8j/c34AjBSTNzO7zTsOyP5IYCQCMBTRBHAbBt/PI0bQ=
+github.com/markbates/goth v1.82.0/go.mod h1:/DRlcq0pyqkKToyZjsL2KgiA1zbF1HIjE7u2uC79rUk=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -297,6 +311,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
+golang.org/x/oauth2 v0.35.0 h1:Mv2mzuHuZuY2+bkyWXIHMfhNdJAdwW3FuWeCPYN5GVQ=
+golang.org/x/oauth2 v0.35.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 4d7eeef7..d1ffdbc5 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -91,7 +91,7 @@
<Tooltip.Provider delayDuration={0}>
<!-- This is not ideal, but because our layout is a top level route it can end up showing sidebar on the login page (after the login before the transition). -->
<!-- We could consider moving this to a lower level layout for the actual app, for now it's just a path check -->
-{#if authState.isAuthenticated && page.url.pathname !== '/login' && page.url.pathname !== '/register' && !page.url.pathname.startsWith('/accept-invitation')}
+{#if authState.isAuthenticated && page.url.pathname !== '/login' && page.url.pathname !== '/register' && page.url.pathname !== '/auth/callback' && page.url.pathname !== '/finish-setup' && !page.url.pathname.startsWith('/accept-invitation')}
<Sidebar.SidebarProvider>
<AppSidebar />
<Sidebar.SidebarInset>
@@ -171,7 +171,7 @@
<Toaster position="bottom-right" />
{:else}
- {#if page.url.pathname === '/login' || page.url.pathname === '/register' || page.url.pathname.startsWith('/accept-invitation')}
+ {#if page.url.pathname === '/login' || page.url.pathname === '/register' || page.url.pathname === '/auth/callback' || page.url.pathname === '/finish-setup' || page.url.pathname.startsWith('/accept-invitation')}
<main class="h-screen w-screen">
{@render children()}
</main>