From bc80f59b2685251fe0d6b122c529178dc3697156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BB=D1=8C=20=D0=A1=D0=B2=D1=96?=
 =?UTF-8?q?=D0=B4=D1=80=D1=96=D0=BA?= <svidryk@corp2.eu>
Date: Wed, 21 Jun 2023 16:52:06 +0300
Subject: [PATCH] add menu for roleid

---
 __pycache__/routes.cpython-310.pyc    | Bin 532 -> 532 bytes
 components/k2adm/k2adm/views.py       |  43 ++-----------------------------
 components/k2adm/setup.py             |   4 +--
 components/k2auth/k2auth/models.py    |  47 +++++++++++-----------------------
 components/k2auth/k2auth/views.py     |   3 +++
 components/k2auth/setup.py            |   4 +--
 db/database.db                        | Bin 36864 -> 36864 bytes
 k2/__pycache__/k2rout.cpython-310.pyc | Bin 14294 -> 14250 bytes
 k2/k2rout.py                          |   4 +--
 routes.py                             |   4 ++-
 10 files changed, 29 insertions(+), 80 deletions(-)

diff --git a/__pycache__/routes.cpython-310.pyc b/__pycache__/routes.cpython-310.pyc
index 1e81df27e6a1e7c9df4844b8530a68e747eb80f9..2333ade9115aa18d11f7189665e929777868795a 100644
GIT binary patch
delta 29
jcmbQjGKGaVpO=@50SNRMCZ}v!$jije#K*|PB*X{+Q3M2&

delta 29
jcmbQjGKGaVpO=@50SL6dO-fm}ke7*_k&lswQHT)$Ud{!4

diff --git a/components/k2adm/k2adm/views.py b/components/k2adm/k2adm/views.py
index 6a2630f..bd6a3b0 100644
--- a/components/k2adm/k2adm/views.py
+++ b/components/k2adm/k2adm/views.py
@@ -71,7 +71,8 @@ def newUser():
 def changePassword():
     session = k2.extensions['sqlalchemy'].db.session
     current_user = get_jwt_identity()
-    user = session.query(k2users).filter_by(user_id=current_user).first()
+
+    user = session.query(k2users).filter_by(user_id=current_user['user_id']).first()
     if user.password == hashlib.md5(request.json['old_password'].encode()).hexdigest():
         if request.json['new_password'] == request.json['re_new_password']:
             user.password = hashlib.md5(request.json['new_password'].encode()).hexdigest()
@@ -101,43 +102,3 @@ def menu_items():
     }]
     return data
 
-
-
-
-
-
-# @adm.route('/register', methods=["POST"])
-# def register():
-#     params = request.json
-#     session = k2.extensions['sqlalchemy'].db.session
-#     exist = k2users.user_by_login(request.json['login'])
-#     if not exist:
-#         user = k2users(**params)
-#         session.add(user)
-#         session.commit()
-#         token, userData, userAbilities = user.get_token()
-#         return {'accessToken': token, "userData": userData, "userAbilities": userAbilities}
-#     else:
-#         return jsonify({'error': 'User exist'}), 401
-
-
-# @adm.route('/login', methods=["POST"])
-# def login():
-#     params = request.json
-#     user = k2users.authenticate(**params)
-#     if user:
-#         token, userData, userAbilities = user.get_token()
-#         return {'accessToken': token, "userData": userData, "userAbilities": userAbilities}
-#     else:
-#         return jsonify({'error': 'Unauthorized'}), 401
-
-
-# @adm.route('/logout', methods=["GET"])
-# @jwt_required()
-# def logout():
-#
-#     response = {
-#         'message': 'Logged out successfully'
-#     }
-
-    # return jsonify(response)
diff --git a/components/k2adm/setup.py b/components/k2adm/setup.py
index 9a8c037..e231f9a 100644
--- a/components/k2adm/setup.py
+++ b/components/k2adm/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='k2adm',
-    version='1.0.0',
+    version='1.0.1',
     description='Description of my project',
     author='k2 cloud',
     author_email='ys@corp2.eu',
