Merge pull request #190 from slyngbaek/master

Add auth headers to zip download requests not just feed requests.

Squirrel/SQRLUpdater.h

@@ -23,6 +23,9 @@ typedef enum : NSUInteger {
        SQRLUpdaterStateAwaitingRelaunch,
 } SQRLUpdaterState;
 
+// Block for providing download requests given a download url
+typedef NSURLRequest * (^SQRLRequestForDownload)(NSURL *);
+
 // The domain for errors originating within SQRLUpdater.
 extern NSString * const SQRLUpdaterErrorDomain;
 
@@ -92,6 +95,15 @@ extern NSString * const SQRLUpdaterJSONObjectErrorKey;
 // This property must never be set to nil.
 @property (atomic, copy) NSURLRequest *updateRequest;
 
+// The block used for fetching a given download request
+//
+// The default value is the argument that was originally passed to
+// -initWithUpdateRequest:requestForDownload:.
+//
+// If initialized with -initWithUpdateRequest: this block will
+// return a generic NSURLRequest with the provided url.
+@property (nonatomic, copy) SQRLRequestForDownload requestForDownload;
+
 // The `SQRLUpdate` subclass to instantiate with the server's response.
 //
 // By default, this is `SQRLUpdate` itself, but it can be set to a custom
@@ -111,6 +123,18 @@ extern NSString * const SQRLUpdaterJSONObjectErrorKey;
 // Returns the initialized `SQRLUpdater`.
 - (id)initWithUpdateRequest:(NSURLRequest *)updateRequest;
 
+// Initializes an updater that will send the given request to check for updates
+// and passes a block to provide requests for the update downloads.
+//
+// updateRequest - Same as with initWithUpdateRequest
+// requestForDownload - Once the update url is found for the update download, allow
+//                      providing custom requests that can be costomized as desired.
+//                      Useful for including `Authorization` headers just like the
+//                      updateRequest param.
+//
+// Returns the initialized `SQRLUpdater`.
+- (id)initWithUpdateRequest:(NSURLRequest *)updateRequest requestForDownload:(SQRLRequestForDownload)requestForDownload;
+
 // Executes `checkForUpdatesCommand` (if enabled) every `interval` seconds.
 //
 // The first check will not occur until `interval` seconds have passed.

Squirrel/SQRLUpdater.m

@@ -144,11 +144,19 @@ - (id)init {
 }
 
 - (id)initWithUpdateRequest:(NSURLRequest *)updateRequest {
+	return [self initWithUpdateRequest:updateRequest requestForDownload:^(NSURL *downloadURL) {
+		return [NSURLRequest requestWithURL:downloadURL];
+	}];
+}
+
+- (id)initWithUpdateRequest:(NSURLRequest *)updateRequest requestForDownload:(SQRLRequestForDownload)requestForDownload {
 	NSParameterAssert(updateRequest != nil);
+	NSParameterAssert(requestForDownload != nil);
 
 	self = [super init];
 	if (self == nil) return nil;
 
+	_requestForDownload = [requestForDownload copy];
 	_updateRequest = [updateRequest copy];
 	_updateClass = SQRLUpdate.class;
 
@@ -383,7 +391,8 @@ - (RACSignal *)downloadBundleForUpdate:(SQRLUpdate *)update intoDirectory:(NSURL
 	return [[RACSignal
 		defer:^{
 			NSURL *zipDownloadURL = update.updateURL;
-			NSMutableURLRequest *zipDownloadRequest = [NSMutableURLRequest requestWithURL:zipDownloadURL];
+			NSMutableURLRequest *zipDownloadRequest = [self.requestForDownload(zipDownloadURL) mutableCopy];
+
 			[zipDownloadRequest setValue:@"application/zip" forHTTPHeaderField:@"Accept"];
 			if (self.etag != nil) {
 				[zipDownloadRequest setValue:self.etag forHTTPHeaderField:@"If-None-Match"];