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
4 changes: 0 additions & 4 deletions client/deepdame/lib/core/config/app_config.dart

This file was deleted.

21 changes: 21 additions & 0 deletions client/deepdame/lib/core/network/backend_url_controller.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import 'package:deepdame/core/storage/storage_providers.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';

part 'backend_url_controller.g.dart';

@Riverpod(keepAlive: true)
class BackendUrlController extends _$BackendUrlController {
@override
String? build() =>
ref.watch(sharedPreferencesProvider).getString('backend_url');

Future<void> setUrl(String url) async {
await ref.read(sharedPreferencesProvider).setString('backend_url', url);
state = url;
}

Future<void> clear() async {
await ref.read(sharedPreferencesProvider).remove('backend_url');
state = null;
}
}
63 changes: 63 additions & 0 deletions client/deepdame/lib/core/network/backend_url_controller.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 21 additions & 1 deletion client/deepdame/lib/core/network/dio_client.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import 'package:cookie_jar/cookie_jar.dart';
import 'package:deepdame/core/network/auth_interceptor.dart';
import 'package:deepdame/core/network/backend_url_controller.dart';
import 'package:dio/dio.dart';
import 'package:dio_cookie_manager/dio_cookie_manager.dart';
import 'package:flutter/foundation.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';

part 'dio_client.g.dart';
Expand All @@ -8,4 +12,20 @@ part 'dio_client.g.dart';
PersistCookieJar cookieJar(Ref ref) => throw UnimplementedError();

@Riverpod(keepAlive: true)
Dio dio(Ref ref) => throw UnimplementedError();
Dio dio(Ref ref) {
final baseUrl = ref.watch(backendUrlControllerProvider) ?? '';
final dio = Dio(BaseOptions(baseUrl: baseUrl));
dio.interceptors.add(CookieManager(ref.watch(cookieJarProvider)));
dio.interceptors.add(AuthInterceptor(dio));

if (kDebugMode) {
dio.interceptors.add(
LogInterceptor(
requestBody: true,
responseBody: true,
),
);
}

return dio;
}
2 changes: 1 addition & 1 deletion client/deepdame/lib/core/network/dio_client.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions client/deepdame/lib/core/network/stomp_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:async';
import 'dart:convert';

import 'package:cookie_jar/cookie_jar.dart';
import 'package:deepdame/core/config/app_config.dart';
import 'package:deepdame/core/network/backend_url_controller.dart';
import 'package:deepdame/core/network/dio_client.dart';
import 'package:flutter/foundation.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
Expand All @@ -13,11 +13,12 @@ part 'stomp_service.g.dart';
enum StompState { disconnected, connecting, connected, error }

class StompService {
StompService(this._cookieJar) {
StompService(this._cookieJar, this._baseUrl) {
debugPrint('StompService constructed');
}

final CookieJar _cookieJar;
final String _baseUrl;
StompClient? _client;
final _state = StreamController<StompState>.broadcast();
StompState _current = StompState.disconnected;
Expand All @@ -36,12 +37,12 @@ class StompService {
if (_client?.connected ?? false) return;
_emit(StompState.connecting);

final cookies = await _cookieJar.loadForRequest(Uri.parse(API_URL));
final cookies = await _cookieJar.loadForRequest(Uri.parse(_baseUrl));
final cookieHeader = cookies.map((c) => '${c.name}=${c.value}').join('; ');

_client = StompClient(
config: StompConfig.sockJS(
url: '$API_URL/ws',
url: '$_baseUrl/ws',
onConnect: (_) {
debugPrint('----- STOMP CONNECTED');
_emit(StompState.connected);
Expand Down Expand Up @@ -129,7 +130,8 @@ class StompService {

@Riverpod(keepAlive: true)
StompService stompService(Ref ref) {
final service = StompService(ref.watch(cookieJarProvider));
final baseUrl = ref.watch(backendUrlControllerProvider) ?? '';
final service = StompService(ref.watch(cookieJarProvider), baseUrl);
ref.onDispose(service.dispose);
return service;
}
Expand Down
2 changes: 1 addition & 1 deletion client/deepdame/lib/core/network/stomp_service.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions client/deepdame/lib/core/routing/app_router.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:deepdame/features/auth/login_screen.dart';
import 'package:deepdame/features/auth/recover_account.dart';
import 'package:deepdame/features/auth/register_screen.dart';
import 'package:deepdame/features/auth/validate_email.dart';
import 'package:deepdame/features/backend_setup/backend_setup_screen.dart';
import 'package:deepdame/features/banned/banned_screen.dart';
import 'package:deepdame/features/chat/chat_screen.dart';
import 'package:deepdame/features/dev/test/dev_chat_probe_screen.dart';
Expand Down Expand Up @@ -34,6 +35,11 @@ final appRouter = GoRouter(
path: '/splash',
builder: (context, state) => const SplashScreen(),
),
GoRoute(
name: 'backend-setup',
path: '/backend-setup',
builder: (context, state) => const BackendSetupScreen(),
),
GoRoute(
name: 'onboarding',
path: '/onboarding',
Expand Down
Loading
Loading