conflict resolved

zod_bank/settings.py

@@ -9,13 +9,14 @@ https://docs.djangoproject.com/en/3.0/topics/settings/
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/3.0/ref/settings/
 """
-
+# Django Import
 import os
 from dotenv import load_dotenv
 from datetime import timedelta
 load_dotenv()
 # OR, the same with increased verbosity:
 load_dotenv(verbose=True)
+# env  path
 env_path = os.path.join(os.path.abspath(os.path.join('.env', os.pardir)), '.env')
 load_dotenv(dotenv_path=env_path)
 
@@ -34,24 +35,28 @@ SECRET_KEY = '-pb+8w#)6qsh+w&tr+q$tholf7=54v%05e^9!lneiqqgtddg6q'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
+# allow all host
 ALLOWED_HOSTS = ['*']
 
 
 # Application definition
 
 INSTALLED_APPS = [
+    # Add your installed Django apps here
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    # Add Django rest frame work apps here
     'django_extensions',
     'storages',
     'drf_yasg',
     'corsheaders',
     'django.contrib.postgres',
     'rest_framework',
+    # Add your custom apps here.
     'django_ses',
     'account',
     'junior',
@@ -59,8 +64,9 @@ INSTALLED_APPS = [
     'web_admin',
     # 'social_django'
 ]
-
+# define middle ware here
 MIDDLEWARE = [
+    # Add your middleware classes here.
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -68,10 +74,13 @@ MIDDLEWARE = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'account.custom_middleware.CustomMiddleware'
 ]
 
+# define root
 ROOT_URLCONF = 'zod_bank.urls'
 
+# define templates
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -88,7 +97,9 @@ TEMPLATES = [
     },
 ]
 
+# define wsgi
 WSGI_APPLICATION = 'zod_bank.wsgi.application'
+# define rest frame work
 REST_FRAMEWORK = {
                 'DEFAULT_AUTHENTICATION_CLASSES': [
                 # 'rest_framework.authentication.SessionAuthentication',
@@ -97,9 +108,10 @@ REST_FRAMEWORK = {
                 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
                 'PAGE_SIZE': 5,
 }
+# define jwt token
 SIMPLE_JWT = {
-    'ACCESS_TOKEN_LIFETIME': timedelta(minutes=50),
-    'REFRESH_TOKEN_LIFETIME': timedelta(days=7),
+    'ACCESS_TOKEN_LIFETIME': timedelta(hours=2, minutes=59, seconds=59, microseconds=999999),
+    'REFRESH_TOKEN_LIFETIME': timedelta(hours=71, minutes=59, seconds=59, microseconds=999999),
 }
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
@@ -113,7 +125,7 @@ DATABASES = {
         'PORT':os.getenv('DB_PORT'),
     }
 }
-
+# define swagger setting
 SWAGGER_SETTINGS = {
     "exclude_namespaces": [],
     "api_version": '0.1',
@@ -140,6 +152,7 @@ SWAGGER_SETTINGS = {
 # Password validation
 # https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators
 
+# password validation
 AUTH_PASSWORD_VALIDATORS = [
     {
         'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
@@ -159,20 +172,23 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/3.0/topics/i18n/
 
+# language code
 LANGUAGE_CODE = 'en-us'
-
+# time zone
 TIME_ZONE = 'UTC'
-
+# define I18N
 USE_I18N = True
-
+# define L10N
 USE_L10N = True
-
+# define TZ
 USE_TZ = True
 # cors header settings
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 
+# cors allow setting
 CORS_ORIGIN_ALLOW_ALL = True
 
+# cors allow method
 CORS_ALLOW_METHODS = (
     'DELETE',
     'GET',
@@ -181,7 +197,7 @@ CORS_ALLOW_METHODS = (
     'POST',
     'PUT',
 )
-
+# cors allow header
 CORS_ALLOW_HEADERS = (
     'accept',
     'accept-encoding',
@@ -197,11 +213,12 @@ CORS_ALLOW_HEADERS = (
 """Static files (CSS, JavaScript, Images)
 https://docs.djangoproject.com/en/3.0/howto/static-files/"""
 
-
+# google client id
 GOOGLE_CLIENT_ID = os.getenv('GOOGLE_CLIENT_ID')
+# google client secret key
 GOOGLE_CLIENT_SECRET = os.getenv('GOOGLE_CLIENT_SECRET')
 
-
+# email settings
 EMAIL_BACKEND="django.core.mail.backends.smtp.EmailBackend"
 EMAIL_HOST="smtp.sendgrid.net"
 EMAIL_PORT="587"
@@ -211,15 +228,16 @@ EMAIL_HOST_PASSWORD="SG.HAMnFRvaSMWeVLatqr4seg.Y9fQb-ckK9gyXLoMKdUE8eCh5lrel36Tm
 EMAIL_FROM_ADDRESS="support@zodbank.com"
 DEFAULT_ADDRESS="zodbank@yopmail.com"
 
-
+# ali baba cloud settings
 ALIYUN_OSS_ACCESS_KEY_ID = os.getenv('ALIYUN_OSS_ACCESS_KEY_ID')
 ALIYUN_OSS_ACCESS_KEY_SECRET = os.getenv('ALIYUN_OSS_ACCESS_KEY_SECRET')
 ALIYUN_OSS_BUCKET_NAME = os.getenv('ALIYUN_OSS_BUCKET_NAME')
 ALIYUN_OSS_ENDPOINT = os.getenv('ALIYUN_OSS_ENDPOINT')
 ALIYUN_OSS_REGION = os.getenv('ALIYUN_OSS_REGION')
 
-
+# define static url
 STATIC_URL = 'static/'
+# define static root
 STATIC_ROOT = 'static'
 
 MEDIA_URL = "/media/"