LLM/DocsGPT
1
0
Fork 0
mirror of https://github.com/arc53/DocsGPT.git synced 2025-11-29 08:33:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

(feat:oauth) provider as state, not args

Browse Source
This commit is contained in:
ManishMadan2882
2025-09-25 04:55:25 +05:30
parent ac66d77512
commit 2d0e97b66d
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
application/api/connector/routes.py
View File

@@ -1,5 +1,7 @@
import base64
import datetime import datetime
import json import json
import uuid
from bson.objectid import ObjectId from bson.objectid import ObjectId
@@ -13,8 +15,6 @@ from flask import (
from flask_restx import fields, Namespace, Resource from flask_restx import fields, Namespace, Resource
from application.api.user.tasks import ( from application.api.user.tasks import (
ingest_connector_task, ingest_connector_task,
) )
@@ -246,7 +246,11 @@ class ConnectorAuth(Resource):
"status": "pending", "status": "pending",
"created_at": now "created_at": now
}) })
state = str(result.inserted_id) state_dict = {
"provider": provider,
"object_id": str(result.inserted_id)
}
state = base64.urlsafe_b64encode(json.dumps(state_dict).encode()).decode()
auth = ConnectorCreator.create_auth(provider) auth = ConnectorCreator.create_auth(provider)
authorization_url = auth.get_authorization_url(state=state) authorization_url = auth.get_authorization_url(state=state)
@@ -268,13 +272,15 @@ class ConnectorsCallback(Resource):
try: try:
from application.parser.connectors.connector_creator import ConnectorCreator from application.parser.connectors.connector_creator import ConnectorCreator
from flask import request, redirect from flask import request, redirect
import uuid
provider = request.args.get('provider', 'google_drive')
authorization_code = request.args.get('code') authorization_code = request.args.get('code')
state = request.args.get('state') state = request.args.get('state')
error = request.args.get('error') error = request.args.get('error')
state_dict = json.loads(base64.urlsafe_b64decode(state.encode()).decode())
provider = state_dict["provider"]
state_object_id = state_dict["object_id"]
if error: if error:
if error == "access_denied": if error == "access_denied":
return redirect(f"/api/connectors/callback-status?status=cancelled&message=Authentication+was+cancelled.+You+can+try+again+if+you'd+like+to+connect+your+account.&provider={provider}") return redirect(f"/api/connectors/callback-status?status=cancelled&message=Authentication+was+cancelled.+You+can+try+again+if+you'd+like+to+connect+your+account.&provider={provider}")
@@ -285,8 +291,6 @@ class ConnectorsCallback(Resource):
if not authorization_code: if not authorization_code:
return redirect(f"/api/connectors/callback-status?status=error&message=Authentication+failed.+Please+try+again+and+make+sure+to+grant+all+requested+permissions.&provider={provider}") return redirect(f"/api/connectors/callback-status?status=error&message=Authentication+failed.+Please+try+again+and+make+sure+to+grant+all+requested+permissions.&provider={provider}")
state_object_id = ObjectId(state)
try: try:
auth = ConnectorCreator.create_auth(provider) auth = ConnectorCreator.create_auth(provider)
token_info = auth.exchange_code_for_tokens(authorization_code) token_info = auth.exchange_code_for_tokens(authorization_code)
@@ -310,7 +314,7 @@ class ConnectorsCallback(Resource):
} }
sessions_collection.find_one_and_update( sessions_collection.find_one_and_update(
{"_id": state_object_id, "provider": provider}, {"_id": ObjectId(state_object_id), "provider": provider},
{ {
"$set": { "$set": {
"session_token": session_token, "session_token": session_token,

3
application/core/settings.py
View File

@@ -43,8 +43,7 @@ class Settings(BaseSettings):
# Google Drive integration # Google Drive integration
GOOGLE_CLIENT_ID: Optional[str] = None # Replace with your actual Google OAuth client ID GOOGLE_CLIENT_ID: Optional[str] = None # Replace with your actual Google OAuth client ID
GOOGLE_CLIENT_SECRET: Optional[str] = None# Replace with your actual Google OAuth client secret GOOGLE_CLIENT_SECRET: Optional[str] = None# Replace with your actual Google OAuth client secret
CONNECTOR_REDIRECT_BASE_URI: Optional[str] = "http://127.0.0.1:7091/api/connectors/callback" CONNECTOR_REDIRECT_BASE_URI: Optional[str] = "http://127.0.0.1:7091/api/connectors/callback" ##add redirect url as it is to your provider's console(gcp)
##append ?provider={provider_name} in your Provider console like http://127.0.0.1:7091/api/connectors/callback?provider=google_drive
# LLM Cache # LLM Cache

2
application/parser/connectors/google_drive/auth.py
View File

@@ -23,7 +23,7 @@ class GoogleDriveAuth(BaseConnectorAuth):
def __init__(self): def __init__(self):
self.client_id = settings.GOOGLE_CLIENT_ID self.client_id = settings.GOOGLE_CLIENT_ID
self.client_secret = settings.GOOGLE_CLIENT_SECRET self.client_secret = settings.GOOGLE_CLIENT_SECRET
self.redirect_uri = f"{settings.CONNECTOR_REDIRECT_BASE_URI}?provider=google_drive" self.redirect_uri = f"{settings.CONNECTOR_REDIRECT_BASE_URI}"
if not self.client_id or not self.client_secret: if not self.client_id or not self.client_secret:
raise ValueError("Google OAuth credentials not configured. Please set GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET in settings.") raise ValueError("Google OAuth credentials not configured. Please set GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET in settings.")