auth: update profile class to contain profileData as well

This commit is contained in:
James Xylight committed 2025-07-12 10:56:38 -07:00
1 parent 36a9631707
commit 185cc5f54d
13 files changed
+238 -265

No files matched your search

+182 -201
View File
@@ -20,11 +20,6 @@ import { site } from './lemmy.svelte'
import { errorMessage } from './lemmy/error'
import { publishedToDate } from './components/util/date'
const getDefaultProfile = (): Profile => ({
id: -1,
instance: profileData.defaultInstance ?? DEFAULT_INSTANCE_URL,
})
function getFromStorage<T>(key: string): T | undefined {
if (typeof localStorage == 'undefined') return undefined
const lc = localStorage.getItem(key)
@@ -39,7 +34,7 @@ function setFromStorage(key: string, item: any, stringify: boolean = true) {
return localStorage.setItem(key, stringify ? JSON.stringify(item) : item)
}
export interface Profile {
export interface ProfileInfo {
id: number
instance: string
jwt?: string
@@ -54,9 +49,9 @@ export interface Profile {
* What gets stored in localstorage.
*/
interface ProfileData {
profiles: Profile[]
profiles: ProfileInfo[]
// should be named currentId
profile: number
defaultInstance?: string
}
interface Notifications {
@@ -68,8 +63,6 @@ interface Notifications {
const getCookie = (key: string): string | undefined => {
if (!browser) return undefined
// sorry i was dying when i wrote this line
// ask chatgpt or something to explain this for you
return document?.cookie
?.split(';')
.map(c => c.trim())
@@ -77,33 +70,101 @@ const getCookie = (key: string): string | undefined => {
?.split('=')?.[1]
}
export const profileData = $state<ProfileData>(
getFromStorage<ProfileData>('profileData') ?? {
profiles: [
{
id: 1,
instance: DEFAULT_INSTANCE_URL,
username: 'Guest',
color: '#505050',
},
],
profile: 1,
},
)
class CurrentProfile {
#current = $derived(
profileData.profiles.find(i => i.id == profileData.profile) ??
getDefaultProfile(),
class Profile {
meta = $state<ProfileData>(
getFromStorage<ProfileData>('profileData') ?? {
profiles: [
{
id: 1,
instance: DEFAULT_INSTANCE_URL,
username: 'Guest',
color: '#505050',
},
],
profile: 1,
},
)
#current = $derived(
this.meta.profiles.find(i => i.id == this.meta.profile) ??
this.getDefaultProfile(),
)
getDefaultProfile(): ProfileInfo {
return {
id: -1,
instance: DEFAULT_INSTANCE_URL,
}
}
constructor() {
// cookie migration code
if (
env.PUBLIC_MIGRATE_COOKIE &&
this.meta.profiles.length == 0 &&
env.PUBLIC_INSTANCE_URL
) {
const jwt = getCookie('jwt')
if (jwt) {
;(async () => {
const result = await this.add(jwt, env.PUBLIC_INSTANCE_URL ?? '')
if (result)
toast({
content:
'Your instance migrated to Photon, and your account was transferred.',
type: 'success',
})
})()
}
}
setInterval(
() => {
if (profile.current.jwt)
this.checkInbox().then(res => notifications.update(() => res))
},
4 * 60 * 1000,
)
// hacky way to check donation status
setTimeout(() => {
if (
profile.current.user?.local_user_view.local_user
.last_donation_notification
) {
const donationDate = publishedToDate(
profile.current.user?.local_user_view.local_user
.last_donation_notification,
)
if (Date.now() - donationDate.getTime() > 365 * 24 * 60 * 60 * 1000) {
toast({
content: t.get('toast.lemmyDonate'),
duration: 3600 * 1000,
long: true,
})
// lemmy js client donation dialog is broken
fetch(
`${instanceToURL(profile.current.instance)}/api/v3/user/donation_dialog_shown`,
{
method: 'POST',
headers: {
authorization: `Bearer ${profile.current.jwt}`,
},
},
)
}
}
}, 3 * 1000)
}
get current() {
return this.#current
}
set current(value) {
if (!value) return
const index = profileData.profiles.findIndex(i => i.id == value?.id)
profileData.profiles[index] = value
const index = this.meta.profiles.findIndex(i => i.id == value?.id)
this.meta.profiles[index] = value
}
async fetchUserData() {
@@ -143,9 +204,98 @@ class CurrentProfile {
return this
}
async checkInbox() {
const { user, jwt } = profile.current
if (!user || !jwt) throw new Error('checkInbox() called with invalid user')
const notifs = await getNotificationCount(
jwt,
amModOfAny(user) ?? false,
user ? isAdmin(user) : false,
)
return {
inbox: notifs.unreads,
applications: notifs.applications,
reports: notifs.reports,
}
}
async add(jwt: string, instance: string) {
const user = await userFromJwt(jwt, instance)
.then(u => u)
.catch(err => {
toast({ content: errorMessage(err as string), type: 'error' })
})
if (!user?.user) {
toast({
content: "Your instance's API did not return your user data.",
type: 'error',
})
}
const id = Math.max(...this.meta.profiles.map(p => p.id)) + 1
this.meta.profile = id
this.meta.profiles.push({
id: id,
instance: instance,
jwt: jwt,
username: user?.user?.local_user_view.person.name,
avatar: user?.user?.local_user_view.person.avatar,
})
return user
}
remove(id: number) {
this.meta.profiles.splice(
this.meta.profiles.findIndex(p => p.id == id),
1,
)
if (id == this.meta.profile) this.meta.profile = -1
}
move(id: number, up: boolean) {
try {
const index = this.meta.profiles.findIndex(i => i.id == id)
this.meta.profiles = moveItem(
this.meta.profiles,
index,
index + (up ? -1 : 1),
)
} catch {
/* empty */
}
}
mainEffect = $effect.root(() => {
// Sync with localStorage
$effect(() => {
const serialized = {
...this.meta,
profiles: this.meta.profiles.map(p => serializeUser(p)),
}
setFromStorage('profileData', serialized)
// no more profiles left
if (serialized.profiles.length == 0) {
this.meta.profiles = [this.getDefaultProfile()]
this.meta.profile = 1
}
})
$effect(() => {
if (this.current.jwt)
this.fetchUserData().then(() => {
this.checkInbox().then(res => notifications.update(() => res))
})
})
})
}
export const profile = new CurrentProfile()
export const profile = new Profile()
export const notifications = writable<Notifications>({
applications: 0,
@@ -153,90 +303,6 @@ export const notifications = writable<Notifications>({
reports: 0,
})
$effect.root(() => {
$effect(() => {
const serialized = {
...profileData,
profiles: profileData.profiles.map(p => serializeUser(p)),
}
setFromStorage('profileData', serialized)
if (serialized.profiles.length == 0) {
profileData.profiles = [
{
id: 1,
instance: DEFAULT_INSTANCE_URL,
username: t.get('account.guest') || 'Guest',
},
]
profileData.profile = 1
}
})
$effect(() => {
if (profile.current.id || profileData)
profile.fetchUserData().then(() => {
checkInbox()
})
})
})
// cookie migration code
if (
env.PUBLIC_MIGRATE_COOKIE &&
profileData.profiles.length == 0 &&
env.PUBLIC_INSTANCE_URL
) {
const jwt = getCookie('jwt')
if (jwt) {
;(async () => {
const user = await userFromJwt(jwt, env.PUBLIC_INSTANCE_URL ?? '')
if (!user) return
const result = await setUser(jwt, env.PUBLIC_INSTANCE_URL ?? '')
if (result)
toast({
content:
'Your instance migrated to Photon, and you were logged in using a leftover cookie.',
type: 'success',
})
})()
}
}
export async function setUser(jwt: string, inst: string) {
try {
new URL(instanceToURL(inst))
} catch {
return
}
const user = await userFromJwt(jwt, inst)
.then(u => u)
.catch(err => {
toast({ content: errorMessage(err as string), type: 'error' })
})
if (!user?.user) {
toast({
content: "Your instance's API did not return your user data.",
type: 'error',
})
}
const id = Math.max(...profileData.profiles.map(p => p.id)) + 1
profileData.profile = id
profileData.profiles.push({
id: id,
instance: inst,
jwt: jwt,
username: user?.user?.local_user_view.person.name,
avatar: user?.user?.local_user_view.person.avatar,
})
return user
}
async function userFromJwt(
jwt: string,
instance: string,
@@ -281,44 +347,13 @@ async function userFromJwt(
}
}
export function resetProfile() {
profileData.profile = -1
}
export function deleteProfile(id: number) {
profileData.profiles.splice(
profileData.profiles.findIndex(p => p.id == id),
1,
)
if (id == profileData.profile) resetProfile()
}
function serializeUser(user: Profile): Profile {
function serializeUser(user: ProfileInfo): ProfileInfo {
return {
...user,
user: undefined,
}
}
export async function setUserID(id: number) {
if (!profileData.profiles.find(p => p.id == id)) return -1
profileData.profile = id
return profile
}
export function moveProfile(id: number, up: boolean) {
try {
const index = profileData.profiles.findIndex(i => i.id == id)
profileData.profiles = moveItem(
profileData.profiles,
index,
index + (up ? -1 : 1),
)
} catch {
/* empty */
}
}
async function getNotificationCount(jwt: string, mod: boolean, admin: boolean) {
const unreadsPromise = getClient()
.getUnreadCount()
@@ -356,57 +391,3 @@ async function getNotificationCount(jwt: string, mod: boolean, admin: boolean) {
applications: applications,
}
}
async function checkInbox() {
const { user, jwt } = profile.current
if (!jwt || !user) return
const notifs = await getNotificationCount(
jwt,
amModOfAny(user) ?? false,
user ? isAdmin(user) : false,
)
notifications.set({
inbox: notifs.unreads,
applications: notifs.applications,
reports: notifs.reports,
})
}
async function init() {
setInterval(checkInbox, 4 * 60 * 1000)
// hacky way to check donation status
setTimeout(() => {
if (
profile.current.user?.local_user_view.local_user
.last_donation_notification
) {
const donationDate = publishedToDate(
profile.current.user?.local_user_view.local_user
.last_donation_notification,
)
if (Date.now() - donationDate.getTime() > 365 * 24 * 60 * 60 * 1000) {
toast({
content: t.get('toast.lemmyDonate'),
duration: 3600 * 1000,
long: true,
})
// lemmy js client donation dialog is broken
fetch(
`${instanceToURL(profile.current.instance)}/api/v3/user/donation_dialog_shown`,
{
method: 'POST',
headers: {
authorization: `Bearer ${profile.current.jwt}`,
},
},
)
}
}
}, 3 * 1000)
}
init()
@@ -2,7 +2,7 @@
import { browser } from '$app/environment'
import { goto } from '$app/navigation'
import { page } from '$app/state'
import { profile, profileData } from '$lib/auth.svelte'
import { profile } from '$lib/auth.svelte'
import { t } from '$lib/i18n/translations'
import { resumables } from '$lib/lemmy/item'
import { theme } from '$lib/ui/colors.svelte'
@@ -24,7 +24,7 @@
groups = getGroups(
$resumables,
profile.current,
profileData.profiles,
profile.meta.profiles,
theme.data,
page.data.contextual?.actions,
)
@@ -1,6 +1,6 @@
import { goto } from '$app/navigation'
import { page } from '$app/state'
import { setUserID, type Profile } from '$lib/auth.svelte'
import { profile as currentProfile, type ProfileInfo } from '$lib/auth.svelte'
import {
amModOfAny,
isAdmin,
@@ -64,8 +64,8 @@ export interface Action {
export function getGroups(
resumables: ResumableItem[],
profile: Profile,
profiles: Profile[],
profile: ProfileInfo,
profiles: ProfileInfo[],
td: ThemeData,
contextual?: Action[],
) {
@@ -311,7 +311,7 @@ export function getGroups(
detail: p.instance,
handle: async () => {
if (profile.id != p.id) {
await setUserID(p.id)
currentProfile.meta.profile = p.id
}
await goto(page.url, {
@@ -1,7 +1,7 @@
<script lang="ts">
import { goto } from '$app/navigation'
import { page } from '$app/state'
import { profile, setUserID, type Profile } from '$lib/auth.svelte.js'
import { profile, type ProfileInfo } from '$lib/auth.svelte'
import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte'
import { LINKED_INSTANCE_URL } from '$lib/instance.svelte'
import ProfileAvatar from '$lib/lemmy/ProfileAvatar.svelte'
@@ -9,7 +9,7 @@
let switching: boolean = $state(false)
interface Props {
prof: Profile
prof: ProfileInfo
index: number
guest?: boolean
}
@@ -28,7 +28,7 @@
switching = true
if (profile.current?.id != prof.id) {
await setUserID(prof.id)
profile.meta.profile = prof.id
}
await goto(page.url, {
+4 -4
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { notifications, profile, profileData } from '$lib/auth.svelte.js'
import { notifications, profile } from '$lib/auth.svelte.js'
import Expandable from '$lib/components/ui/Expandable.svelte'
import CommunityList from '$lib/components/ui/sidebar/CommunityList.svelte'
import ProfileButton from '$lib/components/ui/sidebar/ProfileButton.svelte'
@@ -88,7 +88,7 @@
{/snippet}
</SidebarButton>
{/if}
{#if profileData.profiles.length >= 1}
{#if profile.meta.profiles.length >= 1}
<hr class="border-slate-200 dark:border-zinc-900 my-1" />
<Expandable
@@ -101,14 +101,14 @@
{$t('account.accounts')}
{#snippet action()}
<span class="dark:text-white text-black">
{profileData.profiles.length}
{profile.meta.profiles.length}
</span>
{/snippet}
</EndPlaceholder>
</span>
{/snippet}
<div class="w-full flex gap-px flex-col">
{#each [...profileData.profiles] as prof, index}
{#each [...profile.meta.profiles] as prof, index}
<div class="w-full">
<ProfileButton {index} {prof} />
</div>
+19 -27
View File
@@ -1,13 +1,5 @@
<script lang="ts">
import {
profile as currentProfile,
deleteProfile,
moveProfile,
type Profile,
profile,
profileData,
setUserID,
} from '$lib/auth.svelte.js'
import { profile, type ProfileInfo } from '$lib/auth.svelte.js'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import DebugObject from '$lib/components/util/debug/DebugObject.svelte'
import { t } from '$lib/i18n/translations'
@@ -29,11 +21,11 @@
} from 'svelte-hero-icons'
let debugging = $state(false)
let debugProfile: Profile | undefined = $state(undefined)
let debugProfile: ProfileInfo | undefined = $state(undefined)
let removing = $state({
shown: false,
account: undefined as Profile | undefined,
account: undefined as ProfileInfo | undefined,
})
let switching = $state(-1)
@@ -41,7 +33,7 @@
let radioSelected = $state(profile.current.id)
$effect(() => {
switching = radioSelected
setUserID(radioSelected)
profile.meta.profile = radioSelected
})
$effect(() => {
@@ -94,7 +86,7 @@
<Button
onclick={() => {
removing.shown = false
if (removing.account) deleteProfile(removing.account.id)
if (removing.account) profile.remove(removing.account.id)
}}
size="lg"
class="flex-1"
@@ -141,13 +133,13 @@
{/snippet}
</Header>
<form class="accounts-grid mt-4 sm:mt-6 gap-4">
{#each profileData.profiles as profile, index (profile.id)}
{#each profile.meta.profiles as p, index (p.id)}
<label>
<input
type="radio"
id={profile.id.toString()}
id={p.id.toString()}
name="profile"
value={profile.id}
value={p.id}
class="hidden peer"
bind:group={radioSelected}
/>
@@ -158,26 +150,26 @@
class={[
'flex flex-row items-center px-3 py-3 gap-2 transition-all duration-75 cursor-pointer relative',
'peer-checked:ring-2',
switching == profile.id && 'ring-slate-400 dark:ring-zinc-600',
switching == p.id && 'ring-slate-400 dark:ring-zinc-600',
]}
>
<ProfileAvatar
{profile}
profile={p}
{index}
selected={currentProfile?.data.id == profile.id}
selected={profile?.current.id == p.id}
size={40}
/>
<div class="flex flex-col overflow-hidden">
<span class="break-words font-medium text-base">
{profile.username}
{#if !profile.jwt}
{p.username}
{#if !p.jwt}
<Badge class="inline-grid w-6 h-6 p-0! place-items-center">
<Icon src={QuestionMarkCircle} size="16" micro />
</Badge>
{/if}
</span>
<span class="text-sm text-slate-600 dark:text-zinc-400">
{profile.instance}
{p.instance}
</span>
</div>
<Menu placement="bottom-end">
@@ -203,7 +195,7 @@
size="square-md"
color="secondary"
title={$t('account.moveUp')}
onclick={() => moveProfile(profile.id, true)}
onclick={() => profile.move(p.id, true)}
>
{#snippet prefix()}
<Icon src={ChevronUp} size="16" mini />
@@ -213,7 +205,7 @@
size="square-md"
color="secondary"
title={$t('account.moveDown')}
onclick={() => moveProfile(profile.id, false)}
onclick={() => profile.move(p.id, false)}
>
{#snippet prefix()}
<Icon src={ChevronDown} size="16" mini />
@@ -223,7 +215,7 @@
{#if settings.debugInfo}
<MenuButton
onclick={() => {
debugProfile = profile
debugProfile = p
debugging = !debugging
}}
>
@@ -233,10 +225,10 @@
{$t('common.debug')}
</MenuButton>
{/if}
{#if !LINKED_INSTANCE_URL || profile.user}
{#if !LINKED_INSTANCE_URL || p.user}
<MenuButton
onclick={() => {
removing.account = profile
removing.account = p
removing.shown = !removing.shown
}}
color="danger-subtle"
@@ -2,7 +2,7 @@
import { goto } from '$app/navigation'
import { resolveRoute } from '$app/paths'
import { page } from '$app/state'
import { profile, profileData } from '$lib/auth.svelte'
import { profile } from '$lib/auth.svelte'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import ProfileButton from '$lib/components/ui/sidebar/ProfileButton.svelte'
import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte'
@@ -74,8 +74,8 @@
{$t('routes.postRedirect.actions.back')}
</Button>
</div>
{#if profileData.profiles}
{@const filtered = profileData.profiles.filter(
{#if profile.meta.profiles}
{@const filtered = profile.meta.profiles.filter(
i => i.instance == page.params.instance,
)}
<div class="space-y-1">
+2 -2
View File
@@ -3,7 +3,6 @@
import { goto } from '$app/navigation'
import { page } from '$app/state'
import { setUser } from '$lib/auth.svelte.js'
import ErrorContainer, {
clearErrorScope,
pushError,
@@ -25,6 +24,7 @@
QuestionMarkCircle,
UserCircle,
} from 'svelte-hero-icons'
import { profile } from '$lib/auth.svelte'
interface Props {
ref?: string
@@ -57,7 +57,7 @@
})
if (response?.jwt) {
const result = await setUser(response.jwt, data.instance, data.username)
const result = await profile.add(response.jwt, data.instance)
if (result) {
toast({ content: $t('toast.logIn'), type: 'success' })
+5 -5
View File
@@ -3,7 +3,6 @@
import { goto } from '$app/navigation'
import { page } from '$app/state'
import { profileData } from '$lib/auth.svelte'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import { t } from '$lib/i18n/translations'
import { LINKED_INSTANCE_URL } from '$lib/instance.svelte'
@@ -12,6 +11,7 @@
import { DOMAIN_REGEX_FORMS } from '$lib/util.svelte'
import { MINIMUM_VERSION } from '$lib/version'
import { Button, Note, TextInput, toast } from 'mono-svelte'
import { profile } from '$lib/auth.svelte'
interface Props {
ref?: string
@@ -23,7 +23,7 @@
let form = $state({
instance: '',
username: `${$t('account.guest')} ${profileData.profiles.filter(p => p.jwt == undefined).length + 1}`,
username: `${$t('account.guest')} ${profile.meta.profiles.filter(p => p.jwt == undefined).length + 1}`,
loading: false,
})
@@ -35,13 +35,13 @@
return
}
const id = Math.max(...profileData.profiles.map(i => i.id)) + 1
profileData.profiles.push({
const id = Math.max(...profile.meta.profiles.map(i => i.id)) + 1
profile.meta.profiles.push({
id: id,
instance: form.instance,
username: form.username,
})
profileData.profile = id
profile.meta.profile = id
toast({ content: $t('toast.addAccount'), type: 'success' })
@@ -2,7 +2,7 @@
import { goto } from '$app/navigation'
import { resolveRoute } from '$app/paths'
import { page } from '$app/state'
import { profile, profileData } from '$lib/auth.svelte'
import { profile } from '$lib/auth.svelte'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import ProfileButton from '$lib/components/ui/sidebar/ProfileButton.svelte'
import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte'
@@ -74,8 +74,8 @@
{$t('routes.postRedirect.actions.back')}
</Button>
</div>
{#if profileData.profiles}
{@const filtered = profileData.profiles.filter(
{#if profile.meta.profiles}
{@const filtered = profile.meta.profiles.filter(
i => i.instance == page.params.instance,
)}
<div class="space-y-1">
@@ -1,11 +1,11 @@
<script lang="ts">
import { preventDefault } from 'svelte/legacy'
import { deleteProfile, profile, setUser } from '$lib/auth.svelte'
import { client } from '$lib/lemmy.svelte'
import { t } from '$lib/i18n/translations'
import { Button, TextInput, toast } from 'mono-svelte'
import { errorMessage } from '$lib/lemmy/error'
import { profile } from '$lib/auth.svelte'
let oldPassword = $state(''),
newPassword = $state(''),
@@ -21,9 +21,9 @@
old_password: oldPassword,
})
if (res?.jwt) {
const { instance, username } = profile.current
deleteProfile(profile.current.id)
await setUser(res.jwt, instance, username!)
const { instance } = profile.current
profile.remove(profile.current.id)
await profile.add(res.jwt, instance)
toast({ content: $t('toast.loginRefresh'), type: 'success' })
} else {
@@ -1,6 +1,5 @@
<script lang="ts">
import { goto } from '$app/navigation'
import { profileData, setUserID } from '$lib/auth.svelte'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import { client } from '$lib/lemmy.svelte'
import { t } from '$lib/i18n/translations'
@@ -14,6 +13,7 @@
TextInput,
toast,
} from 'mono-svelte'
import { profile } from '$lib/auth.svelte'
let deletion = $state({
modal: false,
@@ -70,11 +70,11 @@
delete_content: deletion.deleteContent,
})
profileData.profiles.splice(
profileData.profiles.findIndex(p => profileData.profile == p.id),
profile.meta.profiles.splice(
profile.meta.profiles.findIndex(p => profile.meta.profile == p.id),
)
setUserID(-1)
profile.meta.profile = -1
toast({
content: $t('toast.deleted'),
})
+3 -3
View File
@@ -3,7 +3,6 @@
import { goto } from '$app/navigation'
import { page } from '$app/state'
import { setUser } from '$lib/auth.svelte.js'
import ErrorContainer, {
clearErrorScope,
pushError,
@@ -37,6 +36,7 @@
QuestionMarkCircle,
XCircle,
} from 'svelte-hero-icons'
import { profile } from '$lib/auth.svelte.js'
let { data } = $props()
@@ -88,7 +88,7 @@
const registrationMode = data.site_view.local_site.registration_mode
if (res?.jwt) {
await setUser(res.jwt, page.params.instance)
await profile.add(res.jwt, page.params.instance)
toast({ content: $t('toast.logIn'), type: 'success' })
goto('/')
@@ -127,7 +127,7 @@
})
if (res.jwt) {
await setUser(res.jwt, page.params.instance)
await profile.add(res.jwt, page.params.instance)
goto('/')
} else if (res.verify_email_sent) {
pushError({