mleku/flotilla
1
1
Fork 0
mirror of https://github.com/coracle-social/flotilla.git synced 2025-12-11 03:17:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use new welshman auth

Browse Source
This commit is contained in:
Jon Staab
2024-10-14 15:29:30 -07:00
parent 5e221d803e
commit d8a0b31d3a
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/commands.ts
View File

@@ -190,7 +190,10 @@ export const setInboxRelayPolicy = (url: string, enabled: boolean) => {
// Relay access
export const checkRelayAccess = async (url: string, claim = "") => {
await ctx.net.pool.get(url).ensureAuth()
const connection = ctx.net.pool.get(url)
await connection.auth.attemptIfRequested()
await connection.auth.waitIfPending()
const result = await publishThunk({
event: createEvent(28934, {tags: [["claim", claim]]}),
@@ -214,23 +217,24 @@ export const checkRelayProfile = async (url: string) => {
export const checkRelayConnection = async (url: string) => {
const connection = ctx.net.pool.get(url)
const okStatuses = [ConnectionStatus.Ok, ConnectionStatus.Slow, ConnectionStatus.Unauthorized]
const okStatuses = [ConnectionStatus.Ok, ConnectionStatus.Slow]
await connection.ensureConnected()
if (!okStatuses.includes(connection.meta.getStatus())) {
return `Failed to connect: "${connection.meta.getDescription()}"`
return `Failed to connect`
}
}
export const checkRelayAuth = async (url: string) => {
const connection = ctx.net.pool.get(url)
const okStatuses = [AuthStatus.Ok, AuthStatus.Pending]
const okStatuses = [AuthStatus.None, AuthStatus.Ok]
await connection.ensureAuth()
await connection.auth.attemptIfRequested()
await connection.auth.waitIfPending()
if (!okStatuses.includes(connection.meta.authStatus)) {
return `Failed to authenticate: "${connection.meta.authStatus}"`
if (!okStatuses.includes(connection.auth.status)) {
return `Failed to authenticate: "${connection.auth.message}"`
}
}