yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: upgrade sequelize (#965)

Browse Source 
* 0.18.0

* chore: Upgrade sequelize 4 -> 5

* fix: migrations v5 support

* fix: Majority of test failures

* fix: the rest of v5 tests
This commit is contained in:
Tom Moor
2019-06-23 15:49:45 -07:00
committed by GitHub
parent 595adeb55f
commit 32f83311f6
35 changed files with 260 additions and 7662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/auth/slack.js
View File

@@ -89,7 +89,7 @@ router.get('slack.commands', auth({ required: false }), async ctx => {
if (!user) {
if (state) {
try {
const team = await Team.findById(state);
const team = await Team.findByPk(state);
return ctx.redirect(
`${team.url}/auth${ctx.request.path}?${ctx.request.querystring}`
);
@@ -143,8 +143,8 @@ router.get('slack.post', auth({ required: false }), async ctx => {
// appropriate subdomain to complete the oauth flow
if (!user) {
try {
const collection = await Collection.findById(state);
const team = await Team.findById(collection.teamId);
const collection = await Collection.findByPk(state);
const team = await Team.findByPk(collection.teamId);
return ctx.redirect(
`${team.url}/auth${ctx.request.path}?${ctx.request.querystring}`
);