eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

TF-2168 Fix mailto invalid recipient

Browse Source 
(cherry picked from commit c559daeb1029c96103e3bca951317d878a837a5c)
This commit is contained in:
dab246
2023-09-26 16:50:55 +07:00
committed by Dat H. Pham
parent 92dc0dbe7e
commit 6710702924
8 changed files with 91 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/main/routes/navigation_router.dart
+5 -1
View File
@@ -1,6 +1,7 @@
import 'package:equatable/equatable.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:tmail_ui_user/features/thread/domain/model/search_query.dart';
@@ -15,7 +16,8 @@ class NavigationRouter with EquatableMixin {
final DashboardType dashboardType;
final SearchQuery? searchQuery;
final String? routeName;
final String? emailAddress;
final EmailAddress? emailAddress;
final String? subject;
NavigationRouter({
this.emailId,
@@ -24,6 +26,7 @@ class NavigationRouter with EquatableMixin {
this.dashboardType = DashboardType.normal,
this.routeName,
this.emailAddress,
this.subject,
});
factory NavigationRouter.initial() => NavigationRouter();
@@ -36,5 +39,6 @@ class NavigationRouter with EquatableMixin {
dashboardType,
routeName,
emailAddress,
subject,
];
}
lib/main/routes/route_utils.dart
+59 -12
View File
@@ -3,16 +3,31 @@ import 'package:core/data/model/query/query_parameter.dart';
import 'package:core/data/network/config/service_path.dart';
import 'package:core/utils/app_logger.dart';
import 'package:core/utils/platform_info.dart';
import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/core/id.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:tmail_ui_user/features/login/data/extensions/service_path_extension.dart';
import 'package:tmail_ui_user/features/thread/domain/model/search_query.dart';
import 'package:tmail_ui_user/main/routes/app_routes.dart';
import 'package:tmail_ui_user/main/routes/navigation_router.dart';
import 'package:universal_html/html.dart' as html;
abstract class RouteUtils {
static const String paramID = 'id';
static const String paramType = 'type';
static const String paramContext = 'context';
static const String paramQuery = 'q';
static const String paramRouteName = 'routeName';
static const String paramMailtoAddress = 'mailtoAddress';
static const String paramSubject = 'subject';
static const String mailtoPrefix = 'mailto:';
static const String INVALID_VALUE = 'invalid';
static String get baseOriginUrl => Uri.base.origin;
static String get baseUrl => Uri.base.path;
@@ -24,11 +39,11 @@ abstract class RouteUtils {
servicePath = servicePath.withPathParameter(router.emailId!.id.value);
}
servicePath = servicePath.withQueryParameters([
StringQueryParameter('type', router.dashboardType.name),
StringQueryParameter(paramType, router.dashboardType.name),
if (router.mailboxId != null)
StringQueryParameter('context', router.mailboxId!.id.value),
StringQueryParameter(paramContext, router.mailboxId!.id.value),
if (router.searchQuery != null)
StringQueryParameter('q', router.searchQuery!.value),
StringQueryParameter(paramQuery, router.searchQuery!.value),
]);
return servicePath.path;
} else {
@@ -43,23 +58,24 @@ abstract class RouteUtils {
servicePath = servicePath.withPathParameter(router.emailId!.id.value);
}
servicePath = servicePath.withQueryParameters([
StringQueryParameter('type', router.dashboardType.name),
StringQueryParameter(paramType, router.dashboardType.name),
if (router.mailboxId != null)
StringQueryParameter('context', router.mailboxId!.id.value),
StringQueryParameter(paramContext, router.mailboxId!.id.value),
if (router.searchQuery != null)
StringQueryParameter('q', router.searchQuery!.value),
StringQueryParameter(paramQuery, router.searchQuery!.value),
]);
return Uri.parse(servicePath.path);
}
static NavigationRouter parsingRouteParametersToNavigationRouter(Map<String, String?> parameters) {
final idParam = parameters['id'];
final typeParam = parameters['type'];
final contextPram = parameters['context'];
final queryParam = parameters['q'];
final routeName = parameters['routeName'];
final emailAddress = parameters['emailAddress'];
final idParam = parameters[paramID];
final typeParam = parameters[paramType];
final contextPram = parameters[paramContext];
final queryParam = parameters[paramQuery];
final routeName = parameters[paramRouteName];
final mailtoAddress = parameters[paramMailtoAddress];
final subject = parameters[paramSubject];
final emailId = idParam != null ? EmailId(Id(idParam)) : null;
final mailboxId = contextPram != null ? MailboxId(Id(contextPram)) : null;
@@ -67,6 +83,9 @@ abstract class RouteUtils {
final dashboardType = typeParam == DashboardType.search.name
? DashboardType.search
: DashboardType.normal;
final emailAddress = mailtoAddress != null && GetUtils.isEmail(mailtoAddress)
? EmailAddress(null, mailtoAddress)
: EmailAddress(null, INVALID_VALUE);
return NavigationRouter(
emailId: emailId,
@@ -75,6 +94,7 @@ abstract class RouteUtils {
dashboardType: dashboardType,
routeName: routeName,
emailAddress: emailAddress,
subject: subject,
);
}
@@ -83,4 +103,31 @@ abstract class RouteUtils {
log('RouteUtils::updateRouteOnBrowser(): newRoute: $newRoute');
html.window.history.replaceState(null, title, newRoute.toString());
}
static Map<String, String?> parseMapMailtoFromUri(String? mailtoUri) {
log('RouteUtils::parseMapMailtoFromUri:mailtoUri: $mailtoUri');
final mapMailto = <String, String?>{
RouteUtils.paramRouteName: AppRoutes.mailtoURL,
};
if (mailtoUri?.startsWith(mailtoPrefix) == true) {
final mailtoUrlDecoded = Uri.decodeFull(mailtoUri!);
final uri = Uri.tryParse(mailtoUrlDecoded);
if (uri == null) return mapMailto;
final mailtoAddress = uri.path;
final mapQueryParam = uri.queryParameters;
mapMailto[paramMailtoAddress] = mailtoAddress;
if (mapQueryParam.containsKey(paramSubject)) {
mapMailto[paramSubject] = mapQueryParam[paramSubject];
}
} else if (mailtoUri != null) {
final mailtoUrlDecoded = Uri.decodeFull(mailtoUri);
mapMailto[paramMailtoAddress] = mailtoUrlDecoded;
} else {
mapMailto[paramMailtoAddress] = mailtoUri;
}
log('RouteUtils::parseMapMailtoFromUri:mapMailto: $mapMailto');
return mapMailto;
}
}