From 552b2a9781544cd1b877ba2bdc712bbe16d87fbb Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <georges.antoine.assi@gmail.com>
Date: Thu, 24 Aug 2023 10:14:59 -0400
Subject: [PATCH] Use semantic version for package

---
 backend/config/__init__.py | 9 ++++++---
 backend/utils/fs.py        | 6 ++----
 backend/utils/oauth.py     | 3 ++-
 frontend/package-lock.json | 4 ++--
 frontend/package.json      | 2 +-
 pyproject.toml             | 2 +-
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/backend/config/__init__.py b/backend/config/__init__.py
index ae17f7b81..acd5a830d 100644
--- a/backend/config/__init__.py
+++ b/backend/config/__init__.py
@@ -20,11 +20,14 @@ LOGS_BASE_PATH: Final = f"{ROMM_BASE_PATH}/logs"
 HIGH_PRIO_STRUCTURE_PATH: Final = f"{LIBRARY_BASE_PATH}/roms"
 
 # DEFAULT RESOURCES
-DEFAULT_URL_COVER_L: Final = "https://images.igdb.com/igdb/image/upload/t_cover_big/nocover.png"
+DEFAULT_URL_COVER_L: Final = (
+    "https://images.igdb.com/igdb/image/upload/t_cover_big/nocover.png"
+)
 DEFAULT_PATH_COVER_L: Final = "default/default/cover/big.png"
-DEFAULT_URL_COVER_S: Final = "https://images.igdb.com/igdb/image/upload/t_cover_small/nocover.png"
+DEFAULT_URL_COVER_S: Final = (
+    "https://images.igdb.com/igdb/image/upload/t_cover_small/nocover.png"
+)
 DEFAULT_PATH_COVER_S: Final = "default/default/cover/small.png"
-DEFAULT_PATH_USER_AVATAR: Final = f"users"
 
 # MARIADB
 DB_HOST: Final = os.environ.get("DB_HOST", "127.0.0.1")
diff --git a/backend/utils/fs.py b/backend/utils/fs.py
index c301aa85a..4680166b8 100644
--- a/backend/utils/fs.py
+++ b/backend/utils/fs.py
@@ -12,8 +12,6 @@ from config import (
     DEFAULT_PATH_COVER_L,
     DEFAULT_URL_COVER_S,
     DEFAULT_PATH_COVER_S,
-    RESOURCES_BASE_PATH,
-    DEFAULT_PATH_USER_AVATAR
 )
 from config.config_loader import config
 from exceptions.fs_exceptions import (
@@ -306,6 +304,6 @@ def remove_rom(p_slug: str, file_name: str):
 
 # ========= Users utils =========
 def build_avatar_path(avatar_path, username):
-    avatar_user_path = f"{RESOURCES_BASE_PATH}/{DEFAULT_PATH_USER_AVATAR}/{username}"
+    avatar_user_path = f"{RESOURCES_BASE_PATH}/users/{username}"
     Path(avatar_user_path).mkdir(parents=True, exist_ok=True)
-    return f"{DEFAULT_PATH_USER_AVATAR}/{username}/{avatar_path}", avatar_user_path
+    return f"users/{username}/{avatar_path}", avatar_user_path
diff --git a/backend/utils/oauth.py b/backend/utils/oauth.py
index 3d0fcd8b4..14cb66b21 100644
--- a/backend/utils/oauth.py
+++ b/backend/utils/oauth.py
@@ -11,6 +11,7 @@ from starlette.authentication import requires
 from config import ROMM_AUTH_SECRET_KEY
 
 ALGORITHM: Final = "HS256"
+DEFAULT_OAUTH_TOKEN_EXPIRY: Final = 15
 
 DEFAULT_SCOPES_MAP: Final = {
     "me.read": "View your profile",
@@ -46,7 +47,7 @@ def create_oauth_token(data: dict, expires_delta: timedelta | None = None):
     if expires_delta:
         expire = datetime.utcnow() + expires_delta
     else:
-        expire = datetime.utcnow() + timedelta(minutes=15)
+        expire = datetime.utcnow() + timedelta(minutes=DEFAULT_OAUTH_TOKEN_EXPIRY)
 
     to_encode.update({"exp": expire})
 
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 954e5f1ae..abda9fdf7 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "romm",
-  "version": "2.0",
+  "version": "2.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "romm",
-      "version": "1.10",
+      "version": "2.0.0",
       "dependencies": {
         "@mdi/font": "7.0.96",
         "axios": "^1.3.4",
diff --git a/frontend/package.json b/frontend/package.json
index 221e4aaa2..b9d84fead 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "romm",
-  "version": "2.0",
+  "version": "2.0.0",
   "private": true,
   "scripts": {
     "dev": "vite --host",
diff --git a/pyproject.toml b/pyproject.toml
index 3c4f560d9..19132cd56 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "RomM"
-version = "2.0"
+version = "2.0.0"
 description = "RomM (Rom Manager) is a web based retro roms manager integrated with IGDB."
 authors = ["zurdi <zurdizurdo25@gmail.com>"]
 readme = "README.md"