diff --git a/lib/models/user.ts b/lib/models/user.ts index 69d08f19e..453379cf7 100644 --- a/lib/models/user.ts +++ b/lib/models/user.ts @@ -36,7 +36,7 @@ export type Profile = { id: string; username: string; displayName: string; - emails: any[]; + emails: string[]; avatarUrl: string; profileUrl: string; provider: ProviderEnum; @@ -125,7 +125,7 @@ export class User extends Model { } break case ProviderEnum.dropbox: - photo = generateAvatarURL('', profile.emails[0].value, bigger) + photo = generateAvatarURL('', profile.emails[0], bigger) break case ProviderEnum.google: photo = profile.photos[0].value diff --git a/lib/web/auth/dropbox/index.ts b/lib/web/auth/dropbox/index.ts index 1c6f5b72b..bf8db04a6 100644 --- a/lib/web/auth/dropbox/index.ts +++ b/lib/web/auth/dropbox/index.ts @@ -2,6 +2,7 @@ import { NextFunction, Request, Response, Router } from 'express' import passport from 'passport' import { Strategy as DropboxStrategy } from 'passport-dropbox-oauth2' import { config } from '../../../config' +import { User } from '../../../models' import { AuthMiddleware } from '../interface' import { passportGeneralCallback } from '../utils' @@ -14,7 +15,17 @@ export const DropboxMiddleware: AuthMiddleware = { clientID: config.dropbox.clientID, clientSecret: config.dropbox.clientSecret, callbackURL: config.serverURL + '/auth/dropbox/callback' - }, passportGeneralCallback)) + }, ( + accessToken: string, + refreshToken: string, + profile: any, + done: (err?: Error | null, user?: User) => void + ): void => { + // the Dropbox plugin wraps the email addresses in an object + // see https://github.com/florianheinemann/passport-dropbox-oauth2/blob/master/lib/passport-dropbox-oauth2/strategy.js#L146 + profile.emails = profile.emails.map(element => element.value) + passportGeneralCallback(accessToken, refreshToken, profile, done) + })) dropboxAuth.get('/auth/dropbox', function (req: Request, res: Response, next: NextFunction) { passport.authenticate('dropbox-oauth2')(req, res, next)