login_separate

app.py

@@ -15,6 +15,7 @@ from google.oauth2 import id_token
 from google_auth_oauthlib.flow import Flow
 from google.auth.transport import requests as google_requests
 from new_record import record_bp
+from login import login_bp 
 
 
 # Hugging Face のトークン取得（環境変数 HF に設定）
@@ -36,15 +37,6 @@ app = Flask(__name__)
 
 app.config['SECRET_KEY'] = os.urandom(24)
 
-# Google OAuth 2.0の設定
-os.environ["OAUTHLIB_INSECURE_TRANSPORT"] = "1"
-GOOGLE_CLIENT_ID = "228160683186-6u7986qsfhcv3kd9iqtv08iphpl4gdk2.apps.googleusercontent.com"
-GOOGLE_CLIENT_SECRET = "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"
-#HFにpushするときは下記のコメントアウトを外してください
-#REDIRECT_URI = "https://huggingface.co/spaces/Justtalk/JusTalk/callback"
-#ローカルの時はこちら
-REDIRECT_URI = "http://127.0.0.1:7860/callback"
-
 flow = Flow.from_client_secrets_file(
     'client_secret.json',
     scopes=["openid", "https://www.googleapis.com/auth/userinfo.profile", "https://www.googleapis.com/auth/userinfo.email"],
@@ -109,47 +101,13 @@ def generate_filename(random_length):
     return filename
 
 app.register_blueprint(record_bp)
+app.register_blueprint(login_bp) 
 
 # トップページ（テンプレート: index.html）
 @app.route('/')
 def top():
     return redirect('index')
 
-# ログイン画面（テンプレート: login.html）
-@app.route('/login')
-def login():
-   authorization_url, state = flow.authorization_url()
-   session['state'] = state
-   return redirect(authorization_url)
-
-
-# ログイン後画面
-@app.route('/callback')
-def callback():
-    flow.fetch_token(authorization_response=request.url)
-
-    # `session.get('state')` を使用し、エラーを防ぐ
-    session_state = session.get('state')
-    request_state = request.args.get('state')
-
-    if session_state is None or session_state != request_state:
-        print(f"State mismatch error: session_state={session_state}, request_state={request_state}")
-        return 'State mismatch error', 400
-
-    credentials = flow.credentials
-    request_session = google_requests.Request()
-
-    id_info = id_token.verify_oauth2_token(
-        credentials.id_token, request_session, GOOGLE_CLIENT_ID
-    )
-
-    session['google_id'] = id_info.get("sub")
-    session['email'] = id_info.get("email")
-    session['name'] = id_info.get("name")
-
-    return redirect(url_for('new_person'))
-
-
 # フィードバック画面（テンプレート: feedback.html）
 @app.route('/feedback', methods=['GET', 'POST'])
 def feedback():

client_secret.json

@@ -1,11 +0,0 @@
-{
-  "web": {
-    "client_id": "228160683186-6u7986qsfhcv3kd9iqtv08iphpl4gdk2.apps.googleusercontent.com",
-    "project_id": "justtalk-454100",
-    "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-    "token_uri": "https://oauth2.googleapis.com/token",
-    "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-    "client_secret": "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",
-    "redirect_uris": "http://127.0.0.1:7860/callback"
-  }
-}

login.py

@@ -0,0 +1,51 @@
+from flask import Blueprint, request, redirect, session, url_for, render_template
+import os
+from google.oauth2 import id_token
+from google_auth_oauthlib.flow import Flow
+from google.auth.transport import requests as google_requests
+
+login_bp = Blueprint('login', __name__)
+
+# Google OAuth 2.0 の設定
+os.environ["OAUTHLIB_INSECURE_TRANSPORT"] = "1"
+GOOGLE_CLIENT_ID = "228160683186-6u7986qsfhcv3kd9iqtv08iphpl4gdk2.apps.googleusercontent.com"
+GOOGLE_CLIENT_SECRET = "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"
+REDIRECT_URI = "http://127.0.0.1:7860/callback"
+
+flow = Flow.from_client_secrets_file(
+    'client_secret.json',
+    scopes=["openid", "https://www.googleapis.com/auth/userinfo.profile", "https://www.googleapis.com/auth/userinfo.email"],
+    redirect_uri=REDIRECT_URI
+)
+
+@login_bp.route('/login')
+def login():
+    authorization_url, state = flow.authorization_url()
+    session['state'] = state
+    return redirect(authorization_url)
+
+@login_bp.route('/callback')
+def callback():
+    flow.fetch_token(authorization_response=request.url)
+
+    session_state = session.get('state')
+    request_state = request.args.get('state')
+
+    if session_state is None or session_state != request_state:
+        print(f"State mismatch error: session_state={session_state}, request_state={request_state}")
+        return 'State mismatch error', 400
+
+    credentials = flow.credentials
+    request_session = google_requests.Request()
+
+    id_info = id_token.verify_oauth2_token(
+        credentials.id_token, request_session, GOOGLE_CLIENT_ID
+    )
+
+    session['google_id'] = id_info.get("sub")
+    session['email'] = id_info.get("email")
+    session['name'] = id_info.get("name")
+
+    return redirect(url_for('new_person'))
+
+