Mikescher/SimpleCloudNotifier
1
0
Fork 0
Code Pull Requests Actions Releases Activity

Implement login

Browse Source
This commit is contained in:
Mike Schwörer
2024-06-01 14:00:16 +02:00
parent 16d97ad08f
commit d662a6c426
5 changed files with 252 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
flutter/lib/pages/account/account.dart
View File

@@ -90,7 +90,7 @@ class _AccountRootPageState extends State<AccountRootPage> {
return Consumer<UserAccount>(
builder: (context, acc, child) {
if (acc.auth == null) {
return buildNoAuth(context);
return _buildNoAuth(context);
} else {
return FutureBuilder(
future: acc.loadUser(false),
@@ -99,7 +99,7 @@ class _AccountRootPageState extends State<AccountRootPage> {
if (snapshot.hasError) {
return Text('Error: ${snapshot.error}'); //TODO better error display
}
return buildShowAccount(context, acc, snapshot.data!);
return _buildShowAccount(context, acc, snapshot.data!);
}
return Center(child: CircularProgressIndicator());
}),
@@ -109,61 +109,63 @@ class _AccountRootPageState extends State<AccountRootPage> {
);
}
Widget buildNoAuth(BuildContext context) {
return Padding(
padding: const EdgeInsets.fromLTRB(24, 32, 24, 16),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
if (!loading)
Center(
child: Container(
width: 200,
height: 200,
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.secondary,
borderRadius: BorderRadius.circular(100),
Widget _buildNoAuth(BuildContext context) {
return SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.fromLTRB(24, 32, 24, 16),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
if (!loading)
Center(
child: Container(
width: 200,
height: 200,
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.secondary,
borderRadius: BorderRadius.circular(100),
),
child: Center(child: FaIcon(FontAwesomeIcons.userSecret, size: 96, color: Theme.of(context).colorScheme.onSecondary)),
),
child: Center(child: FaIcon(FontAwesomeIcons.userSecret, size: 96, color: Theme.of(context).colorScheme.onSecondary)),
),
),
if (loading)
Center(
child: Container(
width: 200,
height: 200,
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.secondary,
borderRadius: BorderRadius.circular(100),
if (loading)
Center(
child: Container(
width: 200,
height: 200,
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.secondary,
borderRadius: BorderRadius.circular(100),
),
child: Center(child: CircularProgressIndicator(color: Theme.of(context).colorScheme.onSecondary)),
),
child: Center(child: CircularProgressIndicator(color: Theme.of(context).colorScheme.onSecondary)),
),
const SizedBox(height: 32),
FilledButton(
style: FilledButton.styleFrom(textStyle: const TextStyle(fontSize: 24), padding: const EdgeInsets.fromLTRB(8, 12, 8, 12)),
onPressed: () {
if (loading) return;
_createNewAccount();
},
child: const Text('Create new account'),
),
const SizedBox(height: 32),
FilledButton(
style: FilledButton.styleFrom(textStyle: const TextStyle(fontSize: 24), padding: const EdgeInsets.fromLTRB(8, 12, 8, 12)),
onPressed: () {
if (loading) return;
createNewAccount();
},
child: const Text('Create new account'),
),
const SizedBox(height: 16),
FilledButton.tonal(
style: FilledButton.styleFrom(textStyle: const TextStyle(fontSize: 24), padding: const EdgeInsets.fromLTRB(8, 12, 8, 12)),
onPressed: () {
if (loading) return;
Navigator.push(context, MaterialPageRoute<AccountLoginPage>(builder: (context) => AccountLoginPage()));
},
child: const Text('Use existing account'),
),
],
const SizedBox(height: 16),
FilledButton.tonal(
style: FilledButton.styleFrom(textStyle: const TextStyle(fontSize: 24), padding: const EdgeInsets.fromLTRB(8, 12, 8, 12)),
onPressed: () {
if (loading) return;
Navigator.push(context, MaterialPageRoute<AccountLoginPage>(builder: (context) => AccountLoginPage()));
},
child: const Text('Use existing account'),
),
],
),
),
);
}
Widget buildShowAccount(BuildContext context, UserAccount acc, User user) {
Widget _buildShowAccount(BuildContext context, UserAccount acc, User user) {
//TODO better layout
return Column(
children: [
@@ -173,23 +175,23 @@ class _AccountRootPageState extends State<AccountRootPage> {
padding: const EdgeInsets.fromLTRB(8.0, 24.0, 8.0, 8.0),
child: Column(
children: [
buildHeader(context, user),
_buildHeader(context, user),
const SizedBox(height: 16),
Text(user.username ?? user.userID, overflow: TextOverflow.ellipsis, style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20)),
const SizedBox(height: 16),
...buildCards(context, user),
..._buildCards(context, user),
],
),
),
),
const Expanded(child: SizedBox(height: 16)),
buildFooter(context, user),
_buildFooter(context, user),
SizedBox(height: 40)
],
);
}
Row buildHeader(BuildContext context, User user) {
Row _buildHeader(BuildContext context, User user) {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -284,7 +286,7 @@ class _AccountRootPageState extends State<AccountRootPage> {
);
}
List<Widget> buildCards(BuildContext context, User user) {
List<Widget> _buildCards(BuildContext context, User user) {
return [
Card.filled(
margin: EdgeInsets.fromLTRB(0, 4, 0, 4),
@@ -416,20 +418,20 @@ class _AccountRootPageState extends State<AccountRootPage> {
];
}
Widget buildFooter(BuildContext context, User user) {
Widget _buildFooter(BuildContext context, User user) {
return Padding(
padding: const EdgeInsets.fromLTRB(8, 0, 8, 0),
child: Row(
children: [
Expanded(child: FilledButton(onPressed: () {/*TODO*/}, child: Text('Logout'), style: TextButton.styleFrom(backgroundColor: Colors.orange))),
Expanded(child: FilledButton(onPressed: _logout, child: Text('Logout'), style: TextButton.styleFrom(backgroundColor: Colors.orange))),
const SizedBox(width: 8),
Expanded(child: FilledButton(onPressed: () {/*TODO*/}, child: Text('Delete Account'), style: TextButton.styleFrom(backgroundColor: Colors.red))),
Expanded(child: FilledButton(onPressed: _deleteAccount, child: Text('Delete Account'), style: TextButton.styleFrom(backgroundColor: Colors.red))),
],
),
);
}
void createNewAccount() async {
void _createNewAccount() async {
setState(() => loading = true);
final acc = Provider.of<UserAccount>(context, listen: false);
@@ -453,9 +455,8 @@ class _AccountRootPageState extends State<AccountRootPage> {
final user = await APIClient.createUserWithClient(null, fcmToken, Globals().platform, Globals().version, Globals().hostname, Globals().clientType);
acc.setUser(user.user);
acc.setToken(KeyTokenAuth(userId: user.user.userID, tokenAdmin: user.adminKey, tokenSend: user.sendKey));
acc.setClient(user.clients[0]);
acc.set(user.user, user.clients[0], KeyTokenAuth(userId: user.user.userID, tokenAdmin: user.adminKey, tokenSend: user.sendKey));
await acc.save();
} catch (exc, trace) {
ApplicationLog.error('Failed to create user account: ' + exc.toString(), trace: trace);
@@ -464,4 +465,17 @@ class _AccountRootPageState extends State<AccountRootPage> {
setState(() => loading = false);
}
}
void _logout() async {
final acc = Provider.of<UserAccount>(context, listen: false);
acc.clear();
await acc.save();
Toaster.info('Logout', 'Successfully logged out');
}
void _deleteAccount() async {
//TODO
}
}

177
flutter/lib/pages/account/login.dart
View File

@@ -1,14 +1,17 @@
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:provider/provider.dart';
import 'package:simplecloudnotifier/api/api_client.dart';
import 'package:simplecloudnotifier/components/layout/scaffold.dart';
import 'package:simplecloudnotifier/models/key_token_auth.dart';
import 'package:simplecloudnotifier/state/application_log.dart';
import 'package:simplecloudnotifier/state/globals.dart';
import 'package:simplecloudnotifier/state/user_account.dart';
import 'package:simplecloudnotifier/utils/toaster.dart';
class AccountLoginPage extends StatefulWidget {
final void Function()? onLogin;
const AccountLoginPage({super.key, this.onLogin});
const AccountLoginPage({super.key});
@override
State<AccountLoginPage> createState() => _AccountLoginPageState();
@@ -16,81 +19,147 @@ class AccountLoginPage extends StatefulWidget {
class _AccountLoginPageState extends State<AccountLoginPage> {
final TextEditingController _ctrlUserID = TextEditingController();
final TextEditingController _ctrlToken = TextEditingController();
final TextEditingController _ctrlTokenAdmin = TextEditingController();
final TextEditingController _ctrlTokenSend = TextEditingController();
bool loading = false;
@override
void dispose() {
_ctrlUserID.dispose();
_ctrlToken.dispose();
_ctrlTokenAdmin.dispose();
_ctrlTokenSend.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
FractionallySizedBox(
widthFactor: 1.0,
child: TextField(
controller: _ctrlUserID,
decoration: const InputDecoration(
border: OutlineInputBorder(),
labelText: 'UserID',
return SCNScaffold(
title: 'Login',
showSearch: false,
child: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.fromLTRB(24, 32, 24, 16),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
if (!loading)
Center(
child: Container(
width: 200,
height: 200,
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.secondary,
borderRadius: BorderRadius.circular(100),
),
child: Center(child: FaIcon(FontAwesomeIcons.solidRightToBracket, size: 96, color: Theme.of(context).colorScheme.onSecondary)),
),
),
if (loading)
Center(
child: Container(
width: 200,
height: 200,
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.secondary,
borderRadius: BorderRadius.circular(100),
),
child: Center(child: CircularProgressIndicator(color: Theme.of(context).colorScheme.onSecondary)),
),
),
const SizedBox(height: 32),
FractionallySizedBox(
widthFactor: 1.0,
child: TextField(
controller: _ctrlUserID,
decoration: const InputDecoration(
border: OutlineInputBorder(),
labelText: 'UserID',
),
),
),
),
),
const SizedBox(height: 16),
FractionallySizedBox(
widthFactor: 1.0,
child: TextField(
controller: _ctrlToken,
decoration: const InputDecoration(
border: OutlineInputBorder(),
labelText: 'Token',
const SizedBox(height: 16),
FractionallySizedBox(
widthFactor: 1.0,
child: TextField(
controller: _ctrlTokenAdmin,
decoration: const InputDecoration(
border: OutlineInputBorder(),
labelText: 'Admin Token',
),
),
),
),
const SizedBox(height: 16),
FractionallySizedBox(
widthFactor: 1.0,
child: TextField(
controller: _ctrlTokenSend,
decoration: const InputDecoration(
border: OutlineInputBorder(),
labelText: 'Send Token (optional)',
),
),
),
const SizedBox(height: 16),
FilledButton(
style: FilledButton.styleFrom(textStyle: const TextStyle(fontSize: 24), padding: const EdgeInsets.fromLTRB(8, 12, 8, 12)),
onPressed: _login,
child: const Text('Login'),
),
],
),
const SizedBox(height: 16),
FilledButton(
style: FilledButton.styleFrom(textStyle: const TextStyle(fontSize: 20)),
onPressed: _login,
child: const Text('Login'),
),
],
),
),
);
}
void _login() async {
final msgr = ScaffoldMessenger.of(context);
final acc = Provider.of<UserAccount>(context, listen: false);
try {
final uid = _ctrlUserID.text;
final tok = _ctrlToken.text;
setState(() => loading = true);
final verified = await APIClient.verifyToken(uid, tok); //TODO verify that this is an perm=ADMIN key
if (verified) {
msgr.showSnackBar(
const SnackBar(
content: Text('Data ok'), //TODO use toast?
),
);
acc.setToken(KeyTokenAuth(userId: uid, tokenAdmin: tok, tokenSend: '')); //TOTO send token
await acc.save();
widget.onLogin?.call();
} else {
msgr.showSnackBar(
const SnackBar(
content: Text('Failed to verify token'), //TODO use toast?
),
);
final uid = _ctrlUserID.text;
final atokv = _ctrlTokenAdmin.text;
final stokv = _ctrlTokenSend.text;
final fcmToken = await FirebaseMessaging.instance.getToken();
if (fcmToken == null) {
Toaster.warn("Missing Token", 'No FCM Token found, please allow notifications, ensure you have a network connection and restart the app');
return;
}
final toka = await APIClient.getKeyTokenByToken(uid, atokv);
if (!toka.allChannels || toka.permissions != 'A') {
Toaster.error("Error", 'Admin token does not have required permissions');
return;
}
final toks = await APIClient.getKeyTokenByToken(uid, stokv);
if (!toks.allChannels || toks.permissions != 'CS') {
Toaster.error("Error", 'Send token does not have required permissions');
return;
}
final kta = KeyTokenAuth(userId: uid, tokenAdmin: atokv, tokenSend: stokv);
final user = await APIClient.getUser(kta, uid);
final client = await APIClient.addClient(acc.auth, fcmToken, Globals().deviceModel, Globals().version, Globals().hostname, Globals().clientType);
acc.set(user, client, kta);
await acc.save();
Toaster.success("Login", "Successfully logged in");
} catch (exc, trace) {
ApplicationLog.error('Failed to verify token: ' + exc.toString(), trace: trace);
Toaster.error("Error", 'Failed to verify token');
} finally {
setState(() => loading = false);
}
}
}