Skip to content

Commit 7ec0bfc

Browse files
ComputerEliteComputerElite
committed
Add loginv2
1 parent e6bfc9d commit 7ec0bfc

File tree

14 files changed

+336
-92
lines changed

14 files changed

+336
-92
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ You can download a Portable version (zip file) from the [releases](https://githu
125125
- [x] Add global limit for self.
126126
- [x] Stop live playback when changing type
127127
- [x] Make sure text in popups is scrollable so it can be read completely
128-
- [ ] Implement login V2 (how am I supposed to reliably extract sideKeys for turnstile on any OpenShock instance)
128+
- [x] Implement login V2 (Android only currently)
129129
- [ ] Implement Shares V2 (once officially declared done in backend and implementation in official frontend exists. Can't make sense of the api rn without explenation)
130130

131131
# Planned settings

‎fastlane/metadata/android/en-US/changelogs/43.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
**Changelog:**
2+
- Switched login to LoginV2 on Android. Linux and Windows will follow. This means cloudflare turnstile has been added to the app. It can be disabled in the settings.
3+
- When logging out a loading indicator is now shown

‎lib/screens/settings/login_popup.dart‎

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
import 'dart:io';
2+
3+
import 'package:cloudflare_turnstile/cloudflare_turnstile.dart';
4+
import 'package:flutter/material.dart';
5+
import 'package:shock_alarm_app/dialogs/error_dialog.dart';
6+
import 'package:shock_alarm_app/dialogs/loading_dialog.dart';
7+
import 'package:shock_alarm_app/services/alarm_list_manager.dart';
8+
import 'package:shock_alarm_app/services/openshock.dart';
9+
import 'package:url_launcher/url_launcher.dart';
10+
11+
class LoginPopup extends StatefulWidget {
12+
TextEditingController serverController = TextEditingController();
13+
TextEditingController usernameController = TextEditingController();
14+
TextEditingController passwordController = TextEditingController();
15+
String? turnstileToken;
16+
OpenShockBackendInformationData? backendInfo;
17+
bool useTurnstile = true;
18+
19+
@override
20+
State<StatefulWidget> createState() => _LoginPopupState();
21+
}
22+
23+
class _LoginPopupState extends State<LoginPopup> {
24+
bool useTurnstile = false;
25+
26+
@override
27+
void initState() {
28+
widget.serverController.text = "https://api.openshock.app";
29+
if(Platform.isLinux || Platform.isWindows || AlarmListManager.getInstance().settings.forceLoginV1) widget.useTurnstile = false;
30+
super.initState();
31+
reloadBackendData();
32+
}
33+
34+
void reloadBackendData() {
35+
setState(() {
36+
widget.turnstileToken = null;
37+
useTurnstile = false;
38+
});
39+
OpenShockClient().getOpenShockInstanceInfo(widget.serverController.text).then((res) {
40+
setState(() {
41+
if(res.value != null) {
42+
widget.backendInfo = res.value!;
43+
useTurnstile = widget.backendInfo!.turnstileSiteKey != null && widget.useTurnstile;
44+
}
45+
});
46+
});
47+
}
48+
49+
@override
50+
Widget build(BuildContext context) {
51+
return AlertDialog.adaptive(
52+
title: Text("Log in to OpenShock"),
53+
content: SingleChildScrollView(
54+
child: Column(
55+
children: <Widget>[
56+
TextField(
57+
decoration: InputDecoration(labelText: "Server"),
58+
controller: widget.serverController,
59+
onEditingComplete: reloadBackendData,
60+
),
61+
AutofillGroup(
62+
child: Column(
63+
children: [
64+
TextField(
65+
decoration: InputDecoration(labelText: "Email"),
66+
controller: widget.usernameController,
67+
autofillHints: [AutofillHints.email],
68+
),
69+
TextField(
70+
decoration: InputDecoration(labelText: "Password"),
71+
obscureText: true,
72+
obscuringCharacter: "*",
73+
controller: widget.passwordController,
74+
autofillHints: [AutofillHints.password],
75+
),
76+
if(widget.backendInfo != null && useTurnstile) CloudFlareTurnstile(
77+
siteKey: widget.backendInfo!.turnstileSiteKey!, //Change with your site key
78+
baseUrl: widget.backendInfo!.frontendUrl,
79+
mode: TurnstileMode.nonInteractive,
80+
onTokenRecived: (token) {
81+
widget.turnstileToken = token;
82+
},
83+
onTokenExpired: reloadBackendData,
84+
),
85+
],
86+
))
87+
],
88+
),
89+
),
90+
actions: <Widget>[
91+
TextButton(
92+
onPressed: () {
93+
Navigator.of(context).pop();
94+
},
95+
child: Text("Cancel")),
96+
TextButton(
97+
child: Text("Register"),
98+
onPressed: () {
99+
launchUrl(
100+
Uri.parse("https://openshock.app/#/account/signup"));
101+
},
102+
),
103+
TextButton(
104+
onPressed: () async {
105+
if(widget.turnstileToken == null && useTurnstile) {
106+
ErrorDialog.show("Challenge not done", "Make sure to validate via cloudflare turnstile");
107+
return;
108+
}
109+
LoadingDialog.show("Logging in");
110+
bool worked = await AlarmListManager.getInstance().login(
111+
widget.serverController.text,
112+
widget.usernameController.text,
113+
widget.passwordController.text,
114+
widget.turnstileToken);
115+
if (worked) {
116+
Navigator.of(context).pop();
117+
Navigator.of(context).pop();
118+
AlarmListManager.getInstance().reloadAllMethod!();
119+
} else {
120+
Navigator.of(context).pop();
121+
ErrorDialog.show(
122+
"Login failed", "Check server, email and password");
123+
}
124+
},
125+
child: Text("Login"))
126+
],
127+
);
128+
}
129+
}

‎lib/screens/settings/settings_screen.dart‎

Lines changed: 29 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ import 'package:shock_alarm_app/dialogs/info_dialog.dart';
1414
import 'package:shock_alarm_app/dialogs/loading_dialog.dart';
1515
import 'package:shock_alarm_app/main.dart';
1616
import 'package:shock_alarm_app/screens/settings/confirm_shock_dialog.dart';
17+
import 'package:shock_alarm_app/screens/settings/login_popup.dart';
1718
import 'package:shock_alarm_app/screens/tones/tones.dart';
1819
import 'package:shock_alarm_app/services/alarm_list_manager.dart';
1920
import 'package:shock_alarm_app/services/alarm_manager.dart';
2021
import 'package:shock_alarm_app/services/openshock.dart';
2122
import 'package:url_launcher/url_launcher.dart';
23+
import 'package:cloudflare_turnstile/cloudflare_turnstile.dart';
2224
import 'token_item.dart';
2325
import '../../stores/alarm_store.dart';
2426
import '../tools/tools.dart';
@@ -522,76 +524,10 @@ class _SettingsScreenState extends State<SettingsScreen> {
522524
}
523525

524526
Future showLoginPopup() async {
525-
TextEditingController serverController = TextEditingController();
526-
TextEditingController usernameController = TextEditingController();
527-
TextEditingController passwordController = TextEditingController();
528-
serverController.text = "https://api.openshock.app";
527+
String? turnstileToken;
529528
return showDialog(
530529
context: context,
531-
builder: (BuildContext context) {
532-
return AlertDialog.adaptive(
533-
title: Text("Log in to OpenShock"),
534-
content: SingleChildScrollView(
535-
child: Column(
536-
children: <Widget>[
537-
TextField(
538-
decoration: InputDecoration(labelText: "Server"),
539-
controller: serverController,
540-
),
541-
AutofillGroup(
542-
child: Column(
543-
children: [
544-
TextField(
545-
decoration: InputDecoration(labelText: "Email"),
546-
controller: usernameController,
547-
autofillHints: [AutofillHints.email],
548-
),
549-
TextField(
550-
decoration: InputDecoration(labelText: "Password"),
551-
obscureText: true,
552-
obscuringCharacter: "*",
553-
controller: passwordController,
554-
autofillHints: [AutofillHints.password],
555-
)
556-
],
557-
))
558-
],
559-
),
560-
),
561-
actions: <Widget>[
562-
TextButton(
563-
onPressed: () {
564-
Navigator.of(context).pop();
565-
},
566-
child: Text("Cancel")),
567-
TextButton(
568-
child: Text("Register"),
569-
onPressed: () {
570-
launchUrl(
571-
Uri.parse("https://openshock.app/#/account/signup"));
572-
},
573-
),
574-
TextButton(
575-
onPressed: () async {
576-
LoadingDialog.show("Logging in");
577-
bool worked = await widget.manager.login(
578-
serverController.text,
579-
usernameController.text,
580-
passwordController.text);
581-
if (worked) {
582-
Navigator.of(context).pop();
583-
Navigator.of(context).pop();
584-
AlarmListManager.getInstance().reloadAllMethod!();
585-
} else {
586-
Navigator.of(context).pop();
587-
ErrorDialog.show(
588-
"Login failed", "Check server, email and password");
589-
}
590-
},
591-
child: Text("Login"))
592-
],
593-
);
594-
});
530+
builder: (context) =>LoginPopup());
595531
}
596532

597533

@@ -1045,6 +981,31 @@ class _SettingsScreenState extends State<SettingsScreen> {
1045981
})
1046982
],
1047983
),
984+
Row(
985+
mainAxisAlignment: MainAxisAlignment.spaceBetween,
986+
children: [
987+
Row(
988+
children: [
989+
Text("Login without cloudflare"),
990+
IconButton(
991+
onPressed: () {
992+
InfoDialog.show("What does this mean?",
993+
"ShockAlarm uses the V2 login api of OpenShock by default which requires cloudflare turnstile to be embedded for bot detection. By activating this you can switch back to the V1 login api which does not require this but may not be available on all OpenShock instances.");
994+
},
995+
icon: Icon(Icons.info))
996+
],
997+
),
998+
HapticSwitch(
999+
value: widget.manager.settings.forceLoginV1,
1000+
key: ValueKey("forceLoginV1"),
1001+
onChanged: (value) {
1002+
setState(() {
1003+
widget.manager.settings.forceLoginV1 = value;
1004+
widget.manager.saveSettings();
1005+
});
1006+
})
1007+
],
1008+
),
10481009
Row(
10491010
mainAxisAlignment: MainAxisAlignment.spaceBetween,
10501011
children: [

‎lib/screens/settings/token_item.dart‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ class TokenItemState extends State<TokenItem> {
3333
TokenItemState(this.token, this.manager, this.onRebuild);
3434

3535
void _delete() async {
36-
deleting = true;
36+
setState(() {
37+
deleting = true;
38+
});
3739
if (token.flavor == TokenFlavor.openshock) {
3840
String? error = await manager.deleteToken(token);
3941
await manager.updateShockerStore();
@@ -142,8 +144,6 @@ class TokenItemState extends State<TokenItem> {
142144
icon: Icon(expanded
143145
? Icons.arrow_upward_rounded
144146
: Icons.arrow_downward_rounded)),
145-
if (!manager.settings.allowTokenEditing && deleting)
146-
CircularProgressIndicator(),
147147
if (token.flavor == TokenFlavor.openshock && token.type == TokenType.session)
148148
IconButton(
149149
icon: Icon(Icons.person),
@@ -154,6 +154,8 @@ class TokenItemState extends State<TokenItem> {
154154
onRebuild();
155155
},
156156
),
157+
if (!manager.settings.allowTokenEditing && deleting)
158+
CircularProgressIndicator(),
157159
if (!manager.settings.allowTokenEditing && !deleting)
158160
IconButton(
159161
icon: Icon(Icons.logout),

‎lib/screens/shockers/grouped/grouped_shockers.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ class _GroupedShockerScreenState extends State<GroupedShockerScreen> {
158158
@override
159159
Widget build(BuildContext context) {
160160
AlarmListManager.getInstance().reloadAllMethod = () {
161+
if(!mounted) return;
161162
setState(() {});
162163
};
163164
ThemeData t = Theme.of(context);

‎lib/services/alarm_list_manager.dart‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ class AlarmListManager {
4343
void setAlarmImplementation() {
4444

4545
if (isAndroid() && !settings.useAlarmServer) {
46-
alarmManager = AndroidAlarmManager();
46+
alarmManager = AndroidShockAlarmManager();
4747
} else {
48-
alarmManager = AlarmServerAlarmManager();
48+
alarmManager = AlarmServerShockAlarmManager();
4949
}
5050
}
5151

@@ -501,9 +501,10 @@ class AlarmListManager {
501501
}
502502

503503
Future<bool> login(
504-
String serverAddress, String email, String password) async {
504+
String serverAddress, String email, String password, String? turnstileToken) async {
505505
Token? session =
506-
await OpenShockClient().login(serverAddress, email, password, this);
506+
await OpenShockClient().loginV2(serverAddress, email, password, turnstileToken);
507+
await session?.addBackendData();
507508
if (session != null) {
508509
await saveToken(session);
509510
}

‎lib/services/alarm_manager.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ abstract class AlarmManager {
1616
Future<bool> saveTone(AlarmTone tone);
1717
}
1818

19-
class AndroidAlarmManager implements AlarmManager {
19+
class AndroidShockAlarmManager implements AlarmManager {
2020
@override
2121
AlarmManagerType? type = AlarmManagerType.android;
2222

@@ -61,7 +61,7 @@ class AndroidAlarmManager implements AlarmManager {
6161
}
6262
}
6363

64-
class AlarmServerAlarmManager implements AlarmManager {
64+
class AlarmServerShockAlarmManager implements AlarmManager {
6565
@override
6666
AlarmManagerType? type = AlarmManagerType.server;
6767

0 commit comments

Comments
 (0)