From e987a00707edc96303740fc57072f8444ed55b02 Mon Sep 17 00:00:00 2001 From: saddydead1 Date: Thu, 17 Jul 2025 13:39:19 +0300 Subject: [PATCH] ~ --- client/src/auth/user.py | 16 ++++++++++++++++ server/main-server/src/database/db.py | 8 +++++--- server/main-server/src/database/user.py | 2 ++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 client/src/auth/user.py diff --git a/client/src/auth/user.py b/client/src/auth/user.py new file mode 100644 index 0000000..2e39221 --- /dev/null +++ b/client/src/auth/user.py @@ -0,0 +1,16 @@ +from enum import Enum + + +class Role(Enum): + ADMIN = 'Admin' + USER = 'User' + + +class User: + username: str + email: str + role: Role + out_vpn_access: bool + docker_access: bool + git_access: bool + password: str \ No newline at end of file diff --git a/server/main-server/src/database/db.py b/server/main-server/src/database/db.py index 6f0851d..a3200da 100644 --- a/server/main-server/src/database/db.py +++ b/server/main-server/src/database/db.py @@ -45,14 +45,16 @@ class Database: password TEXT NOT NULL, email TEXT NOT NULL, role TEXT NOT NULL, - out_vpn_access BOOL NOT NULL + out_vpn_access BOOL NOT NULL, + docker_access BOOL NOT NULL, + git_access BOOL NOT NULL ) ''' ) await self.conn.fetch( ''' - INSERT INTO users (username, password, email, role, out_vpn_access) - SELECT $1, $2, 'admin@admin.admin', 'Admin', true + INSERT INTO users (username, password, email, role, out_vpn_access, docker_access, git_access) + SELECT $1, $2, 'admin@admin.admin', 'Admin', true, true, true WHERE NOT EXISTS (SELECT 1 FROM users WHERE username = $1) ''', self.admin_name, diff --git a/server/main-server/src/database/user.py b/server/main-server/src/database/user.py index d1ef2ab..10f52c6 100644 --- a/server/main-server/src/database/user.py +++ b/server/main-server/src/database/user.py @@ -11,4 +11,6 @@ class User(UserLogin): email: EmailStr role: Role out_vpn_access: bool + docker_access: bool + git_access: bool password: str \ No newline at end of file