fix: Redirect to collection on self-hosted (#2438)
This commit is contained in:
@ -45,6 +45,7 @@ router.get("/redirect", auth(), async (ctx) => {
|
|||||||
Team.findByPk(user.teamId),
|
Team.findByPk(user.teamId),
|
||||||
Collection.findOne({
|
Collection.findOne({
|
||||||
where: { teamId: user.teamId },
|
where: { teamId: user.teamId },
|
||||||
|
order: [["index", "ASC"]],
|
||||||
}),
|
}),
|
||||||
View.findOne({
|
View.findOne({
|
||||||
where: { userId: user.id },
|
where: { userId: user.id },
|
||||||
|
@ -4,7 +4,7 @@ import * as Sentry from "@sentry/node";
|
|||||||
import { addMonths } from "date-fns";
|
import { addMonths } from "date-fns";
|
||||||
import { type Context } from "koa";
|
import { type Context } from "koa";
|
||||||
import { pick } from "lodash";
|
import { pick } from "lodash";
|
||||||
import { User, Event, Team } from "../models";
|
import { User, Event, Team, Collection, View } from "../models";
|
||||||
import { getCookieDomain } from "../utils/domains";
|
import { getCookieDomain } from "../utils/domains";
|
||||||
|
|
||||||
export function getAllowedDomains(): string[] {
|
export function getAllowedDomains(): string[] {
|
||||||
@ -99,6 +99,22 @@ export async function signIn(
|
|||||||
httpOnly: false,
|
httpOnly: false,
|
||||||
expires,
|
expires,
|
||||||
});
|
});
|
||||||
ctx.redirect(`${team.url}/home${isNewUser ? "?welcome" : ""}`);
|
|
||||||
|
const [collection, view] = await Promise.all([
|
||||||
|
Collection.findOne({
|
||||||
|
where: { teamId: user.teamId },
|
||||||
|
order: [["index", "ASC"]],
|
||||||
|
}),
|
||||||
|
View.findOne({
|
||||||
|
where: { userId: user.id },
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
|
||||||
|
const hasViewedDocuments = !!view;
|
||||||
|
ctx.redirect(
|
||||||
|
!hasViewedDocuments && collection
|
||||||
|
? `${team.url}${collection.url}`
|
||||||
|
: `${team.url}/home`
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user