fix: migration error for new installs
This commit is contained in:
parent
ef739de970
commit
60f2a2a8d9
@ -1,9 +1,20 @@
|
|||||||
exports.up = async knex => {
|
exports.up = async knex => {
|
||||||
await knex('authentication').where('isEnabled', false).del()
|
// Check for users using disabled strategies
|
||||||
|
let protectedStrategies = []
|
||||||
|
const disabledStrategies = await knex('authentication').where('isEnabled', false)
|
||||||
|
if (disabledStrategies) {
|
||||||
|
const incompatibleUsers = await knex('users').distinct('providerKey').whereIn('providerKey', disabledStrategies.map(s => s.key))
|
||||||
|
if (incompatibleUsers && incompatibleUsers.length > 0) {
|
||||||
|
protectedStrategies = incompatibleUsers.map(u => u.providerKey)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete disabled strategies
|
||||||
|
await knex('authentication').whereNotIn('key', protectedStrategies).andWhere('isEnabled', false).del()
|
||||||
|
|
||||||
|
// Update table schema
|
||||||
await knex.schema
|
await knex.schema
|
||||||
.alterTable('authentication', table => {
|
.alterTable('authentication', table => {
|
||||||
table.dropColumn('isEnabled')
|
|
||||||
table.integer('order').unsigned().notNullable().defaultTo(0)
|
table.integer('order').unsigned().notNullable().defaultTo(0)
|
||||||
table.string('strategyKey').notNullable().defaultTo('')
|
table.string('strategyKey').notNullable().defaultTo('')
|
||||||
table.string('displayName').notNullable().defaultTo('')
|
table.string('displayName').notNullable().defaultTo('')
|
||||||
|
14
server/db/migrations-sqlite/2.5.108.js
Normal file
14
server/db/migrations-sqlite/2.5.108.js
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
const has = require('lodash/has')
|
||||||
|
|
||||||
|
exports.up = async knex => {
|
||||||
|
// -> Fix 2.5.1 added isEnabled columns for beta users
|
||||||
|
const localStrategy = await knex('authentication').where('key', 'local')
|
||||||
|
if (!has(localStrategy, 'isEnabled')) {
|
||||||
|
await knex.schema
|
||||||
|
.alterTable('authentication', table => {
|
||||||
|
table.boolean('isEnabled').notNullable().defaultTo(true)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
exports.down = knex => { }
|
@ -1,8 +1,13 @@
|
|||||||
exports.up = async knex => {
|
exports.up = async knex => {
|
||||||
// Check for users using disabled strategies
|
// Check for users using disabled strategies
|
||||||
|
let protectedStrategies = []
|
||||||
const disabledStrategies = await knex('authentication').where('isEnabled', false)
|
const disabledStrategies = await knex('authentication').where('isEnabled', false)
|
||||||
|
if (disabledStrategies) {
|
||||||
const incompatibleUsers = await knex('users').distinct('providerKey').whereIn('providerKey', disabledStrategies.map(s => s.key))
|
const incompatibleUsers = await knex('users').distinct('providerKey').whereIn('providerKey', disabledStrategies.map(s => s.key))
|
||||||
const protectedStrategies = (incompatibleUsers && incompatibleUsers.length > 0) ? incompatibleUsers.map(u => u.providerKey) : []
|
if (incompatibleUsers && incompatibleUsers.length > 0) {
|
||||||
|
protectedStrategies = incompatibleUsers.map(u => u.providerKey)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Delete disabled strategies
|
// Delete disabled strategies
|
||||||
await knex('authentication').whereNotIn('key', protectedStrategies).andWhere('isEnabled', false).del()
|
await knex('authentication').whereNotIn('key', protectedStrategies).andWhere('isEnabled', false).del()
|
||||||
|
Loading…
Reference in New Issue
Block a user