Merge pull request '~' (#2) from develop into main

Reviewed-on: #2

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

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)
+                INSERT INTO users (username, password, email, role, out_vpn_access, docker_access, git_access)
-                SELECT $1, $2, 'admin@admin.admin', 'Admin', true
+                SELECT $1, $2, 'admin@admin.admin', 'Admin', true, true, true
                 WHERE NOT EXISTS (SELECT 1 FROM users WHERE username = $1)
                 ''',
                 self.admin_name,

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