Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 18:36:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15690 from danteruiz/mac-launcher-bugs

Browse source 
Fixing mac luancher bugs.
This commit is contained in:
Shannon Romano 2019-06-06 15:07:07 -07:00 committed by GitHub
commit fae13682d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
launchers/darwin/src/CredentialsRequest.m
View file

@ -7,7 +7,9 @@
- (void) confirmCredentials:(NSString*)username :(NSString*)password { - (void) confirmCredentials:(NSString*)username :(NSString*)password {
NSLog(@"web request started"); NSLog(@"web request started");
NSString *post = [NSString stringWithFormat:@"grant_type=password&username=%@&password=%@&scope=owner", username, password]; NSString *post = [NSString stringWithFormat:@"grant_type=password&username=%@&password=%@&scope=owner",
[username stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet alphanumericCharacterSet]],
[password stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet alphanumericCharacterSet]]];
NSData *postData = [post dataUsingEncoding:NSUTF8StringEncoding]; NSData *postData = [post dataUsingEncoding:NSUTF8StringEncoding];
NSString *postLength = [NSString stringWithFormat:@"%ld", (unsigned long)[postData length]]; NSString *postLength = [NSString stringWithFormat:@"%ld", (unsigned long)[postData length]];
@ -18,7 +20,6 @@
[request setValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"]; [request setValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"];
[request setHTTPBody:postData]; [request setHTTPBody:postData];
//NSURLConnection *theConnection = [[NSURLConnection alloc] initWithRequest:request delegate:self];
NSURLSession* session = [NSURLSession sharedSession]; NSURLSession* session = [NSURLSession sharedSession];
NSURLSessionDataTask* dataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { NSURLSessionDataTask* dataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {

1
launchers/darwin/src/DownloadInterface.m
View file

@ -41,6 +41,7 @@
[fileManager moveItemAtURL:location toURL:destinationURL error:&error]; [fileManager moveItemAtURL:location toURL:destinationURL error:&error];
Launcher* sharedLauncher = [Launcher sharedLauncher]; Launcher* sharedLauncher = [Launcher sharedLauncher];
[sharedLauncher setDownloadFilename:destinationFileName];
NSString* appPath = [sharedLauncher getAppPath]; NSString* appPath = [sharedLauncher getAppPath];
NSString* downloadFileName = [sharedLauncher getDownloadFilename]; NSString* downloadFileName = [sharedLauncher getDownloadFilename];

3
launchers/darwin/src/OrganizationRequest.m
View file

@ -12,7 +12,7 @@ static NSString* const organizationURL = @"https://s3.amazonaws.com/hifi-public/
self.username = aUsername; self.username = aUsername;
const char *cKey = LAUNCHER_HMAC_SECRET; const char *cKey = LAUNCHER_HMAC_SECRET;
const char *cData = [aOrganization cStringUsingEncoding:NSASCIIStringEncoding]; const char *cData = [[aOrganization lowercaseString] cStringUsingEncoding:NSASCIIStringEncoding];
unsigned char cHMAC[CC_SHA256_DIGEST_LENGTH]; unsigned char cHMAC[CC_SHA256_DIGEST_LENGTH];
CCHmac(kCCHmacAlgSHA256, cKey, strlen(cKey), cData, strlen(cData), cHMAC); CCHmac(kCCHmacAlgSHA256, cKey, strlen(cKey), cData, strlen(cData), cHMAC);
NSData *HMACData = [NSData dataWithBytes:cHMAC length:sizeof(cHMAC)]; NSData *HMACData = [NSData dataWithBytes:cHMAC length:sizeof(cHMAC)];
@ -33,7 +33,6 @@ static NSString* const organizationURL = @"https://s3.amazonaws.com/hifi-public/
[sharedLauncher setLoginErrorState: NONE]; [sharedLauncher setLoginErrorState: NONE];
return [sharedLauncher organizationRequestFinished:TRUE]; return [sharedLauncher organizationRequestFinished:TRUE];
} }
NSLog(@"FAAAAILLLLLLLEEEEEEEDDDDDD");
[sharedLauncher setLoginErrorState: ORGANIZATION]; [sharedLauncher setLoginErrorState: ORGANIZATION];
return [sharedLauncher organizationRequestFinished:FALSE]; return [sharedLauncher organizationRequestFinished:FALSE];
/*NSLog(@"URL: %@", [organizationURL stringByAppendingString:jsonFile]); /*NSLog(@"URL: %@", [organizationURL stringByAppendingString:jsonFile]);