@@ -12,4 +12,4 @@ setup(
     package_data={  # Optional
         },
     install_requires=[""],
-)
\ No newline at end of file
+)
diff --git a/components/k2auth/k2auth/models.py b/components/k2auth/k2auth/models.py
index 7880dbe..7c948ac 100644
--- a/components/k2auth/k2auth/models.py
+++ b/components/k2auth/k2auth/models.py
@@ -1,3 +1,4 @@
+
 import uuid
 from sqlalchemy import Column, Integer, String
 from sqlalchemy.ext.declarative import declarative_base
@@ -30,12 +31,17 @@ class k2users(Base):
 
     def get_token(self, expire_time=24):
         expires_delta = timedelta(expire_time)
-        token = create_access_token(identity=self.user_id, expires_delta=expires_delta)
+        # token = create_access_token(identity=self.user_id, expires_delta=expires_delta)
+        token = create_access_token(identity={
+            'user_id': self.user_id,
+            'user_role': self.roleid
+        }, expires_delta=expires_delta)
 
         db = k2.extensions['sqlalchemy'].db
         connection = db.engine.connect()
         result = connection.execute(
             db.text(f"SELECT rolename FROM k2roles where roleid = '{self.roleid}'")).fetchone()
+
         rolename = result[0] if result else None
 
         userData = {
@@ -48,14 +54,19 @@ class k2users(Base):
         }
 
         userAbilities = []
+        from k2.k2comp import Component
+        components = Component.query.filter(Component.installed == 1).all()
+        components_names = [component.name for component in components]
+
+
 
         abilities_query = f"""
         SELECT menus.namemenu,
-            prava.r, prava.w, prava.i, prava.d, prava.c, prava.exp,  prava.imp, prava.settable, prava.cutpast, 
+            prava.r, prava.w, prava.i, prava.d, prava.c, prava.exp,  prava.imp, prava.settable, prava.cutpast,
             prava.enable, prava.del
         FROM k2admin_menus menus
         JOIN k2admin_menus_prava prava ON menus.menuid = prava.menuid
-        WHERE prava.roleid = {self.roleid}
+        WHERE prava.roleid = {self.roleid} AND menus.namemenu IN {tuple(components_names)}
         """
         abilities_list = connection.execute(db.text(abilities_query)).fetchall()
 
@@ -72,7 +83,7 @@ class k2users(Base):
              "settable": ability[8],
              "cutpast": ability[9],
              "enable": ability[10],
-             "del": ability[11],
+             "del": ability[11]
              }
 
             abilities_dict_copy = abilities_dict.copy()
@@ -80,34 +91,6 @@ class k2users(Base):
                 if value == 0:
                     del abilities_dict[key]
             userAbilities.append(abilities_dict)
-        #________________________________________________________________________________________
-
-        menu_query = f"""
-                               SELECT menus.prevmenu, menus.namemenu, menus.caption, menus.url
-                               FROM k2admin_menus menus
-                               JOIN k2admin_menus_prava prava ON menus.menuid = prava.menuid
-                               WHERE prava.roleid = '{self.roleid}'
-                               """
-        menus = connection.execute(db.text(menu_query)).fetchall()
-
-        menus_dict = {}
-        for menu in menus:
-            menus_dict[menu[0]] = []
-
-        for key in menus_dict:
-            for el in menus:
-                if key == el[0]:
-                    menus_dict[key].append(
-                        {
-                            "namemenu": el[1],
-                            "caption": el[2],
-                            "url": el[3]
-                        })
-
-        print(menus_dict)
-
-
-        #________________________________________________________________________________________
 
         return (token, userData, userAbilities)
 
diff --git a/components/k2auth/k2auth/views.py b/components/k2auth/k2auth/views.py
index 6b9aa61..a69ef96 100644
--- a/components/k2auth/k2auth/views.py
+++ b/components/k2auth/k2auth/views.py
@@ -32,11 +32,14 @@ class Auth():
             session.add(user)
             session.commit()
             token, userData, userAbilities = user.get_token()
+            print(userAbilities)
+
             return {'accessToken': token, "userData": userData, "userAbilities": userAbilities}
         except:
             return jsonify({'status': '400', 'message': "Missing required fields"}), 400
 
 
