Auth method use API (#825)

* Auth method use API

* Remove whitespace issues

---------

Co-authored-by: Martijn van der Kleijn <[email protected]>

Author: peglah

Autobrr/Autobrr.php

@@ -6,33 +6,57 @@ class Autobrr extends \App\SupportedApps implements \App\EnhancedApps
 {
     public $config;
 
-    //protected $login_first = true; // Uncomment if api requests need to be authed first
-    //protected $method = 'POST';  // Uncomment if requests to the API should be set by POST
-
-    public function __construct()
-    {
-        //$this->jar = new \GuzzleHttp\Cookie\CookieJar; // Uncomment if cookies need to be set
-    }
-
     public function test()
     {
-        $test = parent::appTest($this->url('status'));
+        $headers = [
+            'headers' => [
+                'X-API-Token' => $this->config->apikey,
+            ],
+        ];
+
+        $test = parent::appTest($this->url('healthz/liveness'), $headers);
         echo $test->status;
     }
 
     public function livestats()
     {
         $status = 'inactive';
-        $res = parent::execute($this->url('status'));
-        $details = json_decode($res->getBody());
+        $headers = [
+            'headers' => [
+                'X-API-Token' => $this->config->apikey,
+            ],
+        ];
+
+        $filtersRes = parent::execute($this->url('filters'), $headers);
+        $filters = json_decode($filtersRes->getBody(), true);
+        $filterCount = is_array($filters) ? count($filters) : 0;
+
+        $ircRes = parent::execute($this->url('irc'), $headers);
+        $irc = json_decode($ircRes->getBody(), true);
+        $ircCount = 0;
+
+        if (is_array($irc)) {
+            foreach ($irc as $conn) {
+                if (!empty($conn['connected'])) {
+                    $ircCount++;
+                }
+            }
+        }
+
+        $data = [
+            'Filters' => $filterCount,
+            'IRC'     => $ircCount,
+        ];
+
+        if ($filterCount > 0 || $ircCount > 0) {
+            $status = 'active';
+        }
 
-        $data = [];
         return parent::getLiveStats($status, $data);
     }
 
     public function url($endpoint)
     {
-        $api_url = parent::normaliseurl($this->config->url) . $endpoint;
-        return $api_url;
+        return parent::normaliseurl($this->config->url) . 'api/' . $endpoint;
     }
 }

Autobrr/config.blade.php

@@ -2,18 +2,13 @@
 <div class="items">
     <div class="input">
         <label>{{ strtoupper(__('app.url')) }}</label>
-        {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
+        {!! Form::text('config[override_url]', isset($item) ? $item->getconfig()->override_url : null, ['placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control']) !!}
     </div>
     <div class="input">
-        <label>{{ __('app.apps.username') }}</label>
-        {!! Form::text('config[username]', null, array('placeholder' => __('app.apps.username'), 'data-config' => 'username', 'class' => 'form-control config-item')) !!}
-    </div>
-    <div class="input">
-        <label>{{ __('app.apps.password') }}</label>
-        {!! Form::input('password', 'config[password]', '', ['placeholder' => __('app.apps.password'), 'data-config' => 'password', 'class' => 'form-control config-item']) !!}
+        <label>{{ __('app.apps.apikey') }}</label>
+        {!! Form::text('config[apikey]', isset($item) ? $item->getconfig()->apikey : null, ['placeholder' => __('app.apps.apikey'), 'data-config' => 'apikey', 'class' => 'form-control config-item']) !!}
     </div>
     <div class="input">
         <button style="margin-top: 32px;" class="btn test" id="test_config">Test</button>
     </div>
 </div>
-

Autobrr/livestats.blade.php

@@ -1,10 +1,15 @@
 <ul class="livestats">
-    <li>
-        <span class="title">Queue</span>
-        <strong>{!! $queue_size !!}</strong>
-    </li>
-    <li>
-        <span class="title">Speed</span>
-        <strong>{!! $current_speed !!}</strong>
-    </li>
-</ul>
+    @if (isset($data['Filters']))
+        <li>
+            <span class="title">Filters</span>
+            <strong>{{ $data['Filters'] }}</strong>
+        </li>
+    @endif
+    @if (isset($data['IRC']))
+        <li>
+            <span class="title">IRC</span>
+            <strong>{{ $data['IRC'] }}</strong>
+        </li>
+    @endif
+</ul>
+