Improve opening a model from an URL (#1979)
Browse files
src/lib/utils/auth.ts
CHANGED
|
@@ -8,9 +8,10 @@ import { page } from "$app/state";
|
|
| 8 |
*/
|
| 9 |
export function requireAuthUser(): boolean {
|
| 10 |
if (page.data.loginEnabled && !page.data.user) {
|
| 11 |
-
const url =
|
| 12 |
-
|
| 13 |
-
|
|
|
|
| 14 |
goto(url, { invalidateAll: true });
|
| 15 |
return true;
|
| 16 |
}
|
|
|
|
| 8 |
*/
|
| 9 |
export function requireAuthUser(): boolean {
|
| 10 |
if (page.data.loginEnabled && !page.data.user) {
|
| 11 |
+
const url =
|
| 12 |
+
page.data.shared || page.url.pathname.startsWith(`${base}/models/`)
|
| 13 |
+
? `${base}/login?next=${encodeURIComponent(page.url.pathname + page.url.search)}`
|
| 14 |
+
: `${base}/login`;
|
| 15 |
goto(url, { invalidateAll: true });
|
| 16 |
return true;
|
| 17 |
}
|
src/routes/models/[...model]/+page.ts
CHANGED
|
@@ -1,15 +1,10 @@
|
|
| 1 |
import { base } from "$app/paths";
|
| 2 |
-
import { redirect } from "@sveltejs/kit";
|
| 3 |
|
| 4 |
export async function load({ params, parent, fetch }) {
|
| 5 |
-
|
| 6 |
method: "POST",
|
| 7 |
});
|
| 8 |
|
| 9 |
-
if (!r.ok) {
|
| 10 |
-
redirect(302, base + "/");
|
| 11 |
-
}
|
| 12 |
-
|
| 13 |
return {
|
| 14 |
settings: await parent().then((data) => ({
|
| 15 |
...data.settings,
|
|
|
|
| 1 |
import { base } from "$app/paths";
|
|
|
|
| 2 |
|
| 3 |
export async function load({ params, parent, fetch }) {
|
| 4 |
+
await fetch(`${base}/api/v2/models/${params.model}/subscribe`, {
|
| 5 |
method: "POST",
|
| 6 |
});
|
| 7 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 8 |
return {
|
| 9 |
settings: await parent().then((data) => ({
|
| 10 |
...data.settings,
|