(20241205) Migrating from the field "accountId" to "tokenId" to identify auth tokens.

api/blueprints/mail/list.py

@@ -165,9 +165,9 @@ async def list_mails_for_account_id(
         )
 
     # Get the mail:
-    mails_list = await current_app.mail_retrieve_model.list_for_account_identifier(
+    mails_list = await current_app.mail_retrieve_model.list_for_token_id(
         mongo_conn = current_app.data_mongo,
-        account_identifier = inbound_data.accountId,
+        token_id = inbound_data.tokenId,
         limit = inbound_data.count,
         skip = inbound_data.fromCount
     )

api/blueprints/mail/oauth_callback.py

@@ -159,7 +159,7 @@ async def handle_gmail_callback() -> render_template:
         # if they don't match, we reject the authorization:
         placeholder_token = await current_app.mail_oauth_model.get_token(
             mongo_conn = current_app.data_mongo,
-            account_identifier = g.inbound_data["state"]
+            token_id = g.inbound_data["state"]
         )
         if (
                 (not placeholder_token) or
@@ -210,7 +210,7 @@ async def handle_gmail_callback() -> render_template:
             db_conn = current_app.sql_writer,
             mongo_conn = current_app.data_mongo,
             session_token = g.inbound_headers.get("X-Session-Token"),
-            account_identifier = g.inbound_data["state"],
+            token_id = g.inbound_data["state"],
             email_id = tokens.email,
             token = tokens.model_dump()
         )

api/blueprints/mail/oauth_request.py

@@ -175,7 +175,7 @@ async def request_oauth_authorization_url(
     #            ┛
 
     # Make a user identifier from the session info:
-    user_identifier = await current_app.mail_oauth_model.get_account_identifier(
+    token_id = await current_app.mail_oauth_model.get_token_id(
         db_conn = current_app.sql_writer,
         mongo_conn = current_app.data_mongo,
         session_token = inbound_headers["X-Session-Token"],
@@ -184,13 +184,13 @@ async def request_oauth_authorization_url(
         service_client = inbound_data.mailClient,
         auth_type = "oauth"
     )
-    if user_identifier is None:
+    if token_id is None:
         return ResponseModel(
             status_code = StatusCodes.FAILED,
             http_code = HttpCodes.INTERNAL_SERVER_ERROR,
-            message = "failed to generate user identifier"
+            message = "failed to generate token id"
         )
-    user_identifier = str(user_identifier)
+    token_id = str(token_id)
 
     # ┏┓      ┏┓┳┳┓  •┓
     # ┣ ┏┓┏┓  ┃┓┃┃┃┏┓┓┃
@@ -201,7 +201,7 @@ async def request_oauth_authorization_url(
         # Get the authorization URL:
         auth_url = await current_app.gmail_client.get_authorization_url(
             scopes = SCOPES_GMAIL_MAIL_MANAGEMENT,
-            state = user_identifier,
+            state = token_id,
             access_type = "offline",
             approval_prompt = "force",
             include_granted_scopes = "true",

api/blueprints/mail/retrieve.py

@@ -166,7 +166,7 @@ async def get_one_mail(
     # Get the mail:
     mail_data = await current_app.mail_retrieve_model.get_mail(
         mongo_conn = current_app.data_mongo,
-        mail_identifier = inbound_data.mailId
+        mail_id = inbound_data.mailId
     )
 
     # Done here:

api/blueprints/mail/sync.py

@@ -146,7 +146,7 @@ async def sync_mails(
     return await current_app.mail_sync_model.sync(
         session_token = inbound_headers["X-Session-Token"],
         mongo_conn = mongo_conn,
-        account_identifier = inbound_data.accountId,
+        token_id = inbound_data.tokenId,
         llm = llm,
         force_sync = inbound_data.forceSync,
         start_date = inbound_data.startDate,