Fix issue on login when no hooks are registered

Fixes directus#5688
abbas-salimi · May 14, 2021 · e8ac74b · e8ac74b
1 parent 6f51fa4
commit e8ac74b
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 45 deletions.
diff --git a/api/src/services/authentication.ts b/api/src/services/authentication.ts
@@ -17,6 +17,7 @@ import { createRateLimiter } from '../rate-limiter';
 import { ActivityService } from '../services/activity';
 import { AbstractServiceOptions, Accountability, Action, SchemaOverview, Session } from '../types';
 import { SettingsService } from './settings';
+import { merge } from 'lodash';
 
 type AuthenticateOptions = {
 	email: string;
@@ -76,7 +77,7 @@ export class AuthenticationService {
 		});
 
 		if (updatedUser) {
-			user = updatedUser;
+			user = updatedUser.length > 0 ? updatedUser.reduce((val, acc) => merge(acc, val)) : user;
 		}
 
 		const emitStatus = (status: 'fail' | 'success') => {

diff --git a/package-lock.json b/package-lock.json