apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-05-31 19:45:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

BE-2: Remove duplicate-check logic and enable user-friendly auto-naming for Airtable and Confluence connector OAuth flows

Browse source
This commit is contained in:
CREDO23 2026-01-06 19:26:40 +02:00
parent c58a3fba55
commit d75df7e5b2
2 changed files with 44 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

29
surfsense_backend/app/routes/airtable_add_connector_route.py
View file

@ -23,6 +23,7 @@ from app.db import (
from app.schemas.airtable_auth_credentials import AirtableAuthCredentialsBase from app.schemas.airtable_auth_credentials import AirtableAuthCredentialsBase
from app.users import current_active_user from app.users import current_active_user
from app.utils.oauth_security import OAuthStateManager, TokenEncryption from app.utils.oauth_security import OAuthStateManager, TokenEncryption
from app.utils.connector_naming import generate_unique_connector_name, extract_identifier_from_credentials
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -297,29 +298,17 @@ async def airtable_callback(
credentials_dict = credentials.to_dict() credentials_dict = credentials.to_dict()
credentials_dict["_token_encrypted"] = True credentials_dict["_token_encrypted"] = True
# Check if connector already exists for this search space and user # Extract unique identifier from connector credentials
existing_connector_result = await session.execute( connector_identifier = extract_identifier_from_credentials(
select(SearchSourceConnector).filter( SearchSourceConnectorType.AIRTABLE_CONNECTOR, credentials_dict
SearchSourceConnector.search_space_id == space_id,
SearchSourceConnector.user_id == user_id,
SearchSourceConnector.connector_type
== SearchSourceConnectorType.AIRTABLE_CONNECTOR,
) )
# Generate a unique, user-friendly connector name from credentials/account info
connector_name = generate_unique_connector_name(
SearchSourceConnectorType.AIRTABLE_CONNECTOR, connector_identifier
) )
existing_connector = existing_connector_result.scalars().first()
if existing_connector:
# Update existing connector
existing_connector.config = credentials_dict
existing_connector.name = "Airtable Connector"
existing_connector.is_indexable = True
logger.info(
f"Updated existing Airtable connector for user {user_id} in space {space_id}"
)
else:
# Create new connector # Create new connector
new_connector = SearchSourceConnector( new_connector = SearchSourceConnector(
name="Airtable Connector", name=connector_name,
connector_type=SearchSourceConnectorType.AIRTABLE_CONNECTOR, connector_type=SearchSourceConnectorType.AIRTABLE_CONNECTOR,
is_indexable=True, is_indexable=True,
config=credentials_dict, config=credentials_dict,
@ -350,7 +339,7 @@ async def airtable_callback(
await session.rollback() await session.rollback()
raise HTTPException( raise HTTPException(
status_code=409, status_code=409,
detail=f"Integrity error: A connector with this type already exists. {e!s}", detail=f"Database integrity error: {e!s}",
) from e ) from e
except Exception as e: except Exception as e:
logger.error(f"Failed to create search source connector: {e!s}") logger.error(f"Failed to create search source connector: {e!s}")

29
surfsense_backend/app/routes/confluence_add_connector_route.py
View file

@ -26,6 +26,7 @@ from app.db import (
from app.schemas.atlassian_auth_credentials import AtlassianAuthCredentialsBase from app.schemas.atlassian_auth_credentials import AtlassianAuthCredentialsBase
from app.users import current_active_user from app.users import current_active_user
from app.utils.oauth_security import OAuthStateManager, TokenEncryption from app.utils.oauth_security import OAuthStateManager, TokenEncryption
from app.utils.connector_naming import generate_unique_connector_name, extract_identifier_from_credentials
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -288,29 +289,17 @@ async def confluence_callback(
"_token_encrypted": True, "_token_encrypted": True,
} }
# Check if connector already exists for this search space and user # Extract unique identifier from connector credentials
existing_connector_result = await session.execute( connector_identifier = extract_identifier_from_credentials(
select(SearchSourceConnector).filter( SearchSourceConnectorType.CONFLUENCE_CONNECTOR, connector_config
SearchSourceConnector.search_space_id == space_id,
SearchSourceConnector.user_id == user_id,
SearchSourceConnector.connector_type
== SearchSourceConnectorType.CONFLUENCE_CONNECTOR,
) )
# Generate a unique, user-friendly connector name from credentials/account info
connector_name = generate_unique_connector_name(
SearchSourceConnectorType.CONFLUENCE_CONNECTOR, connector_identifier
) )
existing_connector = existing_connector_result.scalars().first()
if existing_connector:
# Update existing connector
existing_connector.config = connector_config
existing_connector.name = "Confluence Connector"
existing_connector.is_indexable = True
logger.info(
f"Updated existing Confluence connector for user {user_id} in space {space_id}"
)
else:
# Create new connector # Create new connector
new_connector = SearchSourceConnector( new_connector = SearchSourceConnector(
name="Confluence Connector", name=connector_name,
connector_type=SearchSourceConnectorType.CONFLUENCE_CONNECTOR, connector_type=SearchSourceConnectorType.CONFLUENCE_CONNECTOR,
is_indexable=True, is_indexable=True,
config=connector_config, config=connector_config,
@ -340,7 +329,7 @@ async def confluence_callback(
await session.rollback() await session.rollback()
raise HTTPException( raise HTTPException(
status_code=409, status_code=409,
detail=f"Integrity error: A connector with this type already exists. {e!s}", detail=f"Database integrity error: {e!s}",
) from e ) from e
except Exception as e: except Exception as e:
logger.error(f"Failed to create search source connector: {e!s}") logger.error(f"Failed to create search source connector: {e!s}")