keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename & clean & open group onion request init

Browse Source
pull/227/head
Ryan ZHAO 5 years ago
parent 428daac5b3
commit e2219f986c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File

6
SignalServiceKit/src/Loki/API/FileServerAPI.swift
Unescape Escape View File

@ -90,7 +90,7 @@ public final class FileServerAPI : DotNetAPI {
let url = URL(string: "\(server)/users?\(queryParameters)")! let url = URL(string: "\(server)/users?\(queryParameters)")!
let request = TSRequest(url: url) let request = TSRequest(url: url)
if (useOnionRequests) { if (useOnionRequests) {
return OnionRequestAPI.sendOnionRequestFileServerDest(request, server: server, using: fileServerPublicKey).map2 { rawResponse -> Set<DeviceLink> in return OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: fileServerPublicKey).map2 { rawResponse -> Set<DeviceLink> in
guard let data = rawResponse["data"] as? [JSON] else { guard let data = rawResponse["data"] as? [JSON] else {
print("[Loki] Couldn't parse device links for users: \(hexEncodedPublicKeys) from: \(rawResponse).") print("[Loki] Couldn't parse device links for users: \(hexEncodedPublicKeys) from: \(rawResponse).")
throw DotNetAPIError.parsingFailed throw DotNetAPIError.parsingFailed
@ -127,7 +127,7 @@ public final class FileServerAPI : DotNetAPI {
request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ] request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
return attempt(maxRetryCount: 8, recoveringOn: SnodeAPI.workQueue) { return attempt(maxRetryCount: 8, recoveringOn: SnodeAPI.workQueue) {
if (useOnionRequests) { if (useOnionRequests) {
return OnionRequestAPI.sendOnionRequestFileServerDest(request, server: server, using: fileServerPublicKey).map2 { _ in } return OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: fileServerPublicKey).map2 { _ in }
} }
return LokiFileServerProxy(for: server).perform(request).map2 { _ in } return LokiFileServerProxy(for: server).perform(request).map2 { _ in }
}.handlingInvalidAuthTokenIfNeeded(for: server).recover2 { error in }.handlingInvalidAuthTokenIfNeeded(for: server).recover2 { error in
@ -182,7 +182,7 @@ public final class FileServerAPI : DotNetAPI {
return Promise(error: error) return Promise(error: error)
} }
if (useOnionRequests) { if (useOnionRequests) {
return OnionRequestAPI.sendOnionRequestFileServerDest(request, server: server, using: fileServerPublicKey).map2 { json in return OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: fileServerPublicKey).map2 { json in
guard let data = json["data"] as? JSON, let downloadURL = data["url"] as? String else { guard let data = json["data"] as? JSON, let downloadURL = data["url"] as? String else {
print("[Loki] Couldn't parse profile picture from: \(json).") print("[Loki] Couldn't parse profile picture from: \(json).")
throw DotNetAPIError.parsingFailed throw DotNetAPIError.parsingFailed

2
SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift
Unescape Escape View File

@ -241,7 +241,7 @@ public enum OnionRequestAPI {
} }
/// Sends an onion request to `file server`. Builds new paths as needed. /// Sends an onion request to `file server`. Builds new paths as needed.
internal static func sendOnionRequestFileServerDest(_ request: NSURLRequest, server: String, using x25519Key: String) -> Promise<JSON> { internal static func sendOnionRequestLsrpcDest(_ request: NSURLRequest, server: String, using x25519Key: String) -> Promise<JSON> {
var headers = getCanonicalHeaders(for: request) var headers = getCanonicalHeaders(for: request)
let urlAsString = request.url!.absoluteString let urlAsString = request.url!.absoluteString
let serverURLEndIndex = urlAsString.range(of: server)!.upperBound let serverURLEndIndex = urlAsString.range(of: server)!.upperBound

2
SignalServiceKit/src/Loki/API/Open Groups/LokiPublicChatAPI.swift
Unescape Escape View File

@ -8,6 +8,8 @@ public final class LokiPublicChatAPI : DotNetAPI {
public static var displayNameUpdatees: [String:Set<String>] = [:] public static var displayNameUpdatees: [String:Set<String>] = [:]
internal static var useOnionRequests = true
// MARK: Settings // MARK: Settings
private static let attachmentType = "net.app.core.oembed" private static let attachmentType = "net.app.core.oembed"
private static let channelInfoType = "net.patter-app.settings" private static let channelInfoType = "net.patter-app.settings"

Write Preview
Loading…
Cancel
Save