diff --git a/lib/logic/api_maps/graphql_maps/graphql_api_map.dart b/lib/logic/api_maps/graphql_maps/graphql_api_map.dart index f91fc7a7..6a00f5b6 100644 --- a/lib/logic/api_maps/graphql_maps/graphql_api_map.dart +++ b/lib/logic/api_maps/graphql_maps/graphql_api_map.dart @@ -74,13 +74,11 @@ abstract class GraphQLApiMap { defaultHeaders: {'Accept-Language': _locale}, ); - final String token = _getApiToken(); - final Link graphQLLink = RequestLoggingLink().concat( isWithToken ? AuthLink( getToken: () async => - customToken == '' ? 'Bearer $token' : customToken, + customToken == '' ? 'Bearer $_token' : customToken, ).concat(httpLink) : httpLink, ); @@ -96,16 +94,14 @@ abstract class GraphQLApiMap { } Future getSubscriptionClient() async { - final String token = _getApiToken(); - final WebSocketLink webSocketLink = WebSocketLink( 'ws://api.$rootAddress/graphql', config: SocketClientConfig( autoReconnect: true, - headers: token.isEmpty + headers: _token.isEmpty ? null : { - 'Authorization': 'Bearer $token', + 'Authorization': 'Bearer $_token', 'Accept-Language': _locale, }, ), @@ -119,7 +115,7 @@ abstract class GraphQLApiMap { String get _locale => getIt.get().localeCode ?? 'en'; - String _getApiToken() { + String get _token { String token = ''; final serverDetails = getIt().serverDetails; if (serverDetails != null) {