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

Left Join-ing on roles to allow users without roles to login (#10836)

Browse Source 
* Left Join-ing on roles to allow users without roles to login

* moving filter logic to more appropriate location
This commit is contained in:
John Huffsmith
2022-01-04 12:24:44 -05:00
committed by GitHub
parent 2724d306ea
commit 8a05018883
4 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/database/migrations/run.ts
View File

@@ -14,9 +14,7 @@ export default async function run(database: Knex, direction: 'up' | 'down' | 'la
let customMigrationFiles =
((await fse.pathExists(customMigrationsPath)) && (await fse.readdir(customMigrationsPath))) || [];
migrationFiles = migrationFiles.filter(
(file: string) => file.startsWith('run') === false && file.endsWith('.d.ts') === false
);
migrationFiles = migrationFiles.filter((file: string) => file.startsWith('run') === false && file.endsWith('.js'));
customMigrationFiles = customMigrationFiles.filter((file: string) => file.endsWith('.js'));
const completedMigrations = await database.select<Migration[]>('*').from('directus_migrations').orderBy('version');

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

@@ -74,7 +74,7 @@ export class AuthenticationService {
'u.auth_data'
)
.from('directus_users as u')
.innerJoin('directus_roles as r', 'u.role', 'r.id')
.leftJoin('directus_roles as r', 'u.role', 'r.id')
.where('u.id', await provider.getUserID(cloneDeep(payload)))
.andWhere('u.provider', providerName)
.first();