feat: admin rights support

TomBursch · Dec 5, 2021 · df3892c · df3892c
1 parent 57504d1
commit df3892c
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 14 deletions.
diff --git a/lib/cubits/settings_user_cubit.dart b/lib/cubits/settings_user_cubit.dart
@@ -2,12 +2,14 @@ import 'package:equatable/equatable.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:kitchenowl/cubits/auth_cubit.dart';
+import 'package:kitchenowl/enums/update_enum.dart';
 import 'package:kitchenowl/models/user.dart';
 import 'package:kitchenowl/services/api/api_service.dart';
 
 class SettingsUserCubit extends Cubit<SettingsUserState> {
   final int userId;
-  SettingsUserCubit(this.userId) : super(const SettingsUserState(null)) {
+  SettingsUserCubit(this.userId)
+      : super(const SettingsUserState(null, false, UpdateEnum.unchanged)) {
     refresh();
   }
 
@@ -18,7 +20,7 @@ class SettingsUserCubit extends Cubit<SettingsUserState> {
     } else {
       user = await ApiService.getInstance().getUser();
     }
-    emit(SettingsUserState(user));
+    emit(state.copyWith(user: user, setAdmin: user?.admin));
   }
 
   Future<void> updateUser({
@@ -33,6 +35,7 @@ class SettingsUserCubit extends Cubit<SettingsUserState> {
         userId,
         name: name,
         password: password,
+        admin: (state.setAdmin != state.user.admin) ? state.setAdmin : null,
       );
     } else {
       res = await ApiService.getInstance().updateUser(
@@ -41,6 +44,7 @@ class SettingsUserCubit extends Cubit<SettingsUserState> {
       );
     }
     if (res) {
+      emit(state.copyWith(updateState: UpdateEnum.updated));
       if (userId == null &&
           context != null &&
           BlocProvider.of<AuthCubit>(context) != null) {
@@ -49,13 +53,24 @@ class SettingsUserCubit extends Cubit<SettingsUserState> {
       await refresh();
     }
   }
+
+  void setAdmin(bool newAdmin) {
+    emit(state.copyWith(setAdmin: newAdmin));
+  }
 }
 
 class SettingsUserState extends Equatable {
   final User user;
+  final bool setAdmin;
+  final UpdateEnum updateState;
 
-  const SettingsUserState(this.user);
+  const SettingsUserState(this.user, this.setAdmin, this.updateState);
 
   @override
-  List<Object> get props => [user];
+  List<Object> get props => [user, setAdmin, updateState];
+
+  SettingsUserState copyWith(
+          {User user, bool setAdmin, UpdateEnum updateState}) =>
+      SettingsUserState(user ?? this.user, setAdmin ?? this.setAdmin,
+          updateState ?? this.updateState);
 }
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
@@ -9,6 +9,7 @@
     },
     "addRecipeToPlanner": "Zum Essensplan hinzufügen",
     "address": "Adresse",
+    "admin": "Admin",
     "appDescription": "KitchenOwl hilft dir dein Lebensmitteleinkauf zu erleichtern",
     "appLegal": "2021 The KitchenOwl Authors",
     "appTitle": "KitchenOwl",

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -9,6 +9,7 @@
     },
     "addRecipeToPlanner": "Add to meal plan",
     "address": "Address",
+    "admin": "Admin",
     "appDescription": "KitchenOwl helps you organize your grocery life.",
     "appLegal": "2021 The KitchenOwl Authors",
     "appTitle": "KitchenOwl",

diff --git a/lib/models/user.dart b/lib/models/user.dart
@@ -5,6 +5,7 @@ class User extends Model {
   final String username;
   final String name;
   final bool owner;
+  final bool admin;
 
   final double balance;
 
@@ -13,6 +14,7 @@ class User extends Model {
     this.name,
     this.username,
     this.owner = false,
+    this.admin = false,
     this.balance = 0,
   });
 
@@ -21,11 +23,12 @@ class User extends Model {
         username: map['username'],
         name: map['name'],
         owner: map['owner'] ?? false,
+        admin: map['admin'] ?? false,
         balance: map['expense_balance'] ?? 0,
       );
 
   @override
-  List<Object> get props => [id, name, username, owner, balance];
+  List<Object> get props => [id, name, username, owner, admin, balance];
 
   @override
   Map<String, dynamic> toJson() => {
@@ -38,6 +41,9 @@ class User extends Model {
         "username": username,
         "name": name,
         "owner": owner,
+        "admin": admin,
         "expense_balance": balance,
       };
+
+  bool hasAdminRights() => admin || owner;
 }
diff --git a/lib/pages/home_page/profile.dart b/lib/pages/home_page/profile.dart
@@ -102,7 +102,7 @@ class ProfilePage extends StatelessWidget {
                                     const SettingsUserPage())),
                       ),
                     ),
