feat: Introduce `DEV_USERNAME` and `DEV_PASSWORD` configuration variables and use them as default credentials for sign-in functions.

rest-api
MrWaradana 1 month ago
parent 0c4e62a761
commit 762460baa5

@ -77,8 +77,8 @@ SQLALCHEMY_DATABASE_URI = f"postgresql+asyncpg://{_DATABASE_CREDENTIAL_USER}:{_Q
# collector # collector
COLLECTOR_HOSTNAME = config("COLLECTOR_HOSTNAME", default="http://192.168.1.86") COLLECTOR_HOSTNAME = config("COLLECTOR_HOSTNAME", default="http://192.168.1.86")
COLLECTOR_PORT = config("COLLECTOR_PORT", cast=int, default=5432) COLLECTOR_PORT = config("COLLECTOR_PORT", cast=int, default=5432)
_COLLECTOR_CREDENTIAL_USER = config("COLLECTOR_CREDENTIAL_USER", default="postgres") _COLLECTOR_CREDENTIAL_USER = config("COLLECTOR_CREDENTIAL_USER")
_COLLECTOR_CREDENTIAL_PASSWORD = config("COLLECTOR_CREDENTIAL_PASSWORD", default="postgres") _COLLECTOR_CREDENTIAL_PASSWORD = config("COLLECTOR_CREDENTIAL_PASSWORD")
_QUOTED_COLLECTOR_PASSWORD = parse.quote(str(_COLLECTOR_CREDENTIAL_PASSWORD)) _QUOTED_COLLECTOR_PASSWORD = parse.quote(str(_COLLECTOR_CREDENTIAL_PASSWORD))
COLLECTOR_NAME = config("COLLECTOR_NAME", default="digital_twin") COLLECTOR_NAME = config("COLLECTOR_NAME", default="digital_twin")
@ -95,3 +95,6 @@ RELIABILITY_APP_URL = config(
) )
RBD_APP_URL = config("RBD_APP_URL", default="http://192.168.1.82:8000/rbd") RBD_APP_URL = config("RBD_APP_URL", default="http://192.168.1.82:8000/rbd")
DEV_USERNAME = config("DEV_USERNAME")
DEV_PASSWORD = config("DEV_PASSWORD")

@ -4,7 +4,7 @@ import os
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '../..'))) sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '../..')))
from src.config import DATABASE_HOSTNAME, DATABASE_PORT, COLLECTOR_HOSTNAME, COLLECTOR_PORT, _DATABASE_CREDENTIAL_USER, _DATABASE_CREDENTIAL_PASSWORD, _COLLECTOR_CREDENTIAL_USER, _COLLECTOR_CREDENTIAL_PASSWORD, DATABASE_NAME, COLLECTOR_NAME from src.config import DATABASE_HOSTNAME, DATABASE_PORT, COLLECTOR_HOSTNAME, COLLECTOR_PORT, _DATABASE_CREDENTIAL_USER, _DATABASE_CREDENTIAL_PASSWORD, _COLLECTOR_CREDENTIAL_USER, _COLLECTOR_CREDENTIAL_PASSWORD, DATABASE_NAME, COLLECTOR_NAME, DEV_USERNAME, DEV_PASSWORD
def get_production_connection(): def get_production_connection():
try: try:

@ -16,7 +16,7 @@ from dotenv import load_dotenv
import sys import sys
import os import os
from .formula import rc_labor_cost, rc_lost_cost, rc_total_cost from .formula import rc_labor_cost, rc_lost_cost, rc_total_cost
from src.modules.config import get_connection, get_production_connection from src.modules.config import get_connection, get_production_connection, DEV_USERNAME, DEV_PASSWORD
import json import json
load_dotenv() load_dotenv()
@ -566,7 +566,7 @@ class Prediksi:
# Authentication: sign-in and refresh helpers # Authentication: sign-in and refresh helpers
async def sign_in(self, username: str = "lcca_admin", password: str = "password") -> dict: async def sign_in(self, username: str = DEV_USERNAME, password: str = DEV_PASSWORD) -> dict:
"""Sign in to AUTH_APP_URL/sign-in using provided username/password. """Sign in to AUTH_APP_URL/sign-in using provided username/password.
Stores access_token and refresh_token on the instance when successful and returns the parsed response dict. Stores access_token and refresh_token on the instance when successful and returns the parsed response dict.

@ -6,14 +6,14 @@ from datetime import datetime
from sqlalchemy import select from sqlalchemy import select
from src.database.core import DbSession from src.database.core import DbSession
from src.yeardata.model import Yeardata from src.yeardata.model import Yeardata
from src.config import RBD_APP_URL from src.config import RBD_APP_URL, DEV_USERNAME, DEV_PASSWORD
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
current_year = datetime.now().year current_year = datetime.now().year
AUTH_APP_URL = os.getenv("AUTH_APP_URL", "http://192.168.1.82:8000/auth") AUTH_APP_URL = os.getenv("AUTH_APP_URL", "http://192.168.1.82:8000/auth")
async def sign_in(username: str = "lcca_admin", password: str = "password") -> str: async def sign_in(username: str = DEV_USERNAME, password: str = DEV_PASSWORD) -> str:
""" """
Sign in to AUTH_APP_URL/sign-in using provided username/password. Sign in to AUTH_APP_URL/sign-in using provided username/password.
Returns the access_token string if successful, else None. Returns the access_token string if successful, else None.

Loading…
Cancel
Save