Browse Source

Tautulli cookie delete on logout
Tautulli SSO test - fix

causefx 7 năm trước cách đây
mục cha
commit
815ea9623c
2 tập tin đã thay đổi với 16 bổ sung12 xóa
  1. 10 0
      api/functions/organizr-functions.php
  2. 6 12
      api/functions/sso-functions.php

+ 10 - 0
api/functions/organizr-functions.php

@@ -313,11 +313,21 @@ function editUser($array)
 	}
 }
 
+function clearTautulliTokens()
+{
+	foreach (array_keys($_COOKIE) as $k => $v) {
+		if (strpos($v, 'tautulli') !== false) {
+			coookie('delete', $v);
+		}
+	}
+}
+
 function logout()
 {
 	coookie('delete', $GLOBALS['cookieName']);
 	coookie('delete', 'mpt');
 	coookie('delete', 'Auth');
+	clearTautulliTokens();
 	revokeToken(array('data' => array('token' => $GLOBALS['organizrUser']['token'])));
 	$GLOBALS['organizrUser'] = false;
 	return true;

+ 6 - 12
api/functions/sso-functions.php

@@ -61,18 +61,12 @@ function getTautulliToken($username, $password, $plexToken = null)
 					"Content-Type" => "application/x-www-form-urlencoded",
 					"User-Agent" => isset($_SERVER ['HTTP_USER_AGENT']) ? $_SERVER ['HTTP_USER_AGENT'] : null
 				);
-				if ($token) {
-					$data = array(
-						"token" => $plexToken,
-						"remember_me" => 1,
-					);
-				} else {
-					$data = array(
-						"username" => $username,
-						"password" => $password,
-						"remember_me" => 1,
-					);
-				}
+				$data = array(
+					"username" => $username,
+					"password" => $password,
+					"token" => $plexToken,
+					"remember_me" => 1,
+				);
 				$options = (localURL($url)) ? array('verify' => false) : array();
 				$response = Requests::post($url, $headers, $data, $options);
 				if ($response->success) {