Compare commits
2 Commits
main
...
cs/msteams
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ea25d9cc03 | ||
|
|
ade8426cb2 |
@ -22,6 +22,7 @@ Docs: https://docs.clawd.bot
|
|||||||
- Media: preserve PNG alpha when possible; fall back to JPEG when still over size cap. (#1491) Thanks @robbyczgw-cla.
|
- Media: preserve PNG alpha when possible; fall back to JPEG when still over size cap. (#1491) Thanks @robbyczgw-cla.
|
||||||
- Agents: treat plugin-only tool allowlists as opt-ins; keep core tools enabled. (#1467)
|
- Agents: treat plugin-only tool allowlists as opt-ins; keep core tools enabled. (#1467)
|
||||||
- Exec approvals: persist allowlist entry ids to keep macOS allowlist rows stable. (#1521) Thanks @ngutman.
|
- Exec approvals: persist allowlist entry ids to keep macOS allowlist rows stable. (#1521) Thanks @ngutman.
|
||||||
|
- MS Teams (plugin): remove `.default` suffix from Graph scopes to avoid double-appending. (#1507) Thanks @Evizero.
|
||||||
|
|
||||||
## 2026.1.22
|
## 2026.1.22
|
||||||
|
|
||||||
|
|||||||
@ -68,10 +68,10 @@ function scopeCandidatesForUrl(url: string): string[] {
|
|||||||
host.endsWith("1drv.ms") ||
|
host.endsWith("1drv.ms") ||
|
||||||
host.includes("sharepoint");
|
host.includes("sharepoint");
|
||||||
return looksLikeGraph
|
return looksLikeGraph
|
||||||
? ["https://graph.microsoft.com/.default", "https://api.botframework.com/.default"]
|
? ["https://graph.microsoft.com", "https://api.botframework.com"]
|
||||||
: ["https://api.botframework.com/.default", "https://graph.microsoft.com/.default"];
|
: ["https://api.botframework.com", "https://graph.microsoft.com"];
|
||||||
} catch {
|
} catch {
|
||||||
return ["https://api.botframework.com/.default", "https://graph.microsoft.com/.default"];
|
return ["https://api.botframework.com", "https://graph.microsoft.com"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -198,7 +198,7 @@ export async function downloadMSTeamsGraphMedia(params: {
|
|||||||
const messageUrl = params.messageUrl;
|
const messageUrl = params.messageUrl;
|
||||||
let accessToken: string;
|
let accessToken: string;
|
||||||
try {
|
try {
|
||||||
accessToken = await params.tokenProvider.getAccessToken("https://graph.microsoft.com/.default");
|
accessToken = await params.tokenProvider.getAccessToken("https://graph.microsoft.com");
|
||||||
} catch {
|
} catch {
|
||||||
return { media: [], messageUrl, tokenError: true };
|
return { media: [], messageUrl, tokenError: true };
|
||||||
}
|
}
|
||||||
|
|||||||
@ -64,7 +64,7 @@ async function resolveGraphToken(cfg: unknown): Promise<string> {
|
|||||||
if (!creds) throw new Error("MS Teams credentials missing");
|
if (!creds) throw new Error("MS Teams credentials missing");
|
||||||
const { sdk, authConfig } = await loadMSTeamsSdkWithAuth(creds);
|
const { sdk, authConfig } = await loadMSTeamsSdkWithAuth(creds);
|
||||||
const tokenProvider = new sdk.MsalTokenProvider(authConfig);
|
const tokenProvider = new sdk.MsalTokenProvider(authConfig);
|
||||||
const token = await tokenProvider.getAccessToken("https://graph.microsoft.com/.default");
|
const token = await tokenProvider.getAccessToken("https://graph.microsoft.com");
|
||||||
const accessToken = readAccessToken(token);
|
const accessToken = readAccessToken(token);
|
||||||
if (!accessToken) throw new Error("MS Teams graph token unavailable");
|
if (!accessToken) throw new Error("MS Teams graph token unavailable");
|
||||||
return accessToken;
|
return accessToken;
|
||||||
|
|||||||
@ -13,7 +13,7 @@ import type { MSTeamsAccessTokenProvider } from "./attachments/types.js";
|
|||||||
|
|
||||||
const GRAPH_ROOT = "https://graph.microsoft.com/v1.0";
|
const GRAPH_ROOT = "https://graph.microsoft.com/v1.0";
|
||||||
const GRAPH_BETA = "https://graph.microsoft.com/beta";
|
const GRAPH_BETA = "https://graph.microsoft.com/beta";
|
||||||
const GRAPH_SCOPE = "https://graph.microsoft.com/.default";
|
const GRAPH_SCOPE = "https://graph.microsoft.com";
|
||||||
|
|
||||||
export interface OneDriveUploadResult {
|
export interface OneDriveUploadResult {
|
||||||
id: string;
|
id: string;
|
||||||
|
|||||||
@ -143,7 +143,7 @@ async function resolveGraphToken(cfg: unknown): Promise<string> {
|
|||||||
if (!creds) throw new Error("MS Teams credentials missing");
|
if (!creds) throw new Error("MS Teams credentials missing");
|
||||||
const { sdk, authConfig } = await loadMSTeamsSdkWithAuth(creds);
|
const { sdk, authConfig } = await loadMSTeamsSdkWithAuth(creds);
|
||||||
const tokenProvider = new sdk.MsalTokenProvider(authConfig);
|
const tokenProvider = new sdk.MsalTokenProvider(authConfig);
|
||||||
const token = await tokenProvider.getAccessToken("https://graph.microsoft.com/.default");
|
const token = await tokenProvider.getAccessToken("https://graph.microsoft.com");
|
||||||
const accessToken = readAccessToken(token);
|
const accessToken = readAccessToken(token);
|
||||||
if (!accessToken) throw new Error("MS Teams graph token unavailable");
|
if (!accessToken) throw new Error("MS Teams graph token unavailable");
|
||||||
return accessToken;
|
return accessToken;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user