Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Passing along response parameters to the caller also for OAuth1 #79

Closed
wants to merge 2 commits into from
Closed

Passing along response parameters to the caller also for OAuth1 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9977902
Passing along response parameters to the caller also for OAuth1
phimage Jun 29, 2015
7c296b2
Merge upstream into feature-parametersoauth1
phimage Aug 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions OAuthSwift/OAuth1Swift.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ public class OAuth1Swift: NSObject {
static let appOnlyAuthenticationErrorCode = 1
}

public typealias TokenSuccessHandler = (credential: OAuthSwiftCredential, response: NSURLResponse) -> Void
public typealias TokenSuccessHandler = (credential: OAuthSwiftCredential, response: NSURLResponse, parameters: NSDictionary) -> Void
public typealias FailureHandler = (error: NSError) -> Void

// 0. Start
public func authorizeWithCallbackURL(callbackURL: NSURL, success: TokenSuccessHandler, failure: ((error: NSError) -> Void)) {
self.postOAuthRequestTokenWithCallbackURL(callbackURL, success: {
credential, response in
credential, response, parameters in

self.observer = NSNotificationCenter.defaultCenter().addObserverForName(CallbackNotification.notificationName, object: nil, queue: NSOperationQueue.mainQueue(), usingBlock:{
notification in
Expand All @@ -74,10 +74,7 @@ public class OAuth1Swift: NSObject {
if (parameters["oauth_verifier"] != nil) {
self.client.credential.oauth_verifier = parameters["oauth_verifier"]!
}
self.postOAuthAccessTokenWithRequestToken({
credential, response in
success(credential: credential, response: response)
}, failure: failure)
self.postOAuthAccessTokenWithRequestToken(success, failure: failure)
} else {
let userInfo = [NSLocalizedFailureReasonErrorKey: NSLocalizedString("Oauth problem.", comment: "")]
failure(error: NSError(domain: OAuthSwiftErrorDomain, code: -1, userInfo: userInfo))
Expand All @@ -103,7 +100,7 @@ public class OAuth1Swift: NSObject {
let parameters = responseString.parametersFromQueryString()
self.client.credential.oauth_token = parameters["oauth_token"]!
self.client.credential.oauth_token_secret = parameters["oauth_token_secret"]!
success(credential: self.client.credential, response: response)
success(credential: self.client.credential, response: response, parameters: parameters)
}, failure: failure)
}

Expand All @@ -118,7 +115,7 @@ public class OAuth1Swift: NSObject {
let parameters = responseString.parametersFromQueryString()
self.client.credential.oauth_token = parameters["oauth_token"]!
self.client.credential.oauth_token_secret = parameters["oauth_token_secret"]!
success(credential: self.client.credential, response: response)
success(credential: self.client.credential, response: response, parameters: parameters)
}, failure: failure)
}

Expand Down
5 changes: 1 addition & 4 deletions OAuthSwift/OAuth2Swift.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,7 @@ public class OAuth2Swift: NSObject {
}
if let code = responseParameters["code"] {
self.postOAuthAccessTokenWithRequestTokenByCode(code.stringByRemovingPercentEncoding!,
callbackURL:callbackURL,
success: { credential, response, responseParameters in
success(credential: credential, response: response, parameters: responseParameters)
}, failure: failure)
callbackURL:callbackURL, success: success, failure: failure)
}
if let error = responseParameters["error"], error_description = responseParameters["error_description"] {
let errorInfo = [NSLocalizedFailureReasonErrorKey: NSLocalizedString(error, comment: error_description)]
Expand Down
20 changes: 10 additions & 10 deletions OAuthSwiftDemo/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
)
//oauthswift.authorize_url_handler = WebViewController()
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/twitter")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Twitter", message: "auth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
var parameters = Dictionary<String, AnyObject>()
oauthswift.client.get("https://api.twitter.com/1.1/statuses/mentions_timeline.json", parameters: parameters,
Expand All @@ -62,7 +62,7 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
accessTokenUrl: "https://www.flickr.com/services/oauth/access_token"
)
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/flickr")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Flickr", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
let url :String = "https://api.flickr.com/services/rest/"
let parameters :Dictionary = [
Expand Down Expand Up @@ -170,7 +170,7 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
accessTokenUrl: "https://api.fitbit.com/oauth/access_token"
)
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/fitbit")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Fitbit", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
}, failure: {(error:NSError!) -> Void in
println(error.localizedDescription)
Expand All @@ -186,7 +186,7 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
accessTokenUrl: "https://oauth.withings.com/account/access_token"
)
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/withings")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Withings", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
}, failure: {(error:NSError!) -> Void in
println(error.localizedDescription)
Expand All @@ -202,7 +202,7 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
accessTokenUrl: "https://api.linkedin.com/uas/oauth/accessToken"
)
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/linkedin")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Linkedin", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
var parameters = Dictionary<String, AnyObject>()
oauthswift.client.get("https://api.linkedin.com/v1/people/~", parameters: parameters,
Expand Down Expand Up @@ -255,7 +255,7 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
oauthswift.allowMissingOauthVerifier = true
// NOTE: Smugmug's callback URL is configured on their site and the one passed in is ignored.
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/smugmug")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Smugmug", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
}, failure: {(error:NSError!) -> Void in
println(error.localizedDescription)
Expand Down Expand Up @@ -324,7 +324,7 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
accessTokenUrl: "https://bitbucket.org/api/1.0/oauth/access_token"
)
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/bitbucket")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("BitBucket", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
var parameters = Dictionary<String, AnyObject>()
oauthswift.client.get("https://bitbucket.org/api/1.0/user", parameters: parameters,
Expand Down Expand Up @@ -376,7 +376,7 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
accessTokenUrl: "https://oauth.intuit.com/oauth/v1/get_access_token"
)
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/intuit")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Intuit", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
}, failure: {(error:NSError!) -> Void in
println(error.localizedDescription)
Expand All @@ -391,7 +391,7 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
accessTokenUrl: "https://api.zaim.net/v2/auth/access"
)
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/zaim")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Zaim", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
}, failure: {(error:NSError!) -> Void in
println(error.localizedDescription)
Expand All @@ -406,7 +406,7 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
accessTokenUrl: "http://www.tumblr.com/oauth/access_token"
)
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/tumblr")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Tumblr", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
}, failure: {(error:NSError!) -> Void in
println(error.localizedDescription)
Expand Down
18 changes: 9 additions & 9 deletions OAuthSwiftOSXDemo/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class ViewController: NSViewController , NSTableViewDelegate, NSTableViewDataSou

//oauthswift.authorize_url_handler = createWebViewController()
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/twitter")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Twitter", message: "auth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
var parameters = Dictionary<String, AnyObject>()
oauthswift.client.get("https://api.twitter.com/1.1/statuses/mentions_timeline.json", parameters: parameters,
Expand All @@ -86,7 +86,7 @@ class ViewController: NSViewController , NSTableViewDelegate, NSTableViewDataSou
accessTokenUrl: "https://www.flickr.com/services/oauth/access_token"
)
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/flickr")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Flickr", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
let url :String = "https://api.flickr.com/services/rest/"
let parameters :Dictionary = [
Expand Down Expand Up @@ -202,7 +202,7 @@ class ViewController: NSViewController , NSTableViewDelegate, NSTableViewDataSou
accessTokenUrl: "https://api.fitbit.com/oauth/access_token"
)
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/fitbit")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Fitbit", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
}, failure: {(error:NSError!) -> Void in
println(error.localizedDescription)
Expand All @@ -218,7 +218,7 @@ class ViewController: NSViewController , NSTableViewDelegate, NSTableViewDataSou
accessTokenUrl: "https://oauth.withings.com/account/access_token"
)
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/withings")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Withings", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
}, failure: {(error:NSError!) -> Void in
println(error.localizedDescription)
Expand All @@ -234,7 +234,7 @@ class ViewController: NSViewController , NSTableViewDelegate, NSTableViewDataSou
accessTokenUrl: "https://api.linkedin.com/uas/oauth/accessToken"
)
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/linkedin")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Linkedin", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
var parameters = Dictionary<String, AnyObject>()
oauthswift.client.get("https://api.linkedin.com/v1/people/~", parameters: parameters,
Expand Down Expand Up @@ -287,7 +287,7 @@ class ViewController: NSViewController , NSTableViewDelegate, NSTableViewDataSou
oauthswift.allowMissingOauthVerifier = true
// NOTE: Smugmug's callback URL is configured on their site and the one passed in is ignored.
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/smugmug")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Smugmug", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
}, failure: {(error:NSError!) -> Void in
println(error.localizedDescription)
Expand Down Expand Up @@ -358,7 +358,7 @@ class ViewController: NSViewController , NSTableViewDelegate, NSTableViewDataSou
accessTokenUrl: "https://bitbucket.org/api/1.0/oauth/access_token"
)
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/bitbucket")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("BitBucket", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
var parameters = Dictionary<String, AnyObject>()
oauthswift.client.get("https://bitbucket.org/api/1.0/user", parameters: parameters,
Expand Down Expand Up @@ -412,7 +412,7 @@ class ViewController: NSViewController , NSTableViewDelegate, NSTableViewDataSou
accessTokenUrl: "https://oauth.intuit.com/oauth/v1/get_access_token"
)
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/intuit")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Intuit", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
}, failure: {(error:NSError!) -> Void in
println(error.localizedDescription)
Expand All @@ -428,7 +428,7 @@ class ViewController: NSViewController , NSTableViewDelegate, NSTableViewDataSou
accessTokenUrl: "https://api.zaim.net/v2/auth/access"
)
oauthswift.authorizeWithCallbackURL( NSURL(string: "oauth-swift://oauth-callback/zaim")!, success: {
credential, response in
credential, response, parameters in
self.showAlertView("Zaim", message: "oauth_token:\(credential.oauth_token)\n\noauth_toke_secret:\(credential.oauth_token_secret)")
}, failure: {(error:NSError!) -> Void in
println(error.localizedDescription)
Expand Down