mobile: Use new account API

mobile/lib/screens/account_settings.dart

@@ -1,84 +1,164 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:musicus_client/musicus_client.dart';
 import 'package:musicus_common/musicus_common.dart';
 
+import 'email.dart';
+import 'password.dart';
 import 'register.dart';
 
-/// A screen for logging in using a Musicus account.
 class AccountSettingsScreen extends StatefulWidget {
   @override
   _AccountSettingsScreenState createState() => _AccountSettingsScreenState();
 }
 
 class _AccountSettingsScreenState extends State<AccountSettingsScreen> {
-  final nameController = TextEditingController();
+  final _usernameController = TextEditingController();
-  final passwordController = TextEditingController();
+  final _passwordController = TextEditingController();
 
-  MusicusBackendState backend;
+  MusicusBackendState _backend;
-  StreamSubscription<MusicusAccountSettings> accountSubscription;
+  StreamSubscription<MusicusAccountCredentials> _accountSubscription;
+  bool _loading = false;
+  bool _loggedIn = false;
+  String _username;
+  String _email;
 
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
 
-    backend = MusicusBackend.of(context);
+    _backend = MusicusBackend.of(context);
 
-    if (accountSubscription != null) {
+    final credentials = _backend.settings.account.value;
-      accountSubscription.cancel();
+    if (credentials != null) {
+      _setCredentials(credentials);
+      _getDetails();
     }
 
-    _settingsChanged(backend.settings.account.value);
+    _accountSubscription = _backend.settings.account.listen((credentials) {
-    accountSubscription = backend.settings.account.listen((settings) {
+      _setCredentials(credentials);
-      _settingsChanged(settings);
     });
   }
 
-  void _settingsChanged(MusicusAccountSettings settings) {
+  Future<void> _setCredentials(MusicusAccountCredentials credentials) async {
-    nameController.text = settings?.username ?? '';
+    if (credentials != null) {
-    passwordController.text = settings?.password ?? '';
+      if (mounted) {
+        setState(() {
+          _loggedIn = true;
+          _username = credentials.username;
+        });
+      }
+    }
+  }
+
+  Future<void> _getDetails() async {
+    setState(() {
+      _email = null;
+    });
+
+    final email = (await _backend.client.getAccountDetails()).email;
+
+    if (mounted) {
+      setState(() {
+        _email = email;
+      });
+    }
   }
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    List<Widget> children;
-      appBar: AppBar(
-        title: Text('Account settings'),
-        actions: <Widget>[
-          FlatButton(
-            onPressed: () async {
-              await backend.settings.setAccount(MusicusAccountSettings(
-                username: nameController.text,
-                password: passwordController.text,
-              ));
 
+    if (_loggedIn) {
+      children = [
+        Material(
+          elevation: 2.0,
+          child: ListTile(
+            title: Text('Logged in as: $_username'),
+          ),
+        ),
+        ListTile(
+          title: Text('E-mail address'),
+          subtitle: Text(
+              _email != null ? _email.isNotEmpty ? _email : 'Not set' : '...'),
+          trailing: const Icon(Icons.chevron_right),
+          onTap: () async {
+            await Navigator.push(
+              context,
+              MaterialPageRoute(
+                builder: (context) => EmailScreen(
+                  email: _email,
+                ),
+              ),
+            );
+
+            _getDetails();
+          },
+        ),
+        ListTile(
+          title: Text('Change password'),
+          trailing: const Icon(Icons.chevron_right),
+          onTap: () {
+            Navigator.push(
+              context,
+              MaterialPageRoute(
+                builder: (context) => PasswordScreen(),
+              ),
+            );
+          },
+        ),
+        ListTile(
+          title: Text('Logout'),
+          onTap: () async {
+            await _backend.settings.clearAccount();
             Navigator.pop(context);
           },
-            child: Text('LOGIN'),
         ),
-        ],
+      ];
-      ),
+    } else {
-      body: ListView(
+      children = [
-        children: <Widget>[
         Padding(
-            padding: const EdgeInsets.all(16.0),
+          padding: const EdgeInsets.only(
+            left: 16.0,
+            right: 16.0,
+            top: 16.0,
+            bottom: 8.0,
+          ),
+          child: Text(
+            'Enter your Musicus account credentials:',
+            style: Theme.of(context).textTheme.subtitle1,
+          ),
+        ),
+        Padding(
+          padding: const EdgeInsets.symmetric(
+            horizontal: 16.0,
+          ),
           child: TextField(
-              controller: nameController,
+            controller: _usernameController,
             decoration: InputDecoration(
               labelText: 'User name',
             ),
           ),
         ),
+        SizedBox(
+          height: 16.0,
+        ),
         Padding(
-            padding: const EdgeInsets.all(16.0),
+          padding: const EdgeInsets.symmetric(
+            horizontal: 16.0,
+          ),
           child: TextField(
-              controller: passwordController,
+            controller: _passwordController,
             obscureText: true,
             decoration: InputDecoration(
               labelText: 'Password',
             ),
           ),
         ),
+        SizedBox(
+          height: 32.0,
+        ),
         ListTile(
           title: Text('Create a new account'),
           onTap: () {
@@ -90,21 +170,76 @@ class _AccountSettingsScreenState extends State<AccountSettingsScreen> {
             );
           },
         ),
-          ListTile(
+      ];
-            title: Text('Don\'t use an account'),
+    }
-            onTap: () {
+
-              backend.settings.clearAccount();
+    return Scaffold(
+      appBar: AppBar(
+        title: Text('Musicus account'),
+        actions: <Widget>[
+          Builder(
+            builder: (context) {
+              if (_loggedIn) {
+                return Container();
+              } else if (_loading) {
+                return Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: Center(
+                    child: SizedBox(
+                      width: 24.0,
+                      height: 24.0,
+                      child: CircularProgressIndicator(
+                        strokeWidth: 2.0,
+                      ),
+                    ),
+                  ),
+                );
+              } else {
+                return FlatButton(
+                  onPressed: () async {
+                    setState(() {
+                      _loading = true;
+                    });
+
+                    final credentials = MusicusAccountCredentials(
+                      username: _usernameController.text,
+                      password: _passwordController.text,
+                    );
+
+                    _backend.client.credentials = credentials;
+
+                    try {
+                      await _backend.client.login();
+                      await _backend.settings.setAccount(credentials);
                       Navigator.pop(context);
+                    } on MusicusLoginFailedException {
+                      Scaffold.of(context).showSnackBar(
+                        SnackBar(
+                          content: Text('Login failed'),
+                        ),
+                      );
+                    }
+
+                    setState(() {
+                      _loading = false;
+                    });
+                  },
+                  child: Text('LOGIN'),
+                );
+              }
             },
           ),
         ],
       ),
+      body: ListView(
+        children: children,
+      ),
     );
   }
 
   @override
   void dispose() {
     super.dispose();
-    accountSubscription.cancel();
+    _accountSubscription.cancel();
   }
 }

mobile/lib/screens/email.dart

@@ -0,0 +1,102 @@
+import 'package:flutter/material.dart';
+import 'package:musicus_common/musicus_common.dart';
+
+class EmailScreen extends StatefulWidget {
+  final String email;
+
+  EmailScreen({
+    this.email,
+  });
+
+  @override
+  _EmailScreenState createState() => _EmailScreenState();
+}
+
+class _EmailScreenState extends State<EmailScreen> {
+  final _emailController = TextEditingController();
+
+  bool _loading = false;
+
+  @override
+  void initState() {
+    super.initState();
+
+    if (widget.email != null) {
+      _emailController.text = widget.email;
+    }
+  }
+
+  Future<void> _setEmail(String email) async {
+    setState(() {
+      _loading = true;
+    });
+
+    final backend = MusicusBackend.of(context);
+
+    await backend.client.updateAccount(
+      newEmail: email,
+    );
+
+    setState(() {
+      _loading = false;
+    });
+
+    Navigator.pop(context);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text('E-mail address'),
+        actions: <Widget>[
+          Builder(
+            builder: (context) {
+              if (_loading) {
+                return Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: Center(
+                    child: SizedBox(
+                      width: 24.0,
+                      height: 24.0,
+                      child: CircularProgressIndicator(
+                        strokeWidth: 2.0,
+                      ),
+                    ),
+                  ),
+                );
+              } else {
+                return FlatButton(
+                  onPressed: () {
+                    _setEmail(_emailController.text);
+                  },
+                  child: Text('DONE'),
+                );
+              }
+            },
+          ),
+        ],
+      ),
+      body: ListView(
+        children: <Widget>[
+          Padding(
+            padding: const EdgeInsets.all(16.0),
+            child: TextField(
+              controller: _emailController,
+              keyboardType: TextInputType.emailAddress,
+              decoration: InputDecoration(
+                labelText: 'E-mail',
+              ),
+            ),
+          ),
+          ListTile(
+            title: Text('Delete E-mail address'),
+            onTap: () {
+              _setEmail('');
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}

mobile/lib/screens/password.dart

@@ -0,0 +1,116 @@
+import 'package:flutter/material.dart';
+import 'package:musicus_client/musicus_client.dart';
+import 'package:musicus_common/musicus_common.dart';
+
+class PasswordScreen extends StatefulWidget {
+  @override
+  _PasswordScreenState createState() => _PasswordScreenState();
+}
+
+class _PasswordScreenState extends State<PasswordScreen> {
+  final _oldPasswordController = TextEditingController();
+  final _newPasswordController = TextEditingController();
+  final _repeatController = TextEditingController();
+
+  bool _loading = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text('Change password'),
+        actions: <Widget>[
+          Builder(
+            builder: (context) {
+              if (_loading) {
+                return Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: Center(
+                    child: SizedBox(
+                      width: 24.0,
+                      height: 24.0,
+                      child: CircularProgressIndicator(
+                        strokeWidth: 2.0,
+                      ),
+                    ),
+                  ),
+                );
+              } else {
+                return FlatButton(
+                  onPressed: () async {
+                    final backend = MusicusBackend.of(context);
+                    final password = _newPasswordController.text;
+
+                    if (_oldPasswordController.text ==
+                            backend.settings.account.value.password &&
+                        password.isNotEmpty &&
+                        password == _repeatController.text) {
+                      setState(() {
+                        _loading = true;
+                      });
+
+                      await backend.client.updateAccount(
+                        newPassword: password,
+                      );
+
+                      await backend.settings
+                          .setAccount(MusicusAccountCredentials(
+                        username: backend.settings.account.value.username,
+                        password: password,
+                      ));
+
+                      setState(() {
+                        _loading = false;
+                      });
+
+                      Navigator.pop(context);
+                    } else {
+                      Scaffold.of(context).showSnackBar(SnackBar(
+                        content: Text('Invalid inputs'),
+                      ));
+                    }
+                  },
+                  child: Text('DONE'),
+                );
+              }
+            },
+          ),
+        ],
+      ),
+      body: ListView(
+        children: <Widget>[
+          Padding(
+            padding: const EdgeInsets.all(16.0),
+            child: TextField(
+              controller: _oldPasswordController,
+              obscureText: true,
+              decoration: InputDecoration(
+                labelText: 'Old password',
+              ),
+            ),
+          ),
+          Padding(
+            padding: const EdgeInsets.all(16.0),
+            child: TextField(
+              controller: _newPasswordController,
+              obscureText: true,
+              decoration: InputDecoration(
+                labelText: 'New password',
+              ),
+            ),
+          ),
+          Padding(
+            padding: const EdgeInsets.all(16.0),
+            child: TextField(
+              controller: _repeatController,
+              obscureText: true,
+              decoration: InputDecoration(
+                labelText: 'New password (repeat)',
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

mobile/lib/screens/register.dart

@@ -34,11 +34,11 @@ class _RegisterScreenState extends State<RegisterScreen> {
                         _loading = true;
                       });
 
-                      final success = await backend.client.register(User(
+                      final success = await backend.client.registerAccount(
-                        name: nameController.text,
+                        username: nameController.text,
                         email: emailController.text,
                         password: passwordController.text,
-                      ));
+                      );
 
                       setState(() {
                         _loading = false;
@@ -46,9 +46,8 @@ class _RegisterScreenState extends State<RegisterScreen> {
 
                       if (success) {
                         await backend.settings
-                            .setAccount(MusicusAccountSettings(
+                            .setAccount(MusicusAccountCredentials(
                           username: nameController.text,
-                          email: emailController.text,
                           password: passwordController.text,
                         ));
 

mobile/lib/screens/settings.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:musicus_client/musicus_client.dart';
 import 'package:musicus_common/musicus_common.dart';
 
 import 'account_settings.dart';
@@ -61,14 +62,15 @@ class SettingsScreen extends StatelessWidget {
               );
             },
           ),
-          StreamBuilder<MusicusAccountSettings>(
+          StreamBuilder<MusicusAccountCredentials>(
             stream: settings.account,
             builder: (context, snapshot) {
-              final a = snapshot.data;
+              final credentials = snapshot.data;
 
               return ListTile(
                 title: Text('Account settings'),
-                subtitle: Text(a != null ? a.username : 'No account'),
+                subtitle: Text(
+                    credentials != null ? credentials.username : 'No account'),
                 trailing: const Icon(Icons.chevron_right),
                 onTap: () {
                   Navigator.push(