Mastodon
/
mastodon-app-ufficiale-iphone-ios
mirror of https://github.com/mastodon/mastodon-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle onboarding authentication errors in /api/v1/instance

This commit is contained in:
Zac West 2022-03-15 20:16:08 -07:00
parent 0ec2b9f66c
commit 7da4c186e1
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Instance.swift
View File

@ -37,7 +37,18 @@ extension Mastodon.API.Instance {
)
return session.dataTaskPublisher(for: request)
.tryMap { data, response in
let value = try Mastodon.API.decode(type: Mastodon.Entity.Instance.self, from: data, response: response)
let value: Mastodon.Entity.Instance
do {
value = try Mastodon.API.decode(type: Mastodon.Entity.Instance.self, from: data, response: response)
} catch {
if let response = response as? HTTPURLResponse, 400 ..< 500 ~= response.statusCode {
// For example, AUTHORIZED_FETCH may result in authentication errors
value = Mastodon.Entity.Instance(domain: domain)
} else {
throw error
}
}
return Mastodon.Response.Content(value: value, response: response)
}
.eraseToAnyPublisher()

21
MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Instance.swift
View File

@ -22,7 +22,7 @@ extension Mastodon.Entity {
public let title: String
public let description: String
public let shortDescription: String?
public let email: String
public let email: String?
public let version: String?
public let languages: [String]? // (ISO 639 Part 1-5 language codes)
public let registrations: Bool?
@ -38,6 +38,25 @@ extension Mastodon.Entity {
// https://github.com/mastodon/mastodon/pull/16485
public let configuration: Configuration?
public init(domain: String) {
self.uri = domain
self.title = domain
self.description = ""
self.shortDescription = nil
self.email = nil
self.version = nil
self.languages = nil
self.registrations = nil
self.approvalRequired = nil
self.invitesEnabled = nil
self.urls = nil
self.statistics = nil
self.thumbnail = nil
self.contactAccount = nil
self.rules = nil
self.configuration = nil
}
enum CodingKeys: String, CodingKey {
case uri
case title