Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(calendar): request only the Google Calendar scopes Macro uses (#5637)

gbirmanaa4eff70cdb0
diff --git a/crates/calendar_events/src/domain/models.rs b/crates/calendar_events/src/domain/models.rs
index d72d836426..621fd60001 100644
--- a/crates/calendar_events/src/domain/models.rs
+++ b/crates/calendar_events/src/domain/models.rs
@@ -6,12 +6,19 @@ use chrono::{DateTime, NaiveDate, Utc};
use serde::{Deserialize, Serialize};
use uuid::Uuid;
-/// Top-level Google scope granting the complete calendar capability,
-/// mirroring how email requests the single broad `gmail.modify` scope.
-pub const GOOGLE_CALENDAR_SCOPE: &str = "https://www.googleapis.com/auth/calendar";
+/// Read and write events on every calendar the user can access. Covers the
+/// event list, get, instances, insert, patch, and watch calls.
+pub const GOOGLE_CALENDAR_EVENTS_SCOPE: &str = "https://www.googleapis.com/auth/calendar.events";
+
+/// Read the user's calendar subscriptions. Covers the `calendarList` call that
+/// discovers which calendars to sync.
+pub const GOOGLE_CALENDAR_LIST_SCOPE: &str =
+ "https://www.googleapis.com/auth/calendar.calendarlist.readonly";
/// The Google Calendar scopes Macro requests for the calendar capability.
-pub const GOOGLE_CALENDAR_SCOPES: [&str; 1] = [GOOGLE_CALENDAR_SCOPE];
+pub const GOOGLE_CALENDAR_SCOPES: [&str; 2] =
+ [GOOGLE_CALENDAR_EVENTS_SCOPE, GOOGLE_CALENDAR_LIST_SCOPE];
+
/// Build the space-delimited calendar scope fragment for an OAuth authorization URL.
pub fn google_calendar_scope_parameter() -> String {
GOOGLE_CALENDAR_SCOPES.join(" ")
diff --git a/crates/calendar_events/src/domain/service/test.rs b/crates/calendar_events/src/domain/service/test.rs
index 84a2e96bbc..8fde39474b 100644
--- a/crates/calendar_events/src/domain/service/test.rs
+++ b/crates/calendar_events/src/domain/service/test.rs
@@ -235,12 +235,24 @@ fn rejects_invalid_occurrence_time() {
}
#[test]
-fn complete_scope_capability_requires_top_level_scope() {
+fn complete_scope_capability_requires_every_requested_scope() {
let complete = GoogleScopeSet::parse(&GOOGLE_CALENDAR_SCOPES.join(" "));
assert!(complete.has_calendar_capability());
- let partial = GoogleScopeSet::parse("https://www.googleapis.com/auth/calendar.events");
- assert!(!partial.has_calendar_capability());
+ for scope in GOOGLE_CALENDAR_SCOPES {
+ let partial = GoogleScopeSet::parse(scope);
+ assert!(
+ !partial.has_calendar_capability(),
+ "{scope} alone must not read as the complete capability"
+ );
+ }
+}
+
+#[test]
+fn broad_calendar_grant_no_longer_reads_as_the_capability() {
+ let broad = GoogleScopeSet::parse("https://www.googleapis.com/auth/calendar");
+
+ assert!(!broad.has_calendar_capability());
}
#[derive(Clone)]
diff --git a/infra/stacks/fusionauth-instance/index.ts b/infra/stacks/fusionauth-instance/index.ts
index 5451d16e8c..0e33f260f7 100644
--- a/infra/stacks/fusionauth-instance/index.ts
+++ b/infra/stacks/fusionauth-instance/index.ts
@@ -436,7 +436,10 @@ new FusionAuthIdpOpenIdConnect(
const enableGoogleCalendarIntegration = config.requireBoolean(
'enable-google-calendar'
);
-const GOOGLE_CALENDAR_SCOPES = ['https://www.googleapis.com/auth/calendar'];
+const GOOGLE_CALENDAR_SCOPES = [
+ 'https://www.googleapis.com/auth/calendar.events',
+ 'https://www.googleapis.com/auth/calendar.calendarlist.readonly',
+];
const GOOGLE_GMAIL_OAUTH_SCOPES = [
'openid',