Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/providers/seerr_api_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import 'package:fladder/providers/user_provider.dart';
import 'package:fladder/seerr/seerr_chopper_service.dart';
import 'package:fladder/seerr/seerr_json_converter.dart';
import 'package:fladder/util/fladder_config.dart';
import 'package:fladder/util/seerr_http_client.dart'
if (dart.library.html) 'package:fladder/util/seerr_http_client_web.dart';

part 'seerr_api_provider.g.dart';

Expand All @@ -21,6 +23,7 @@ class SeerrApi extends _$SeerrApi {
ref.watch(userProvider.select((u) => u?.seerrCredentials));

final chopperClient = ChopperClient(
client: createSeerrHttpClient(),
converter: const SeerrJsonConverter(),
interceptors: [
SeerrRequest(ref),
Expand Down Expand Up @@ -89,7 +92,8 @@ class SeerrRequest implements Interceptor {

Map<String, String> _authHeaders({required String apiKey, required String cookie}) {
if (apiKey.isNotEmpty) return {'X-Api-Key': apiKey};
if (cookie.isNotEmpty) return {'Cookie': cookie};
if (cookie.isNotEmpty && cookie != kBrowserManagedCookie) return {'Cookie': cookie};
if (cookie == kBrowserManagedCookie) return const {};
return const {};
}

Expand Down
15 changes: 11 additions & 4 deletions lib/providers/seerr_service_provider.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'dart:io';

import 'package:chopper/chopper.dart';
import 'package:flutter/foundation.dart' show kIsWeb;
import 'package:flutter_riverpod/flutter_riverpod.dart';

import 'package:fladder/models/items/images_models.dart';
Expand All @@ -11,6 +12,7 @@ import 'package:fladder/seerr/seerr_chopper_service.dart';
import 'package:fladder/seerr/seerr_models.dart';

const tmbdUrl = 'https://image.tmdb.org/t/p/original';
const kBrowserManagedCookie = '__browser_managed__';

class SeerrService {
SeerrService(this.ref, this._api);
Expand Down Expand Up @@ -632,7 +634,8 @@ class SeerrService {

SeerrDashboardPosterModel? posterFromDiscoverItem(SeerrDiscoverItem item) => _posterFromDiscoverItem(item);

Future<String> authenticateLocal({required String email, required String password, Map<String, String>? headers}) async {
Future<String> authenticateLocal(
{required String email, required String password, Map<String, String>? headers}) async {
final response = await _api.authenticateLocal(
SeerrAuthLocalBody(email: email, password: password),
headers: headers,
Expand All @@ -647,14 +650,16 @@ class SeerrService {
return cookie;
}

Future<String> authenticateJellyfin({required String username, required String password, Map<String, String>? headers}) async {
Future<String> authenticateJellyfin(
{required String username, required String password, Map<String, String>? headers}) async {
final response = await _authenticateJellyfin(username: username, password: password, headers: headers);
return _requireSessionCookie(response, label: 'Jellyfin');
}

Future<void> logout() async => await _api.logout();

Future<Response<dynamic>> _authenticateJellyfin({required String username, required String password, Map<String, String>? headers}) async {
Future<Response<dynamic>> _authenticateJellyfin(
{required String username, required String password, Map<String, String>? headers}) async {
var response = await _api.authenticateJellyfin(
SeerrAuthJellyfinBody(username: username, password: password),
headers: headers,
Expand Down Expand Up @@ -697,7 +702,9 @@ class SeerrService {

String? _extractSessionCookie(Response<dynamic> response) {
final setCookie = response.base.headers['set-cookie'];
if (setCookie == null || setCookie.isEmpty) return null;
if (setCookie == null || setCookie.isEmpty) {
return kIsWeb ? kBrowserManagedCookie : null;
}
return setCookie.split(';').first.trim();
}
}
3 changes: 3 additions & 0 deletions lib/util/seerr_http_client.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import 'package:http/http.dart' as http;

http.Client createSeerrHttpClient() => http.Client();
6 changes: 6 additions & 0 deletions lib/util/seerr_http_client_web.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import 'package:http/browser_client.dart';
import 'package:http/http.dart' as http;

http.Client createSeerrHttpClient() {
return BrowserClient()..withCredentials = true;
}