diff --git a/WebKit/scripts/controller/Oauth.js b/WebKit/scripts/controller/Oauth.js index 1adf8a9..f556117 100644 --- a/WebKit/scripts/controller/Oauth.js +++ b/WebKit/scripts/controller/Oauth.js @@ -142,7 +142,7 @@ function(HostApp, APICalls, Hmac) { var requestBody = JSON.stringify({ 'code' : urlVars["code"], - 'token_type' : "https://tent.io/oauth/hawk-token" + 'token_type': "https://tent.io/oauth/hawk-token" }); var those = this; @@ -154,7 +154,7 @@ function(HostApp, APICalls, Hmac) { ); APICalls.post(url, requestBody, { - content_type: "https://tent.io/types/app/v0#", + content_type: "application/json", auth_header: auth_header, callback: function(resp) { those.requestAccessTokenTicketFinished(resp.responseText); @@ -170,7 +170,6 @@ function(HostApp, APICalls, Hmac) { Oauth.prototype.requestAccessTokenTicketFinished = function(responseBody) { var access = JSON.parse(responseBody); - debug(access) HostApp.setStringForKey(access["access_token"], "user_access_token"); HostApp.setSecret(access["hawk_key"]); @@ -178,7 +177,6 @@ function(HostApp, APICalls, Hmac) { HostApp.setStringForKey(access["token_type"], "user_token_type"); HostApp.loggedIn(); - debug("loggedIn") } Oauth.prototype.logout = function() { diff --git a/WebKit/scripts/controller/Profile.js b/WebKit/scripts/controller/Profile.js index 94dcb7a..d57b605 100644 --- a/WebKit/scripts/controller/Profile.js +++ b/WebKit/scripts/controller/Profile.js @@ -240,7 +240,7 @@ function(HostApp, Core, APICalls, URI) { } else { var url = HostApp.serverUrl("posts_feed") + "?types=" + encodeURIComponent("https://tent.io/types/meta/v0") + "&entities=" + encodeURIComponent(this.entity) - debug(url) + APICalls.get(url, { callback: function(resp) { profile = JSON.parse(resp.responseText); @@ -272,7 +272,7 @@ function(HostApp, Core, APICalls, URI) { Profile.prototype.showProfile = function(profile) { - debug(profile) + //debug(profile) return var basic = profile["https://tent.io/types/info/basic/v0.1.0"]; diff --git a/WebKit/scripts/helper/APICalls.js b/WebKit/scripts/helper/APICalls.js index dd942de..64341b1 100644 --- a/WebKit/scripts/helper/APICalls.js +++ b/WebKit/scripts/helper/APICalls.js @@ -36,7 +36,12 @@ function(jQuery, HostApp, Hmac, Cache) { console.error("No content type for " + options.url); return; } else { - content_type = "application/vnd.tent.post.v0+json; type=\"" + options.content_type + "\""; + if(options.content_type != "application/json") { + content_type = "application/vnd.tent.post.v0+json; type=\"" + options.content_type + "\""; + } else { + content_type = options.content_type; + } + } var settings = { diff --git a/WebKit/scripts/helper/Paths.js b/WebKit/scripts/helper/Paths.js index f6a703f..af1fb75 100644 --- a/WebKit/scripts/helper/Paths.js +++ b/WebKit/scripts/helper/Paths.js @@ -65,7 +65,7 @@ function(jQuery, HostApp, Hmac, Cache) { console.error("getURL (" + xhr.status + ")" + xhr.statusText + " " + http_method + " (" + url + "): '" + xhr.responseText + "'"); } } - debug(url) + jQuery.ajax(options); }