diff --git a/Dockerfile.dev b/Dockerfile.dev index c040e8e3b0..c7f29cc444 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -14,6 +14,6 @@ RUN yarn COPY . /app -ENV APPVIEW_PROXY=${APPVIEW_PROXY} +ENV APPVIEW_DID=${APPVIEW_DID} CMD ["yarn", "web"] diff --git a/src/env.ts b/src/env.ts index 724e46abda..c33106cffe 100644 --- a/src/env.ts +++ b/src/env.ts @@ -1,3 +1,5 @@ +import {Did} from '@atproto/api' + export const LOG_DEBUG = process.env.EXPO_PUBLIC_LOG_DEBUG || '' export const LOG_LEVEL = (process.env.EXPO_PUBLIC_LOG_LEVEL || 'info') as | 'debug' @@ -5,4 +7,4 @@ export const LOG_LEVEL = (process.env.EXPO_PUBLIC_LOG_LEVEL || 'info') as | 'warn' | 'error' -export const APPVIEW_PROXY = process.env.APPVIEW_PROXY || '' +export const APPVIEW_DID: Did = process.env.APPVIEW_DID || '' diff --git a/src/state/session/agent.ts b/src/state/session/agent.ts index ec5204e7a9..7c30955ed6 100644 --- a/src/state/session/agent.ts +++ b/src/state/session/agent.ts @@ -13,7 +13,7 @@ import {tryFetchGates} from '#/lib/statsig/statsig' import {getAge} from '#/lib/strings/time' import {logger} from '#/logger' import {snoozeEmailConfirmationPrompt} from '#/state/shell/reminders' -import {APPVIEW_PROXY} from '#/env' +import {APPVIEW_DID} from '#/env' import {emitNetworkConfirmed, emitNetworkLost} from '../events' import {addSessionErrorLog} from './logging' import { @@ -38,7 +38,7 @@ export async function createAgentAndResume( ) => void, ) { const agent = new BskyAppAgent({service: storedAccount.service}) - agent.configureProxy(`did:web:${APPVIEW_PROXY}#bsky_appview`) + agent.configureProxy(`${APPVIEW_DID}#bsky_appview`) if (storedAccount.pdsUrl) { agent.sessionManager.pdsUrl = new URL(storedAccount.pdsUrl) } @@ -86,7 +86,7 @@ export async function createAgentAndLogin( ) => void, ) { const agent = new BskyAppAgent({service}) - agent.configureProxy(`did:web:${APPVIEW_PROXY}#bsky_appview`) + agent.configureProxy(`${APPVIEW_DID}#bsky_appview`) await agent.login({identifier, password, authFactorToken}) const account = agentToSessionAccountOrThrow(agent) @@ -122,7 +122,7 @@ export async function createAgentAndCreateAccount( ) => void, ) { const agent = new BskyAppAgent({service}) - agent.configureProxy(`did:web:${APPVIEW_PROXY}#bsky_appview`) + agent.configureProxy(`${APPVIEW_DID}#bsky_appview`) await agent.createAccount({ email, password,