(20241202) Testing out the modified auth process.
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
|
||||
DATE:
|
||||
|
||||
Wednesday, 27th Nov., 2024
|
||||
Monday, 2nd Dec., 2024
|
||||
|
||||
OBJECTIVE:
|
||||
|
||||
@@ -95,11 +95,12 @@ class MailOAuthModel(BaseModel):
|
||||
|
||||
AUTH_COLLECTION = "_authTokens"
|
||||
|
||||
async def get_user_identifier(
|
||||
async def get_account_identifier(
|
||||
self,
|
||||
db_conn: AsyncMySQL,
|
||||
mongo_conn: AsyncMongo,
|
||||
user_info: dict,
|
||||
email_id: str,
|
||||
service_client: Literal["gmail"],
|
||||
auth_type: Literal["oauth"],
|
||||
session_token: str = None
|
||||
@@ -111,6 +112,7 @@ class MailOAuthModel(BaseModel):
|
||||
:param db_conn: The database connection (MariaDB) to use to perform the action.
|
||||
:param mongo_conn: The database connection (MongoDB) to use to perform the action.
|
||||
:param user_info: The dictionary that has the user's session information.
|
||||
:param email_id: The e-mail id that the user wants to connect to your service.
|
||||
:param service_client: The name of the company or brand that is providing this service that is being integrated.
|
||||
:param auth_type: To identify the type of authentication being done here. This could indicate simple password
|
||||
authentication, more advance OAuth2.0 authentication, etc.
|
||||
@@ -122,82 +124,68 @@ class MailOAuthModel(BaseModel):
|
||||
request_ts = date_time.get_current_utc_date_time(as_string = False)
|
||||
|
||||
# Get the identifier from the database:
|
||||
inserted_id = await mongo_conn.insert_one(
|
||||
mongo_json = await mongo_conn.find_one_and_update(
|
||||
collection = MailOAuthModel.AUTH_COLLECTION,
|
||||
document = {
|
||||
"version": "-1.0.1",
|
||||
filter = {
|
||||
"serviceType": "email",
|
||||
"client": service_client,
|
||||
"authType": auth_type,
|
||||
"user": user_info,
|
||||
"token": None,
|
||||
"firstRefreshTs": None,
|
||||
"lastRefreshTs": None,
|
||||
"lastRequestTs": request_ts
|
||||
}
|
||||
"user": {
|
||||
"entityId": user_info["entityId"],
|
||||
"billingAccountId": user_info["billingAccountId"]
|
||||
},
|
||||
"clientUserId": email_id
|
||||
},
|
||||
update = {
|
||||
"$set": {
|
||||
"lastRequestTs": request_ts
|
||||
},
|
||||
"$setOnInsert": {
|
||||
"version": "1.1.0",
|
||||
"serviceType": "email",
|
||||
"client": service_client,
|
||||
"authType": auth_type,
|
||||
"user": user_info,
|
||||
"token": None,
|
||||
"firstRefreshTs": None,
|
||||
"lastRefreshTs": None,
|
||||
"firstRequestTs": request_ts,
|
||||
}
|
||||
},
|
||||
projection = {
|
||||
"_id": True
|
||||
},
|
||||
upsert = True,
|
||||
return_updated = True
|
||||
)
|
||||
return inserted_id
|
||||
|
||||
# # Get the identifier from the database:
|
||||
# mongo_json = await mongo_conn.find_one_and_update(
|
||||
# collection = MailOAuthModel.AUTH_COLLECTION,
|
||||
# filter = {
|
||||
# "serviceType": "email",
|
||||
# "client": service_client,
|
||||
# "authType": auth_type,
|
||||
# "user": user_info,
|
||||
# },
|
||||
# update = {
|
||||
# "$set": {
|
||||
# "lastRequestTs": request_ts
|
||||
# },
|
||||
# "$setOnInsert": {
|
||||
# "version": "1.0.0",
|
||||
# "serviceType": "email",
|
||||
# "client": service_client,
|
||||
# "authType": auth_type,
|
||||
# "user": user_info,
|
||||
# "token": None,
|
||||
# "firstRefreshTs": None,
|
||||
# "lastRefreshTs": None,
|
||||
# "firstRequestTs": request_ts,
|
||||
# }
|
||||
# },
|
||||
# projection = {
|
||||
# "_id": True
|
||||
# },
|
||||
# upsert = True,
|
||||
# return_updated = True
|
||||
# )
|
||||
#
|
||||
# # Tell MariaDB that an authorization request was initiated:
|
||||
# db_json = {}
|
||||
# if mongo_json is not None:
|
||||
# db_json = await self.call_procedure(
|
||||
# db_conn = db_conn,
|
||||
# proc_name = "entity_integration_save",
|
||||
# proc_args = (
|
||||
# user_info["entityId"], # ............................................ 'p_entity_id'
|
||||
# service_client, # ................................................... 'p_provider'
|
||||
# "Auth Requested", # ................................................. 'p_current_status'
|
||||
# "Auth URL Generated", # ............................................. 'p_last_action'
|
||||
# None, # ............................................................. 'p_display_name'
|
||||
# None, # ............................................................. 'p_display_picture'
|
||||
# str(mongo_json["_id"]), # ........................................... 'p_token_id'
|
||||
# json.to_string(python_data = {"email": None}, no_space = True), # ... 'p_notes'
|
||||
# user_info["userId"] # ............................................... 'p_created_by'
|
||||
# ),
|
||||
# session_token = session_token
|
||||
# )
|
||||
#
|
||||
# # Done here:
|
||||
# return mongo_json["_id"] if mongo_json and db_json.get("status") == 1 else None
|
||||
# Tell MariaDB that an authorization request was initiated:
|
||||
db_json = {}
|
||||
if mongo_json is not None:
|
||||
db_json = await self.call_procedure(
|
||||
db_conn = db_conn,
|
||||
proc_name = "entity_integration_save",
|
||||
proc_args = (
|
||||
user_info["entityId"], # ............................................ 'p_entity_id'
|
||||
service_client, # ................................................... 'p_provider'
|
||||
"Auth Requested", # ................................................. 'p_current_status'
|
||||
"Auth URL Generated", # ............................................. 'p_last_action'
|
||||
None, # ............................................................. 'p_display_name'
|
||||
None, # ............................................................. 'p_display_picture'
|
||||
str(mongo_json["_id"]), # ........................................... 'p_token_id'
|
||||
json.to_string(python_data = {"email": None}, no_space = True), # ... 'p_notes'
|
||||
user_info["userId"] # ............................................... 'p_created_by'
|
||||
),
|
||||
session_token = session_token
|
||||
)
|
||||
|
||||
# Done here:
|
||||
return mongo_json["_id"] if mongo_json and db_json.get("status") == 1 else None
|
||||
|
||||
async def set_token(
|
||||
self,
|
||||
db_conn: AsyncMySQL,
|
||||
mongo_conn: AsyncMongo,
|
||||
user_identifier: ObjectId | str,
|
||||
account_identifier: ObjectId | str,
|
||||
email_id: str,
|
||||
token: dict,
|
||||
session_token: str = None
|
||||
) -> bool:
|
||||
@@ -208,7 +196,9 @@ class MailOAuthModel(BaseModel):
|
||||
ALSO.
|
||||
:param db_conn: The database connection (MariaDB) to use to perform the action.
|
||||
:param mongo_conn: The database connection (MongoDB) to use to perform the action.
|
||||
:param user_identifier: The identifier granted by the 'get_user_identifier' method.
|
||||
:param account_identifier: The identifier granted by the 'get_account_identifier' method.
|
||||
:param email_id: The e-mail id that the user tried to connect to your service. This should match the e-mail id
|
||||
the user claimed he wants to connect when he used 'get_account_identifier'.
|
||||
:param token: The token granted by the third-party service.
|
||||
:param session_token: The session token of the user who requested this service.
|
||||
:return: True if saved, False if failed.
|
||||
@@ -223,7 +213,10 @@ class MailOAuthModel(BaseModel):
|
||||
# Save the token to MongoDB:
|
||||
mongo_json = await mongo_conn.find_one_and_update(
|
||||
collection = MailOAuthModel.AUTH_COLLECTION,
|
||||
filter = {"_id": ObjectId(user_identifier)},
|
||||
filter = {
|
||||
"_id": ObjectId(account_identifier),
|
||||
"clientUserId": email_id
|
||||
},
|
||||
update = {
|
||||
"$set": {
|
||||
"token": token,
|
||||
@@ -250,7 +243,7 @@ class MailOAuthModel(BaseModel):
|
||||
"Set Token", # ................................................................ 'p_last_action'
|
||||
None, # ....................................................................... 'p_display_name'
|
||||
None, # ....................................................................... 'p_display_picture'
|
||||
user_identifier, # ............................................................ 'p_token_id'
|
||||
account_identifier, # ......................................................... 'p_token_id'
|
||||
json.to_string(python_data = {"email": token["email"]}, no_space = True), # ... 'p_notes'
|
||||
mongo_json["user"]["userId"] # ................................................ 'p_created_by'
|
||||
),
|
||||
@@ -264,14 +257,14 @@ class MailOAuthModel(BaseModel):
|
||||
async def get_token(
|
||||
self,
|
||||
mongo_conn: AsyncMongo,
|
||||
user_identifier: ObjectId | str = None,
|
||||
account_identifier: ObjectId | str = None,
|
||||
**kwargs
|
||||
) -> dict | None:
|
||||
|
||||
"""
|
||||
To retrieve stored tokens from the database.
|
||||
:param mongo_conn: The database connection (MongoDB) to use to perform the action.
|
||||
:param user_identifier: The identifier granted by the 'get_user_identifier' method.
|
||||
:param account_identifier: The identifier granted by the 'account_identifier' method.
|
||||
:param kwargs: Any set of key-value pairs to build custom search criteria. This could be things like the user
|
||||
info, the client, the type of authentication used, or even the kind of service.
|
||||
:return: The retrieved record that has the token, and information about the service and client if found, else
|
||||
@@ -280,7 +273,7 @@ class MailOAuthModel(BaseModel):
|
||||
|
||||
# Build the filter:
|
||||
filter_json = {k: v for k, v in kwargs.items()}
|
||||
if user_identifier: filter_json["_id"] = ObjectId(user_identifier)
|
||||
if account_identifier: filter_json["_id"] = ObjectId(account_identifier)
|
||||
|
||||
# If there is no search criteria, we exit with failure:
|
||||
if not filter_json: return None
|
||||
|
||||
Reference in New Issue
Block a user