diff --git a/apps/api/v2/swagger/documentation.json b/apps/api/v2/swagger/documentation.json index 249c6f48af..1d382cfc61 100644 --- a/apps/api/v2/swagger/documentation.json +++ b/apps/api/v2/swagger/documentation.json @@ -15064,7 +15064,6 @@ "discord-video", "demodesk-video", "campfire-video", - "around-video" ], "example": "cal-video" }, @@ -22298,7 +22297,6 @@ "discord-video", "demodesk-video", "campfire-video", - "around-video" ] } }, @@ -25170,4 +25168,4 @@ } } } -} \ No newline at end of file +} diff --git a/apps/web/playwright/apps/conferencing/conferencingApps.e2e.ts b/apps/web/playwright/apps/conferencing/conferencingApps.e2e.ts index dc88624d57..c5c57162c0 100644 --- a/apps/web/playwright/apps/conferencing/conferencingApps.e2e.ts +++ b/apps/web/playwright/apps/conferencing/conferencingApps.e2e.ts @@ -1,6 +1,7 @@ import { test } from "../../lib/fixtures"; import type { TApp } from "./types"; +// Around is not available in the app store anymore const APP: TApp = { slug: "around", type: "integrations:around_video", @@ -11,7 +12,8 @@ const APP: TApp = { test.describe.configure({ mode: "parallel" }); test.afterEach(({ users }) => users.deleteAll()); -test.describe("check non-oAuth link-based conferencing apps", () => { +// TODO: remove skip once more apps are added +test.skip("check non-oAuth link-based conferencing apps", () => { test(`check conferencing app: ${APP.slug} by skipping the configure step`, async ({ appsPage, page, @@ -24,7 +26,7 @@ test.describe("check non-oAuth link-based conferencing apps", () => { }); }); -test.describe("check non-oAuth link-based conferencing apps using the new flow", () => { +test.skip("check non-oAuth link-based conferencing apps using the new flow", () => { test(`can add ${APP.slug} app and book with it`, async ({ appsPage, page, users }) => { const user = await users.create(); await user.apiLogin(); diff --git a/docs/api-reference/v2/openapi.json b/docs/api-reference/v2/openapi.json index 44e09de206..b538d03944 100644 --- a/docs/api-reference/v2/openapi.json +++ b/docs/api-reference/v2/openapi.json @@ -14163,8 +14163,7 @@ "eightxeight-video", "discord-video", "demodesk-video", - "campfire-video", - "around-video" + "campfire-video" ], "example": "cal-video" }, @@ -20419,8 +20418,7 @@ "eightxeight-video", "discord-video", "demodesk-video", - "campfire-video", - "around-video" + "campfire-video" ] } }, diff --git a/packages/app-store/apps.metadata.generated.ts b/packages/app-store/apps.metadata.generated.ts index a08dc3f0ac..74cb40a888 100644 --- a/packages/app-store/apps.metadata.generated.ts +++ b/packages/app-store/apps.metadata.generated.ts @@ -5,7 +5,6 @@ import alby_config_json from "./alby/config.json"; import amie_config_json from "./amie/config.json"; import { metadata as applecalendar__metadata_ts } from "./applecalendar/_metadata"; -import around_config_json from "./around/config.json"; import attio_config_json from "./attio/config.json"; import autocheckin_config_json from "./autocheckin/config.json"; import baa_for_hipaa_config_json from "./baa-for-hipaa/config.json"; @@ -112,7 +111,6 @@ export const appStoreMetadata = { alby: alby_config_json, amie: amie_config_json, applecalendar: applecalendar__metadata_ts, - around: around_config_json, attio: attio_config_json, autocheckin: autocheckin_config_json, "baa-for-hipaa": baa_for_hipaa_config_json, diff --git a/packages/app-store/apps.server.generated.ts b/packages/app-store/apps.server.generated.ts index ce7da6d676..c4b8753613 100644 --- a/packages/app-store/apps.server.generated.ts +++ b/packages/app-store/apps.server.generated.ts @@ -6,7 +6,6 @@ export const apiHandlers = { alby: import("./alby/api"), amie: import("./amie/api"), applecalendar: import("./applecalendar/api"), - around: import("./around/api"), attio: import("./attio/api"), autocheckin: import("./autocheckin/api"), "baa-for-hipaa": import("./baa-for-hipaa/api"), diff --git a/packages/app-store/around/DESCRIPTION.md b/packages/app-store/around/DESCRIPTION.md deleted file mode 100644 index b3be801ef9..0000000000 --- a/packages/app-store/around/DESCRIPTION.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -items: - - 1.jpg - - 2.jpg - - 3.jpg - - 4.jpg - - 5.jpg - - 6.jpg - - 7.jpg - - 8.jpg ---- - -Discover radically unique video calls designed to help hybrid-remote teams create, collaborate and celebrate together. diff --git a/packages/app-store/around/api/_getAdd.ts b/packages/app-store/around/api/_getAdd.ts deleted file mode 100644 index 510b5267c7..0000000000 --- a/packages/app-store/around/api/_getAdd.ts +++ /dev/null @@ -1,30 +0,0 @@ -import type { NextApiRequest } from "next"; - -import { defaultResponder } from "@calcom/lib/server/defaultResponder"; - -import checkSession from "../../_utils/auth"; -import getInstalledAppPath from "../../_utils/getInstalledAppPath"; -import { checkInstalled, createDefaultInstallation } from "../../_utils/installation"; -import appConfig from "../config.json"; - -export async function getHandler(req: NextApiRequest) { - const session = checkSession(req); - const slug = appConfig.slug; - const variant = appConfig.variant; - const appType = appConfig.type; - const teamId = req.query.teamId ? Number(req.query.teamId) : undefined; - const returnTo = req.query?.returnTo; - - await checkInstalled(slug, session.user.id); - await createDefaultInstallation({ - appType, - user: session.user, - slug, - key: {}, - teamId, - }); - - return { url: returnTo ?? getInstalledAppPath({ variant, slug }) }; -} - -export default defaultResponder(getHandler); diff --git a/packages/app-store/around/api/add.ts b/packages/app-store/around/api/add.ts deleted file mode 100644 index 7a02bcf7a7..0000000000 --- a/packages/app-store/around/api/add.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { defaultHandler } from "@calcom/lib/server/defaultHandler"; - -export default defaultHandler({ - GET: import("./_getAdd"), -}); diff --git a/packages/app-store/around/api/index.ts b/packages/app-store/around/api/index.ts deleted file mode 100644 index 4c0d2ead01..0000000000 --- a/packages/app-store/around/api/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default as add } from "./add"; diff --git a/packages/app-store/around/config.json b/packages/app-store/around/config.json deleted file mode 100644 index 186802b882..0000000000 --- a/packages/app-store/around/config.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "/*": "Don't modify slug - If required, do it using cli edit command", - "name": "Around", - "title": "Around", - "slug": "around", - "type": "around_video", - "logo": "icon.svg", - "url": "https://cal.com/", - "variant": "conferencing", - "categories": ["conferencing"], - "publisher": "Cal.com", - "email": "help@cal.com", - "description": "Discover radically unique video calls designed to help hybrid-remote teams create, collaborate and celebrate together.", - "__createdUsingCli": true, - "appData": { - "location": { - "linkType": "static", - "type": "integrations:around_video", - "label": "Around Video", - "urlRegExp": "^http(s)?:\\/\\/(www\\.)?around.co\\/[a-zA-Z0-9]*", - "organizerInputPlaceholder": "https://www.around.co/rick" - } - }, - "isOAuth": false -} diff --git a/packages/app-store/around/index.ts b/packages/app-store/around/index.ts deleted file mode 100644 index d7f3602204..0000000000 --- a/packages/app-store/around/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * as api from "./api"; diff --git a/packages/app-store/around/package.json b/packages/app-store/around/package.json deleted file mode 100644 index b41b8d9723..0000000000 --- a/packages/app-store/around/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/package.json", - "private": true, - "name": "@calcom/around", - "version": "0.0.0", - "main": "./index.ts", - "description": "Discover radically unique video calls designed to help hybrid-remote teams create, collaborate and celebrate together.", - "dependencies": { - "@calcom/lib": "*" - }, - "devDependencies": { - "@calcom/types": "*" - } -} diff --git a/packages/app-store/around/static/1.jpg b/packages/app-store/around/static/1.jpg deleted file mode 100644 index 86124b384e..0000000000 Binary files a/packages/app-store/around/static/1.jpg and /dev/null differ diff --git a/packages/app-store/around/static/2.jpg b/packages/app-store/around/static/2.jpg deleted file mode 100644 index 2d0f645eed..0000000000 Binary files a/packages/app-store/around/static/2.jpg and /dev/null differ diff --git a/packages/app-store/around/static/3.jpg b/packages/app-store/around/static/3.jpg deleted file mode 100644 index 746eb0847b..0000000000 Binary files a/packages/app-store/around/static/3.jpg and /dev/null differ diff --git a/packages/app-store/around/static/4.jpg b/packages/app-store/around/static/4.jpg deleted file mode 100644 index 3149f4771c..0000000000 Binary files a/packages/app-store/around/static/4.jpg and /dev/null differ diff --git a/packages/app-store/around/static/5.jpg b/packages/app-store/around/static/5.jpg deleted file mode 100644 index fea006e034..0000000000 Binary files a/packages/app-store/around/static/5.jpg and /dev/null differ diff --git a/packages/app-store/around/static/6.jpg b/packages/app-store/around/static/6.jpg deleted file mode 100644 index 9506606172..0000000000 Binary files a/packages/app-store/around/static/6.jpg and /dev/null differ diff --git a/packages/app-store/around/static/7.jpg b/packages/app-store/around/static/7.jpg deleted file mode 100644 index a675005102..0000000000 Binary files a/packages/app-store/around/static/7.jpg and /dev/null differ diff --git a/packages/app-store/around/static/8.jpg b/packages/app-store/around/static/8.jpg deleted file mode 100644 index 608a4e52f3..0000000000 Binary files a/packages/app-store/around/static/8.jpg and /dev/null differ diff --git a/packages/app-store/around/static/icon.svg b/packages/app-store/around/static/icon.svg deleted file mode 100644 index adf1f5fabb..0000000000 --- a/packages/app-store/around/static/icon.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/packages/app-store/bookerApps.metadata.generated.ts b/packages/app-store/bookerApps.metadata.generated.ts index 34fc10d1f4..c696da4f72 100644 --- a/packages/app-store/bookerApps.metadata.generated.ts +++ b/packages/app-store/bookerApps.metadata.generated.ts @@ -2,7 +2,6 @@ This file is autogenerated using the command `yarn app-store:build --watch`. Don't modify this file manually. **/ -import around_config_json from "./around/config.json"; import campfire_config_json from "./campfire/config.json"; import { metadata as dailyvideo__metadata_ts } from "./dailyvideo/_metadata"; import demodesk_config_json from "./demodesk/config.json"; @@ -48,7 +47,6 @@ import whereby_config_json from "./whereby/config.json"; import { metadata as zoomvideo__metadata_ts } from "./zoomvideo/_metadata"; export const appStoreMetadata = { - around: around_config_json, campfire: campfire_config_json, dailyvideo: dailyvideo__metadata_ts, demodesk: demodesk_config_json, diff --git a/packages/app-store/index.ts b/packages/app-store/index.ts index e8f5fca522..2058b530a2 100644 --- a/packages/app-store/index.ts +++ b/packages/app-store/index.ts @@ -1,7 +1,6 @@ const appStore = { alby: createCachedImport(() => import("./alby")), applecalendar: createCachedImport(() => import("./applecalendar")), - aroundvideo: createCachedImport(() => import("./around")), caldavcalendar: createCachedImport(() => import("./caldavcalendar")), closecom: createCachedImport(() => import("./closecom")), dailyvideo: createCachedImport(() => import("./dailyvideo")), diff --git a/packages/lib/event-types/transformers/api-to-internal/locations.ts b/packages/lib/event-types/transformers/api-to-internal/locations.ts index 530aafb5d1..b0d0414cb0 100644 --- a/packages/lib/event-types/transformers/api-to-internal/locations.ts +++ b/packages/lib/event-types/transformers/api-to-internal/locations.ts @@ -41,7 +41,6 @@ export const apiToInternalintegrationsMapping = { "discord-video": "integrations:discord_video", "demodesk-video": "integrations:demodesk_video", "campfire-video": "integrations:campfire_video", - "around-video": "integrations:around_video", } as const; function transformLocation(location: T) { diff --git a/packages/lib/event-types/transformers/internal-to-api/locations.ts b/packages/lib/event-types/transformers/internal-to-api/locations.ts index 729749216a..fa3f1cdfe5 100644 --- a/packages/lib/event-types/transformers/internal-to-api/locations.ts +++ b/packages/lib/event-types/transformers/internal-to-api/locations.ts @@ -43,7 +43,6 @@ const internalToApiIntegrationsMapping: Record>'type' != 'integrations:around_video' +) +WHERE "locations" @> '[{"type": "integrations:around_video"}]'; diff --git a/packages/prisma/migrations/20250506000001_remove_around_credentials/migration.sql b/packages/prisma/migrations/20250506000001_remove_around_credentials/migration.sql new file mode 100644 index 0000000000..c7eeb8ee0b --- /dev/null +++ b/packages/prisma/migrations/20250506000001_remove_around_credentials/migration.sql @@ -0,0 +1,2 @@ +-- Remove credentials with appId 'around' +DELETE FROM "Credential" WHERE "appId" = 'around'; diff --git a/packages/prisma/migrations/20250506000002_remove_around_app/migration.sql b/packages/prisma/migrations/20250506000002_remove_around_app/migration.sql new file mode 100644 index 0000000000..1c6e7a1c28 --- /dev/null +++ b/packages/prisma/migrations/20250506000002_remove_around_app/migration.sql @@ -0,0 +1,2 @@ +-- Remove the around app from the App table +DELETE FROM "App" WHERE "slug" = 'around'; diff --git a/yarn.lock b/yarn.lock index 17bdb3fa34..1a86fc923a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2868,15 +2868,6 @@ __metadata: languageName: unknown linkType: soft -"@calcom/around@workspace:packages/app-store/around": - version: 0.0.0-use.local - resolution: "@calcom/around@workspace:packages/app-store/around" - dependencies: - "@calcom/lib": "*" - "@calcom/types": "*" - languageName: unknown - linkType: soft - "@calcom/atoms@*, @calcom/atoms@workspace:packages/platform/atoms": version: 0.0.0-use.local resolution: "@calcom/atoms@workspace:packages/platform/atoms"