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

update suggestion change on connectionmanagers

Browse source
This commit is contained in:
grafixeyehero 2019-10-17 20:04:32 +03:00
parent 9207ece95f
commit df720d2d14
1 changed files with 2 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/bower_components/apiclient/connectionmanager.js vendored
View file

@ -242,41 +242,11 @@ define(["events", "apiclient", "appStorage"], function (events, apiClientFactory
} }
function ensureConnectUser(credentials) { function ensureConnectUser(credentials) {
if (connectUser && connectUser.Id === credentials.ConnectUserId) {
return Promise.resolve();
}
return Promise.resolve(); return Promise.resolve();
} }
function addAuthenticationInfoFromConnect(server, serverUrl, credentials) { function addAuthenticationInfoFromConnect(server, serverUrl, credentials) {
if (!server.ExchangeToken) { return Promise.reject();
throw new Error("server.ExchangeToken cannot be null");
}
if (!credentials.ConnectUserId) {
throw new Error("credentials.ConnectUserId cannot be null");
}
var url = getEmbyServerUrl(serverUrl, "Connect/Exchange?format=json&ConnectUserId=" + credentials.ConnectUserId);
var auth = 'MediaBrowser Client="' + appName + '", Device="' + deviceName + '", DeviceId="' + deviceId + '", Version="' + appVersion + '"';
return ajax({
type: "GET",
url: url,
dataType: "json",
headers: {
"X-MediaBrowser-Token": server.ExchangeToken,
"X-Emby-Authorization": auth
}
}).then(function (auth) {
server.UserId = auth.LocalUserId;
server.AccessToken = auth.AccessToken;
return auth;
}, function () {
server.UserId = null;
server.AccessToken = null;
return Promise.reject();
});
} }
function validateAuthentication(server, serverUrl) { function validateAuthentication(server, serverUrl) {
@ -771,12 +741,8 @@ define(["events", "apiclient", "appStorage"], function (events, apiClientFactory
console.log("Begin getAvailableServers"); console.log("Begin getAvailableServers");
var credentials = credentialProvider.credentials(); var credentials = credentialProvider.credentials();
return Promise.all([findServers()]).then(function (responses) { return Promise.all([findServers()]).then(function (responses) {
var connectServers = responses[0]; var foundServers = responses[0];
var foundServers = responses[1];
var servers = credentials.Servers.slice(0); var servers = credentials.Servers.slice(0);
//mergeServers(credentialProvider, servers, foundServers);
//mergeServers(credentialProvider, servers, connectServers);
servers = filterServers(servers, connectServers);
servers.sort(function (a, b) { servers.sort(function (a, b) {
return (b.DateLastAccessed || 0) - (a.DateLastAccessed || 0); return (b.DateLastAccessed || 0) - (a.DateLastAccessed || 0);
}); });