mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
update web client packager
This commit is contained in:
Luke Pulverenti
parent
0a81db18ed
commit
68ad0f6226
8 changed files with 234 additions and 10 deletions
35
dashboard-ui/connectlogin.html
Normal file
35
dashboard-ui/connectlogin.html
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>${TitleSignIn}</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="connectLoginPage" data-role="page" class="page standalonePage connectLoginPage">
|
||||
|
||||
<div data-role="content">
|
||||
|
||||
<form class="connectLoginForm" style="text-align: center; margin: 0 auto;">
|
||||
|
||||
<h2 style="text-align: left;">${HeaderPleaseSignIn}</h2>
|
||||
|
||||
<label for="txtManualName" style="text-align: left;">${LabelUser}</label>
|
||||
<input type="text" id="txtManualName" required="required" />
|
||||
|
||||
<label for="txtManualPassword" style="text-align: left;">${LabelPassword}</label>
|
||||
<input type="password" id="txtManualPassword" placeholder="password" required="required" />
|
||||
<button type="submit" data-icon="check">
|
||||
${ButtonSignIn}
|
||||
</button>
|
||||
|
||||
<br /><br /><br />
|
||||
<h2 style="text-align: left;">${HeaderNewUsers}</h2>
|
||||
<a data-role="button" data-icon="action" href="http://mediabrowser.tv/community/index.php?app=core&module=global§ion=register" target="_blank">${ButtonSignUp}</a>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<script type="text/javascript">
|
||||
$('.connectLoginForm').off('submit', ConnectLoginPage.onSubmit).on('submit', ConnectLoginPage.onSubmit);
|
||||
</script>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
110
dashboard-ui/scripts/connectlogin.js
Normal file
110
dashboard-ui/scripts/connectlogin.js
Normal file
|
|
@ -0,0 +1,110 @@
|
|||
(function () {
|
||||
|
||||
function onLoggedIn() {
|
||||
|
||||
ConnectionManager.getServers().done(function (result) {
|
||||
|
||||
if (result.length) {
|
||||
|
||||
connectToServerInstance(result[0]);
|
||||
|
||||
} else {
|
||||
Dashboard.alert('Coming soon');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function connectToServerInstance(server) {
|
||||
|
||||
var url = server.Url;
|
||||
var exchangeToken = server.AccessKey;
|
||||
|
||||
url += "/mediabrowser/Connect/Exchange?format=json&ConnectUserId=" + ConnectionManager.connectUserId();
|
||||
|
||||
$.ajax({
|
||||
|
||||
type: "GET",
|
||||
url: url,
|
||||
dataType: "json",
|
||||
|
||||
error: function () {
|
||||
// Don't show normal dashboard errors
|
||||
},
|
||||
headers: {
|
||||
"X-MediaBrowser-Token": exchangeToken
|
||||
}
|
||||
|
||||
|
||||
}).done(function (result) {
|
||||
|
||||
Dashboard.setCurrentUser(result.LocalUserId, result.AccessToken);
|
||||
|
||||
window.location = 'index.html';
|
||||
|
||||
}).fail(function (result) {
|
||||
|
||||
alert('Error talking to MBS');
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
function login(page, username, password) {
|
||||
|
||||
var md5 = CryptoJS.MD5(password).toString();
|
||||
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "https://connect.mediabrowser.tv/service/user/authenticate",
|
||||
data: {
|
||||
userName: username,
|
||||
password: md5
|
||||
},
|
||||
dataType: "json",
|
||||
contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
|
||||
|
||||
error: function () {
|
||||
// Don't show normal dashboard errors
|
||||
}
|
||||
|
||||
|
||||
}).done(function (result) {
|
||||
|
||||
ConnectionManager.onConnectAuthenticated(result);
|
||||
|
||||
onLoggedIn();
|
||||
|
||||
}).fail(function (result) {
|
||||
|
||||
Dashboard.alert({
|
||||
message: Globalize.translate('MessageInvalidUser'),
|
||||
title: Globalize.translate('HeaderLoginFailure')
|
||||
});
|
||||
|
||||
$('#txtManualPassword', page).val('');
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
function submit(page) {
|
||||
|
||||
var user = $('#txtManualName', page).val();
|
||||
var password = $('#txtManualPassword', page).val();
|
||||
|
||||
login(page, user, password);
|
||||
|
||||
}
|
||||
|
||||
window.ConnectLoginPage = {
|
||||
|
||||
onSubmit: function () {
|
||||
|
||||
var page = $(this).parents('.page');
|
||||
|
||||
submit(page);
|
||||
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
})();
|
||||
|
|
@ -319,7 +319,7 @@
|
|||
return;
|
||||
}
|
||||
|
||||
var url = window.location.hash || window.location.toString();
|
||||
var url = window.location.hash || getWindowUrl();
|
||||
|
||||
var id = getParameterByName('id', url);
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
// Chrome seems to have virtualization built-in and can handle large lists easily
|
||||
var isChrome = $.browser.chrome;
|
||||
|
||||
if (window.location.toString().toLowerCase().indexOf('localhost') != -1) {
|
||||
if (getWindowUrl().toString().toLowerCase().indexOf('localhost') != -1) {
|
||||
return isChrome ? 200 : 100;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
isLocalhost: function () {
|
||||
|
||||
var location = window.location.toString().toLowerCase();
|
||||
var location = getWindowUrl().toString().toLowerCase();
|
||||
return location.indexOf('localhost') != -1 || location.indexOf('127.0.0.1') != -1;
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -147,16 +147,26 @@ var Dashboard = {
|
|||
Dashboard.getUserPromise = null;
|
||||
},
|
||||
|
||||
isConnectMode: function () {
|
||||
|
||||
return getWindowUrl().toLowerCase().indexOf('mediabrowser.tv') != -1;
|
||||
},
|
||||
|
||||
logout: function (logoutWithServer) {
|
||||
|
||||
ConnectionManager.logoutFromConnect();
|
||||
store.removeItem("userId");
|
||||
store.removeItem("token");
|
||||
|
||||
var loginPage = !Dashboard.isConnectMode() ?
|
||||
'login.html' :
|
||||
'connectlogin.html';
|
||||
|
||||
if (logoutWithServer === false) {
|
||||
window.location = "login.html";
|
||||
window.location = loginPage;
|
||||
} else {
|
||||
ApiClient.logout().done(function () {
|
||||
window.location = "login.html";
|
||||
window.location = loginPage;
|
||||
});
|
||||
|
||||
}
|
||||
|
|
@ -308,14 +318,14 @@ var Dashboard = {
|
|||
|
||||
reloadPage: function () {
|
||||
|
||||
var currentUrl = window.location.toString().toLowerCase();
|
||||
var currentUrl = getWindowUrl().toLowerCase();
|
||||
|
||||
// If they're on a plugin config page just go back to the dashboard
|
||||
// The plugin may not have been loaded yet, or could have been uninstalled
|
||||
if (currentUrl.indexOf('configurationpage') != -1) {
|
||||
window.location.href = "dashboard.html";
|
||||
} else {
|
||||
window.location.href = window.location.href;
|
||||
window.location.href = getWindowUrl();
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -1318,6 +1328,18 @@ $(document).on('pagebeforeshow', ".page", function () {
|
|||
|
||||
var page = $(this);
|
||||
|
||||
var isConnectMode = Dashboard.isConnectMode();
|
||||
|
||||
if (isConnectMode && !page.hasClass('connectLoginPage')) {
|
||||
|
||||
if (!ConnectionManager.isLoggedIntoConnect()) {
|
||||
|
||||
console.log('Not logged into connect. Redirecting to login.');
|
||||
Dashboard.logout();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (Dashboard.getAccessToken() && Dashboard.getCurrentUserId()) {
|
||||
|
||||
Dashboard.getCurrentUser().done(function (user) {
|
||||
|
|
@ -1334,8 +1356,10 @@ $(document).on('pagebeforeshow', ".page", function () {
|
|||
}
|
||||
|
||||
else {
|
||||
if (this.id !== "loginPage" && !page.hasClass('wizardPage')) {
|
||||
|
||||
if (this.id !== "loginPage" && !page.hasClass('wizardPage') && !isConnectMode) {
|
||||
|
||||
console.log('Not logged into server. Redirecting to login.');
|
||||
Dashboard.logout();
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,13 +8,49 @@ MediaBrowser.ConnectionManager = function () {
|
|||
|
||||
var self = this;
|
||||
|
||||
self.getServers = function (currentApiClient) {
|
||||
self.onConnectAuthenticated = function (result) {
|
||||
|
||||
store.setItem('ConnectAccessToken', result.AccessToken);
|
||||
store.setItem('ConnectUserId', result.User.Id);
|
||||
};
|
||||
|
||||
self.isLoggedIntoConnect = function () {
|
||||
|
||||
return self.connectToken() && self.connectUserId();
|
||||
};
|
||||
|
||||
self.logoutFromConnect = function () {
|
||||
store.removeItem('ConnectAccessToken');
|
||||
store.removeItem('ConnectUserId');
|
||||
};
|
||||
|
||||
self.changeServer = function (currentApiClient, server) {
|
||||
|
||||
};
|
||||
|
||||
self.connectUserId = function () {
|
||||
return store.getItem('ConnectUserId');
|
||||
};
|
||||
|
||||
self.connectToken = function () {
|
||||
return store.getItem('ConnectAccessToken');
|
||||
};
|
||||
|
||||
self.getServers = function () {
|
||||
|
||||
var url = "https://connect.mediabrowser.tv/service/servers?userId=" + self.connectUserId();
|
||||
|
||||
return $.ajax({
|
||||
type: "GET",
|
||||
url: url,
|
||||
dataType: "json",
|
||||
headers: {
|
||||
"X-Connect-UserToken": self.connectToken()
|
||||
}
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
}();
|
||||
|
||||
window.ConnectionManager = new MediaBrowser.ConnectionManager();
|
||||
19
dashboard-ui/thirdparty/md5.js
vendored
Normal file
19
dashboard-ui/thirdparty/md5.js
vendored
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
/*
|
||||
CryptoJS v3.1.2
|
||||
code.google.com/p/crypto-js
|
||||
(c) 2009-2013 by Jeff Mott. All rights reserved.
|
||||
code.google.com/p/crypto-js/wiki/License
|
||||
*/
|
||||
var CryptoJS=CryptoJS||function(s,p){var m={},l=m.lib={},n=function(){},r=l.Base={extend:function(b){n.prototype=this;var h=new n;b&&h.mixIn(b);h.hasOwnProperty("init")||(h.init=function(){h.$super.init.apply(this,arguments)});h.init.prototype=h;h.$super=this;return h},create:function(){var b=this.extend();b.init.apply(b,arguments);return b},init:function(){},mixIn:function(b){for(var h in b)b.hasOwnProperty(h)&&(this[h]=b[h]);b.hasOwnProperty("toString")&&(this.toString=b.toString)},clone:function(){return this.init.prototype.extend(this)}},
|
||||
q=l.WordArray=r.extend({init:function(b,h){b=this.words=b||[];this.sigBytes=h!=p?h:4*b.length},toString:function(b){return(b||t).stringify(this)},concat:function(b){var h=this.words,a=b.words,j=this.sigBytes;b=b.sigBytes;this.clamp();if(j%4)for(var g=0;g<b;g++)h[j+g>>>2]|=(a[g>>>2]>>>24-8*(g%4)&255)<<24-8*((j+g)%4);else if(65535<a.length)for(g=0;g<b;g+=4)h[j+g>>>2]=a[g>>>2];else h.push.apply(h,a);this.sigBytes+=b;return this},clamp:function(){var b=this.words,h=this.sigBytes;b[h>>>2]&=4294967295<<
|
||||
32-8*(h%4);b.length=s.ceil(h/4)},clone:function(){var b=r.clone.call(this);b.words=this.words.slice(0);return b},random:function(b){for(var h=[],a=0;a<b;a+=4)h.push(4294967296*s.random()|0);return new q.init(h,b)}}),v=m.enc={},t=v.Hex={stringify:function(b){var a=b.words;b=b.sigBytes;for(var g=[],j=0;j<b;j++){var k=a[j>>>2]>>>24-8*(j%4)&255;g.push((k>>>4).toString(16));g.push((k&15).toString(16))}return g.join("")},parse:function(b){for(var a=b.length,g=[],j=0;j<a;j+=2)g[j>>>3]|=parseInt(b.substr(j,
|
||||
2),16)<<24-4*(j%8);return new q.init(g,a/2)}},a=v.Latin1={stringify:function(b){var a=b.words;b=b.sigBytes;for(var g=[],j=0;j<b;j++)g.push(String.fromCharCode(a[j>>>2]>>>24-8*(j%4)&255));return g.join("")},parse:function(b){for(var a=b.length,g=[],j=0;j<a;j++)g[j>>>2]|=(b.charCodeAt(j)&255)<<24-8*(j%4);return new q.init(g,a)}},u=v.Utf8={stringify:function(b){try{return decodeURIComponent(escape(a.stringify(b)))}catch(g){throw Error("Malformed UTF-8 data");}},parse:function(b){return a.parse(unescape(encodeURIComponent(b)))}},
|
||||
g=l.BufferedBlockAlgorithm=r.extend({reset:function(){this._data=new q.init;this._nDataBytes=0},_append:function(b){"string"==typeof b&&(b=u.parse(b));this._data.concat(b);this._nDataBytes+=b.sigBytes},_process:function(b){var a=this._data,g=a.words,j=a.sigBytes,k=this.blockSize,m=j/(4*k),m=b?s.ceil(m):s.max((m|0)-this._minBufferSize,0);b=m*k;j=s.min(4*b,j);if(b){for(var l=0;l<b;l+=k)this._doProcessBlock(g,l);l=g.splice(0,b);a.sigBytes-=j}return new q.init(l,j)},clone:function(){var b=r.clone.call(this);
|
||||
b._data=this._data.clone();return b},_minBufferSize:0});l.Hasher=g.extend({cfg:r.extend(),init:function(b){this.cfg=this.cfg.extend(b);this.reset()},reset:function(){g.reset.call(this);this._doReset()},update:function(b){this._append(b);this._process();return this},finalize:function(b){b&&this._append(b);return this._doFinalize()},blockSize:16,_createHelper:function(b){return function(a,g){return(new b.init(g)).finalize(a)}},_createHmacHelper:function(b){return function(a,g){return(new k.HMAC.init(b,
|
||||
g)).finalize(a)}}});var k=m.algo={};return m}(Math);
|
||||
(function(s){function p(a,k,b,h,l,j,m){a=a+(k&b|~k&h)+l+m;return(a<<j|a>>>32-j)+k}function m(a,k,b,h,l,j,m){a=a+(k&h|b&~h)+l+m;return(a<<j|a>>>32-j)+k}function l(a,k,b,h,l,j,m){a=a+(k^b^h)+l+m;return(a<<j|a>>>32-j)+k}function n(a,k,b,h,l,j,m){a=a+(b^(k|~h))+l+m;return(a<<j|a>>>32-j)+k}for(var r=CryptoJS,q=r.lib,v=q.WordArray,t=q.Hasher,q=r.algo,a=[],u=0;64>u;u++)a[u]=4294967296*s.abs(s.sin(u+1))|0;q=q.MD5=t.extend({_doReset:function(){this._hash=new v.init([1732584193,4023233417,2562383102,271733878])},
|
||||
_doProcessBlock:function(g,k){for(var b=0;16>b;b++){var h=k+b,w=g[h];g[h]=(w<<8|w>>>24)&16711935|(w<<24|w>>>8)&4278255360}var b=this._hash.words,h=g[k+0],w=g[k+1],j=g[k+2],q=g[k+3],r=g[k+4],s=g[k+5],t=g[k+6],u=g[k+7],v=g[k+8],x=g[k+9],y=g[k+10],z=g[k+11],A=g[k+12],B=g[k+13],C=g[k+14],D=g[k+15],c=b[0],d=b[1],e=b[2],f=b[3],c=p(c,d,e,f,h,7,a[0]),f=p(f,c,d,e,w,12,a[1]),e=p(e,f,c,d,j,17,a[2]),d=p(d,e,f,c,q,22,a[3]),c=p(c,d,e,f,r,7,a[4]),f=p(f,c,d,e,s,12,a[5]),e=p(e,f,c,d,t,17,a[6]),d=p(d,e,f,c,u,22,a[7]),
|
||||
c=p(c,d,e,f,v,7,a[8]),f=p(f,c,d,e,x,12,a[9]),e=p(e,f,c,d,y,17,a[10]),d=p(d,e,f,c,z,22,a[11]),c=p(c,d,e,f,A,7,a[12]),f=p(f,c,d,e,B,12,a[13]),e=p(e,f,c,d,C,17,a[14]),d=p(d,e,f,c,D,22,a[15]),c=m(c,d,e,f,w,5,a[16]),f=m(f,c,d,e,t,9,a[17]),e=m(e,f,c,d,z,14,a[18]),d=m(d,e,f,c,h,20,a[19]),c=m(c,d,e,f,s,5,a[20]),f=m(f,c,d,e,y,9,a[21]),e=m(e,f,c,d,D,14,a[22]),d=m(d,e,f,c,r,20,a[23]),c=m(c,d,e,f,x,5,a[24]),f=m(f,c,d,e,C,9,a[25]),e=m(e,f,c,d,q,14,a[26]),d=m(d,e,f,c,v,20,a[27]),c=m(c,d,e,f,B,5,a[28]),f=m(f,c,
|
||||
d,e,j,9,a[29]),e=m(e,f,c,d,u,14,a[30]),d=m(d,e,f,c,A,20,a[31]),c=l(c,d,e,f,s,4,a[32]),f=l(f,c,d,e,v,11,a[33]),e=l(e,f,c,d,z,16,a[34]),d=l(d,e,f,c,C,23,a[35]),c=l(c,d,e,f,w,4,a[36]),f=l(f,c,d,e,r,11,a[37]),e=l(e,f,c,d,u,16,a[38]),d=l(d,e,f,c,y,23,a[39]),c=l(c,d,e,f,B,4,a[40]),f=l(f,c,d,e,h,11,a[41]),e=l(e,f,c,d,q,16,a[42]),d=l(d,e,f,c,t,23,a[43]),c=l(c,d,e,f,x,4,a[44]),f=l(f,c,d,e,A,11,a[45]),e=l(e,f,c,d,D,16,a[46]),d=l(d,e,f,c,j,23,a[47]),c=n(c,d,e,f,h,6,a[48]),f=n(f,c,d,e,u,10,a[49]),e=n(e,f,c,d,
|
||||
C,15,a[50]),d=n(d,e,f,c,s,21,a[51]),c=n(c,d,e,f,A,6,a[52]),f=n(f,c,d,e,q,10,a[53]),e=n(e,f,c,d,y,15,a[54]),d=n(d,e,f,c,w,21,a[55]),c=n(c,d,e,f,v,6,a[56]),f=n(f,c,d,e,D,10,a[57]),e=n(e,f,c,d,t,15,a[58]),d=n(d,e,f,c,B,21,a[59]),c=n(c,d,e,f,r,6,a[60]),f=n(f,c,d,e,z,10,a[61]),e=n(e,f,c,d,j,15,a[62]),d=n(d,e,f,c,x,21,a[63]);b[0]=b[0]+c|0;b[1]=b[1]+d|0;b[2]=b[2]+e|0;b[3]=b[3]+f|0},_doFinalize:function(){var a=this._data,k=a.words,b=8*this._nDataBytes,h=8*a.sigBytes;k[h>>>5]|=128<<24-h%32;var l=s.floor(b/
|
||||
4294967296);k[(h+64>>>9<<4)+15]=(l<<8|l>>>24)&16711935|(l<<24|l>>>8)&4278255360;k[(h+64>>>9<<4)+14]=(b<<8|b>>>24)&16711935|(b<<24|b>>>8)&4278255360;a.sigBytes=4*(k.length+1);this._process();a=this._hash;k=a.words;for(b=0;4>b;b++)h=k[b],k[b]=(h<<8|h>>>24)&16711935|(h<<24|h>>>8)&4278255360;return a},clone:function(){var a=t.clone.call(this);a._hash=this._hash.clone();return a}});r.MD5=t._createHelper(q);r.HmacMD5=t._createHmacHelper(q)})(Math);
|
||||
Loading…
Add table
Add a link
Reference in a new issue