khushalps/api_utils_converse_v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(20241129) User infor needs to be fetched from Mongo.

Browse Source
This commit is contained in:
khushal
2024-11-29 13:32:00 +05:30
parent 6c95166327
commit 0db8ad7773
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/blueprints/mail/oauth_callback.py
-1
View File
@@ -167,7 +167,6 @@ async def mail_callback(
db_conn = current_app.sql_writer, db_conn = current_app.sql_writer,
mongo_conn = current_app.data_mongo, mongo_conn = current_app.data_mongo,
session_token = inbound_headers.get("X-Session-Token"), session_token = inbound_headers.get("X-Session-Token"),
user_info = kwargs["session_info"],
user_identifier = inbound_data["state"], user_identifier = inbound_data["state"],
token = tokens.model_dump() token = tokens.model_dump()
) )
models/behaviour/mail/oauth.py
+11 -12
View File
@@ -134,14 +134,14 @@ class MailOAuthModel(BaseModel):
}, },
update = { update = {
"$set": { "$set": {
"lastRequestTs": request_ts "lastRequestTs": request_ts,
"user": user_info,
}, },
"$setOnInsert": { "$setOnInsert": {
"version": "1.0.0", "version": "1.0.0",
"serviceType": service_type, "serviceType": service_type,
"client": service_client, "client": service_client,
"authType": auth_type, "authType": auth_type,
"user": user_info,
"token": None, "token": None,
"firstRefreshTs": None, "firstRefreshTs": None,
"lastRefreshTs": None, "lastRefreshTs": None,
@@ -182,7 +182,6 @@ class MailOAuthModel(BaseModel):
self, self,
db_conn: AsyncMySQL, db_conn: AsyncMySQL,
mongo_conn: AsyncMongo, mongo_conn: AsyncMongo,
user_info: dict,
user_identifier: ObjectId | str, user_identifier: ObjectId | str,
token: dict, token: dict,
session_token: str = None session_token: str = None
@@ -227,15 +226,15 @@ class MailOAuthModel(BaseModel):
db_conn = db_conn, db_conn = db_conn,
proc_name = "entity_integration_save", proc_name = "entity_integration_save",
proc_args = ( proc_args = (
user_info["entityId"], # ... 'p_entity_id' mongo_json["user"]["entityId"], # ... 'p_entity_id'
mongo_json["client"], # .... 'p_provider' mongo_json["client"], # ............. 'p_provider'
"Auth Granted", # .......... 'p_current_status' "Auth Granted", # ................... 'p_current_status'
"Set Token", # ............. 'p_last_action' "Set Token", # ...................... 'p_last_action'
None, # .................... 'p_display_name' None, # ............................. 'p_display_name'
None, # .................... 'p_display_picture' None, # ............................. 'p_display_picture'
user_identifier, # ......... 'p_token_id' user_identifier, # .................. 'p_token_id'
token["email"], # .......... 'p_notes' token["email"], # ................... 'p_notes'
user_info["userId"] # ...... 'p_created_by' mongo_json["user"]["userId"] # ...... 'p_created_by'
), ),
session_token = session_token session_token = session_token
) )