github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

feat: improve logging and error handling in Microsoft Teams user token retrieval

Browse Source
This commit is contained in:
Nawaz Dhandala
2025-12-11 19:20:13 +00:00
parent 6e5e0b4a0a
commit abc0446c3a
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Common/Server/API/MicrosoftTeamsAPI.ts
View File

@@ -472,7 +472,7 @@ export default class MicrosoftTeamsAPI {
}
},
);
/*
* Admin consent - start flow (tenant-wide admin consent)
* Uses state in the same format as OAuth: <projectId>:<userId>

30
Common/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.ts
View File

@@ -30,6 +30,7 @@ import BadDataException from "../../../../Types/Exception/BadDataException";
import ObjectID from "../../../../Types/ObjectID";
import WorkspaceProjectAuthTokenService from "../../../Services/WorkspaceProjectAuthTokenService";
import WorkspaceUserAuthTokenService from "../../../Services/WorkspaceUserAuthTokenService";
import WorkspaceUserAuthToken from "../../../../Models/DatabaseModels/WorkspaceUserAuthToken";
import WorkspaceProjectAuthToken, {
MicrosoftTeamsMiscData,
MicrosoftTeamsTeam,
@@ -2859,28 +2860,37 @@ All monitoring checks are passing normally.`;
try {
// If caller provided a userAccessToken directly, use it
if (data.userAccessToken) {
logger.debug("Using provided user access token to fetch joined teams");
logger.debug(
"Using provided user access token to fetch joined teams",
);
usedAccessToken = data.userAccessToken;
const userTeams = await this.getUserJoinedTeams(usedAccessToken);
const userTeams: Record<string, { id: string; name: string }> =
await this.getUserJoinedTeams(usedAccessToken);
allTeams = Object.values(userTeams) as any;
} else if (data.userId) {
// Try to fetch stored user auth for this project + user
logger.debug("Looking up stored user auth token for provided userId");
const userAuth = await WorkspaceUserAuthTokenService.getUserAuth({
projectId: data.projectId,
userId: data.userId,
workspaceType: WorkspaceType.MicrosoftTeams,
});
const userAuth: WorkspaceUserAuthToken | null =
await WorkspaceUserAuthTokenService.getUserAuth({
projectId: data.projectId,
userId: data.userId,
workspaceType: WorkspaceType.MicrosoftTeams,
});
if (userAuth && userAuth.authToken) {
usedAccessToken = userAuth.authToken;
logger.debug("Found user auth token; using it to fetch joined teams");
const userTeams = await this.getUserJoinedTeams(usedAccessToken);
logger.debug(
"Found user auth token; using it to fetch joined teams",
);
const userTeams: Record<string, { id: string; name: string }> =
await this.getUserJoinedTeams(usedAccessToken);
allTeams = Object.values(userTeams) as any;
}
}
} catch (err) {
logger.warn("Failed to fetch teams using user-scoped token, falling back to app token:");
logger.warn(
"Failed to fetch teams using user-scoped token, falling back to app token:",
);
logger.warn(err);
allTeams = [];
}