Merge pull request #32 from moevm/test-users

Test users

client/src/components/routes/auth/AuthComponent.vue

@@ -39,12 +39,23 @@ const login = ref(""),
   password = ref("");
 
 async function doLogin() {
-  // await devLogin();
-  toaster.addToast({
-    title: "Выполнено",
-    body: "Вы вошли в аккаунт",
-    type: ToastTypes.primary,
-  });
+  try {
+    await userStore.login(login.value, password.value);
+    toaster.addToast({
+      title: "Выполнено",
+      body: "Вы вошли в аккаунт",
+      type: ToastTypes.primary,
+    });
+    router.push({ name: routeNames.Home });
+  }
+  catch (err) {
+    toaster.addToast({
+      title: "Ошибка",
+      body: "Неверные данные",
+      type: ToastTypes.danger,
+    });
+  }
+
 }
 
 async function devLogin() {

server/app/__init__.py

@@ -23,3 +23,14 @@
 scheduler = BackgroundScheduler()
 scheduler.add_job(send_queue, 'interval', seconds=1)
 scheduler.start()
+
+from .dev import get_admin, get_test_user
+
+
+def add_init_users():
+    get_admin()
+    get_test_user()
+
+
+with app.app_context():
+    add_init_users()

server/app/dev.py

@@ -0,0 +1,31 @@
+from werkzeug.local import LocalProxy
+from flask import current_app as app
+from app.db import get_db
+
+db = LocalProxy(get_db)
+
+
+def get_admin():
+    admin = db.users.find_one({"login": app.config.get('INIT_ADMIN_LOGIN')})
+    if not admin:
+        result = db.users.insert_one({
+            'login': app.config.get('INIT_ADMIN_LOGIN'),
+            'password': app.config.get('INIT_ADMIN_PASSWORD'),
+            'name': 'root',
+            'role': 'admin'
+        })
+        admin = db.users.find_one(result.inserted_id)
+    return admin
+
+
+def get_test_user():
+    user = db.users.find_one({"login": 'user'})
+    if not user:
+        result = db.users.insert_one({
+            'login': 'user',
+            'password': '1234',
+            'name': 'Ivan',
+            'role': 'user'
+        })
+        user = db.users.find_one(result.inserted_id)
+    return user

server/app/routes/auth.py

@@ -5,6 +5,7 @@
 from flask import current_app as app
 from app.auth.User import User
 from app.db import get_db
+from app.dev import get_admin
 from app.services.user import get_user_by_id
 from app.utils import parse_json
 
@@ -48,14 +49,6 @@ def delete(self):
 @api.route('/login/dev')
 class Login(Resource):
     def get(self):
-        admin = db.users.find_one({"login": app.config.get('INIT_ADMIN_LOGIN')})
-        if not admin:
-            result = db.users.insert_one({
-                'login': app.config.get('INIT_ADMIN_LOGIN'),
-                'password': app.config.get('INIT_ADMIN_PASSWORD'),
-                'name': 'root',
-                'role': 'admin'
-            })
-            admin = db.users.find_one(result.inserted_id)
+        admin = get_admin()
         login_user(User(admin), remember=True)
         return parse_json(get_user_by_id(current_user.get_id()))