Skip to content

Add API to list calendars for a user #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ayusht2810 wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Add API to list calendars for a user #379

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
84ffac1
[MM-595] Add new api to get calendar list
ayusht2810 Jul 16, 2024
5de8728
[MM-595] Update create event interface
ayusht2810 Jul 17, 2024
7b13946
[MM-595] Fix status code and linting
ayusht2810 Jul 22, 2024
5f461c9
[MM-595] Add log to the API
ayusht2810 Jul 23, 2024
799f180
Merge branch 'master' into fix_issue_59
Aug 5, 2024
143b7e8
Merge branch 'master' into fix_issue_59
wiggin77 Aug 7, 2024
c07ae73
Merge branch 'master' into fix_issue_59
Aug 8, 2024
6e6a30c
Merge branch 'master' into fix_issue_59
Aug 9, 2024
519393b
Merge branch 'master' into fix_issue_59
wiggin77 Aug 26, 2024
2afad59
Merge branch 'master' into fix_issue_59
Sep 19, 2024
f51026d
Merge branch 'master' into fix_issue_59
Oct 31, 2025
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
2 changes: 2 additions & 0 deletions calendar/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ func Init(h *httputils.Handler, env engine.Env, notificationProcessor engine.Not
dialogRouter.HandleFunc(config.PathUsers, api.autocompleteConnectedUsers)

apiRoutes := h.Router.PathPrefix(config.InternalAPIPath).Subrouter()
calendarsRouter := apiRoutes.PathPrefix(config.PathCalendar).Subrouter()
calendarsRouter.HandleFunc(config.PathList, api.listCalendars).Methods(http.MethodGet)
eventsRouter := apiRoutes.PathPrefix(config.PathEvents).Subrouter()
eventsRouter.HandleFunc(config.PathCreate, api.createEvent).Methods("POST")
apiRoutes.HandleFunc(config.PathConnectedUser, api.connectedUserHandler)
Expand Down
32 changes: 31 additions & 1 deletion calendar/api/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
const (
createEventDateTimeFormat = "2006-01-02 15:04"
createEventDateFormat = "2006-01-02"
HeaderMattermostUserID = "Mattermost-User-Id"
)

type createEventPayload struct {
Expand All @@ -35,6 +36,7 @@ type createEventPayload struct {
Subject string `json:"subject"`
Location string `json:"location,omitempty"`
ChannelID string `json:"channel_id"`
CalendarID string `json:"calendar_id"`
}

func (cep createEventPayload) ToRemoteEvent(loc *time.Location) (*remote.Event, error) {
Expand Down Expand Up @@ -226,7 +228,7 @@ func (api *api) createEvent(w http.ResponseWriter, r *http.Request) {
})
}

event, err := client.CreateEvent(user.Remote.ID, event)
event, err := client.CreateEvent("", user.Remote.ID, event)

Copilot AI Nov 6, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The calendarID parameter is hardcoded as an empty string, but the payload includes a CalendarID field (line 41). Consider using payload.CalendarID instead of an empty string to utilize the calendar selection functionality.

Suggested change
event, err := client.CreateEvent("", user.Remote.ID, event)
event, err := client.CreateEvent(payload.CalendarID, user.Remote.ID, event)

Copilot uses AI. Check for mistakes.
if err != nil {
httputils.WriteInternalServerError(w, err)
return
Expand Down Expand Up @@ -272,3 +274,31 @@ func (api *api) createEvent(w http.ResponseWriter, r *http.Request) {

httputils.WriteJSONResponse(w, `{"ok": true}`, http.StatusCreated)
}

func (api *api) listCalendars(w http.ResponseWriter, r *http.Request) {
mattermostUserID := r.Header.Get(HeaderMattermostUserID)
if mattermostUserID == "" {
httputils.WriteUnauthorizedError(w, fmt.Errorf("unauthorized"))
Comment thread
ayusht2810 marked this conversation as resolved.

@ghost ghost Nov 7, 2025 •
edited by ghost
Loading

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

consider using a shared error like var ErrUnauthorized = errors.New("unauthorized")
to avoid repeating the literal "unauthorized" in multiple places.

return
}

user, errStore := api.Store.LoadUser(mattermostUserID)
if errStore != nil && !errors.Is(errStore, store.ErrNotFound) {
httputils.WriteInternalServerError(w, errStore)
return
}
if errors.Is(errStore, store.ErrNotFound) {
httputils.WriteUnauthorizedError(w, fmt.Errorf("unauthorized"))
return
}

client := api.Remote.MakeClient(context.Background(), user.OAuth2Token)

calendars, errMailbox := client.GetCalendars(user.Remote.ID)
if errMailbox != nil {
httputils.WriteInternalServerError(w, errMailbox)
return
}

httputils.WriteJSONResponse(w, calendars, http.StatusOK)
}
2 changes: 2 additions & 0 deletions calendar/config/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ const (

InternalAPIPath = "/api/v1"
PathEvents = "/events"
PathCalendar = "/calendar"
PathList = "/list"
Comment thread
ayusht2810 marked this conversation as resolved.
PathCreate = "/create"
PathProvider = "/provider"
PathConnectedUser = "/me"
Expand Down
2 changes: 1 addition & 1 deletion calendar/engine/calendar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func (m *mscalendar) CreateEvent(user *User, event *remote.Event, mattermostUser
}
}

return m.client.CreateEvent(user.Remote.ID, event)
return m.client.CreateEvent("", user.Remote.ID, event)

Copilot AI Nov 6, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The calendarID parameter is hardcoded as an empty string. If calendar selection is intended to be supported, this should accept a calendarID parameter and pass it through, or document why it's intentionally empty.

Copilot uses AI. Check for mistakes.
}

func (m *mscalendar) DeleteCalendar(user *User, calendarID string) error {
Expand Down
2 changes: 1 addition & 1 deletion calendar/remote/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ type Calendars interface {
}

type Events interface {
CreateEvent(remoteUserID string, calendarEvent *Event) (*Event, error)
CreateEvent(calendarID, remoteUserID string, calendarEvent *Event) (*Event, error)
AcceptEvent(remoteUserID, eventID string) error
DeclineEvent(remoteUserID, eventID string) error
TentativelyAcceptEvent(remoteUserID, eventID string) error
Expand Down
4 changes: 2 additions & 2 deletions calendar/remote/mock_remote/mock_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion msgraph/create_event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
)

// CreateEvent creates a calendar event
func (c *client) CreateEvent(remoteUserID string, in *remote.Event) (*remote.Event, error) {
func (c *client) CreateEvent(calendarID, remoteUserID string, in *remote.Event) (*remote.Event, error) {
var out = remote.Event{}
err := c.rbuilder.Users().ID(remoteUserID).Events().Request().JSONRequest(c.ctx, http.MethodPost, "", &in, &out)
if err != nil {
Expand Down