FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retrieve session id for later requests

Browse Source
This commit is contained in:
Anh Do 2020-03-09 23:26:11 -04:00
parent 034aabbfff
commit b7fe991b7b
No known key found for this signature in database
GPG Key ID: 451E3092F917B62D
5 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Frameworks/Account/Credentials/Credentials.swift
View File

@ -17,7 +17,8 @@ public enum CredentialsType: String {
case basic = "password" case basic = "password"
case feedWranglerBasic = "feedWranglerBasic" case feedWranglerBasic = "feedWranglerBasic"
case feedWranglerToken = "feedWranglerToken" case feedWranglerToken = "feedWranglerToken"
case newsBlur = "newsBlur" case newsBlurBasic = "newsBlurBasic"
case newsBlurSessionId = "newsBlurSessionId"
case readerBasic = "readerBasic" case readerBasic = "readerBasic"
case readerAPIKey = "readerAPIKey" case readerAPIKey = "readerAPIKey"
case oauthAccessToken = "oauthAccessToken" case oauthAccessToken = "oauthAccessToken"

5
Frameworks/Account/Credentials/URLRequest+RSWeb.swift
View File

@ -33,11 +33,14 @@ public extension URLRequest {
]) ])
case .feedWranglerToken: case .feedWranglerToken:
self.url = url.appendingQueryItem(URLQueryItem(name: "access_token", value: credentials.secret)) self.url = url.appendingQueryItem(URLQueryItem(name: "access_token", value: credentials.secret))
case .newsBlur: case .newsBlurBasic:
setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type") setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
httpMethod = "POST" httpMethod = "POST"
let postData = "username=\(credentials.username)&password=\(credentials.secret)" let postData = "username=\(credentials.username)&password=\(credentials.secret)"
httpBody = postData.data(using: String.Encoding.utf8) httpBody = postData.data(using: String.Encoding.utf8)
case .newsBlurSessionId:
setValue("\(NewsBlurAPICaller.SessionIdCookie)=\(credentials.secret)", forHTTPHeaderField: "Cookie")
httpShouldHandleCookies = true
case .readerBasic: case .readerBasic:
setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type") setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
httpMethod = "POST" httpMethod = "POST"

20
Frameworks/Account/NewsBlur/NewsBlurAPICaller.swift
View File

@ -21,6 +21,7 @@ enum NewsBlurError: LocalizedError {
} }
final class NewsBlurAPICaller: NSObject { final class NewsBlurAPICaller: NSObject {
static let SessionIdCookie = "newsblur_sessionid"
private let baseURL = URL(string: "https://www.newsblur.com/")! private let baseURL = URL(string: "https://www.newsblur.com/")!
private var transport: Transport! private var transport: Transport!
@ -39,8 +40,8 @@ final class NewsBlurAPICaller: NSObject {
transport.send(request: request, resultType: NewsBlurLoginResponse.self) { result in transport.send(request: request, resultType: NewsBlurLoginResponse.self) { result in
switch result { switch result {
case .success(_, let payload): case .success(let response, let payload):
guard payload?.code != -1 else { guard let url = response.url, let headerFields = response.allHeaderFields as? [String: String], payload?.code != -1 else {
let error = payload?.errors?.username ?? payload?.errors?.others let error = payload?.errors?.username ?? payload?.errors?.others
if let message = error?.first { if let message = error?.first {
completion(.failure(NewsBlurError.general(message: message))) completion(.failure(NewsBlurError.general(message: message)))
@ -49,7 +50,20 @@ final class NewsBlurAPICaller: NSObject {
} }
return return
} }
completion(.success(self.credentials))
guard let username = self.credentials?.username else {
completion(.failure(NewsBlurError.general(message: "Failed to log in")))
return
}
let cookies = HTTPCookie.cookies(withResponseHeaderFields: headerFields, for: url)
for cookie in cookies where cookie.name == Self.SessionIdCookie {
let credentials = Credentials(type: .newsBlurSessionId, username: username, secret: cookie.value)
completion(.success(credentials))
return
}
completion(.failure(NewsBlurError.general(message: "Failed to retrieve session")))
case .failure(let error): case .failure(let error):
completion(.failure(error)) completion(.failure(error))
} }

2
Frameworks/Account/NewsBlur/NewsBlurAccountDelegate.swift
View File

@ -116,7 +116,7 @@ final class NewsBlurAccountDelegate: AccountDelegate {
} }
func accountDidInitialize(_ account: Account) { func accountDidInitialize(_ account: Account) {
credentials = try? account.retrieveCredentials(type: .newsBlur) credentials = try? account.retrieveCredentials(type: .newsBlurSessionId)
} }
func accountWillBeDeleted(_ account: Account) { func accountWillBeDeleted(_ account: Account) {

2
iOS/Account/NewsBlurAccountViewController.swift
View File

@ -87,7 +87,7 @@ class NewsBlurAccountViewController: UITableViewController {
// When you fill in the email address via auto-complete it adds extra whitespace // When you fill in the email address via auto-complete it adds extra whitespace
let trimmedUsername = username.trimmingCharacters(in: .whitespaces) let trimmedUsername = username.trimmingCharacters(in: .whitespaces)
let credentials = Credentials(type: .newsBlur, username: trimmedUsername, secret: password) let credentials = Credentials(type: .newsBlurBasic, username: trimmedUsername, secret: password)
Account.validateCredentials(type: .newsBlur, credentials: credentials) { result in Account.validateCredentials(type: .newsBlur, credentials: credentials) { result in
self.stopAnimtatingActivityIndicator() self.stopAnimtatingActivityIndicator()