vynte-infra/calendar
2
0
Fork 0
Code Issues Pull Requests Actions 2.2k Packages Projects Releases Wiki Activity

feat: Domain-wide delegation for Google Calendar and Google Meet (#16622)

Browse Source 
* Add endpoints for testing the flow

* Add MVP

* new route

* Fixes

* Fixes

* Remove enable toggle support from domainWideDelegation

* Fixes

* Revert "Remove enable toggle support from domainWideDelegation"

This reverts commit c29e729206cd1fa063f9c9ce0cf148ef1577d60b.

* Revert yarn.lock

* More fixes

* Fix new workspace platform add

* refactor: improvements

* refactor: bug fixes and improvements

* fix: type errors

* fix: conflicts

* chore: update test

* fix: logic

* chore: improvements

* fix: toglle

* fix: bugs

* fix: type err

* chore: check number type

* fix: after conflicts

* chore: fix type err

* fix: type errors and tests

* fix: tets

* test

* chore: remove unused

* fix: google meet url on booking page and secondary calendar

* fix: add property

* fix: type err

* fix: re assingment bug

* fix: use getAllCredentials

* chore: fix import

* fix: installed count

* fix: pass event type

* fix: import

* fix: [Stacked PR] Review fixes (#17958)

* Review fixes

* fix: destination calendar bug

---------

Co-authored-by: Udit Takkar <udit222001@gmail.com>

* refactor: use repository

* chore: remove duplicate

* fix: More review fixes for domain wide delegation (#17969)

* Reuse buildCredentialPayloadForCalendar

* fixes

---------

Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>

* fix ts error

* Fix getSchedule not using dwd credentials (#17995)

* fix: Remove direct DWD table access from google-calendar and remove delegatedToId column from Credential (#18015)

* Remove fn rename to reduce number of files changed

* chore: check feature globally

* test: add unit tests

* chore: move function

* test: add booking test

* wip

* Remove domain-wide-delegation team feature flag

* Make sure duplicate calendars are not shown due to DWD. Show DWD when there is conflict

* Fix tests and their ts errors

* Fix more tests

* Move findUsersForAvailabilityCheck to separate file as it has AppStore dependency causing problem with Routing Forms. Build crashes

* fix: Multiple calendar connections from Google not showing up in apps/installed

* DestinationCalendar must have either credentialId or domainWideDeelgationId. Also handle the case when DWD is disabled and there was a non-dwd credential that could be used

* Disable deletetion of DWD as it is destructive and prefer disabling instead

* Show DWD credential calendars at the top

* Fixed tests

* Calendar Cache DWD support

* Self-Review: Verify email required and add more selectedCalendar tests

* Self Review: shorten names

* Self ReviewL Dead code removal

* Revert "Calendar Cache DWD support"

This reverts commit 009f236470fa21eba5986117d4f6e4d4c5e38c34.

* Some misc fixes

* fixes

* Performance improvememt in slots loading and booking

* More cases for handling dwd credentials

* simplify the logic. Ensure that EventManager and the modules below it in the flow have CredentialForCalendarService available

* Fix tests

* Fix installed/conferencing not showing gogole meet

* Shorten name

* Fix ApI v2 tests

* Add some more tests

* add getSchedule tests

* Improve tests

* Make Google Meet default when DWD for google is enabled

* Enable feature flagging for DWD

* chore: bump libraries

* Encrypt serviceaccount private key

* Fix ts errors

* bump platform libraries

* org add dwd

* org add dwd

* bump platform libraries

* fix selected calendars

* fix remove selected dwd calendar

* remove oauthclient id aliad in authedCalendar

* remove oauthclient id aliad in authedCalendar

* refactor: OrganizationsDwdController

* chore: export toggleDwdEnabled from platform-libraries

* feat: v2 update (enable / disable) dwd

* refactor: SelectedCalendarsController check if user belongs to dwd org & for not dwd use previous logic

* wip: DestinationCalendar send domainWideDelegationCredentialId from frontend to api

* try fix set destination calendar api v2

* fixup! try fix set destination calendar api v2

* setting google meet as default location working for dwd

* bump platform libraries version

* allow office 365 workspace slug

* allow office 365 workspace slug

* chore: v2 create dwd MS and Google service keys input

* fix: CreateDwdInput serviceAccountKey

* fix: CredentialForCalendarService type

* fix: check workspace slug

* feat: update serviceAccessKey of DWD

* testing

* fixup! testing

* fix: getAuthUtl bug

* fix: unit tests

* fix: type err and unit test

* fix: e2e test

* fix: credentials bug and failing unit tests

* Update CalendarService.ts

* chore: refactor office365 calendar service and add testDomainWideDelegationSetup

* fix: office365Calendar use correct clientId/Secret for DWD

* fix: office365Calendar dwd no need refresh token

* test: add unit test for outlook dwd and setup

* feat: added dwd support for office365 calendar

* feat: added dwd support for office365 video

* test: finish test for outlook dwd

* fix: create dialog bug

* chore: remove console logs

* fix: refreshToken bug

* bump version libraries

* refactor: fetch dwd credentials only in findQualifiedHosts

* fixup! refactor: fetch dwd credentials only in findQualifiedHosts

* fix: type err

* fix: type err

* fix: getUserDisplayName

* fix: unit test

* chore: bump platform lib

---------

Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Udit Takkar <udit222001@gmail.com>
Co-authored-by: Morgan Vernay <morgan@cal.com>
Co-authored-by: supalarry <laurisskraucis@gmail.com>
Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com>
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
This commit is contained in:
Hariom Balhara
2025-03-02 16:52:57 -03:00
committed by GitHub
co-authored by Syed Ali Shahbaz Udit Takkar Udit Takkar Morgan Vernay supalarry Somay Chauhan Morgan
parent 2d915a1c51
commit be77ac133c
173 changed files with 12277 additions and 1137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/api-reference/v2/openapi.json
+256 -2
View File
@@ -1037,6 +1037,92 @@
"tags": ["Orgs / Attributes / Options"]
}
},
"/v2/organizations/{orgId}/delegation-credentials": {
"post": {
"operationId": "OrganizationsDwdController_createDwd",
"summary": "Save delegation credentials for your organization.",
"parameters": [
{
"name": "orgId",
"required": true,
"in": "path",
"schema": {
"type": "number"
}
}
],
"requestBody": {
"required": true,
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/CreateDwdInput"
}
}
}
},
"responses": {
"201": {
"description": "",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/CreateDwdOutput"
}
}
}
}
},
"tags": ["Orgs / Delegation Credentials"]
}
},
"/v2/organizations/{orgId}/delegation-credentials/{credentialId}": {
"patch": {
"operationId": "OrganizationsDwdController_updateDwd",
"summary": "Update delegation credentials of your organization.",
"parameters": [
{
"name": "orgId",
"required": true,
"in": "path",
"schema": {
"type": "number"
}
},
{
"name": "credentialId",
"required": true,
"in": "path",
"schema": {
"type": "string"
}
}
],
"requestBody": {
"required": true,
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/UpdateDwdInput"
}
}
}
},
"responses": {
"200": {
"description": "",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/UpdateDwdOutput"
}
}
}
}
},
"tags": ["Orgs / Delegation Credentials"]
}
},
"/v2/organizations/{orgId}/teams/{teamId}/event-types": {
"post": {
"operationId": "OrganizationsEventTypesController_createTeamEventType",
@@ -5487,7 +5573,7 @@
"tags": ["Selected Calendars"]
},
"delete": {
"operationId": "SelectedCalendarsController_removeSelectedCalendar",
"operationId": "SelectedCalendarsController_deleteSelectedCalendar",
"summary": "Delete a selected calendar",
"parameters": [
{
@@ -5513,6 +5599,14 @@
"schema": {
"type": "string"
}
},
{
"name": "domainWideDelegationCredentialId",
"required": false,
"in": "query",
"schema": {
"type": "string"
}
}
],
"responses": {
@@ -7476,7 +7570,7 @@
"integration": {
"type": "string",
"example": "cal-video",
"enum": ["cal-video", "google-meet"]
"enum": ["cal-video", "google-meet", "office365-video", "zoom"]
}
},
"required": ["type", "integration"]
@@ -10456,6 +10550,9 @@
},
"credentialId": {
"type": "number"
},
"domainWideDelegationCredentialId": {
"type": "string"
}
},
"required": ["integration", "externalId", "credentialId"]
@@ -13569,6 +13666,144 @@
},
"required": ["status", "data"]
},
"GoogleServiceAccountKeyInput": {
"type": "object",
"properties": {
"private_key": {
"type": "string"
},
"client_email": {
"type": "string"
},
"client_id": {
"type": "string"
}
},
"required": ["private_key", "client_email", "client_id"]
},
"CreateDwdInput": {
"type": "object",
"properties": {
"workspacePlatformSlug": {
"type": "string"
},
"domain": {
"type": "string"
},
"serviceAccountKey": {
"type": "array",
"items": {
"oneOf": [
{
"$ref": "#/components/schemas/GoogleServiceAccountKeyInput"
},
{
"$ref": "#/components/schemas/MicrosoftServiceAccountKeyInput"
}
]
}
}
},
"required": ["workspacePlatformSlug", "domain", "serviceAccountKey"]
},
"WorkspacePlatformDto": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"slug": {
"type": "string"
}
},
"required": ["name", "slug"]
},
"DwdOutput": {
"type": "object",
"properties": {
"id": {
"type": "string"
},
"enabled": {
"type": "boolean"
},
"domain": {
"type": "string"
},
"organizationId": {
"type": "number"
},
"workspacePlatform": {
"$ref": "#/components/schemas/WorkspacePlatformDto"
},
"createdAt": {
"format": "date-time",
"type": "string"
},
"updatedAt": {
"format": "date-time",
"type": "string"
}
},
"required": [
"id",
"enabled",
"domain",
"organizationId",
"workspacePlatform",
"createdAt",
"updatedAt"
]
},
"CreateDwdOutput": {
"type": "object",
"properties": {
"status": {
"type": "string",
"example": "success",
"enum": ["success", "error"]
},
"data": {
"$ref": "#/components/schemas/DwdOutput"
}
},
"required": ["status", "data"]
},
"UpdateDwdInput": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean"
},
"serviceAccountKey": {
"type": "array",
"items": {
"oneOf": [
{
"$ref": "#/components/schemas/GoogleServiceAccountKeyInput"
},
{
"$ref": "#/components/schemas/MicrosoftServiceAccountKeyInput"
}
]
}
}
}
},
"UpdateDwdOutput": {
"type": "object",
"properties": {
"status": {
"type": "string",
"example": "success",
"enum": ["success", "error"]
},
"data": {
"$ref": "#/components/schemas/DwdOutput"
}
},
"required": ["status", "data"]
},
"CreateOrganizationInput": {
"type": "object",
"properties": {
@@ -14073,6 +14308,10 @@
},
"credentialId": {
"type": "number"
},
"domainWideDelegationCredentialId": {
"type": "string",
"nullable": true
}
},
"required": ["externalId", "primary", "readOnly", "isSelected", "credentialId"]
@@ -14104,6 +14343,10 @@
},
"credentialId": {
"type": "number"
},
"domainWideDelegationCredentialId": {
"type": "string",
"nullable": true
}
},
"required": ["externalId", "readOnly", "isSelected", "credentialId"]
@@ -14117,6 +14360,10 @@
"credentialId": {
"type": "number"
},
"domainWideDelegationCredentialId": {
"type": "string",
"nullable": true
},
"primary": {
"$ref": "#/components/schemas/Primary"
},
@@ -14157,6 +14404,10 @@
"type": "number",
"nullable": true
},
"domainWideDelegationCredentialId": {
"type": "string",
"nullable": true
},
"name": {
"type": "string",
"nullable": true
@@ -16233,6 +16484,9 @@
"type": "string",
"example": "https://caldav.icloud.com/26962146906/calendars/1644422A-1945-4438-BBC0-4F0Q23A57R7S/",
"description": "Unique identifier used to represent the specfic calendar, as returned by the /calendars endpoint"
},
"domainWideDelegationCredentialId": {
"type": "string"
}
},
"required": ["integration", "externalId"]