- {#if pb.authStore.model} + {#if pb.authStore.record}
- {#if trail.public && pb.authStore.model}
+ {#if trail.public && pb.authStore.record}
{trail.name}
- {#if trail.public && pb.authStore.model}
+ {#if trail.public && pb.authStore.record}
diff --git a/web/src/lib/i18n/index.ts b/web/src/lib/i18n/index.ts
index 53250f56..a12e6be8 100644
--- a/web/src/lib/i18n/index.ts
+++ b/web/src/lib/i18n/index.ts
@@ -18,5 +18,5 @@ register('zh', () => import('./locales/zh.json'))
init({
fallbackLocale: defaultLocale,
- initialLocale: browser ? pb.authStore.model?.language ?? window.navigator.language : defaultLocale,
+ initialLocale: browser ? pb.authStore.record?.language ?? window.navigator.language : defaultLocale,
})
\ No newline at end of file
diff --git a/web/src/lib/stores/comment_store.ts b/web/src/lib/stores/comment_store.ts
index 0dd9369e..e0d01542 100644
--- a/web/src/lib/stores/comment_store.ts
+++ b/web/src/lib/stores/comment_store.ts
@@ -28,11 +28,11 @@ export async function comments_index(trail: Trail) {
}
export async function comments_create(comment: Comment) {
- if (!pb.authStore.model) {
+ if (!pb.authStore.record) {
throw new Error("Unauthenticated");
}
- comment.author = pb.authStore.model!.id;
+ comment.author = pb.authStore.record!.id;
let r = await fetch('/api/v1/comment', {
method: 'PUT',
diff --git a/web/src/lib/stores/integration_store.ts b/web/src/lib/stores/integration_store.ts
index 794e5e1e..bbeb1105 100644
--- a/web/src/lib/stores/integration_store.ts
+++ b/web/src/lib/stores/integration_store.ts
@@ -25,11 +25,11 @@ export async function integrations_index(f: (url: RequestInfo | URL, config?: Re
}
export async function integrations_create(integration: Integration) {
- if (!pb.authStore.model) {
+ if (!pb.authStore.record) {
throw new Error("Unauthenticated");
}
- integration.user = pb.authStore.model!.id;
+ integration.user = pb.authStore.record!.id;
let r = await fetch('/api/v1/integration', {
method: 'PUT',
diff --git a/web/src/lib/stores/list_store.ts b/web/src/lib/stores/list_store.ts
index 1216df72..7d7f0536 100644
--- a/web/src/lib/stores/list_store.ts
+++ b/web/src/lib/stores/list_store.ts
@@ -121,11 +121,11 @@ export async function lists_show(id: string, f: (url: RequestInfo | URL, config?
}
export async function lists_create(list: List, avatar?: File) {
- if (!pb.authStore.model) {
+ if (!pb.authStore.record) {
throw new Error("Unauthenticated");
}
- list.author = pb.authStore.model!.id;
+ list.author = pb.authStore.record!.id;
let r = await fetch('/api/v1/list', {
method: 'PUT',
@@ -241,13 +241,13 @@ function buildFilterText(filter: ListFilter): string {
if (filter.author?.length) {
filterText += `&&author="${filter.author}"`
}
- if (pb.authStore.model) {
+ if (pb.authStore.record) {
if (filter.public === false && filter.shared === false) {
- filterText += `&&author="${pb.authStore.model.id}"`
+ filterText += `&&author="${pb.authStore.record.id}"`
} else if (filter.public === true && filter.shared === false) {
- filterText += `&&(public=true||list_share_via_list.user!="${pb.authStore.model.id}"||author="${pb.authStore.model.id}")`
+ filterText += `&&(public=true||list_share_via_list.user!="${pb.authStore.record.id}"||author="${pb.authStore.record.id}")`
} else if (filter.public === false && filter.shared === true) {
- filterText += `&&(public=false||list_share_via_list.user="${pb.authStore.model.id}"||author="${pb.authStore.model.id}")`
+ filterText += `&&(public=false||list_share_via_list.user="${pb.authStore.record.id}"||author="${pb.authStore.record.id}")`
}
}
return filterText
@@ -268,17 +268,17 @@ function buildSearchFilterText(filter: ListFilter): string {
if (filter.public !== undefined) {
filterText += `(public = ${filter.public}`
- if (!filter.author?.length || filter.author == pb.authStore.model?.id) {
- filterText += ` OR author = ${pb.authStore.model?.id}`
+ if (!filter.author?.length || filter.author == pb.authStore.record?.id) {
+ filterText += ` OR author = ${pb.authStore.record?.id}`
}
filterText += ")"
}
if (filter.shared !== undefined) {
if (filter.shared === true) {
- filterText += ` OR shares = ${pb.authStore.model?.id}`
+ filterText += ` OR shares = ${pb.authStore.record?.id}`
} else {
- filterText += ` AND NOT shares = ${pb.authStore.model?.id}`
+ filterText += ` AND NOT shares = ${pb.authStore.record?.id}`
}
}
diff --git a/web/src/lib/stores/summit_log_store.ts b/web/src/lib/stores/summit_log_store.ts
index e868e986..3a131f9f 100644
--- a/web/src/lib/stores/summit_log_store.ts
+++ b/web/src/lib/stores/summit_log_store.ts
@@ -46,7 +46,7 @@ export async function summit_logs_index(author: string, filter?: SummitLogFilter
}
export async function summit_logs_create(summitLog: SummitLog, f: (url: RequestInfo | URL, config?: RequestInit) => Promise = fetch) {
- summitLog.author = pb.authStore.model!.id
+ summitLog.author = pb.authStore.record!.id
let r = await f('/api/v1/summit-log', {
method: 'PUT',
@@ -101,7 +101,7 @@ export async function summit_logs_create(summitLog: SummitLog, f: (url: RequestI
}
export async function summit_logs_update(oldSummitLog: SummitLog, newSummitLog: SummitLog) {
- newSummitLog.author = pb.authStore.model!.id
+ newSummitLog.author = pb.authStore.record!.id
let r = await fetch('/api/v1/summit-log/' + newSummitLog.id, {
method: 'POST',
diff --git a/web/src/lib/stores/trail_store.ts b/web/src/lib/stores/trail_store.ts
index 3740f5bc..82815b43 100644
--- a/web/src/lib/stores/trail_store.ts
+++ b/web/src/lib/stores/trail_store.ts
@@ -182,7 +182,7 @@ export async function trails_create(trail: Trail, photos: File[], gpx: File | Bl
trail.summit_logs.push(model.id!);
}
- trail.author = pb.authStore.model!.id
+ trail.author = pb.authStore.record!.id
let r = await f(`/api/v1/trail?` + new URLSearchParams({
expand: "category,waypoints,summit_logs,trail_share_via_trail",
@@ -501,17 +501,17 @@ function buildFilterText(filter: TrailFilter, includeGeo: boolean): string {
if (filter.public !== undefined) {
filterText += `(public = ${filter.public}`
- if (!filter.author?.length || filter.author == pb.authStore.model?.id) {
- filterText += ` OR author = ${pb.authStore.model?.id}`
+ if (!filter.author?.length || filter.author == pb.authStore.record?.id) {
+ filterText += ` OR author = ${pb.authStore.record?.id}`
}
filterText += ")"
}
if (filter.shared !== undefined) {
if (filter.shared === true) {
- filterText += ` OR shares = ${pb.authStore.model?.id}`
+ filterText += ` OR shares = ${pb.authStore.record?.id}`
} else {
- filterText += ` AND NOT shares = ${pb.authStore.model?.id}`
+ filterText += ` AND NOT shares = ${pb.authStore.record?.id}`
}
}
diff --git a/web/src/lib/stores/user_store.ts b/web/src/lib/stores/user_store.ts
index 728b2bc0..5290f22b 100644
--- a/web/src/lib/stores/user_store.ts
+++ b/web/src/lib/stores/user_store.ts
@@ -25,7 +25,7 @@ export async function users_create(user: User) {
export async function users_search(q: string, includeSelf: boolean = true) {
let r = await fetch('/api/v1/user/anonymous?' + new URLSearchParams({
- "filter": `username~"${q}"${includeSelf ? '' : `&&id!="${pb.authStore.model?.id}"`}`,
+ "filter": `username~"${q}"${includeSelf ? '' : `&&id!="${pb.authStore.record?.id}"`}`,
}), {
method: 'GET',
})
@@ -62,7 +62,7 @@ export async function users_auth_methods(f: (url: RequestInfo | URL, config?: Re
const response = await r.json();
throw new APIError(r.status, response.message, response.detail)
}
- return await r.json()
+ return await r.json() as AuthMethodsList
}
diff --git a/web/src/lib/stores/waypoint_store.ts b/web/src/lib/stores/waypoint_store.ts
index dd46565f..2509e148 100644
--- a/web/src/lib/stores/waypoint_store.ts
+++ b/web/src/lib/stores/waypoint_store.ts
@@ -7,7 +7,7 @@ export const waypoint: Writable = writable(new Waypoint(0, 0));
export async function waypoints_create(waypoint: Waypoint, f: (url: RequestInfo | URL, config?: RequestInit) => Promise = fetch) {
- waypoint.author = pb.authStore.model!.id
+ waypoint.author = pb.authStore.record!.id
let r = await f('/api/v1/waypoint', {
method: 'PUT',
@@ -45,7 +45,7 @@ export async function waypoints_create(waypoint: Waypoint, f: (url: RequestInfo
}
export async function waypoints_update(oldWaypoint: Waypoint, newWaypoint: Waypoint) {
- newWaypoint.author = pb.authStore.model!.id
+ newWaypoint.author = pb.authStore.record!.id
let r = await fetch('/api/v1/waypoint/' + newWaypoint.id, {
method: 'POST',
diff --git a/web/src/routes/api/v1/auth/oauth/+server.ts b/web/src/routes/api/v1/auth/oauth/+server.ts
index c5a51e4a..b5d20c62 100644
--- a/web/src/routes/api/v1/auth/oauth/+server.ts
+++ b/web/src/routes/api/v1/auth/oauth/+server.ts
@@ -12,10 +12,10 @@ export async function GET(event: RequestEvent) {
try {
const r = await pb.collection('users').listAuthMethods();
- for (const provider of r.authProviders) {
+ for (const provider of r.oauth2.providers) {
const imageURL = `${env.PUBLIC_POCKETBASE_URL}/_/images/oauth2/${provider.name}.svg`
provider['img' as keyof typeof provider] = await imageUrlToBase64(imageURL, event.fetch);
- provider['url' as keyof typeof provider] = `${provider.authUrl}${redirectURL}`
+ provider['url' as keyof typeof provider] = `${provider.authURL}${redirectURL}`
}
return json(r)
} catch (e: any) {
diff --git a/web/src/routes/api/v1/files/[collection]/[record]/[file]/+server.ts b/web/src/routes/api/v1/files/[collection]/[record]/[file]/+server.ts
index a343e1a0..af146c28 100644
--- a/web/src/routes/api/v1/files/[collection]/[record]/[file]/+server.ts
+++ b/web/src/routes/api/v1/files/[collection]/[record]/[file]/+server.ts
@@ -21,7 +21,7 @@ export async function GET(event: RequestEvent) {
parts.push(encodeURIComponent(safeParams.data.record));
parts.push(encodeURIComponent(safeParams.data.file));
- let fileURL = pb.buildUrl(parts.join("/"));
+ let fileURL = pb.buildURL(parts.join("/"));
try {
const r = await event.fetch(fileURL)
diff --git a/web/src/routes/api/v1/list/+server.ts b/web/src/routes/api/v1/list/+server.ts
index 7b53ef04..37adc929 100644
--- a/web/src/routes/api/v1/list/+server.ts
+++ b/web/src/routes/api/v1/list/+server.ts
@@ -8,7 +8,7 @@ export async function GET(event: RequestEvent) {
try {
const r = await list
- (event, Collection.lists);
for (const t of r.items) {
- if (!t.author || !pb.authStore.model) {
+ if (!t.author || !pb.authStore.record) {
continue;
}
if (!t.expand) {
diff --git a/web/src/routes/api/v1/summit-log/+server.ts b/web/src/routes/api/v1/summit-log/+server.ts
index 55507ccc..1ee522bd 100644
--- a/web/src/routes/api/v1/summit-log/+server.ts
+++ b/web/src/routes/api/v1/summit-log/+server.ts
@@ -9,7 +9,7 @@ export async function GET(event: RequestEvent) {
const r = await list