-                  if (!isOffline && user.owner)
+                  if (!isOffline && user.hasAdminRights())
                     Card(
                       child: ListTile(
                         title: Text(AppLocalizations.of(context).server),

diff --git a/lib/pages/settings_server_page.dart b/lib/pages/settings_server_page.dart
@@ -4,6 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:kitchenowl/cubits/auth_cubit.dart';
 import 'package:kitchenowl/cubits/settings_cubit.dart';
 import 'package:kitchenowl/cubits/settings_server_cubit.dart';
+import 'package:kitchenowl/enums/update_enum.dart';
 import 'package:kitchenowl/models/user.dart';
 import 'package:kitchenowl/pages/settings/create_user_page.dart';
 import 'package:kitchenowl/pages/settings_user_page.dart';
@@ -204,14 +205,19 @@ class _SettingsServerPageState extends State<SettingsServerPage> {
                                           .id)
                                   ? ' (${AppLocalizations.of(context).you})'
                                   : '')),
-                          trailing: state.users[i].owner
+                          trailing: state.users[i].hasAdminRights()
                               ? const Icon(Icons.admin_panel_settings_rounded)
                               : null,
-                          onTap: () =>
-                              Navigator.of(context).push(MaterialPageRoute(
-                                  builder: (context) => SettingsUserPage(
-                                        userId: state.users[i].id,
-                                      ))),
+                          onTap: () async {
+                            final res = await Navigator.of(context)
+                                .push<UpdateEnum>(MaterialPageRoute(
+                                    builder: (context) => SettingsUserPage(
+                                          userId: state.users[i].id,
+                                        )));
+                            if (res == UpdateEnum.updated) {
+                              cubit.refresh();
+                            }
+                          },
                         ),
                       ),
                     ),

diff --git a/lib/pages/settings_user_page.dart b/lib/pages/settings_user_page.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:kitchenowl/cubits/settings_user_cubit.dart';
@@ -42,6 +43,9 @@ class _SettingsUserPageState extends State<SettingsUserPage> {
       child: Scaffold(
         appBar: AppBar(
           title: Text(AppLocalizations.of(context).user),
+          leading: BackButton(
+            onPressed: () => Navigator.of(context).pop(cubit.state.updateState),
+          ),
         ),
         body: Align(
           alignment: Alignment.topCenter,
@@ -73,6 +77,28 @@ class _SettingsUserPageState extends State<SettingsUserPage> {
                       labelText: AppLocalizations.of(context).name,
                     ),
                   ),
+                  if (cubit.userId != null)
+                    BlocBuilder<SettingsUserCubit, SettingsUserState>(
+                      bloc: cubit,
+                      builder: (context, state) {
+                        return ListTile(
+                          title: Text(AppLocalizations.of(context).admin),
+                          leading:
+                              const Icon(Icons.admin_panel_settings_rounded),
+                          contentPadding:
+                              const EdgeInsets.only(left: 0, right: 0),
+                          trailing: Transform.scale(
+                            scale: 0.9,
+                            child: CupertinoSwitch(
+                              value: state.setAdmin,
+                              activeColor:
+                                  Theme.of(context).colorScheme.secondary,
+                              onChanged: cubit.setAdmin,
+                            ),
+                          ),
+                        );
+                      },
+                    ),
                   Padding(
                     padding: const EdgeInsets.only(top: 16, bottom: 8),
                     child: ElevatedButton(

diff --git a/lib/services/api/user.dart b/lib/services/api/user.dart
@@ -46,12 +46,13 @@ extension UserApi on ApiService {
   }
 
   Future<bool> updateUserById(int userId,
-      {String name, String password}) async {
+      {String name, String password, bool admin}) async {
     if (!isAuthenticated()) return null;
 
     final body = {};
     if (name != null) body['name'] = name;
-    if (password != null) body['name'] = password;
+    if (password != null) body['password'] = password;
+    if (admin != null) body['admin'] = admin;
 
     final res = await post('/user/$userId', jsonEncode(body));
     return res.statusCode == 200;