Skip to content

Commit b30c910

Browse files
committed
Update Optionals for beta 7
1 parent 46427ca commit b30c910

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

OAuth2/OAuth2.swift

+9-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Foundation
1010

1111
let OAuth2ErrorDomain = "OAuth2ErrorDomain"
1212

13-
enum OAuth2Error: Int {
13+
public enum OAuth2Error: Int {
1414
case Generic = 600
1515
case Unsupported
1616
case NetworkError
@@ -175,8 +175,12 @@ public class OAuth2 {
175175
comp.query = OAuth2.queryStringFor(urlParams)
176176

177177
let final = comp.URL
178-
logIfVerbose("Authorizing against \(final.description)")
179-
return final;
178+
if nil == final {
179+
NSException(name: "OAuth2InvalidURL", reason: "Failed to create authorize URL", userInfo: urlParams).raise()
180+
}
181+
182+
logIfVerbose("Authorizing against \(final!.description)")
183+
return final!;
180184
}
181185

182186
/**
@@ -308,11 +312,11 @@ public class OAuth2 {
308312
}
309313

310314

311-
func genOAuth2Error(message: String) -> NSError {
315+
public func genOAuth2Error(message: String) -> NSError {
312316
return genOAuth2Error(message, .Generic)
313317
}
314318

315-
func genOAuth2Error(message: String, code: OAuth2Error) -> NSError {
319+
public func genOAuth2Error(message: String, code: OAuth2Error) -> NSError {
316320
return NSError(domain: OAuth2ErrorDomain, code: code.toRaw(), userInfo: [NSLocalizedDescriptionKey: message])
317321
}
318322

OAuth2/OAuth2CodeGrant.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class OAuth2CodeGrant: OAuth2 {
5858
let body = comp.query
5959
comp.query = nil
6060

61-
let post = NSMutableURLRequest(URL: comp.URL)
61+
let post = NSMutableURLRequest(URL: comp.URL!)
6262
post.HTTPMethod = "POST"
6363
post.setValue("application/x-www-form-urlencoded; charset=utf-8", forHTTPHeaderField: "Content-Type")
6464
post.HTTPBody = body?.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: true)

OAuth2/OAuth2WebViewController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public class OAuth2WebViewController: UIViewController, UIWebViewDelegate
174174
func dismiss(# asCancel: Bool, animated: Bool) {
175175
webView.stopLoading()
176176

177-
presentingViewController.dismissViewControllerAnimated(animated) {
177+
presentingViewController?.dismissViewControllerAnimated(animated) {
178178
if nil != self.onDismiss {
179179
self.onDismiss!(didCancel: asCancel)
180180
}
@@ -198,7 +198,7 @@ public class OAuth2WebViewController: UIViewController, UIWebViewDelegate
198198
}
199199

200200
public func webViewDidStartLoad(webView: UIWebView!) {
201-
if "file" != webView.request.URL?.scheme {
201+
if "file" != webView.request?.URL.scheme {
202202
showLoadingIndicator()
203203
}
204204
}

0 commit comments

Comments
 (0)