From 434d574867d37352551cedd16fad97a3c3368fea Mon Sep 17 00:00:00 2001
From: Uilton Oliveira <uilton@darksupremo.com>
Date: Fri, 31 Dec 2021 14:35:30 -0300
Subject: [PATCH] bjshare: use cookie login method. resolves #12756 (#12757)

should also resolve #12746
---
 src/Jackett.Common/Indexers/BJShare.cs | 52 +++++++++++++-------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/Jackett.Common/Indexers/BJShare.cs b/src/Jackett.Common/Indexers/BJShare.cs
index 9e779e863..99336c04d 100644
--- a/src/Jackett.Common/Indexers/BJShare.cs
+++ b/src/Jackett.Common/Indexers/BJShare.cs
@@ -22,7 +22,6 @@ namespace Jackett.Common.Indexers
     [ExcludeFromCodeCoverage]
     public class BJShare : BaseWebIndexer
     {
-        private string LoginUrl => SiteLink + "login.php";
         private string BrowseUrl => SiteLink + "torrents.php";
         private string TodayUrl => SiteLink + "torrents.php?action=today";
         private static readonly Regex _EpisodeRegex = new Regex(@"(?:[SsEe]\d{2,4}){1,2}");
@@ -32,7 +31,7 @@ namespace Jackett.Common.Indexers
             "https://bj-share.me/"
         };
 
-        private ConfigurationDataBasicLoginWithRSSAndDisplay ConfigData => (ConfigurationDataBasicLoginWithRSSAndDisplay)configData;
+        private new ConfigurationDataCookie configData => (ConfigurationDataCookie)base.configData;
 
 
 
@@ -90,7 +89,7 @@ namespace Jackett.Common.Indexers
                     logger: l,
                     p: ps,
                     cacheService: cs,
-                    configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
+                    configData: new ConfigurationDataCookie())
         {
             Encoding = Encoding.UTF8;
             Language = "pt-BR";
@@ -123,20 +122,21 @@ namespace Jackett.Common.Indexers
         public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
-            var pairs = new Dictionary<string, string>
+            CookieHeader = configData.Cookie.Value;
+            try
             {
-                {"username", ConfigData.Username.Value},
-                {"password", ConfigData.Password.Value},
-                {"keeplogged", "1"}
-            };
-            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl, true);
-            await ConfigureIfOK(
-                result.Cookies, result.ContentString?.Contains("logout.php") == true, () =>
-                {
-                    var errorMessage = result.ContentString;
-                    throw new ExceptionWithConfigData(errorMessage, ConfigData);
-                });
-            return IndexerConfigurationStatus.RequiresTesting;
+                var results = await PerformQuery(new TorznabQuery());
+                if (!results.Any())
+                    throw new Exception("Found 0 results in the tracker");
+                IsConfigured = true;
+                SaveConfig();
+                return IndexerConfigurationStatus.Completed;
+            }
+            catch (Exception e)
+            {
+                IsConfigured = false;
+                throw new Exception("Your cookie did not work: " + e.Message);
+            }
         }
 
         private static string InternationalTitle(string title)
@@ -222,17 +222,14 @@ namespace Jackett.Common.Indexers
             // until they or the source from where they get that info fix it...
             if (IsAbsoluteNumbering(title))
             {
-                title = Regex.Replace(title, @"(Ep[\.]?[ ]?)|([S]\d\d[Ee])", "");
+                title = Regex.Replace(title, @"(Ep[\.]?[ ]?)|([S]\d\d[Ee])", "E");
                 return title;
             }
 
             return title;
         }
 
-        private bool IsSessionIsClosed(WebResult result)
-        {
-            return result.IsRedirect && result.RedirectingTo.Contains("login.php");
-        }
+        private bool IsSessionIsClosed(WebResult result) => result.IsRedirect && result.RedirectingTo.Contains("login.php");
 
         private string FixSearchTerm(TorznabQuery query)
         {
@@ -265,14 +262,16 @@ namespace Jackett.Common.Indexers
                 {"searchsubmit", "1"}
             };
             foreach (var cat in MapTorznabCapsToTrackers(query))
+            {
                 queryCollection.Add("filter_cat[" + cat + "]", "1");
+            }
+
             searchUrl += "?" + queryCollection.GetQueryString();
             var results = await RequestWithCookiesAsync(searchUrl);
             if (IsSessionIsClosed(results))
             {
-                // re-login
-                await ApplyConfiguration(null);
-                results = await RequestWithCookiesAsync(searchUrl);
+                throw new Exception("The user is not logged in. It is possible that the cookie has expired or you " +
+                                    "made a mistake when copying it. Please check the settings.");
             }
 
             try
@@ -436,9 +435,8 @@ namespace Jackett.Common.Indexers
             var results = await RequestWithCookiesAsync(TodayUrl);
             if (IsSessionIsClosed(results))
             {
-                // re-login
-                await ApplyConfiguration(null);
-                results = await RequestWithCookiesAsync(TodayUrl);
+                throw new Exception("The user is not logged in. It is possible that the cookie has expired or you " +
+                                    "made a mistake when copying it. Please check the settings.");
             }
 
             try