square-administration 3.2.0__py3-none-any.whl → 3.2.2__py3-none-any.whl

square_administration/configuration.py

@@ -10,8 +10,12 @@ try:
     config_file_path = os.path.join(
         os.path.dirname(os.path.abspath(__file__)), "data", "config.ini"
     )
-    ldict_configuration = ConfigReader(config_file_path).read_configuration()
-
+    config_sample_file_path = os.path.join(
+        os.path.dirname(os.path.abspath(__file__)), "data", "config.sample.ini"
+    )
+    ldict_configuration = ConfigReader(
+        config_file_path, config_sample_file_path
+    ).read_configuration()
     # get all vars and typecast
     # ===========================================
     # general
@@ -23,6 +27,9 @@ try:
     # environment
     config_str_host_ip = ldict_configuration["ENVIRONMENT"]["HOST_IP"]
     config_int_host_port = int(ldict_configuration["ENVIRONMENT"]["HOST_PORT"])
+    config_list_allow_origins = eval(
+        ldict_configuration["ENVIRONMENT"]["ALLOW_ORIGINS"]
+    )
     config_str_log_file_name = ldict_configuration["ENVIRONMENT"]["LOG_FILE_NAME"]
     config_str_admin_password_hash = ldict_configuration["ENVIRONMENT"][
         "ADMIN_PASSWORD_HASH"
@@ -36,11 +43,8 @@ try:
     ]
     config_str_cookie_domain = ldict_configuration["ENVIRONMENT"]["COOKIE_DOMAIN"]
     config_str_db_ip = ldict_configuration["ENVIRONMENT"]["DB_IP"]
-
     config_int_db_port = int(ldict_configuration["ENVIRONMENT"]["DB_PORT"])
-
     config_str_db_username = ldict_configuration["ENVIRONMENT"]["DB_USERNAME"]
-
     config_str_db_password = ldict_configuration["ENVIRONMENT"]["DB_PASSWORD"]
     # ===========================================
 

square_administration/data/{config.ini → config.sample.ini}

@@ -5,6 +5,7 @@ APP_NAME = square_admin
 [ENVIRONMENT]
 HOST_IP = 0.0.0.0
 HOST_PORT = 10111
+ALLOW_ORIGINS = ["http://localhost:10111"]
 
 LOG_FILE_NAME = square_administration
 

square_administration/data/{config.testing.ini → config.testing.sample.ini}

@@ -5,6 +5,7 @@ APP_NAME = square_admin
 [ENVIRONMENT]
 HOST_IP = 0.0.0.0
 HOST_PORT = 10111
+ALLOW_ORIGINS = ["http://localhost:10111"]
 
 LOG_FILE_NAME = square_administration
 

square_administration/main.py

@@ -11,6 +11,7 @@ from square_administration.configuration import (
     config_str_module_name,
     config_str_ssl_key_file_path,
     config_str_ssl_crt_file_path,
+    config_list_allow_origins,
 )
 from square_administration.routes import core, authentication
 from square_administration.utils.common import is_https
@@ -20,7 +21,7 @@ app = FastAPI()
 app.add_middleware(
     CORSMiddleware,
     allow_credentials=True,
-    allow_origins=["*"],
+    allow_origins=config_list_allow_origins,
     allow_methods=["*"],
     allow_headers=["*"],
 )

{square_administration-3.2.0.dist-info → square_administration-3.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: square-administration
-Version: 3.2.0
+Version: 3.2.2
 Summary: common business layer for my personal server.
 Home-page: https://github.com/thepmsquare/square_administration
 Author: thePmSquare
@@ -20,7 +20,7 @@ Requires-Dist: requests>=2.32.3
 Requires-Dist: bcrypt>=4.2.0
 Requires-Dist: pytest>=8.0.0
 Requires-Dist: httpx>=0.27.2
-Requires-Dist: square-commons>=1.0.0
+Requires-Dist: square-commons>=2.1.0
 Requires-Dist: square-logger>=2.0.0
 Requires-Dist: square-database-helper>=2.0.0
 Requires-Dist: square-database-structure>=1.0.0
@@ -44,6 +44,17 @@ pip install square_administration
 
 ## changelog
 
+### v3.2.2
+
+- remove config.ini and config.testing.ini from version control.
+
+### v3.2.1
+
+- testing
+    - update get_patched_configuration and create_client_and_cleanup to be session scoped.
+- env
+    - add ALLOW_ORIGINS
+
 ### v3.2.0
 
 - move global_int_app_id getting logic from configuration.py to utils->common

{square_administration-3.2.0.dist-info → square_administration-3.2.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
 square_administration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-square_administration/configuration.py,sha256=u3MB-vHaKMIPz0ccBrgehRNdC3wvhn06XNxEEnCM284,4332
-square_administration/main.py,sha256=jQqoNCfO4X6U8GoqEzn8BD9FhSPRM8PXMptv7uIPTKs,1609
+square_administration/configuration.py,sha256=GoeYwDL3EQeInUdGPEKCT9UvA1wY45o-CGVO4OMGvrk,4601
+square_administration/main.py,sha256=vvKBMn4JkDp8B2L_zwBMIfYaSA41rXxhL3ZFsSv8ly8,1660
 square_administration/messages.py,sha256=VYjJGW0Kvtjrx1Mw7ekksLVMoxcexLol2OckvqhZ3n0,1063
-square_administration/data/config.ini,sha256=mPO_mTQU2RT3d6re-SY7Ip7zcUXjxehCRntN857ncMw,1102
-square_administration/data/config.testing.ini,sha256=byHvkFGaShkU-Oh0DBa5w1mbT284PlQV_8mqY4hsnis,1150
+square_administration/data/config.sample.ini,sha256=kkSbjJP7qR8ah44Oyv2IyCgYfmheYYh4zSU7wD7v3ec,1145
+square_administration/data/config.testing.sample.ini,sha256=vdW01yJdCqdI6uK-jXHfWa9B9IJVuecYdx0n3y7dS2k,1193
 square_administration/pydantic_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 square_administration/pydantic_models/authentication.py,sha256=QEfM5ezG45hc_qATXpFIPNPl4bjf8ICW_bY5tY4cqO4,259
 square_administration/pydantic_models/core.py,sha256=HUMrBmfKrXeL-126gE5j2povdVmktn8XLg2tHEdeXTk,344
@@ -13,9 +13,9 @@ square_administration/routes/core.py,sha256=H5pfPuPDzSn8-HN40gyI7eDVxFW7821urYq0
 square_administration/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 square_administration/utils/common.py,sha256=bnyBF10EDMLIYXnfV3ZZOApNKScHRmw-Jcj2zIFE8kE,1157
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/conftest.py,sha256=KJoXQBlfbyyep60EDWAzLMhV1QpWezPmCGE6FCF7JVE,1767
+tests/conftest.py,sha256=pqL3wk-mb_DPjtTHXWtIcYqVDXqhtM77xFPl3ljbLiw,2010
 tests/test_1.py,sha256=hikxL01-2dcax594y8ceanjRmLJXvuhLpcY-FMPIdY8,378
-square_administration-3.2.0.dist-info/METADATA,sha256=2hiyaCyFxPbFZiQ2w38Mrzi9w6qHbAsRPNVfTJhnXOM,2867
-square_administration-3.2.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-square_administration-3.2.0.dist-info/top_level.txt,sha256=tyroqpdXXQAiA7Y_V1wCqPPt6nnS_orcY9txLeHjm1s,28
-square_administration-3.2.0.dist-info/RECORD,,
+square_administration-3.2.2.dist-info/METADATA,sha256=H5l0VGeSCGUz5HrNC2SReTiSjlmYXg9uQGpWmPEbmn4,3089
+square_administration-3.2.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+square_administration-3.2.2.dist-info/top_level.txt,sha256=tyroqpdXXQAiA7Y_V1wCqPPt6nnS_orcY9txLeHjm1s,28
+square_administration-3.2.2.dist-info/RECORD,,

tests/conftest.py

@@ -1,30 +1,36 @@
+import importlib
 import os
 
 import pytest
 from fastapi.testclient import TestClient
 
 
-def patched_join(*args):
+@pytest.fixture(scope="session")
+def get_patched_configuration():
+    def patched_join(*args):
+        *rest, last = args
+        if last == "config.ini":
+            last = "config.testing.ini"
+        elif last == "config.sample.ini":
+            last = "config.testing.sample.ini"
 
-    *rest, last = args
-    if last == "config.ini":
-        last = "config.testing.ini"
+        return original_join(*rest, last)
 
-    return original_join(*rest, last)
+    original_join = os.path.join
+    os.path.join = patched_join
 
+    import square_administration.configuration
 
-original_join = os.path.join
-
+    importlib.reload(square_administration.configuration)
+    config = square_administration.configuration
 
-@pytest.fixture
-def get_patched_configuration(monkeypatch, tmp_path):
-    monkeypatch.setattr(os.path, "join", patched_join)
-    import square_administration.configuration
+    yield config
 
-    return square_administration.configuration
+    # cleanup
+    os.path.join = original_join
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def create_client_and_cleanup(get_patched_configuration):
     from square_database_structure import create_database_and_tables