fix age assurance screen always appearing #37

pull request https://tangled.org/jollywhoppers.com/witchsky.app/pulls/35 removed "proxying" from random parts of the social apps code. this already sounded like a bad idea to me, as the proxying could be there for a genuinely good reason. seems like this confirms it, as removing the proxying completely breaks the age assurance system and causes the screen to appear each time.

this pull request reverts the changes made by the pull request specifically for the age assurance code, i am unsure if that pull request broke anything else, only time will tell, at least this functions again.

+2 -4

2 changed files

Diff round #0

expand all

src

ageAssurance

data.tsx

useBeginAgeAssurance.ts

+1 -2

src/ageAssurance/data.tsx

··· 20 snoozeBirthdateUpdateAllowedForDid, 21 } from '#/state/birthdate' 22 import {useAgent, useSession} from '#/state/session' 23 - import {pdsAgent} from '#/state/session/agent' 24 import * as debug from '#/ageAssurance/debug' 25 import {logger} from '#/ageAssurance/logger' 26 import { ··· 337 agent: AtpAgent 338 }): Promise<OtherRequiredData> { 339 if (debug.enabled) return debug.resolve(debug.otherRequiredData) 340 - const [prefs] = await Promise.all([pdsAgent(agent).getPreferences()]) 341 const data: OtherRequiredData = { 342 birthdate: prefs.birthDate ? prefs.birthDate.toISOString() : undefined, 343 }

··· 20 snoozeBirthdateUpdateAllowedForDid, 21 } from '#/state/birthdate' 22 import {useAgent, useSession} from '#/state/session' 23 import * as debug from '#/ageAssurance/debug' 24 import {logger} from '#/ageAssurance/logger' 25 import { ··· 336 agent: AtpAgent 337 }): Promise<OtherRequiredData> { 338 if (debug.enabled) return debug.resolve(debug.otherRequiredData) 339 + const [prefs] = await Promise.all([agent.getPreferences()]) 340 const data: OtherRequiredData = { 341 birthdate: prefs.birthDate ? prefs.birthDate.toISOString() : undefined, 342 }

+1 -2

src/ageAssurance/useBeginAgeAssurance.ts

··· 10 } from '#/lib/constants' 11 import {isNetworkError} from '#/lib/hooks/useCleanError' 12 import {useAgent} from '#/state/session' 13 - import {pdsAgent} from '#/state/session/agent' 14 import {usePatchAgeAssuranceServerState} from '#/ageAssurance' 15 import {logger} from '#/ageAssurance/logger' 16 import {BLUESKY_PROXY_DID} from '#/env' ··· 39 40 const { 41 data: {token}, 42 - } = await pdsAgent(agent).com.atproto.server.getServiceAuth({ 43 aud: BLUESKY_PROXY_DID, 44 lxm: `app.bsky.ageassurance.begin`, 45 })

··· 10 } from '#/lib/constants' 11 import {isNetworkError} from '#/lib/hooks/useCleanError' 12 import {useAgent} from '#/state/session' 13 import {usePatchAgeAssuranceServerState} from '#/ageAssurance' 14 import {logger} from '#/ageAssurance/logger' 15 import {BLUESKY_PROXY_DID} from '#/env' ··· 38 39 const { 40 data: {token}, 41 + } = await agent.com.atproto.server.getServiceAuth({ 42 aud: BLUESKY_PROXY_DID, 43 lxm: `app.bsky.ageassurance.begin`, 44 })

History

1 round 0 comments

daniela.lol submitted #0 1mo

1 commit

expand

b9f4ecd9

revert "pdsAgent" change from age assurance

expand 0 comments

pull request successfully merged