+
     def login(self):
         params = request.json
         user = k2users.authenticate(**params)
diff --git a/components/k2auth/setup.py b/components/k2auth/setup.py
index b3e384e..ddb836a 100644
--- a/components/k2auth/setup.py
+++ b/components/k2auth/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='k2auth',
-    version='1.0.0',
+    version='1.0.1',
     description='Description of my project',
     author='k2 cloud',
     author_email='ys@corp2.eu',
@@ -12,4 +12,4 @@ setup(
     package_data={  # Optional
         },
     install_requires=[""],
-)
\ No newline at end of file
+)
diff --git a/db/database.db b/db/database.db
index 4b1e95354da149713d3cec02bc62da2dda4c3338..cc755d79f1809aa48c354ac885e4221e191f6b8d 100644
GIT binary patch
delta 230
zcmaiuJr05}6o3QnMiVz2NR*9YUte2VCKKb}z!i*?+EI@n#0zNZ0l0!;^D3Uh-GmEp
zfbXa2!lnx!QP4h@yP$oa79@7LsR5-1ZE_CaG)Jnegi1Lrq^tdlBmwvjAyX^_El_2e
zB2x4}a)}w26<BHog5!cS1IFf>S#g#&7fSkjwi@WjAJf?!Vi+WhWr&Jt<!`C$51Vqk
RAN!cBCuJ~}>%Z3|{sW@=KA->q

delta 226
zcmZozz|^pSX@WFk(L@<%#-fc0BDxA@X^Dm=W{C!=W+{dyX=$kzhK8m_mPV!q#zsa-
zsU|6tr|7CqcG8iVd{tM7&%nyi)XLOS&(P4)(9&%3SKT}X<D|4?3kyTb)Wnoj6B9#=
zL{np9Ga$n_Eiu*9IL&Z!vz{_gzmA}xf}w$xfho`gJyQ!46C;Dk^*U*rJ@tJZTnV{>
RS%uk`k&s23Z|AEj000{1K8XMT

diff --git a/k2/__pycache__/k2rout.cpython-310.pyc b/k2/__pycache__/k2rout.cpython-310.pyc
index d901934e6e21cb5474667617f3ca5bb301972726..0bd57636cc5f9bd2bf6984e7092b7ffb3ae521cf 100644
GIT binary patch
delta 3726
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
PN;$t_!d2yNEoc7(x(ayH

delta 3776
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

diff --git a/k2/k2rout.py b/k2/k2rout.py
index f085ae6..6fa5a52 100644
--- a/k2/k2rout.py
+++ b/k2/k2rout.py
@@ -15,7 +15,7 @@ import os
 import sys
 from .k2admmenu import K2admin_menus,  K2admin_Menus_Prava
 from sqlalchemy import text
-from flask_jwt_extended import get_jwt_identity
+from flask_jwt_extended import get_jwt_identity, jwt_required
 
 
 
@@ -472,7 +472,6 @@ def add_to_menu():
 @components_bp.route('/api/main-menu/')
 def get_admin_menu():
     current_user = get_jwt_identity()
-    print(current_user)
     role_id = current_user['user_role']
     filter_menu = []
     response = requests.get(f"{k2.domain}api/add-to-menu")
@@ -481,6 +480,7 @@ def get_admin_menu():
     for item in response.json():
         filtered_children = []
         for im in item['children']:
+
             if im['to'] in menu_items_list:
                 filtered_children.append(im)
         if filtered_children:
diff --git a/routes.py b/routes.py
index a3ac1c1..744d4a8 100644
--- a/routes.py
+++ b/routes.py
@@ -4,7 +4,9 @@ from k2.k2rout import components_bp
 app.register_blueprint(components_bp)
 from components.k2test.k2test.views import k2test
 app.register_blueprint(k2test, url_prefix='/k2test')
+
 from components.k2auth.k2auth.views import k2auth
 app.register_blueprint(k2auth, url_prefix='/k2auth')
+
 from components.k2adm.k2adm.views import k2adm
-app.register_blueprint(k2adm, url_prefix='/k2adm')
\ No newline at end of file
+app.register_blueprint(k2adm, url_prefix='/k2adm')
-- 
1.9.1