Skip to content

Commit 384aa9e

Browse files
brendan-kellambrendan-kellam
authored
fix(web): Fix "The account is already associated with another user" errors when signing in with GitLab (#584)
1 parent bbb197a commit 384aa9e

File tree

3 files changed

+32
-72
lines changed

3 files changed

+32
-72
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
### Fixed
1111
- [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)
1212
- Fixed issue with GitHub app token tracking and refreshing. [#583](https://github.com/sourcebot-dev/sourcebot/pull/583)
13+
- Fixed "The account is already associated with another user" errors with GitLab oauth provider. [#584](https://github.com/sourcebot-dev/sourcebot/pull/584)
1314

1415
## [4.8.1] - 2025-10-29
1516

‎packages/web/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@ai-sdk/openai-compatible": "^1.0.18",
2424
"@ai-sdk/react": "^2.0.45",
2525
"@ai-sdk/xai": "^2.0.20",
26-
"@auth/prisma-adapter": "^2.7.4",
26+
"@auth/prisma-adapter": "^2.11.1",
2727
"@aws-sdk/credential-providers": "^3.890.0",
2828
"@codemirror/commands": "^6.6.0",
2929
"@codemirror/lang-cpp": "^6.0.2",
@@ -147,7 +147,7 @@
147147
"lucide-react": "^0.517.0",
148148
"micromatch": "^4.0.8",
149149
"next": "15.5.0",
150-
"next-auth": "^5.0.0-beta.25",
150+
"next-auth": "^5.0.0-beta.30",
151151
"next-navigation-guard": "^0.2.0",
152152
"next-themes": "^0.3.0",
153153
"nodemailer": "^6.10.0",

‎yarn.lock‎

Lines changed: 29 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -228,17 +228,15 @@ __metadata:
228228
languageName: node
229229
linkType: hard
230230

231-
"@auth/core@npm:0.37.2":
232-
version: 0.37.2
233-
resolution: "@auth/core@npm:0.37.2"
231+
"@auth/core@npm:0.41.0":
232+
version: 0.41.0
233+
resolution: "@auth/core@npm:0.41.0"
234234
dependencies:
235235
"@panva/hkdf": "npm:^1.2.1"
236-
"@types/cookie": "npm:0.6.0"
237-
cookie: "npm:0.7.1"
238-
jose: "npm:^5.9.3"
239-
oauth4webapi: "npm:^3.0.0"
240-
preact: "npm:10.11.3"
241-
preact-render-to-string: "npm:5.2.3"
236+
jose: "npm:^6.0.6"
237+
oauth4webapi: "npm:^3.3.0"
238+
preact: "npm:10.24.3"
239+
preact-render-to-string: "npm:6.5.11"
242240
peerDependencies:
243241
"@simplewebauthn/browser": ^9.0.1
244242
"@simplewebauthn/server": ^9.0.2
@@ -250,13 +248,13 @@ __metadata:
250248
optional: true
251249
nodemailer:
252250
optional: true
253-
checksum: 10c0/ff2c6c9bd5fca34c2b18b947e0d76906408b92480a441f5e0ccf51112cc80db9ef926d49c6cfd1500c4dac22eeee9179046826f2a3c628f36aeaab7f4f86d215
251+
checksum: 10c0/2971dc78b12cb00774fa4a82105d0302b7e2d96e416336f119e7e90604878bde26fca16c5c53dc027ecb47cecffb0d1471397cd5d8aedb85a8cd4b41c742379c
254252
languageName: node
255253
linkType: hard
256254

257-
"@auth/core@npm:0.38.0":
258-
version: 0.38.0
259-
resolution: "@auth/core@npm:0.38.0"
255+
"@auth/core@npm:0.41.1":
256+
version: 0.41.1
257+
resolution: "@auth/core@npm:0.41.1"
260258
dependencies:
261259
"@panva/hkdf": "npm:^1.2.1"
262260
jose: "npm:^6.0.6"
@@ -266,26 +264,26 @@ __metadata:
266264
peerDependencies:
267265
"@simplewebauthn/browser": ^9.0.1
268266
"@simplewebauthn/server": ^9.0.2
269-
nodemailer: ^6.8.0
267+
nodemailer: ^7.0.7
270268
peerDependenciesMeta:
271269
"@simplewebauthn/browser":
272270
optional: true
273271
"@simplewebauthn/server":
274272
optional: true
275273
nodemailer:
276274
optional: true
277-
checksum: 10c0/8bbf4dc40af59285298b7dc57a07d6e3fb5c0734a650694e127d37b86a4cc80fa82a97e17162e9ea36013965e9123c492a147dcaa7ebd692368ef824b3a86ccb
275+
checksum: 10c0/0800610fb3842f6cfa4e8bffa79412e4ed34856f91994596b57d312546b0aa8ee906d4df96ce14710becaf9774a3bc83693ebcb9b7b80e20dddf3613d26e3a38
278276
languageName: node
279277
linkType: hard
280278

281-
"@auth/prisma-adapter@npm:^2.7.4":
282-
version: 2.8.0
283-
resolution: "@auth/prisma-adapter@npm:2.8.0"
279+
"@auth/prisma-adapter@npm:^2.11.1":
280+
version: 2.11.1
281+
resolution: "@auth/prisma-adapter@npm:2.11.1"
284282
dependencies:
285-
"@auth/core": "npm:0.38.0"
283+
"@auth/core": "npm:0.41.1"
286284
peerDependencies:
287285
"@prisma/client": ">=2.26.0 || >=3 || >=4 || >=5 || >=6"
288-
checksum: 10c0/92dd1d7dd1029d690ed20e9a0220d149c62b9a31394878bc6e54332a68d377e7d4358eeb3c7e07b921d316748fea2a5adcaa7868c60337fc18fcec26a6ba328a
286+
checksum: 10c0/c2d05d63e495ee7ece7bf65cc8352fadd9df348ecca4ea33e85830468f9fe4848703ab4441ace85d912b68071fd7534e013e60a97ce564f53dbb9870643765e5
289287
languageName: node
290288
linkType: hard
291289

@@ -7954,7 +7952,7 @@ __metadata:
79547952
"@ai-sdk/openai-compatible": "npm:^1.0.18"
79557953
"@ai-sdk/react": "npm:^2.0.45"
79567954
"@ai-sdk/xai": "npm:^2.0.20"
7957-
"@auth/prisma-adapter": "npm:^2.7.4"
7955+
"@auth/prisma-adapter": "npm:^2.11.1"
79587956
"@aws-sdk/credential-providers": "npm:^3.890.0"
79597957
"@codemirror/commands": "npm:^6.6.0"
79607958
"@codemirror/lang-cpp": "npm:^6.0.2"
@@ -8096,7 +8094,7 @@ __metadata:
80968094
lucide-react: "npm:^0.517.0"
80978095
micromatch: "npm:^4.0.8"
80988096
next: "npm:15.5.0"
8099-
next-auth: "npm:^5.0.0-beta.25"
8097+
next-auth: "npm:^5.0.0-beta.30"
81008098
next-navigation-guard: "npm:^0.2.0"
81018099
next-themes: "npm:^0.3.0"
81028100
nodemailer: "npm:^6.10.0"
@@ -8440,13 +8438,6 @@ __metadata:
84408438
languageName: node
84418439
linkType: hard
84428440

8443-
"@types/cookie@npm:0.6.0":
8444-
version: 0.6.0
8445-
resolution: "@types/cookie@npm:0.6.0"
8446-
checksum: 10c0/5b326bd0188120fb32c0be086b141b1481fec9941b76ad537f9110e10d61ee2636beac145463319c71e4be67a17e85b81ca9e13ceb6e3bb63b93d16824d6c149
8447-
languageName: node
8448-
linkType: hard
8449-
84508441
"@types/cors@npm:^2.8.12":
84518442
version: 2.8.17
84528443
resolution: "@types/cors@npm:2.8.17"
@@ -14297,13 +14288,6 @@ __metadata:
1429714288
languageName: node
1429814289
linkType: hard
1429914290

14300-
"jose@npm:^5.9.3":
14301-
version: 5.10.0
14302-
resolution: "jose@npm:5.10.0"
14303-
checksum: 10c0/e20d9fc58d7e402f2e5f04e824b8897d5579aae60e64cb88ebdea1395311c24537bf4892f7de413fab1acf11e922797fb1b42269bc8fc65089a3749265ccb7b0
14304-
languageName: node
14305-
linkType: hard
14306-
1430714291
"jose@npm:^6.0.6":
1430814292
version: 6.0.10
1430914293
resolution: "jose@npm:6.0.10"
@@ -15866,25 +15850,25 @@ __metadata:
1586615850
languageName: node
1586715851
linkType: hard
1586815852

15869-
"next-auth@npm:^5.0.0-beta.25":
15870-
version: 5.0.0-beta.25
15871-
resolution: "next-auth@npm:5.0.0-beta.25"
15853+
"next-auth@npm:^5.0.0-beta.30":
15854+
version: 5.0.0-beta.30
15855+
resolution: "next-auth@npm:5.0.0-beta.30"
1587215856
dependencies:
15873-
"@auth/core": "npm:0.37.2"
15857+
"@auth/core": "npm:0.41.0"
1587415858
peerDependencies:
1587515859
"@simplewebauthn/browser": ^9.0.1
1587615860
"@simplewebauthn/server": ^9.0.2
15877-
next: ^14.0.0-0 || ^15.0.0-0
15878-
nodemailer: ^6.6.5
15879-
react: ^18.2.0 || ^19.0.0-0
15861+
next: ^14.0.0-0 || ^15.0.0 || ^16.0.0
15862+
nodemailer: ^7.0.7
15863+
react: ^18.2.0 || ^19.0.0
1588015864
peerDependenciesMeta:
1588115865
"@simplewebauthn/browser":
1588215866
optional: true
1588315867
"@simplewebauthn/server":
1588415868
optional: true
1588515869
nodemailer:
1588615870
optional: true
15887-
checksum: 10c0/d9bbaae7abad133c30eb1df41ef151e959998c2db5152fabd3389d4e13b5dd9226eb4b6cbba400250ae4713aeca2008fa9bcc29233b14a26777de4c3dc4d6a39
15871+
checksum: 10c0/31ce5ff20320a001ab93444f00c9e0afc8112fd4380a5186bf637f48f6bdc616363861d125da934ea4fa5d1044fe5a61adc988e23a886bf6fb4710aa6488405d
1588815872
languageName: node
1588915873
linkType: hard
1589015874

@@ -16219,7 +16203,7 @@ __metadata:
1621916203
languageName: node
1622016204
linkType: hard
1622116205

16222-
"oauth4webapi@npm:^3.0.0, oauth4webapi@npm:^3.3.0":
16206+
"oauth4webapi@npm:^3.3.0":
1622316207
version: 3.3.1
1622416208
resolution: "oauth4webapi@npm:3.3.1"
1622516209
checksum: 10c0/e3c990dddceff5392deac5401fbbd417f7ae0aeb192ac4531884e7b2d6356185fc9aad3dd62329b9c754f6a07c70de7c7e771a57c6f540cc2aa3a4e8924081b5
@@ -17024,17 +17008,6 @@ __metadata:
1702417008
languageName: node
1702517009
linkType: hard
1702617010

17027-
"preact-render-to-string@npm:5.2.3":
17028-
version: 5.2.3
17029-
resolution: "preact-render-to-string@npm:5.2.3"
17030-
dependencies:
17031-
pretty-format: "npm:^3.8.0"
17032-
peerDependencies:
17033-
preact: ">=10"
17034-
checksum: 10c0/c7695dd034a2dc50e3fd44621fd55e2d41854ab0abbcbc833a81feb3593a22a011596049de5a2486f71483323467a827adc7d6077cbbb1d154c0089fd8ab4cd7
17035-
languageName: node
17036-
linkType: hard
17037-
1703817011
"preact-render-to-string@npm:6.5.11":
1703917012
version: 6.5.11
1704017013
resolution: "preact-render-to-string@npm:6.5.11"
@@ -17044,13 +17017,6 @@ __metadata:
1704417017
languageName: node
1704517018
linkType: hard
1704617019

17047-
"preact@npm:10.11.3":
17048-
version: 10.11.3
17049-
resolution: "preact@npm:10.11.3"
17050-
checksum: 10c0/44f342de226a89b53a7156fad0d4192bfc8233a5cc3eb46162f53d3c0c1c2956222d997927c7dff20f52c3592f112cefec5adac64f0477cbd8370fb39126ef7b
17051-
languageName: node
17052-
linkType: hard
17053-
1705417020
"preact@npm:10.24.3":
1705517021
version: 10.24.3
1705617022
resolution: "preact@npm:10.24.3"
@@ -17099,13 +17065,6 @@ __metadata:
1709917065
languageName: node
1710017066
linkType: hard
1710117067

17102-
"pretty-format@npm:^3.8.0":
17103-
version: 3.8.0
17104-
resolution: "pretty-format@npm:3.8.0"
17105-
checksum: 10c0/69f12937bfb7b2a537a7463b9f875a16322401f1e44d7702d643faa0d21991126c24c093217ef6da403b54c15942a834174fa1c016b72e2cb9edaae6bb3729b6
17106-
languageName: node
17107-
linkType: hard
17108-
1710917068
"prisma@npm:^6.2.1":
1711017069
version: 6.5.0
1711117070
resolution: "prisma@npm:6.5.0"

0 commit comments

Comments
 (0)