Rename JSONDictionary to OAuth2JSON

This makes it possible to include the OAuth2 sources in another project that may already have a definition for "JSONDictionary". Such compatibility is needed to build frameworks that need to include the source files of OAuth2 in order to be distributable.

Author: p2

OAuth2/OAuth2.swift

@@ -31,7 +31,7 @@ public enum OAuth2Error: Int {
 	case AuthorizationError
 }
 
-public typealias JSONDictionary = [String: AnyObject]
+public typealias OAuth2JSON = [String: AnyObject]
 
 
 /**
@@ -40,7 +40,7 @@ public typealias JSONDictionary = [String: AnyObject]
 public class OAuth2
 {
 	/** Settings, as set upon initialization. */
-	let settings: JSONDictionary
+	let settings: OAuth2JSON
 
 	/** The client id. */
 	public let clientId: String
@@ -69,7 +69,7 @@ public class OAuth2
 	public var accessTokenExpiry: NSDate?
 
 	/** Closure called on successful authentication on the main thread. */
-	public var onAuthorize: ((parameters: JSONDictionary) -> Void)?
+	public var onAuthorize: ((parameters: OAuth2JSON) -> Void)?
 
 	/** When authorization fails (if error is not nil) or is cancelled, this block is executed on the main thread. */
 	public var onFailure: ((error: NSError?) -> Void)?
@@ -104,7 +104,7 @@ public class OAuth2
 
 		MITREid: https://github.com/mitreid-connect/
 	 */
-	public init(settings: JSONDictionary) {
+	public init(settings: OAuth2JSON) {
 		self.settings = settings
 
 		if let cid = settings["client_id"] as? String {
@@ -249,7 +249,7 @@ public class OAuth2
 		NSException(name: "OAuth2AbstractClassUse", reason: "Abstract class use", userInfo: nil).raise()
 	}
 
-	func didAuthorize(parameters: JSONDictionary) {
+	func didAuthorize(parameters: OAuth2JSON) {
 		callOnMainThread() {
 			self.onAuthorize?(parameters: parameters)
 			self.afterAuthorizeOrFailure?(wasFailure: false, error: nil)
@@ -307,7 +307,7 @@ public class OAuth2
 		:returns: An NSError instance with the "best" localized error key and all parameters in the userInfo dictionary;
 		          domain "OAuth2ErrorDomain", code 600
 	 */
-	class func errorForAccessTokenErrorResponse(params: JSONDictionary) -> NSError {
+	class func errorForAccessTokenErrorResponse(params: OAuth2JSON) -> NSError {
 		var message = ""
 
 		// "error_description" is optional, we prefer it if it's present

OAuth2/OAuth2CodeGrant.swift

@@ -34,7 +34,7 @@ public class OAuth2CodeGrant: OAuth2
 	/** The receiver's long-time refresh token. */
 	public var refreshToken = ""
 
-	public override init(settings: JSONDictionary) {
+	public override init(settings: OAuth2JSON) {
 		if let token = settings["token_uri"] as? String {
 			tokenURL = NSURL(string: token)
 		}
@@ -150,10 +150,10 @@ public class OAuth2CodeGrant: OAuth2
 	/**
 		Parse the NSData object returned while exchanging the code for a token in `exchangeCodeForToken`.
 
-		:returns: A JSONDictionary, which is usually returned upon token exchange and may contain additional information
+		:returns: A OAuth2JSON, which is usually returned upon token exchange and may contain additional information
 	 */
-	func parseTokenExchangeResponse(data: NSData, error: NSErrorPointer) -> JSONDictionary? {
-		if let json = NSJSONSerialization.JSONObjectWithData(data, options: nil, error: error) as? JSONDictionary {
+	func parseTokenExchangeResponse(data: NSData, error: NSErrorPointer) -> OAuth2JSON? {
+		if let json = NSJSONSerialization.JSONObjectWithData(data, options: nil, error: error) as? OAuth2JSON {
 			if let access = json["access_token"] as? String {
 				accessToken = access
 			}

OAuth2/OAuth2CodeGrantFacebook.swift

@@ -27,7 +27,7 @@ import Foundation
  */
 public class OAuth2CodeGrantFacebook: OAuth2CodeGrant
 {
-	override func parseTokenExchangeResponse(data: NSData, error: NSErrorPointer) -> JSONDictionary? {
+	override func parseTokenExchangeResponse(data: NSData, error: NSErrorPointer) -> OAuth2JSON? {
 		if let str = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
 			let query = self.dynamicType.paramsFromQuery(str)
 			if let access = query["access_token"] {