jeena/Bungloo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

fixed overwriting key in keychain

Browse source
This commit is contained in:
Jeena Paradies 2012-11-24 08:27:12 +01:00
parent b07088f15b
commit 75442db9e0
8 changed files with 57 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

5
WebKit/scripts/controller/Oauth.js
View file

@ -52,7 +52,6 @@ function(HostApp, Paths, Hmac) {
var those = this;
Paths.findProfileURL(entity,
function(profile_url) {
if (profile_url && (profile_url.startsWith("http://") || profile_url.startsWith("https://"))) {
those.register(profile_url);
} else {
@ -67,6 +66,7 @@ function(HostApp, Paths, Hmac) {
Oauth.prototype.register = function (url) {
var those = this;
Paths.getURL(url, "GET", function(resp) {
those.profile = JSON.parse(resp.responseText);
@ -78,7 +78,6 @@ function(HostApp, Paths, Hmac) {
var data = JSON.parse(resp.responseText);
those.authRequest(data);
}
Paths.getURL(Paths.mkApiRootPath("/apps"), "POST", callback, JSON.stringify(those.app_info));
});
}
@ -144,7 +143,7 @@ function(HostApp, Paths, Hmac) {
Oauth.prototype.requestAccessTokenTicketFinished = function(responseBody) {
var access = JSON.parse(responseBody);
HostApp.setStringForKey(access["access_token"], "user_access_token");
HostApp.setSecret(access["mac_key"]);
HostApp.setStringForKey(access["mac_algorithm"], "user_mac_algorithm");

51
WebKit/scripts/helper/Core.js
View file

@ -358,29 +358,24 @@ function(jQuery, Paths, URI, HostApp, Followings) {
post += "\r\n--" + boundary + "\r\n";
var binary_data = this.dataURItoBlob(image_data_uri);
var blob_string = image_data_uri.split(',')[1];
var mime_type = image_data_uri.split(',')[0].split(':')[1].split(';')[0];
var ext = "png";
if (binary_data.mime_type == "image/jpeg") {
if (mime_type == "image/jpeg") {
ext = "jpeg";
} else if (binary_data.mime_type == "image/gif") {
} else if (mime_type == "image/gif") {
ext = "gif";
}
var reader = new FileReader();
reader.onload = function(e) {
var blob_string = e.target.result;
post += 'Content-Disposition: form-data; name="photos[0]"; filename="photo.' + ext + '"\r\n';
post += 'Content-Length: ' + blob_string.length + "\r\n";
post += 'Content-Type: ' + binary_data.mime_type + "\r\n";
post += 'Content-Transfer-Encoding: base64\r\n\r\n';
post += image_data_uri.split(',')[1];
post += "\r\n--" + boundary + "--\r\n";
post += 'Content-Disposition: form-data; name="photos[0]"; filename="photo.' + ext + '"\r\n';
post += 'Content-Length: ' + blob_string.length + "\r\n";
post += 'Content-Type: ' + mime_type + "\r\n";
post += 'Content-Transfer-Encoding: base64\r\n\r\n';
post += blob_string;
post += "\r\n--" + boundary + "--\r\n";
Paths.postMultipart(url.toString(), callback, post, boundary);
}
reader.readAsBinaryString(binary_data.blob)
Paths.postMultipart(url.toString(), callback, post, boundary);
}
Core.prototype.remove = function(id, callback) {
@ -570,30 +565,6 @@ function(jQuery, Paths, URI, HostApp, Followings) {
HostApp.openNewMessageWidow(entity, status_id, string);
}
Core.prototype.dataURItoBlob = function(dataURI) {
// convert base64 to raw binary data held in a string
// doesn't handle URLEncoded DataURIs
var byteString = atob(dataURI.split(',')[1]);
// separate out the mime component
var mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0]
// write the bytes of the string to an ArrayBuffer
var ab = new ArrayBuffer(byteString.length);
var ia = new Uint8Array(ab);
for (var i = 0; i < byteString.length; i++) {
ia[i] = byteString.charCodeAt(i);
}
// write the ArrayBuffer to a blob, and you're done
var blob = new Blob([ab], {type: mimeString});
return {
mime_type: mimeString,
blob: blob,
base64: byteString
}
}
return Core;
});

4
WebKit/scripts/helper/Paths.js
View file

@ -40,7 +40,7 @@ function(jQuery, HostApp, Hmac) {
var user_access_token = HostApp.stringForKey("user_access_token");
if (auth_header !== false && user_access_token) {
if (auth_header !== false && typeof user_access_token != "undefined") {
auth_header = Hmac.makeAuthHeader(
url,
@ -59,7 +59,7 @@ function(jQuery, HostApp, Hmac) {
data: data,
processData: false,
error: function(xhr, ajaxOptions, thrownError) {
console.error("getURL " + xhr.statusText + " " + http_method + " (" + url + "): '" + xhr.responseText + "'");
console.error("getURL (" + xhr.status + ")" + xhr.statusText + " " + http_method + " (" + url + "): '" + xhr.responseText + "'");
}
});
}