Skip to content

Commit

Permalink
Merge pull request #1526 from p2p-org/fix/new-method
Browse files Browse the repository at this point in the history 
[PWN-8165] Return working striga method
  • Loading branch information
@lisemyon
lisemyon authored Jul 31, 2023
2 parents 7f3623e + 5cbe81b commit 320bc16
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 28 deletions.
53 changes: 26 additions & 27 deletions Packages/KeyAppKit/Sources/BankTransfer/Striga/Models/StrigaEndpoint.swift
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
import Foundation
import KeyAppNetworking
import KeyAppKitCore
import KeyAppNetworking
import SolanaSwift
import TweetNacl

/// Endpoint type for striga
struct StrigaEndpoint: HTTPEndpoint {

// MARK: - Properties

let baseURL: String
let path: String
let method: KeyAppNetworking.HTTPMethod
let keyPair: KeyPair
let header: [String : String]
let header: [String: String]
let body: String?

// MARK: - Initializer

private init(
Expand All @@ -29,10 +28,10 @@ struct StrigaEndpoint: HTTPEndpoint {
self.path = path
self.method = method
self.keyPair = keyPair
self.header = [
header = try [
"Content-Type": "application/json",
"User-PublicKey": keyPair.publicKey.base58EncodedString,
"Signed-Message": try keyPair.getSignedTimestampMessage()
"Signed-Message": keyPair.getSignedTimestampMessage(),
]
self.body = body?.encoded
}
Expand All @@ -46,7 +45,7 @@ struct StrigaEndpoint: HTTPEndpoint {
) throws -> Self {
try .init(
baseURL: baseURL,
path: "/api/v1/user/kyc/\(userId)",
path: "/striga/api/v1/user/kyc/\(userId)",
method: .get,
keyPair: keyPair,
body: nil
Expand All @@ -66,7 +65,7 @@ struct StrigaEndpoint: HTTPEndpoint {
keyPair: keyPair,
body: [
"userId": userId,
"verificationCode": verificationCode
"verificationCode": verificationCode,
]
)
}
Expand All @@ -88,7 +87,7 @@ struct StrigaEndpoint: HTTPEndpoint {
"userId": userId,
"sourceAccountId": sourceAccountId,
"whitelistedAddressId": whitelistedAddressId,
"amount": amount
"amount": amount,
]
)
}
Expand All @@ -106,7 +105,7 @@ struct StrigaEndpoint: HTTPEndpoint {
body: nil
)
}

static func createUser(
baseURL: String,
keyPair: KeyPair,
Expand All @@ -120,7 +119,7 @@ struct StrigaEndpoint: HTTPEndpoint {
body: body
)
}

static func resendSMS(
baseURL: String,
keyPair: KeyPair,
Expand All @@ -132,7 +131,7 @@ struct StrigaEndpoint: HTTPEndpoint {
method: .post,
keyPair: keyPair,
body: [
"userId": userId
"userId": userId,
]
)
}
Expand All @@ -146,7 +145,7 @@ struct StrigaEndpoint: HTTPEndpoint {
amount: String,
accountCreation: Bool = false
) throws -> Self {
return try .init(
try .init(
baseURL: baseURL,
path: "/api/v1/wallets/send/initiate/onchain",
method: .post,
Expand All @@ -156,7 +155,7 @@ struct StrigaEndpoint: HTTPEndpoint {
"sourceAccountId": .init(sourceAccountId),
"whitelistedAddressId": .init(whitelistedAddressId),
"amount": .init(amount),
"accountCreation": .init(accountCreation)
"accountCreation": .init(accountCreation),
] as [String: KeyAppNetworking.AnyEncodable]
)
}
Expand All @@ -172,7 +171,7 @@ struct StrigaEndpoint: HTTPEndpoint {
method: .post,
keyPair: keyPair,
body: [
"userId": userId
"userId": userId,
]
)
}
Expand All @@ -194,11 +193,11 @@ struct StrigaEndpoint: HTTPEndpoint {
"userId": .init(userId),
"startDate": .init(startDate.millisecondsSince1970),
"endDate": .init(endDate.millisecondsSince1970),
"page": .init(page)
"page": .init(page),
] as [String: KeyAppNetworking.AnyEncodable]
)
}

static func enrichAccount(
baseURL: String,
keyPair: KeyPair,
Expand All @@ -212,7 +211,7 @@ struct StrigaEndpoint: HTTPEndpoint {
keyPair: keyPair,
body: [
"userId": userId,
"accountId": accountId
"accountId": accountId,
]
)
}
Expand All @@ -230,7 +229,7 @@ struct StrigaEndpoint: HTTPEndpoint {
keyPair: keyPair,
body: [
"userId": userId,
"challengeId": challengeId
"challengeId": challengeId,
]
)
}
Expand All @@ -252,7 +251,7 @@ struct StrigaEndpoint: HTTPEndpoint {
"userId": userId,
"challengeId": challengeId,
"verificationCode": verificationCode,
"ip": ip
"ip": ip,
]
)
}
Expand All @@ -276,7 +275,7 @@ struct StrigaEndpoint: HTTPEndpoint {
"address": address,
"currency": currency,
"network": network,
"label": label
"label": label,
]
)
}
Expand All @@ -286,8 +285,8 @@ struct StrigaEndpoint: HTTPEndpoint {
keyPair: KeyPair,
userId: String,
currency: String?,
label: String?,
page: String?
label _: String?,
page _: String?
) throws -> Self {
try .init(
baseURL: baseURL,
Expand Down Expand Up @@ -359,7 +358,7 @@ struct StrigaEndpoint: HTTPEndpoint {
"accountId": .init(accountId),
"startDate": .init(startDate.millisecondsSince1970),
"endDate": .init(endDate.millisecondsSince1970),
"page": .init(page)
"page": .init(page),
] as [String: KeyAppNetworking.AnyEncodable]
)
}
Expand All @@ -368,8 +367,8 @@ struct StrigaEndpoint: HTTPEndpoint {
extension KeyPair {
func getSignedTimestampMessage(date: NSDate = NSDate()) throws -> String {
// get timestamp
let timestamp = "\(Int(date.timeIntervalSince1970) * 1_000)"
let timestamp = "\(Int(date.timeIntervalSince1970) * 1000)"

// form message
guard
let data = timestamp.data(using: .utf8),
Expand All @@ -392,7 +391,7 @@ private extension Encodable {
var encoded: String? {
encoded(strategy: .useDefaultKeys)
}

func encoded(strategy: JSONEncoder.KeyEncodingStrategy) -> String? {
let encoder = JSONEncoder()
encoder.outputFormatting = [.sortedKeys]
Expand Down
2 changes: 1 addition & 1 deletion Packages/KeyAppKit/Tests/UnitTests/BankTransferTests/StrigaEndpointTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class StrigaEndpointTests: XCTestCase {
userId: userId
)

XCTAssertEqual(endpoint.urlString, "https://example.com/api/v1/user/kyc/userId")
XCTAssertEqual(endpoint.urlString, "https://example.com/striga/api/v1/user/kyc/userId")
XCTAssertEqual(endpoint.method, .get)

let expectedHeader = try [
Expand Down

0 comments on commit 320bc16

Please sign in to comment.