Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
60f2a2a8
Commit
60f2a2a8
authored
Sep 05, 2020
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: migration error for new installs
parent
ef739de9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
4 deletions
+34
-4
2.5.1.js
server/db/migrations-sqlite/2.5.1.js
+13
-2
2.5.108.js
server/db/migrations-sqlite/2.5.108.js
+14
-0
2.5.1.js
server/db/migrations/2.5.1.js
+7
-2
No files found.
server/db/migrations-sqlite/2.5.1.js
View file @
60f2a2a8
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
.
alterTable
(
'authentication'
,
table
=>
{
table
.
dropColumn
(
'isEnabled'
)
table
.
integer
(
'order'
).
unsigned
().
notNullable
().
defaultTo
(
0
)
table
.
string
(
'strategyKey'
).
notNullable
().
defaultTo
(
''
)
table
.
string
(
'displayName'
).
notNullable
().
defaultTo
(
''
)
...
...
server/db/migrations-sqlite/2.5.108.js
0 → 100644
View file @
60f2a2a8
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
=>
{
}
server/db/migrations/2.5.1.js
View file @
60f2a2a8
exports
.
up
=
async
knex
=>
{
// Check for users using disabled strategies
let
protectedStrategies
=
[]
const
disabledStrategies
=
await
knex
(
'authentication'
).
where
(
'isEnabled'
,
false
)
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
(
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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment