Merge branch 'master' of github.com:jeena/Tentia into image

This commit is contained in:
Jeena Paradies 2012-11-24 00:30:44 +01:00
commit 00e1f54636
8 changed files with 68 additions and 10 deletions

View file

@ -10,6 +10,23 @@ define(function() {
controller.setStringForKey(string, key);
}
}
HostApp.setSecret = function(string) {
if (OS_TYPE == "mac") {
controller.setSecret_(string);
} else {
controller.setStringForKey(string, "user_mac_key");
}
}
HostApp.secret = function() {
if (OS_TYPE == "mac") {
return controller.secret();
} else {
return controller.stringForKey("user_mac_key");
}
}
HostApp.stringForKey = function(key) {

View file

@ -40,7 +40,8 @@ function(jQuery, HostApp, Hmac) {
auth_header = Hmac.makeAuthHeader(
url,
http_method,
HostApp.stringForKey("user_mac_key"),
//HostApp.stringForKey("user_mac_key"),
HostApp.secret(),
user_access_token
);
xhr.setRequestHeader("Authorization", auth_header);