feat: swagger base url 수정 (#37)

* style: 파일 포맷팅 * feat(login): 누락된 url 설정 반영 * feat: swagger description 수정
GunGonGamLee · Jan 12, 2024 · 2d64104 · 2d64104
1 parent 1f0cb34
commit 2d64104
Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/backend/login/urls.py b/backend/login/urls.py
@@ -0,0 +1,8 @@
+from django.urls import path
+from .views import GoogleLoginView, FTLoginView
+
+
+urlpatterns = [
+    path('google/', GoogleLoginView.as_view(), name="google_login"),
+    path('42/', FTLoginView.as_view(), name="login_42"),
+]
diff --git a/backend/src/settings.py b/backend/src/settings.py
@@ -33,6 +33,7 @@
 
 client = hvac.Client(url=VAULT_URL, token=VAULT_TOKEN)
 
+
 def wait_for_vault_client(client, retries=5, delay=5):
     for i in range(retries):
         try:
@@ -60,7 +61,6 @@ def wait_for_vault_client(client, retries=5, delay=5):
     db_port = read_response['data']['data']['DB_PORT']
     log_key = read_response['data']['data']['LOG_KEY']
 
-
 env = environ.Env()
 
 env.read_env(env_file=ENV_PATH)
@@ -83,10 +83,10 @@ def wait_for_vault_client(client, retries=5, delay=5):
     },
     'handlers': {
         'logstash': {
-            'level': 'INFO', # 모든 로그 레벨 포함
+            'level': 'INFO',  # 모든 로그 레벨 포함
             'class': 'logstash.TCPLogstashHandler',
-            'host': 'logstash_container', # Logstash 서비스의 컨테이너 이름
-            'port': 5333, # Logstash 컨테이너가 로그를 수신하는 포트
+            'host': 'logstash_container',  # Logstash 서비스의 컨테이너 이름
+            'port': 5333,  # Logstash 컨테이너가 로그를 수신하는 포트
             'version': 1,
             'message_type': 'logstash',
             'fqdn': False,
@@ -96,19 +96,17 @@ def wait_for_vault_client(client, retries=5, delay=5):
     'loggers': {
         'django': {
             'handlers': ['logstash'],
-            'level': 'DEBUG', # 모든 로그 레벨 포함
+            'level': 'DEBUG',  # 모든 로그 레벨 포함
             'propagate': True,
         },
         # 필요에 따라 추가 로거 정의
     },
 }
 
-
 # SECURITY WARNING: don't run with debug turned on in production!
 
 ALLOWED_HOSTS = ['*']
 
-
 # Application definition
 
 INSTALLED_APPS = [
@@ -120,8 +118,8 @@ def wait_for_vault_client(client, retries=5, delay=5):
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-		'rest_framework',
-		'drf_yasg',
+    'rest_framework',
+    'drf_yasg',
 ]
 
 PINGPONG_TOURNAMENT_MODEL = 'pingpong.Tournament'
@@ -180,7 +178,6 @@ def wait_for_vault_client(client, retries=5, delay=5):
         }
     }
 
-
 # Password validation
 # https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators
 
@@ -199,7 +196,6 @@ def wait_for_vault_client(client, retries=5, delay=5):
     },
 ]
 
-
 # Internationalization
 # https://docs.djangoproject.com/en/4.2/topics/i18n/
 
@@ -211,7 +207,6 @@ def wait_for_vault_client(client, retries=5, delay=5):
 
 USE_TZ = True
 
-
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/4.2/howto/static-files/
 

diff --git a/backend/src/urls.py b/backend/src/urls.py
@@ -27,7 +27,7 @@
     openapi.Info(
         title="ft_transcendence API",
         default_version="v1.0.0",
-        description="Test description",
+        description="GunGonGamLee's ft_transcendence API",
         terms_of_service="https://www.google.com/policies/terms/",
     ),
     public=True,
@@ -36,6 +36,7 @@
 
 urlpatterns = [
     path('admin/', admin.site.urls),
+    path('login/', include('login.urls')),
 ]
 
 # DEBUG 모드일 경우, ui 없이 swagger view를 사용할 수 있도록 설정