Bugfix (issue #7) json_rest_server status version error

rodrigorahman · Mar 31, 2023 · ea17ae5 · ea17ae5
1 parent dda0501
commit ea17ae5
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.4.1
+- Bugfix (issue https://github.com/rodrigorahman/json_rest_server/issues/7) json_rest_server status version error
+
+## 1.4.0
+- Support for WebSocket and adding login to another collection to support a possible administrator."
+
 ## 1.3.2
 - patch method correction and added options method with cors support
 

diff --git a/backend/database.json b/backend/database.json
@@ -13,6 +13,22 @@
             "password": "1234"
         }
     ],
+    "adm_users": [
+        {
+            "id": 0,
+            "name": "Rodrigo Rahman",
+            "email": "rodrigorahman@academiadoflutter.com.br",
+            "password": "123",
+            "profile": "ADMIN"
+        },
+        {
+            "id": 1,
+            "name": "Guilherme",
+            "email": "Guilherme@gmail.com",
+            "password": "1234",
+            "profile": "SUPORTE"
+        }
+    ],
     "products": [
         {
             "id": 0,

diff --git a/lib/src/commands/version_command.dart b/lib/src/commands/version_command.dart
@@ -1,8 +1,9 @@
+import 'dart:convert';
+import 'dart:io';
+
 import 'package:args/command_runner.dart';
 
 class VersionCommand extends Command<dynamic> {
-  final _version = '1.2.2';
-
   @override
   String get description => 'Show json rest server version';
 
@@ -11,16 +12,35 @@ class VersionCommand extends Command<dynamic> {
 
   @override
   void run() {
+    final result = Process.runSync('dart', ['pub', 'global', 'list']);
+    final packages = _parsePackagesVersion(result.stdout.toString());
+    final version = packages['json_rest_server'];
+
     print('');
     print('''
-     ██╗███████╗ ██████╗ ███╗   ██╗    ██████╗ ███████╗███████╗████████╗    ███████╗███████╗██████╗ ██╗   ██╗███████╗██████╗ 
+     ██╗███████╗ ██████╗ ███╗   ██╗    ██████╗ ███████╗███████╗████████╗    ███████╗███████╗██████╗ ██╗   ██╗███████╗██████╗
      ██║██╔════╝██╔═══██╗████╗  ██║    ██╔══██╗██╔════╝██╔════╝╚══██╔══╝    ██╔════╝██╔════╝██╔══██╗██║   ██║██╔════╝██╔══██╗
      ██║███████╗██║   ██║██╔██╗ ██║    ██████╔╝█████╗  ███████╗   ██║       ███████╗█████╗  ██████╔╝██║   ██║█████╗  ██████╔╝
 ██   ██║╚════██║██║   ██║██║╚██╗██║    ██╔══██╗██╔══╝  ╚════██║   ██║       ╚════██║██╔══╝  ██╔══██╗╚██╗ ██╔╝██╔══╝  ██╔══██╗
 ╚█████╔╝███████║╚██████╔╝██║ ╚████║    ██║  ██║███████╗███████║   ██║       ███████║███████╗██║  ██║ ╚████╔╝ ███████╗██║  ██║
- ╚════╝ ╚══════╝ ╚═════╝ ╚═╝  ╚═══╝    ╚═╝  ╚═╝╚══════╝╚══════╝   ╚═╝       ╚══════╝╚══════╝╚═╝  ╚═╝  ╚═══╝  ╚══════╝╚═╝  ╚═╝                                                                                                                             
+ ╚════╝ ╚══════╝ ╚═════╝ ╚═╝  ╚═══╝    ╚═╝  ╚═╝╚══════╝╚══════╝   ╚═╝       ╚══════╝╚══════╝╚═╝  ╚═╝  ╚═══╝  ╚══════╝╚═╝  ╚═╝
     ''');
     print('');
-    print('Version: $_version');
+    print('Version: $version');
+  }
+
+  Map<String, String> _parsePackagesVersion(String output) {
+    final lines = LineSplitter.split(output);
+    final packages = <String, String>{};
+
+    for (final line in lines) {
+      final parts = line.split(' ');
+      if (parts.length >= 2) {
+        final packageName = parts[0];
+        final packageVersion = parts[1];
+        packages[packageName] = packageVersion;
+      }
+    }
+    return packages;
   }
 }
diff --git a/lib/src/core/middlewares/auth_middleware.dart b/lib/src/core/middlewares/auth_middleware.dart
@@ -40,7 +40,14 @@ class AuthMiddleware extends Middlewares {
       final body = await request.readAsString();
       final bodyData = jsonDecode(body);
 
-      final users = _database.getAll('users');
+      List<Map<String, dynamic>> users;
+      final adminLogin = bodyData['admin'] ?? false;
+      // ADM Suporte
+      if (adminLogin) {
+        users = _database.getAll('adm_users');
+      } else {
+        users = _database.getAll('users');
+      }
 
       if (users.isEmpty) {
         return Response(500,

diff --git a/lib/src/core/templates/templates.dart b/lib/src/core/templates/templates.dart
@@ -23,6 +23,22 @@ const String _database = r'''
             "password": "1234"
         }
     ],
+    "adm_users": [
+        {
+            "id": 1,
+            "name": "Rodrigo Rahman",
+            "email": "rodrigorahman@academiadoflutter.com.br",
+            "password": "123",
+            "profile": "ADMIN"
+        },
+        {
+            "id": 2,
+            "name": "Guilherme",
+            "email": "Guilherme@gmail.com",
+            "password": "1234",
+            "profile": "SUPORTE"
+        }
+    ],
     "products": [
         {
             "id": 0,

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,8 @@
 name: json_rest_server
 description: A RESTful server based on JSON With this package you can have a fully functional RESTful server with auth, pagination and all the necessaries services do build an application
-version: 1.3.1
-homepage: https://github.com/rodrigorahman/json_rest_server
+version: 1.4.1
+repository: https://github.com/rodrigorahman/json_rest_server
+issue_tracker: https://github.com/rodrigorahman/json_rest_server/issues
 
 environment:
   sdk: '>=2.17.6 <3.0.0'