github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue on login when no hooks are registered

Browse Source 
Fixes #5688
This commit is contained in:
rijkvanzanten
2021-05-14 18:52:20 -04:00
parent 6f51fa4483
commit e8ac74bb4c
2 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/services/authentication.ts
View File

@@ -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') => {

88
package-lock.json generated
View File

@@ -54,17 +54,17 @@
},
"api": {
"name": "directus",
"version": "9.0.0-rc.64",
"version": "9.0.0-rc.65",
"license": "GPL-3.0-only",
"dependencies": {
"@directus/app": "9.0.0-rc.64",
"@directus/drive": "9.0.0-rc.64",
"@directus/drive-azure": "9.0.0-rc.64",
"@directus/drive-gcs": "9.0.0-rc.64",
"@directus/drive-s3": "9.0.0-rc.64",
"@directus/format-title": "9.0.0-rc.64",
"@directus/schema": "9.0.0-rc.64",
"@directus/specs": "9.0.0-rc.64",
"@directus/app": "9.0.0-rc.65",
"@directus/drive": "9.0.0-rc.65",
"@directus/drive-azure": "9.0.0-rc.65",
"@directus/drive-gcs": "9.0.0-rc.65",
"@directus/drive-s3": "9.0.0-rc.65",
"@directus/format-title": "9.0.0-rc.65",
"@directus/schema": "9.0.0-rc.65",
"@directus/specs": "9.0.0-rc.65",
"@godaddy/terminus": "^4.7.2",
"argon2": "^0.27.0",
"async": "^3.2.0",
@@ -272,10 +272,10 @@
},
"app": {
"name": "@directus/app",
"version": "9.0.0-rc.64",
"version": "9.0.0-rc.65",
"devDependencies": {
"@directus/docs": "9.0.0-rc.64",
"@directus/format-title": "9.0.0-rc.64",
"@directus/docs": "9.0.0-rc.65",
"@directus/format-title": "9.0.0-rc.65",
"@fullcalendar/core": "^5.7.0",
"@fullcalendar/daygrid": "^5.7.0",
"@fullcalendar/interaction": "^5.7.0",
@@ -414,7 +414,7 @@
},
"docs": {
"name": "@directus/docs",
"version": "9.0.0-rc.64",
"version": "9.0.0-rc.65",
"license": "ISC",
"devDependencies": {
"directory-tree": "^2.2.9",
@@ -48190,11 +48190,11 @@
},
"packages/cli": {
"name": "@directus/cli",
"version": "9.0.0-rc.64",
"version": "9.0.0-rc.65",
"license": "MIT",
"dependencies": {
"@directus/format-title": "9.0.0-rc.64",
"@directus/sdk": "9.0.0-rc.64",
"@directus/format-title": "9.0.0-rc.65",
"@directus/sdk": "9.0.0-rc.65",
"@types/yargs": "^16.0.1",
"app-module-path": "^2.2.0",
"chalk": "^4.1.0",
@@ -48391,7 +48391,7 @@
}
},
"packages/create-directus-project": {
"version": "9.0.0-rc.64",
"version": "9.0.0-rc.65",
"license": "GPL-3.0-only",
"dependencies": {
"chalk": "^4.1.1",
@@ -48414,7 +48414,7 @@
},
"packages/drive": {
"name": "@directus/drive",
"version": "9.0.0-rc.64",
"version": "9.0.0-rc.65",
"license": "MIT",
"dependencies": {
"fs-extra": "^9.1.0",
@@ -48433,11 +48433,11 @@
},
"packages/drive-azure": {
"name": "@directus/drive-azure",
"version": "9.0.0-rc.64",
"version": "9.0.0-rc.65",
"license": "MIT",
"dependencies": {
"@azure/storage-blob": "^12.2.1",
"@directus/drive": "9.0.0-rc.64",
"@directus/drive": "9.0.0-rc.65",
"normalize-path": "^3.0.0"
},
"devDependencies": {
@@ -48465,10 +48465,10 @@
},
"packages/drive-gcs": {
"name": "@directus/drive-gcs",
"version": "9.0.0-rc.64",
"version": "9.0.0-rc.65",
"license": "MIT",
"dependencies": {
"@directus/drive": "9.0.0-rc.64",
"@directus/drive": "9.0.0-rc.65",
"@google-cloud/storage": "^5.8.4",
"normalize-path": "^3.0.0"
},
@@ -48496,10 +48496,10 @@
},
"packages/drive-s3": {
"name": "@directus/drive-s3",
"version": "9.0.0-rc.64",
"version": "9.0.0-rc.65",
"license": "MIT",
"dependencies": {
"@directus/drive": "9.0.0-rc.64",
"@directus/drive": "9.0.0-rc.65",
"aws-sdk": "^2.902.0",
"normalize-path": "^3.0.0"
},
@@ -48538,7 +48538,7 @@
},
"packages/format-title": {
"name": "@directus/format-title",
"version": "9.0.0-rc.64",
"version": "9.0.0-rc.65",
"license": "MIT",
"devDependencies": {
"@rollup/plugin-commonjs": "^17.1.0",
@@ -48557,7 +48557,7 @@
},
"packages/gatsby-source-directus": {
"name": "@directus/gatsby-source-directus",
"version": "9.0.0-rc.64",
"version": "9.0.0-rc.65",
"license": "MIT",
"dependencies": {
"@directus/sdk-js": "^9.0.0-rc.53",
@@ -51212,7 +51212,7 @@
},
"packages/schema": {
"name": "@directus/schema",
"version": "9.0.0-rc.64",
"version": "9.0.0-rc.65",
"license": "GPL-3.0",
"dependencies": {
"knex-schema-inspector": "^1.3.0",
@@ -51225,7 +51225,7 @@
},
"packages/sdk": {
"name": "@directus/sdk",
"version": "9.0.0-rc.64",
"version": "9.0.0-rc.65",
"license": "MIT",
"dependencies": {
"axios": "^0.21.1"
@@ -51265,7 +51265,7 @@
},
"packages/specs": {
"name": "@directus/specs",
"version": "9.0.0-rc.64",
"version": "9.0.0-rc.65",
"license": "GPL-3.0",
"dependencies": {
"openapi3-ts": "^2.0.1"
@@ -52907,8 +52907,8 @@
"@directus/app": {
"version": "file:app",
"requires": {
"@directus/docs": "9.0.0-rc.64",
"@directus/format-title": "9.0.0-rc.64",
"@directus/docs": "9.0.0-rc.65",
"@directus/format-title": "9.0.0-rc.65",
"@fullcalendar/core": "^5.7.0",
"@fullcalendar/daygrid": "^5.7.0",
"@fullcalendar/interaction": "^5.7.0",
@@ -53033,8 +53033,8 @@
"@directus/cli": {
"version": "file:packages/cli",
"requires": {
"@directus/format-title": "9.0.0-rc.64",
"@directus/sdk": "9.0.0-rc.64",
"@directus/format-title": "9.0.0-rc.65",
"@directus/sdk": "9.0.0-rc.65",
"@types/figlet": "^1.5.0",
"@types/fs-extra": "^9.0.11",
"@types/jest": "^26.0.23",
@@ -53233,7 +53233,7 @@
"version": "file:packages/drive-azure",
"requires": {
"@azure/storage-blob": "^12.2.1",
"@directus/drive": "9.0.0-rc.64",
"@directus/drive": "9.0.0-rc.65",
"@types/fs-extra": "^9.0.11",
"@types/jest": "^26.0.22",
"@types/node": "^15.0.2",
@@ -53258,7 +53258,7 @@
"@directus/drive-gcs": {
"version": "file:packages/drive-gcs",
"requires": {
"@directus/drive": "9.0.0-rc.64",
"@directus/drive": "9.0.0-rc.65",
"@google-cloud/storage": "^5.8.4",
"@lukeed/uuid": "^2.0.0",
"@types/fs-extra": "^9.0.11",
@@ -53284,7 +53284,7 @@
"@directus/drive-s3": {
"version": "file:packages/drive-s3",
"requires": {
"@directus/drive": "9.0.0-rc.64",
"@directus/drive": "9.0.0-rc.65",
"@lukeed/uuid": "^2.0.0",
"@types/fs-extra": "^9.0.11",
"@types/jest": "^26.0.22",
@@ -67298,14 +67298,14 @@
"directus": {
"version": "file:api",
"requires": {
"@directus/app": "9.0.0-rc.64",
"@directus/drive": "9.0.0-rc.64",
"@directus/drive-azure": "9.0.0-rc.64",
"@directus/drive-gcs": "9.0.0-rc.64",
"@directus/drive-s3": "9.0.0-rc.64",
"@directus/format-title": "9.0.0-rc.64",
"@directus/schema": "9.0.0-rc.64",
"@directus/specs": "9.0.0-rc.64",
"@directus/app": "9.0.0-rc.65",
"@directus/drive": "9.0.0-rc.65",
"@directus/drive-azure": "9.0.0-rc.65",
"@directus/drive-gcs": "9.0.0-rc.65",
"@directus/drive-s3": "9.0.0-rc.65",
"@directus/format-title": "9.0.0-rc.65",
"@directus/schema": "9.0.0-rc.65",
"@directus/specs": "9.0.0-rc.65",
"@godaddy/terminus": "^4.7.2",
"@keyv/redis": "^2.1.2",
"@types/async": "^3.2.6",