Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions pocs/concur/outlook_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@ def __init__(self, authenticator):
self.base_url = "https://graph.microsoft.com/v1.0"
self.session = requests.Session()

def _make_request(self, method: str, endpoint: str, params: Optional[Dict] = None) -> Dict[str, Any]:
def _make_request(self, method: str, endpoint: str, params: Optional[Dict] = None, headers: Optional[Dict] = None) -> Dict[str, Any]:
"""Make authenticated request to Outlook API."""
token = self.authenticator.get_access_token()
self.session.headers.update({"Authorization": f"Bearer {token}"})
request_headers = {"Authorization": f"Bearer {token}"}
if headers:
request_headers.update(headers)
self.session.headers.update(request_headers)

url = f"{self.base_url}{endpoint}"
response = self.session.request(method, url, params=params, timeout=30)
Expand All @@ -30,7 +33,8 @@ def _make_request(self, method: str, endpoint: str, params: Optional[Dict] = Non
if response.status_code in (401, 403):
logger.debug("Token expired, retrying with fresh token")
token = self.authenticator.get_access_token()
self.session.headers.update({"Authorization": f"Bearer {token}"})
request_headers["Authorization"] = f"Bearer {token}"
self.session.headers.update(request_headers)
response = self.session.request(method, url, params=params, timeout=30)

response.raise_for_status()
Expand Down Expand Up @@ -87,4 +91,40 @@ def get_message_attachments(self, message_id: str, select_fields=None) -> List[D

attachments = response_data.get("value", [])
logger.debug(f"Found {len(attachments)} attachments")
return attachments
return attachments

def search_messages(self, search_term: str, limit=50, select_fields=None) -> List[Dict[str, Any]]:
"""
Search for messages containing a specific term.

Args:
search_term: Term to search for in messages
limit: Number of messages to retrieve
select_fields: List of fields to select

Returns:
List of message dictionaries matching the search term
"""
endpoint = "/me/messages"

params = {
"$search": f'"{search_term}"',
"$top": limit
}

if select_fields:
params["$select"] = ",".join(select_fields)

logger.info(f"Searching for messages containing: {search_term}")

# Search requires ConsistencyLevel header
headers = {"ConsistencyLevel": "eventual"}
response_data = self._make_request("GET", endpoint, params, headers)

messages = response_data.get("value", [])

# Client-side sort by receivedDateTime desc (search doesn't support $orderby)
messages.sort(key=lambda m: m.get("receivedDateTime", ""), reverse=True)

logger.info(f"Found {len(messages)} messages matching '{search_term}'")
return messages
18 changes: 14 additions & 4 deletions pocs/concur/outlook_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ def load_config():
config["scopes"] = ["Mail.Read"]
config["message_limit"] = int(os.getenv("MESSAGE_LIMIT", "10"))
config["log_level"] = os.getenv("LOG_LEVEL", "INFO")
config["search_term"] = os.getenv("SEARCH_TERM", "") # Optional search term

return config

Expand Down Expand Up @@ -90,10 +91,19 @@ def main():
"hasAttachments", "bodyPreview"
]

messages = client.get_messages(
limit=config["message_limit"],
select_fields=select_fields
)
# Use search if search_term is provided, otherwise get inbox messages
if config["search_term"]:
logger.info(f"Searching for: '{config['search_term']}'")
messages = client.search_messages(
search_term=config["search_term"],
limit=config["message_limit"],
select_fields=select_fields
)
else:
messages = client.get_messages(
limit=config["message_limit"],
select_fields=select_fields
)

if not messages:
logger.info("No messages found")
Expand Down