diff --git a/CHANGELOG.md b/CHANGELOG.md index a221b5a5..905cc6de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - [ask sb] Fixed issue where reasoning tokens would appear in `text` content for openai compatible models. [#582](https://github.com/sourcebot-dev/sourcebot/pull/582) - Fixed issue with GitHub app token tracking and refreshing. [#583](https://github.com/sourcebot-dev/sourcebot/pull/583) +- Fixed "The account is already associated with another user" errors with GitLab oauth provider. [#584](https://github.com/sourcebot-dev/sourcebot/pull/584) ## [4.8.1] - 2025-10-29 diff --git a/packages/web/package.json b/packages/web/package.json index 7818853c..a7a798ab 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -23,7 +23,7 @@ "@ai-sdk/openai-compatible": "^1.0.18", "@ai-sdk/react": "^2.0.45", "@ai-sdk/xai": "^2.0.20", - "@auth/prisma-adapter": "^2.7.4", + "@auth/prisma-adapter": "^2.11.1", "@aws-sdk/credential-providers": "^3.890.0", "@codemirror/commands": "^6.6.0", "@codemirror/lang-cpp": "^6.0.2", @@ -147,7 +147,7 @@ "lucide-react": "^0.517.0", "micromatch": "^4.0.8", "next": "15.5.0", - "next-auth": "^5.0.0-beta.25", + "next-auth": "^5.0.0-beta.30", "next-navigation-guard": "^0.2.0", "next-themes": "^0.3.0", "nodemailer": "^6.10.0", diff --git a/yarn.lock b/yarn.lock index 44ae0558..4afea5e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -228,17 +228,15 @@ __metadata: languageName: node linkType: hard -"@auth/core@npm:0.37.2": - version: 0.37.2 - resolution: "@auth/core@npm:0.37.2" +"@auth/core@npm:0.41.0": + version: 0.41.0 + resolution: "@auth/core@npm:0.41.0" dependencies: "@panva/hkdf": "npm:^1.2.1" - "@types/cookie": "npm:0.6.0" - cookie: "npm:0.7.1" - jose: "npm:^5.9.3" - oauth4webapi: "npm:^3.0.0" - preact: "npm:10.11.3" - preact-render-to-string: "npm:5.2.3" + jose: "npm:^6.0.6" + oauth4webapi: "npm:^3.3.0" + preact: "npm:10.24.3" + preact-render-to-string: "npm:6.5.11" peerDependencies: "@simplewebauthn/browser": ^9.0.1 "@simplewebauthn/server": ^9.0.2 @@ -250,13 +248,13 @@ __metadata: optional: true nodemailer: optional: true - checksum: 10c0/ff2c6c9bd5fca34c2b18b947e0d76906408b92480a441f5e0ccf51112cc80db9ef926d49c6cfd1500c4dac22eeee9179046826f2a3c628f36aeaab7f4f86d215 + checksum: 10c0/2971dc78b12cb00774fa4a82105d0302b7e2d96e416336f119e7e90604878bde26fca16c5c53dc027ecb47cecffb0d1471397cd5d8aedb85a8cd4b41c742379c languageName: node linkType: hard -"@auth/core@npm:0.38.0": - version: 0.38.0 - resolution: "@auth/core@npm:0.38.0" +"@auth/core@npm:0.41.1": + version: 0.41.1 + resolution: "@auth/core@npm:0.41.1" dependencies: "@panva/hkdf": "npm:^1.2.1" jose: "npm:^6.0.6" @@ -266,7 +264,7 @@ __metadata: peerDependencies: "@simplewebauthn/browser": ^9.0.1 "@simplewebauthn/server": ^9.0.2 - nodemailer: ^6.8.0 + nodemailer: ^7.0.7 peerDependenciesMeta: "@simplewebauthn/browser": optional: true @@ -274,18 +272,18 @@ __metadata: optional: true nodemailer: optional: true - checksum: 10c0/8bbf4dc40af59285298b7dc57a07d6e3fb5c0734a650694e127d37b86a4cc80fa82a97e17162e9ea36013965e9123c492a147dcaa7ebd692368ef824b3a86ccb + checksum: 10c0/0800610fb3842f6cfa4e8bffa79412e4ed34856f91994596b57d312546b0aa8ee906d4df96ce14710becaf9774a3bc83693ebcb9b7b80e20dddf3613d26e3a38 languageName: node linkType: hard -"@auth/prisma-adapter@npm:^2.7.4": - version: 2.8.0 - resolution: "@auth/prisma-adapter@npm:2.8.0" +"@auth/prisma-adapter@npm:^2.11.1": + version: 2.11.1 + resolution: "@auth/prisma-adapter@npm:2.11.1" dependencies: - "@auth/core": "npm:0.38.0" + "@auth/core": "npm:0.41.1" peerDependencies: "@prisma/client": ">=2.26.0 || >=3 || >=4 || >=5 || >=6" - checksum: 10c0/92dd1d7dd1029d690ed20e9a0220d149c62b9a31394878bc6e54332a68d377e7d4358eeb3c7e07b921d316748fea2a5adcaa7868c60337fc18fcec26a6ba328a + checksum: 10c0/c2d05d63e495ee7ece7bf65cc8352fadd9df348ecca4ea33e85830468f9fe4848703ab4441ace85d912b68071fd7534e013e60a97ce564f53dbb9870643765e5 languageName: node linkType: hard @@ -7954,7 +7952,7 @@ __metadata: "@ai-sdk/openai-compatible": "npm:^1.0.18" "@ai-sdk/react": "npm:^2.0.45" "@ai-sdk/xai": "npm:^2.0.20" - "@auth/prisma-adapter": "npm:^2.7.4" + "@auth/prisma-adapter": "npm:^2.11.1" "@aws-sdk/credential-providers": "npm:^3.890.0" "@codemirror/commands": "npm:^6.6.0" "@codemirror/lang-cpp": "npm:^6.0.2" @@ -8096,7 +8094,7 @@ __metadata: lucide-react: "npm:^0.517.0" micromatch: "npm:^4.0.8" next: "npm:15.5.0" - next-auth: "npm:^5.0.0-beta.25" + next-auth: "npm:^5.0.0-beta.30" next-navigation-guard: "npm:^0.2.0" next-themes: "npm:^0.3.0" nodemailer: "npm:^6.10.0" @@ -8440,13 +8438,6 @@ __metadata: languageName: node linkType: hard -"@types/cookie@npm:0.6.0": - version: 0.6.0 - resolution: "@types/cookie@npm:0.6.0" - checksum: 10c0/5b326bd0188120fb32c0be086b141b1481fec9941b76ad537f9110e10d61ee2636beac145463319c71e4be67a17e85b81ca9e13ceb6e3bb63b93d16824d6c149 - languageName: node - linkType: hard - "@types/cors@npm:^2.8.12": version: 2.8.17 resolution: "@types/cors@npm:2.8.17" @@ -14297,13 +14288,6 @@ __metadata: languageName: node linkType: hard -"jose@npm:^5.9.3": - version: 5.10.0 - resolution: "jose@npm:5.10.0" - checksum: 10c0/e20d9fc58d7e402f2e5f04e824b8897d5579aae60e64cb88ebdea1395311c24537bf4892f7de413fab1acf11e922797fb1b42269bc8fc65089a3749265ccb7b0 - languageName: node - linkType: hard - "jose@npm:^6.0.6": version: 6.0.10 resolution: "jose@npm:6.0.10" @@ -15866,17 +15850,17 @@ __metadata: languageName: node linkType: hard -"next-auth@npm:^5.0.0-beta.25": - version: 5.0.0-beta.25 - resolution: "next-auth@npm:5.0.0-beta.25" +"next-auth@npm:^5.0.0-beta.30": + version: 5.0.0-beta.30 + resolution: "next-auth@npm:5.0.0-beta.30" dependencies: - "@auth/core": "npm:0.37.2" + "@auth/core": "npm:0.41.0" peerDependencies: "@simplewebauthn/browser": ^9.0.1 "@simplewebauthn/server": ^9.0.2 - next: ^14.0.0-0 || ^15.0.0-0 - nodemailer: ^6.6.5 - react: ^18.2.0 || ^19.0.0-0 + next: ^14.0.0-0 || ^15.0.0 || ^16.0.0 + nodemailer: ^7.0.7 + react: ^18.2.0 || ^19.0.0 peerDependenciesMeta: "@simplewebauthn/browser": optional: true @@ -15884,7 +15868,7 @@ __metadata: optional: true nodemailer: optional: true - checksum: 10c0/d9bbaae7abad133c30eb1df41ef151e959998c2db5152fabd3389d4e13b5dd9226eb4b6cbba400250ae4713aeca2008fa9bcc29233b14a26777de4c3dc4d6a39 + checksum: 10c0/31ce5ff20320a001ab93444f00c9e0afc8112fd4380a5186bf637f48f6bdc616363861d125da934ea4fa5d1044fe5a61adc988e23a886bf6fb4710aa6488405d languageName: node linkType: hard @@ -16219,7 +16203,7 @@ __metadata: languageName: node linkType: hard -"oauth4webapi@npm:^3.0.0, oauth4webapi@npm:^3.3.0": +"oauth4webapi@npm:^3.3.0": version: 3.3.1 resolution: "oauth4webapi@npm:3.3.1" checksum: 10c0/e3c990dddceff5392deac5401fbbd417f7ae0aeb192ac4531884e7b2d6356185fc9aad3dd62329b9c754f6a07c70de7c7e771a57c6f540cc2aa3a4e8924081b5 @@ -17024,17 +17008,6 @@ __metadata: languageName: node linkType: hard -"preact-render-to-string@npm:5.2.3": - version: 5.2.3 - resolution: "preact-render-to-string@npm:5.2.3" - dependencies: - pretty-format: "npm:^3.8.0" - peerDependencies: - preact: ">=10" - checksum: 10c0/c7695dd034a2dc50e3fd44621fd55e2d41854ab0abbcbc833a81feb3593a22a011596049de5a2486f71483323467a827adc7d6077cbbb1d154c0089fd8ab4cd7 - languageName: node - linkType: hard - "preact-render-to-string@npm:6.5.11": version: 6.5.11 resolution: "preact-render-to-string@npm:6.5.11" @@ -17044,13 +17017,6 @@ __metadata: languageName: node linkType: hard -"preact@npm:10.11.3": - version: 10.11.3 - resolution: "preact@npm:10.11.3" - checksum: 10c0/44f342de226a89b53a7156fad0d4192bfc8233a5cc3eb46162f53d3c0c1c2956222d997927c7dff20f52c3592f112cefec5adac64f0477cbd8370fb39126ef7b - languageName: node - linkType: hard - "preact@npm:10.24.3": version: 10.24.3 resolution: "preact@npm:10.24.3" @@ -17099,13 +17065,6 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^3.8.0": - version: 3.8.0 - resolution: "pretty-format@npm:3.8.0" - checksum: 10c0/69f12937bfb7b2a537a7463b9f875a16322401f1e44d7702d643faa0d21991126c24c093217ef6da403b54c15942a834174fa1c016b72e2cb9edaae6bb3729b6 - languageName: node - linkType: hard - "prisma@npm:^6.2.1": version: 6.5.0 resolution: "prisma@npm:6.5.0"