github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-07 13:41:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove PMS token from UI

Browse source
This commit is contained in:
JonnyWong16 2022-01-05 14:04:13 -08:00
parent b7937b8740
commit 3c3d72850f
No known key found for this signature in database
GPG key ID: 7A649674469E6574
3 changed files with 26 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

32
data/interfaces/default/settings.html
View file

@ -969,20 +969,11 @@
<label for="pms_token">Plex.tv Account Token</label> <label for="pms_token">Plex.tv Account Token</label>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="input-group"> <button id="sign-in-plex" class="btn btn-form" type="button">Fetch New Token</button>
<span class="input-group-btn"> <span style="margin-left: 10px; display: none;" id="pms-token-status"></span>
<button class="btn btn-form reveal-token" type="button"><i class="fa fa-eye-slash"></i></button>
</span>
<input type="password" class="form-control" id="pms_token" name="pms_token" value="${config['pms_token']}" data-parsley-trigger="change" data-parsley-errors-container="#pms_token_error" required readonly>
<span class="input-group-btn">
<button id="sign-in-plex" class="btn btn-form" type="button">Fetch Token</button>
</span>
</div>
<span class="form-control-feedback" id="token_verify" aria-hidden="true" style="right: 80px;"></span>
</div> </div>
<div id="pms_token_error" class="alert alert-danger settings-alert" role="alert"></div>
</div> </div>
<p class="help-block">Token for Plex.tv authentication.</p> <p class="help-block">Fetch a new Plex.tv account authentication token.</p>
</div> </div>
<input type="hidden" id="pms_client_id" name="pms_client_id" value="${config['pms_client_id']}"> <input type="hidden" id="pms_client_id" name="pms_client_id" value="${config['pms_client_id']}">
@ -1622,7 +1613,7 @@
</div> </div>
<div id="token_error_bar" style="display: none;"> <div id="token_error_bar" style="display: none;">
<i class="fa fa-exclamation-triangle"></i> Your Plex.tv token is no longer valid.<br> <i class="fa fa-exclamation-triangle"></i> Your Plex.tv token is no longer valid.<br>
Please <a data-tab-destination="plex_media_server" data-target="pms_token">fetch a new token</a>. Please <a data-tab-destination="plex_media_server" data-target="sign-in-plex">fetch a new token</a>.
</div> </div>
</%def> </%def>
@ -2630,12 +2621,9 @@ $(document).ready(function() {
}); });
var select_pms = $select_pms[0].selectize; var select_pms = $select_pms[0].selectize;
function getServerOptions(token) { function getServerOptions() {
$.ajax({ $.ajax({
url: 'discover', url: 'discover',
data: {
token: token
},
success: function (result) { success: function (result) {
if (result) { if (result) {
var existing_ip = $('#pms_ip').val(); var existing_ip = $('#pms_ip').val();
@ -2748,16 +2736,16 @@ $(document).ready(function() {
}); });
function OAuthPreFunction() { function OAuthPreFunction() {
$("#token_verify").html('<i class="fa fa-refresh fa-spin"></i>').fadeIn('fast'); $("#pms-token-status").html('<i class="fa fa-refresh fa-spin"></i>&nbsp; Waiting for authentication...').fadeIn('fast');
} }
function OAuthSuccessCallback(authToken) { function OAuthSuccessCallback(authToken) {
$("#pms_token").val(authToken); $.post('save_pms_token', { token: authToken });
$("#token_verify").html('<i class="fa fa-check"></i>').fadeIn('fast'); $("#pms-token-status").html('<i class="fa fa-check"></i>&nbsp; Authentication successful.').fadeIn('fast');
$('#token_error_bar').hide(); $("#token_error_bar").hide();
getServerOptions(authToken); getServerOptions(authToken);
} }
function OAuthErrorCallback() { function OAuthErrorCallback() {
$("#token_verify").html('<i class="fa fa-close"></i>').fadeIn('fast'); $("#pms-token-status").html('<i class="fa fa-exclamation-circle"></i>&nbsp; Error communicating with Plex.tv.').fadeIn('fast');
} }
$('#sign-in-plex').click(function() { $('#sign-in-plex').click(function() {

17
data/interfaces/default/welcome.html
View file

@ -111,9 +111,9 @@
Tautulli requires a Plex.tv account. Click the button below to sign in on Plex.tv. You may need to allow popups in your browser. Tautulli requires a Plex.tv account. Click the button below to sign in on Plex.tv. You may need to allow popups in your browser.
</p> </p>
</div> </div>
<input type="hidden" name="pms_token" id="pms_token" value="" data-validate="validatePMStoken"> <input type="hidden" id="pms_token_validated" value="0" data-validate="validatePMStoken">
<input type="hidden" name="pms_client_id" id="pms_client_id" value="${config['pms_client_id']}"> <input type="hidden" name="pms_client_id" id="pms_client_id" value="${config['pms_client_id']}">
<a class="btn btn-dark" id="sign-in-plex" href="#" role="button">Sign In with Plex</a> <button id="sign-in-plex" class="btn btn-form" type="button">Sign In with Plex</button>
<span style="margin-left: 10px; display: none;" id="pms-token-status"></span> <span style="margin-left: 10px; display: none;" id="pms-token-status"></span>
</div> </div>
@ -308,7 +308,7 @@
var valid_pms_token = el.val(); var valid_pms_token = el.val();
var retValue = {}; var retValue = {};
if (valid_pms_token === "") { if (valid_pms_token === 0) {
retValue.status = false; retValue.status = false;
retValue.msg = "Please authenticate."; retValue.msg = "Please authenticate.";
$("#pms-token-status").html('<i class="fa fa-exclamation-circle"></i> Please authenticate.'); $("#pms-token-status").html('<i class="fa fa-exclamation-circle"></i> Please authenticate.');
@ -477,13 +477,9 @@ $(document).ready(function() {
}); });
var select_pms = $select_pms[0].selectize; var select_pms = $select_pms[0].selectize;
function getServerOptions(token) { function getServerOptions() {
/* Set token and returns server options */
$.ajax({ $.ajax({
url: 'discover', url: 'discover',
data: {
token: token
},
success: function (result) { success: function (result) {
if (result) { if (result) {
var existing_ip = $('#pms_ip').val(); var existing_ip = $('#pms_ip').val();
@ -557,11 +553,12 @@ $(document).ready(function() {
}); });
function OAuthPreFunction() { function OAuthPreFunction() {
$("#pms_token").val('');
$("#pms-token-status").html('<i class="fa fa-refresh fa-spin"></i>&nbsp; Waiting for authentication...').fadeIn('fast'); $("#pms-token-status").html('<i class="fa fa-refresh fa-spin"></i>&nbsp; Waiting for authentication...').fadeIn('fast');
} }
function OAuthSuccessCallback(authToken) { function OAuthSuccessCallback(authToken) {
$("#pms_token").val(authToken); $.post('save_pms_token', { token: authToken }, function () {
$("#pms_token_validated").val(1);
});
$("#pms-token-status").html('<i class="fa fa-check"></i>&nbsp; Authentication successful.').fadeIn('fast'); $("#pms-token-status").html('<i class="fa fa-check"></i>&nbsp; Authentication successful.').fadeIn('fast');
authenticated = true; authenticated = true;
getServerOptions(authToken); getServerOptions(authToken);

17
plexpy/webserve.py
View file

@ -214,7 +214,6 @@ class WebInterface(object):
"pms_is_remote": plexpy.CONFIG.PMS_IS_REMOTE, "pms_is_remote": plexpy.CONFIG.PMS_IS_REMOTE,
"pms_ssl": plexpy.CONFIG.PMS_SSL, "pms_ssl": plexpy.CONFIG.PMS_SSL,
"pms_is_cloud": plexpy.CONFIG.PMS_IS_CLOUD, "pms_is_cloud": plexpy.CONFIG.PMS_IS_CLOUD,
"pms_token": plexpy.CONFIG.PMS_TOKEN,
"pms_name": plexpy.CONFIG.PMS_NAME, "pms_name": plexpy.CONFIG.PMS_NAME,
"logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL
} }
@ -226,11 +225,19 @@ class WebInterface(object):
else: else:
return serve_template(templatename="welcome.html", title="Welcome", config=config) return serve_template(templatename="welcome.html", title="Welcome", config=config)
@cherrypy.expose
@cherrypy.tools.json_out()
@requireAuth(member_of("admin"))
def save_pms_token(self, token=None, **kwargs):
if token is not None:
plexpy.CONFIG.PMS_TOKEN = token
plexpy.CONFIG.write()
@cherrypy.expose @cherrypy.expose
@cherrypy.tools.json_out() @cherrypy.tools.json_out()
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))
@addtoapi("get_server_list") @addtoapi("get_server_list")
def discover(self, token=None, include_cloud=True, all_servers=True, **kwargs): def discover(self, include_cloud=True, all_servers=True, **kwargs):
""" Get all your servers that are published to Plex.tv. """ Get all your servers that are published to Plex.tv.
``` ```
@ -255,11 +262,6 @@ class WebInterface(object):
] ]
``` ```
""" """
if token:
# Need to set token so result doesn't return http 401
plexpy.CONFIG.__setattr__('PMS_TOKEN', token)
plexpy.CONFIG.write()
include_cloud = not (include_cloud == 'false') include_cloud = not (include_cloud == 'false')
all_servers = not (all_servers == 'false') all_servers = not (all_servers == 'false')
@ -3182,7 +3184,6 @@ class WebInterface(object):
"pms_ip": plexpy.CONFIG.PMS_IP, "pms_ip": plexpy.CONFIG.PMS_IP,
"pms_logs_folder": plexpy.CONFIG.PMS_LOGS_FOLDER, "pms_logs_folder": plexpy.CONFIG.PMS_LOGS_FOLDER,
"pms_port": plexpy.CONFIG.PMS_PORT, "pms_port": plexpy.CONFIG.PMS_PORT,
"pms_token": plexpy.CONFIG.PMS_TOKEN,
"pms_ssl": plexpy.CONFIG.PMS_SSL, "pms_ssl": plexpy.CONFIG.PMS_SSL,
"pms_is_remote": plexpy.CONFIG.PMS_IS_REMOTE, "pms_is_remote": plexpy.CONFIG.PMS_IS_REMOTE,
"pms_is_cloud": plexpy.CONFIG.PMS_IS_CLOUD, "pms_is_cloud": plexpy.CONFIG.PMS_IS_CLOUD,