From e7debbdd399a6791ea02df80c16afcdf871279df Mon Sep 17 00:00:00 2001 From: ggurdin Date: Mon, 21 Oct 2024 10:33:54 -0400 Subject: [PATCH] fixed some incorrect URLs and request setups --- lib/pangea/controllers/subscription_controller.dart | 7 +++++-- lib/pangea/network/urls.dart | 6 +++--- lib/pangea/repo/image_repo.dart | 13 +++++++++---- lib/pangea/repo/interactive_translation_repo.dart | 7 ++++--- lib/pangea/repo/language_repo.dart | 7 ++++++- lib/pangea/repo/subscription_repo.dart | 3 +++ lib/pangea/repo/user_repo.dart | 2 ++ 7 files changed, 32 insertions(+), 13 deletions(-) diff --git a/lib/pangea/controllers/subscription_controller.dart b/lib/pangea/controllers/subscription_controller.dart index 607917c33..1f47ecb39 100644 --- a/lib/pangea/controllers/subscription_controller.dart +++ b/lib/pangea/controllers/subscription_controller.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pangea/config/environment.dart'; import 'package:fluffychat/pangea/constants/local.key.dart'; import 'package:fluffychat/pangea/controllers/base_controller.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; @@ -308,7 +309,10 @@ class SubscriptionController extends BaseController { } Future getPaymentLink(String duration, {bool isPromo = false}) async { - final Requests req = Requests(); + final Requests req = Requests( + choreoApiKey: Environment.choreoApiKey, + accessToken: _pangeaController.userController.accessToken, + ); final String reqUrl = Uri.encodeFull( "${PApiUrls.paymentLink}?pangea_user_id=${_pangeaController.matrixState.client.userID}&duration=$duration&redeem=$isPromo", ); @@ -323,7 +327,6 @@ class SubscriptionController extends BaseController { return paymentLink; } - Future redeemPromoCode(BuildContext context) async { final List? promoCode = await showTextInputDialog( useRootNavigator: false, diff --git a/lib/pangea/network/urls.dart b/lib/pangea/network/urls.dart index 58b9c61b1..da774858b 100644 --- a/lib/pangea/network/urls.dart +++ b/lib/pangea/network/urls.dart @@ -52,14 +52,14 @@ class PApiUrls { static String itFeedback = "${PApiUrls.choreoEndpoint}/translation/feedback"; - static String firstStep = "/it_initialstep"; - static String subseqStep = "/it_step"; + static String firstStep = "${PApiUrls.choreoEndpoint}/it_initialstep"; + static String subseqStep = "${PApiUrls.choreoEndpoint}/it_step"; static String textToSpeech = "${PApiUrls.choreoEndpoint}/text_to_speech"; static String speechToText = "${PApiUrls.choreoEndpoint}/speech_to_text"; static String messageActivityGeneration = - "${Environment.choreoApi}/practice/message"; + "${PApiUrls.choreoEndpoint}/practice/message"; ///-------------------------------- revenue cat -------------------------- diff --git a/lib/pangea/repo/image_repo.dart b/lib/pangea/repo/image_repo.dart index 624e06e22..d12f02975 100644 --- a/lib/pangea/repo/image_repo.dart +++ b/lib/pangea/repo/image_repo.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'dart:developer'; import 'package:fluffychat/pangea/utils/error_handler.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/foundation.dart'; import 'package:http/http.dart'; @@ -44,9 +45,12 @@ class GenerateImageRequest { class ImageRepo { static Future fetchImage( - GenerateImageRequest request) async { - final Requests req = - Requests(baseUrl: Environment.choreoApi); // Set your API base URL + GenerateImageRequest request, + ) async { + final Requests req = Requests( + choreoApiKey: Environment.choreoApiKey, + accessToken: MatrixState.pangeaController.userController.accessToken, + ); // Set your API base URL final requestBody = request.toJson(); try { @@ -58,7 +62,8 @@ class ImageRepo { if (res.statusCode == 200) { final decodedBody = jsonDecode(utf8.decode(res.bodyBytes)); return GenerateImageeResponse.fromJson( - decodedBody); // Convert response to ImageModel + decodedBody, + ); // Convert response to ImageModel } else { throw Exception('Failed to load image'); } diff --git a/lib/pangea/repo/interactive_translation_repo.dart b/lib/pangea/repo/interactive_translation_repo.dart index ab5d3b1d6..6e1739ecf 100644 --- a/lib/pangea/repo/interactive_translation_repo.dart +++ b/lib/pangea/repo/interactive_translation_repo.dart @@ -1,8 +1,9 @@ import 'dart:convert'; +import 'package:fluffychat/pangea/config/environment.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import 'package:http/http.dart'; -import 'package:fluffychat/pangea/config/environment.dart'; import '../models/custom_input_translation_model.dart'; import '../models/it_response_model.dart'; import '../models/system_choice_translation_model.dart'; @@ -14,8 +15,8 @@ class ITRepo { CustomInputRequestModel initalText, ) async { final Requests req = Requests( - baseUrl: Environment.choreoApi, choreoApiKey: Environment.choreoApiKey, + accessToken: MatrixState.pangeaController.userController.accessToken, ); final Response res = await req.post(url: PApiUrls.firstStep, body: initalText.toJson()); @@ -29,8 +30,8 @@ class ITRepo { SystemChoiceRequestModel subseqText, ) async { final Requests req = Requests( - baseUrl: Environment.choreoApi, choreoApiKey: Environment.choreoApiKey, + accessToken: MatrixState.pangeaController.userController.accessToken, ); final Response res = diff --git a/lib/pangea/repo/language_repo.dart b/lib/pangea/repo/language_repo.dart index bbd802c9b..ab764623c 100644 --- a/lib/pangea/repo/language_repo.dart +++ b/lib/pangea/repo/language_repo.dart @@ -1,9 +1,11 @@ import 'dart:convert'; import 'dart:developer'; +import 'package:fluffychat/pangea/config/environment.dart'; import 'package:fluffychat/pangea/models/language_model.dart'; import 'package:fluffychat/pangea/network/urls.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/foundation.dart'; import 'package:http/http.dart'; @@ -11,7 +13,10 @@ import '../network/requests.dart'; class LanguageRepo { static Future> fetchLanguages() async { - final Requests req = Requests(); + final Requests req = Requests( + choreoApiKey: Environment.choreoApiKey, + accessToken: MatrixState.pangeaController.userController.accessToken, + ); final Response res = await req.get(url: PApiUrls.getLanguages); final decodedBody = diff --git a/lib/pangea/repo/subscription_repo.dart b/lib/pangea/repo/subscription_repo.dart index d5b8ae4c7..7a9dc48c8 100644 --- a/lib/pangea/repo/subscription_repo.dart +++ b/lib/pangea/repo/subscription_repo.dart @@ -6,6 +6,7 @@ import 'package:fluffychat/pangea/controllers/subscription_controller.dart'; import 'package:fluffychat/pangea/network/requests.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/subscription_app_id.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; @@ -17,6 +18,7 @@ class SubscriptionRepo { try { final Requests req = Requests( choreoApiKey: Environment.choreoApiKey, + accessToken: MatrixState.pangeaController.userController.accessToken, ); final http.Response res = await req.get( url: PApiUrls.rcAppsChoreo, @@ -38,6 +40,7 @@ class SubscriptionRepo { try { final Requests req = Requests( choreoApiKey: Environment.choreoApiKey, + accessToken: MatrixState.pangeaController.userController.accessToken, ); final http.Response res = await req.get( url: PApiUrls.rcProductsChoreo, diff --git a/lib/pangea/repo/user_repo.dart b/lib/pangea/repo/user_repo.dart index a89009cda..ec6f29c01 100644 --- a/lib/pangea/repo/user_repo.dart +++ b/lib/pangea/repo/user_repo.dart @@ -1,5 +1,6 @@ import 'dart:convert'; +import 'package:fluffychat/pangea/config/environment.dart'; import 'package:fluffychat/pangea/constants/model_keys.dart'; import 'package:http/http.dart'; @@ -20,6 +21,7 @@ class PUserRepo { }) async { final Requests req = Requests( accessToken: accessToken, + choreoApiKey: Environment.choreoApiKey, ); final Map body = {}; // if (interests != null) body[ModelKey.userInterests] = interests.toString();