mirror of
https://github.com/rustdesk/rustdesk.git
synced 2026-11-04 00:33:12 +00:00
21pages
a85ad89ffc
* feat: add connections without sending passwords
Add Without password actions and pass the selection through desktop,
mobile and Web sessions. Omit the password when constructing LoginRequest,
preserve saved credentials, and reuse the existing approval and OS login
dialogs. Keep protocol and controlled-side authentication changes separate.
* fix: preserve login method across session windows
* fix: skip password persistence for consent connections
* refactor: unify request approval menus and naming
* chore: move request approval translation key to the end
* i18n: translate request approval menu label
* fix: align request approval menu layout and icons
* fix: avoid duplicate focus stops in request approval menus
* fix: distinguish request approval submenus on mobile
* fix: open overflowing submenus to the left
* Revert "fix: distinguish request approval submenus on mobile"
This reverts commit 7f0e50d4e4.
298 lines
11 KiB
Dart
298 lines
11 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:flutter/services.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
import 'package:flutter_hbb/common/widgets/request_approval_menu.dart';
|
|
import 'package:flutter_hbb/desktop/widgets/material_mod_popup_menu.dart'
|
|
as mod_menu;
|
|
import 'package:flutter_hbb/desktop/widgets/popup_menu.dart';
|
|
|
|
const connectionTypes = [
|
|
'Connect',
|
|
'Transfer file',
|
|
'View camera',
|
|
'Terminal',
|
|
'Terminal (Run as administrator)',
|
|
'TCP tunneling',
|
|
'RDP',
|
|
];
|
|
|
|
Future<void> openMenu(WidgetTester tester, List<String> actions,
|
|
{ThemeData? theme,
|
|
EdgeInsets? padding,
|
|
bool includeRelay = false,
|
|
RelativeRect position = const RelativeRect.fromLTRB(20, 20, 780, 580)}) async {
|
|
MenuEntryButton<String> entry(String title, {bool requestApproval = false}) =>
|
|
MenuEntryButton<String>(
|
|
childBuilder: (style) => Text(title, style: style),
|
|
proc: () =>
|
|
actions.add(requestApproval ? '$title:request-approval' : title),
|
|
padding: padding,
|
|
dismissOnClicked: true,
|
|
);
|
|
|
|
await tester.pumpWidget(MaterialApp(
|
|
theme: theme,
|
|
home: Scaffold(
|
|
body: Builder(builder: (context) {
|
|
return TextButton(
|
|
onPressed: () => mod_menu.showMenu<String>(
|
|
context: context,
|
|
position: position,
|
|
items: [
|
|
entry('Connect'),
|
|
entry('Transfer file'),
|
|
entry('View camera'),
|
|
MenuEntryButton<String>(
|
|
childBuilder: (style) => Row(children: [
|
|
Text('RDP', style: style),
|
|
const Spacer(),
|
|
IconButton(
|
|
icon: const Icon(Icons.edit),
|
|
onPressed: () {
|
|
Navigator.pop(context);
|
|
actions.add('Edit RDP');
|
|
},
|
|
),
|
|
]),
|
|
proc: () => actions.add('RDP'),
|
|
padding: padding,
|
|
dismissOnClicked: true,
|
|
),
|
|
RequestApprovalMenu(
|
|
title: 'Request approval',
|
|
padding: padding,
|
|
entries: [
|
|
for (final title in connectionTypes)
|
|
entry(title, requestApproval: true),
|
|
],
|
|
),
|
|
if (includeRelay)
|
|
MenuEntrySwitchSync<String>(
|
|
switchType: SwitchType.scheckbox,
|
|
text: 'Always connect via relay',
|
|
currentValue: false,
|
|
setter: (_) async {},
|
|
padding: padding,
|
|
dismissOnClicked: true,
|
|
),
|
|
entry('Rename'),
|
|
]
|
|
.expand((entry) => entry.build(context,
|
|
const MenuConfig(commonColor: Colors.black, height: 20)))
|
|
.toList(),
|
|
),
|
|
child: const Text('Open menu'),
|
|
);
|
|
}),
|
|
),
|
|
));
|
|
await tester.pumpAndSettle();
|
|
await tester.tap(find.text('Open menu'));
|
|
await tester.pumpAndSettle();
|
|
}
|
|
|
|
void main() {
|
|
testWidgets('submenu prefers the left screen edge when neither side fits',
|
|
(tester) async {
|
|
tester.view.physicalSize = const Size(500, 800);
|
|
tester.view.devicePixelRatio = 1;
|
|
addTearDown(tester.view.resetPhysicalSize);
|
|
addTearDown(tester.view.resetDevicePixelRatio);
|
|
await openMenu(tester, [],
|
|
position: const RelativeRect.fromLTRB(480, 20, 20, 780));
|
|
await tester.tap(find.text('Request approval'));
|
|
await tester.pumpAndSettle();
|
|
final submenu = tester.getRect(find.ancestor(
|
|
of: find.text('Connect').last,
|
|
matching: find.byType(mod_menu.PopupMenuItem<String>)));
|
|
expect(submenu.left, closeTo(0, 0.01));
|
|
expect(submenu.right, lessThanOrEqualTo(500));
|
|
await tester.tapAt(const Offset(2, 2));
|
|
await tester.pumpAndSettle();
|
|
});
|
|
|
|
testWidgets('approval submenu opens beside its parent on either screen edge',
|
|
(tester) async {
|
|
tester.view.physicalSize = const Size(1200, 800);
|
|
tester.view.devicePixelRatio = 1;
|
|
addTearDown(tester.view.resetPhysicalSize);
|
|
addTearDown(tester.view.resetDevicePixelRatio);
|
|
for (final atRight in [false, true]) {
|
|
await openMenu(tester, [],
|
|
position: RelativeRect.fromLTRB(atRight ? 1180 : 20, 20,
|
|
atRight ? 20 : 1180, 780));
|
|
final parent = tester.getRect(find.byType(PopupMenuChildrenItem<String>));
|
|
await tester.tap(find.text('Request approval'));
|
|
await tester.pumpAndSettle();
|
|
final submenu = tester.getRect(find.ancestor(
|
|
of: find.text('Connect').last,
|
|
matching: find.byType(mod_menu.PopupMenuItem<String>)));
|
|
if (atRight) {
|
|
expect(submenu.right, lessThanOrEqualTo(parent.left));
|
|
} else {
|
|
expect(submenu.left, greaterThanOrEqualTo(parent.right));
|
|
}
|
|
await tester.tapAt(const Offset(2, 2));
|
|
await tester.pumpAndSettle();
|
|
}
|
|
});
|
|
|
|
testWidgets('approval trigger has one Tab stop and opens with Enter',
|
|
(tester) async {
|
|
await openMenu(tester, []);
|
|
bool approvalHasFocus() => FocusManager.instance.primaryFocus?.context
|
|
?.findAncestorWidgetOfExactType<PopupMenuChildrenItem<String>>() != null;
|
|
|
|
for (var i = 0; i < 30 && !approvalHasFocus(); i++) {
|
|
await tester.sendKeyEvent(LogicalKeyboardKey.tab);
|
|
await tester.pump();
|
|
}
|
|
expect(approvalHasFocus(), isTrue);
|
|
await tester.sendKeyEvent(LogicalKeyboardKey.tab);
|
|
await tester.pump();
|
|
expect(approvalHasFocus(), isFalse,
|
|
reason: 'Tab must leave the approval row after one stop');
|
|
|
|
await tester.sendKeyDownEvent(LogicalKeyboardKey.shiftLeft);
|
|
await tester.sendKeyEvent(LogicalKeyboardKey.tab);
|
|
await tester.sendKeyUpEvent(LogicalKeyboardKey.shiftLeft);
|
|
await tester.pump();
|
|
expect(approvalHasFocus(), isTrue);
|
|
await tester.sendKeyEvent(LogicalKeyboardKey.enter);
|
|
await tester.pumpAndSettle();
|
|
expect(find.text('Terminal (Run as administrator)'), findsOneWidget);
|
|
});
|
|
|
|
testWidgets('tapping outside the approval submenu closes both menus',
|
|
(tester) async {
|
|
final actions = <String>[];
|
|
await openMenu(tester, actions);
|
|
await tester.tap(find.text('Request approval'));
|
|
await tester.pumpAndSettle();
|
|
await tester.tapAt(const Offset(2, 2));
|
|
await tester.pumpAndSettle();
|
|
expect(actions, isEmpty);
|
|
expect(find.text('Request approval'), findsNothing);
|
|
expect(find.text('Rename'), findsNothing);
|
|
expect(find.text('Open menu'), findsOneWidget);
|
|
});
|
|
|
|
testWidgets('approval text and arrow align with normal menu items',
|
|
(tester) async {
|
|
for (final (theme, padding) in [
|
|
(ThemeData(), null),
|
|
(
|
|
ThemeData(
|
|
useMaterial3: false,
|
|
platform: TargetPlatform.windows,
|
|
visualDensity: VisualDensity.compact),
|
|
const EdgeInsets.only(left: 12, right: 3)
|
|
),
|
|
(
|
|
ThemeData(useMaterial3: false),
|
|
const EdgeInsets.symmetric(horizontal: 12)
|
|
),
|
|
(
|
|
ThemeData(
|
|
useMaterial3: false,
|
|
textButtonTheme: TextButtonThemeData(
|
|
style: TextButton.styleFrom(
|
|
padding: const EdgeInsets.symmetric(horizontal: 20)),
|
|
)),
|
|
null
|
|
),
|
|
]) {
|
|
await openMenu(tester, [],
|
|
theme: theme, padding: padding, includeRelay: true);
|
|
expect(tester.getTopLeft(find.text('Request approval')).dx,
|
|
tester.getTopLeft(find.text('Connect')).dx);
|
|
expect(tester.getCenter(find.byIcon(Icons.keyboard_arrow_right)).dx,
|
|
closeTo(tester.getCenter(find.byType(Checkbox)).dx, 0.01));
|
|
await tester.tap(find.text('Rename'));
|
|
await tester.pumpAndSettle();
|
|
}
|
|
});
|
|
|
|
testWidgets('normal connections and RDP editing remain direct actions',
|
|
(tester) async {
|
|
for (final title in [
|
|
'Connect',
|
|
'Transfer file',
|
|
'View camera',
|
|
'RDP',
|
|
'Edit RDP'
|
|
]) {
|
|
final actions = <String>[];
|
|
await openMenu(tester, actions);
|
|
expect(find.byIcon(Icons.keyboard_arrow_right), findsOneWidget);
|
|
final left = tester.getTopLeft(find.text('Rename')).dx;
|
|
for (final row in ['Connect', 'Transfer file', 'View camera', 'RDP']) {
|
|
expect(tester.getTopLeft(find.text(row)).dx, left);
|
|
}
|
|
await tester.tap(
|
|
title == 'Edit RDP' ? find.byIcon(Icons.edit) : find.text(title));
|
|
await tester.pumpAndSettle();
|
|
expect(actions, [title]);
|
|
expect(find.text('Request approval'), findsNothing);
|
|
expect(find.text('Rename'), findsNothing);
|
|
}
|
|
});
|
|
|
|
testWidgets(
|
|
'one approval menu offers all connection types and closes both menus',
|
|
(tester) async {
|
|
for (var i = 0; i < connectionTypes.length; i++) {
|
|
final actions = <String>[];
|
|
await openMenu(tester, actions);
|
|
await tester.tap(i.isEven
|
|
? find.text('Request approval')
|
|
: find.byIcon(Icons.keyboard_arrow_right));
|
|
await tester.pumpAndSettle();
|
|
expect(actions, isEmpty);
|
|
for (final title in connectionTypes) {
|
|
expect(find.text(title), findsWidgets);
|
|
}
|
|
await tester.tap(find.text(connectionTypes[i]).last);
|
|
await tester.pumpAndSettle();
|
|
expect(actions, ['${connectionTypes[i]}:request-approval']);
|
|
expect(find.text('Request approval'), findsNothing);
|
|
expect(find.text('Rename'), findsNothing);
|
|
}
|
|
},
|
|
variant: TargetPlatformVariant({
|
|
TargetPlatform.android,
|
|
TargetPlatform.iOS,
|
|
TargetPlatform.linux,
|
|
TargetPlatform.macOS,
|
|
TargetPlatform.windows,
|
|
}));
|
|
|
|
testWidgets('the whole approval row opens the submenu on a narrow screen',
|
|
(tester) async {
|
|
tester.view.physicalSize = const Size(360, 640);
|
|
tester.view.devicePixelRatio = 1;
|
|
addTearDown(tester.view.resetPhysicalSize);
|
|
addTearDown(tester.view.resetDevicePixelRatio);
|
|
for (final corner in [
|
|
Alignment.topLeft,
|
|
Alignment.topRight,
|
|
Alignment.bottomLeft,
|
|
Alignment.bottomRight,
|
|
]) {
|
|
final actions = <String>[];
|
|
await openMenu(tester, actions);
|
|
final row = tester.getRect(find.byType(PopupMenuChildrenItem<String>));
|
|
await tester.tapAt(corner.withinRect(row.deflate(2)));
|
|
await tester.pumpAndSettle();
|
|
expect(actions, isEmpty);
|
|
expect(find.text('Terminal (Run as administrator)'), findsOneWidget);
|
|
await tester.tap(find.text('Connect').last);
|
|
await tester.pumpAndSettle();
|
|
expect(actions, ['Connect:request-approval']);
|
|
expect(find.text('Rename'), findsNothing);
|
|
}
|
|
},
|
|
variant:
|
|
TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));
|
|
}
|