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

3.0.5416.0

Browse source
This commit is contained in:
Luke Pulverenti 2014-10-31 00:57:24 -04:00
parent 7884354722
commit 866379a702
15 changed files with 190 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

43
dashboard-ui/thirdparty/apiclient/connectionmanager.js vendored
View file

@ -105,7 +105,7 @@
updateServerInfo(server, systemInfo);
apiClient.serverInfo(server);
$(this).trigger('apiclientcreated', [apiClient]);
$(self).trigger('apiclientcreated', [apiClient]);
if (enableAutomaticNetworking) {
self.connectToServer(server);
@ -138,7 +138,7 @@
onLocalAuthenticated(this, result, true);
});
$(this).trigger('apiclientcreated', [apiClient]);
$(self).trigger('apiclientcreated', [apiClient]);
}
@ -199,7 +199,14 @@
var deferred = $.Deferred();
if (self.isLoggedIntoConnect() && !connectUser) {
if (connectUser != null && connectUser.Id == credentials.ConnectUserId) {
deferred.resolveWith(null, [[]]);
}
else if (self.connectToken() && self.connectUserId()) {
connectUser = null;
getConnectUser(credentials.ConnectUserId, credentials.ConnectAccessToken).done(function (user) {
onConnectAuthenticated(user);
@ -352,7 +359,6 @@
deferred.resolveWith(null, [
{
connectUser: connectUser,
localUser: localUser,
name: connectUser ? connectUser.Name : localUser.Name,
canManageServer: localUser && localUser.Configuration.IsAdministrator,
@ -375,14 +381,13 @@
var credentials = credentialProvider.credentials();
if (credentials.ConnectUserId && credentials.ConnectAccessToken) {
if (credentials.ConnectUserId && credentials.ConnectAccessToken && !(self.currentApiClient() && self.currentApiClient().getCurrentUserId())) {
ensureConnectUser(credentials).always(onEnsureConnectUserDone);
} else {
onEnsureConnectUserDone();
}
return deferred.promise();
};
self.isLoggedIntoConnect = function () {
@ -608,7 +613,7 @@
deferred.resolveWith(null, [result]);
$(this).trigger('connected', [result]);
$(self).trigger('connected', [result]);
}
function onExchangeTokenDone() {
@ -720,7 +725,7 @@
self.loginToConnect = function (username, password) {
var md5 = CryptoJS.MD5(password).toString();
var md5 = self.getConnectPasswordHash(password);
return $.ajax({
type: "POST",
@ -746,6 +751,23 @@
});
};
self.getConnectPasswordHash = function (password) {
password = password || '';
password = password
.replace("&", "&")
.replace("/", "\")
.replace("!", "!")
.replace("$", "$")
.replace("\"", """)
.replace("<", "&lt;")
.replace(">", "&gt;")
.replace("'", "&#39;");
return CryptoJS.MD5(password).toString();
};
self.getApiClient = function (item) {
// Accept string + object
@ -755,7 +777,10 @@
return apiClients.filter(function (a) {
return a.serverInfo().Id = item;
var serverInfo = a.serverInfo();
// We have to keep this hack in here because of the addApiClient method
return !serverInfo || serverInfo.Id == item;
})[0];
};