@@ -123,12 +123,12 @@ passport.use(
123
123
User . findOne ( { github : profile . id } , ( findByGithubErr , existingUser ) => {
124
124
if ( existingUser ) {
125
125
if ( req . user && req . user . email !== existingUser . email ) {
126
- done (
127
- new Error ( 'GitHub account is already linked to another account.' )
128
- ) ;
126
+ done ( null , false , {
127
+ msg : 'GitHub account is already linked to another account.'
128
+ } ) ;
129
129
return ;
130
130
} else if ( existingUser . banned ) {
131
- done ( new Error ( accountSuspensionMessage ) ) ;
131
+ done ( null , false , { msg : accountSuspensionMessage } ) ;
132
132
return ;
133
133
}
134
134
done ( null , existingUser ) ;
@@ -159,7 +159,7 @@ passport.use(
159
159
[ existingEmailUser ] = existingEmailUsers ;
160
160
}
161
161
if ( existingEmailUser . banned ) {
162
- done ( new Error ( accountSuspensionMessage ) ) ;
162
+ done ( null , false , { msg : accountSuspensionMessage } ) ;
163
163
return ;
164
164
}
165
165
existingEmailUser . email = existingEmailUser . email || primaryEmail ;
@@ -218,14 +218,12 @@ passport.use(
218
218
( findByGoogleErr , existingUser ) => {
219
219
if ( existingUser ) {
220
220
if ( req . user && req . user . email !== existingUser . email ) {
221
- done (
222
- new Error (
223
- 'Google account is already linked to another account.'
224
- )
225
- ) ;
221
+ done ( null , false , {
222
+ msg : 'Google account is already linked to another account.'
223
+ } ) ;
226
224
return ;
227
225
} else if ( existingUser . banned ) {
228
- done ( new Error ( accountSuspensionMessage ) ) ;
226
+ done ( null , false , { msg : accountSuspensionMessage } ) ;
229
227
return ;
230
228
}
231
229
done ( null , existingUser ) ;
@@ -256,7 +254,7 @@ passport.use(
256
254
// then, append a random friendly word?
257
255
if ( existingEmailUser ) {
258
256
if ( existingEmailUser . banned ) {
259
- done ( new Error ( accountSuspensionMessage ) ) ;
257
+ done ( null , false , { msg : accountSuspensionMessage } ) ;
260
258
return ;
261
259
}
262
260
existingEmailUser . email =
0 commit comments