mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

restored request logging

Browse source
This commit is contained in:
LukePulverenti 2013-03-16 01:52:33 -04:00
parent 3de46dfe40
commit 572607892a
2 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
ApiClient.js
View file

@ -13,6 +13,8 @@ var ApiClient = {
serverPortNumber: 8096, serverPortNumber: 8096,
currentUserId: null,
/** /**
* Detects the hostname and port of MB server based on the current url * Detects the hostname and port of MB server based on the current url
*/ */
@ -36,14 +38,12 @@ var ApiClient = {
throw new Error("Url name cannot be empty"); throw new Error("Url name cannot be empty");
} }
params = params || {};
var url = ApiClient.serverProtocol + "//" + ApiClient.serverHostName + ":" + ApiClient.serverPortNumber + "/mediabrowser/" + name; var url = ApiClient.serverProtocol + "//" + ApiClient.serverHostName + ":" + ApiClient.serverPortNumber + "/mediabrowser/" + name;
if (params) { if (params) {
url += "?" + $.param(params); url += "?" + $.param(params);
} }
return url; return url;
}, },
@ -76,6 +76,10 @@ var ApiClient = {
return "Web Browser"; return "Web Browser";
}, },
getDeviceId: function() {
return SHA1(navigator.userAgent + (navigator.cpuClass || ""));
},
/** /**
* Creates a custom api url based on a handler name and query string parameters * Creates a custom api url based on a handler name and query string parameters
@ -89,16 +93,14 @@ var ApiClient = {
} }
params = params || {}; params = params || {};
params.client = "Dashboard";
params.device = ApiClient.getDeviceName();
params.format = "json"; params.format = "json";
var url = ApiClient.serverProtocol + "//" + ApiClient.serverHostName + ":" + ApiClient.serverPortNumber + "/mediabrowser/" + name; var url = ApiClient.serverProtocol + "//" + ApiClient.serverHostName + ":" + ApiClient.serverPortNumber + "/mediabrowser/" + name;
if (params) { if (params) {
url += "?" + $.param(params); url += "?" + $.param(params);
} }
return url; return url;
}, },
@ -1063,7 +1065,7 @@ var ApiClient = {
var postData = { var postData = {
password: SHA1(password || "") password: SHA1(password || "")
}; };
return $.ajax({ return $.ajax({
type: "POST", type: "POST",
url: url, url: url,
@ -1380,3 +1382,12 @@ var ApiClient = {
// Do this initially. The consumer can always override later // Do this initially. The consumer can always override later
ApiClient.inferServerFromUrl(); ApiClient.inferServerFromUrl();
$(document).ajaxSend(function (event, jqXHR) {
if (ApiClient.currentUserId) {
var auth = 'MediaBrowser UserId="' + ApiClient.currentUserId + '", Client="Dashboard", Device="' + ApiClient.getDeviceName() + '", DeviceId="' + ApiClient.getDeviceName() + '"';
jqXHR.setRequestHeader("Authorization", auth);
}
});

15
Html/scripts/site.js
View file

@ -81,12 +81,14 @@ var Dashboard = {
setCurrentUser: function (userId) { setCurrentUser: function (userId) {
localStorage.setItem("userId", userId); localStorage.setItem("userId", userId);
ApiClient.currentUserId = userId;
Dashboard.getUserPromise = null; Dashboard.getUserPromise = null;
}, },
logout: function () { logout: function () {
localStorage.removeItem("userId"); localStorage.removeItem("userId");
Dashboard.getUserPromise = null; Dashboard.getUserPromise = null;
ApiClient.currentUserId = null;
window.location = "login.html"; window.location = "login.html";
}, },
@ -1113,6 +1115,13 @@ var Dashboard = {
tag: item.PrimaryImageTag, tag: item.PrimaryImageTag,
type: "Primary" type: "Primary"
}); });
if (!item.Id || data.icon.indexOf("undefined") != -1) {
alert("bad image url: " + JSON.stringify(item));
console.log("bad image url: " + JSON.stringify(item));
continue;
}
} }
WebNotifications.show(data); WebNotifications.show(data);
@ -1200,9 +1209,11 @@ $(document).on('pagebeforeshow', ".page", function () {
}).on('pageinit', ".page", function () { }).on('pageinit', ".page", function () {
var page = $(this); var page = $(this);
var hasLogin = Dashboard.getCurrentUserId();
var userId = Dashboard.getCurrentUserId();
ApiClient.currentUserId = userId;
if (!hasLogin) { if (!userId) {
if (this.id !== "loginPage" && !page.hasClass('wizardPage')) { if (this.id !== "loginPage" && !page.hasClass('wizardPage')) {