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