FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added Reddit extension point enablement

This commit is contained in:
Maurice Parker 2020-05-03 14:10:21 -05:00
parent ccd600b880
commit 5f05e945a8
5 changed files with 65 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Frameworks/Account/FeedProvider/Reddit/RedditFeedProvider.swift
View File

@ -24,9 +24,8 @@ public enum RedditFeedProviderError: LocalizedError {
public struct RedditFeedProvider: FeedProvider {
private static let server = "api.twitter.com"
private static let apiBase = "https://api.twitter.com/1.1/"
private static let dateFormat = "EEE MMM dd HH:mm:ss Z yyyy"
private static let server = "www.reddit.com"
private static let apiBase = "https://oauth.reddit.com"
private static let userPaths = ["/home", "/notifications"]
private static let reservedPaths = ["/search", "/explore", "/messages", "/i", "/compose"]
@ -150,6 +149,24 @@ extension RedditFeedProvider: OAuth2SwiftProvider {
return oauth2
}
public static var callbackURL: URL {
return URL(string: "netnewswire://success")!
}
public static var oauth2Vars: (state: String, scope: String, params: [String : String]) {
let state = generateState(withLength: 20)
let scope = "identity mysubreddits"
let params = [
"client_id" : Secrets.redditConsumerKey,
"response_type" : "code",
"state" : state,
"redirect_uri" : "netnewswire://success",
"duration" : "permanent",
"scope" : scope
]
return (state: state, scope: scope, params: params)
}
}
private extension RedditFeedProvider {

4
Frameworks/Account/FeedProvider/Twitter/TwitterFeedProvider.swift
View File

@ -263,6 +263,10 @@ public struct TwitterFeedProvider: FeedProvider {
extension TwitterFeedProvider: OAuth1SwiftProvider {
public static var callbackURL: URL {
return URL(string: "netnewswire://")!
}
public static var oauth1Swift: OAuth1Swift {
return OAuth1Swift(
consumerKey: Secrets.twitterConsumerKey,

1
Frameworks/Secrets/OAuth1SwiftProvider.swift
View File

@ -12,5 +12,6 @@ import OAuthSwift
public protocol OAuth1SwiftProvider {
static var oauth1Swift: OAuth1Swift { get }
static var callbackURL: URL { get }
}

2
Frameworks/Secrets/OAuth2SwiftProvider.swift
View File

@ -13,5 +13,7 @@ import OAuthSwift
public protocol OAuth2SwiftProvider {
static var oauth2Swift: OAuth2Swift { get }
static var callbackURL: URL { get }
static var oauth2Vars: (state: String, scope: String, params: [String: String]) { get }
}

43
Mac/Preferences/ExtensionPoints/ExtensionPointEnableWindowController.swift
View File

@ -20,7 +20,7 @@ class ExtensionPointEnableWindowController: NSWindowController {
private weak var hostWindow: NSWindow?
private let callbackURL = URL(string: "netnewswire://")!
private var callbackURL: URL? = nil
private var oauth: OAuthSwift?
var extensionPointType: ExtensionPoint.Type?
@ -58,6 +58,8 @@ class ExtensionPointEnableWindowController: NSWindowController {
if let oauth1 = extensionPointType as? OAuth1SwiftProvider.Type {
enableOauth1(oauth1)
} else if let oauth2 = extensionPointType as? OAuth2SwiftProvider.Type {
enableOauth2(oauth2)
} else {
ExtensionPointManager.shared.activateExtensionPoint(extensionPointType) { result in
if case .failure(let error) = result {
@ -74,7 +76,7 @@ class ExtensionPointEnableWindowController: NSWindowController {
extension ExtensionPointEnableWindowController: OAuthSwiftURLHandlerType {
public func handle(_ url: URL) {
let session = ASWebAuthenticationSession(url: url, callbackURLScheme: callbackURL.scheme, completionHandler: { (url, error) in
let session = ASWebAuthenticationSession(url: url, callbackURLScheme: callbackURL!.scheme, completionHandler: { (url, error) in
if let callbackedURL = url {
OAuth1Swift.handle(url: callbackedURL)
}
@ -114,12 +116,13 @@ extension ExtensionPointEnableWindowController: ASWebAuthenticationPresentationC
private extension ExtensionPointEnableWindowController {
func enableOauth1(_ provider: OAuth1SwiftProvider.Type) {
callbackURL = provider.callbackURL
let oauth1 = provider.oauth1Swift
self.oauth = oauth1
oauth1.authorizeURLHandler = self
oauth1.authorize(withCallbackURL: callbackURL) { [weak self] result in
oauth1.authorize(withCallbackURL: callbackURL!) { [weak self] result in
guard let self = self, let extensionPointType = self.extensionPointType else { return }
switch result {
@ -131,7 +134,37 @@ private extension ExtensionPointEnableWindowController {
self.hostWindow!.endSheet(self.window!, returnCode: NSApplication.ModalResponse.OK)
}
case .failure(let oauthSwiftError):
NSApplication.shared.presentError(oauthSwiftError)
self.presentError(oauthSwiftError)
}
self.oauth?.cancel()
self.oauth = nil
}
}
func enableOauth2(_ provider: OAuth2SwiftProvider.Type) {
callbackURL = provider.callbackURL
let oauth2 = provider.oauth2Swift
self.oauth = oauth2
oauth2.authorizeURLHandler = self
let oauth2Vars = provider.oauth2Vars
oauth2.authorize(withCallbackURL: callbackURL!, scope: oauth2Vars.scope, state: oauth2Vars.state, parameters: oauth2Vars.params) { [weak self] result in
guard let self = self, let extensionPointType = self.extensionPointType else { return }
switch result {
case .success(let tokenSuccess):
ExtensionPointManager.shared.activateExtensionPoint(extensionPointType, tokenSuccess: tokenSuccess) { result in
if case .failure(let error) = result {
self.presentError(error)
}
self.hostWindow!.endSheet(self.window!, returnCode: NSApplication.ModalResponse.OK)
}
case .failure(let oauthSwiftError):
self.presentError(oauthSwiftError)
}
self.oauth?.cancel()