Commit Graph

154 Commits (staging)

Author SHA1 Message Date
zomars e3cc01bb94 Merge branch 'main' into enterprise-license 2022-04-27 16:56:11 -06:00
zomars aed7405750 Adds hint to InputField 2022-04-27 16:56:01 -06:00
zomars fd34601606 WIP 2022-04-27 16:07:32 -06:00
Hariom Balhara 82d77dc10f
Make sure that absolute URL is of WEBAPP only (#2624) 2022-04-27 16:28:36 +02:00
sean-brydon 34d3aac4b0
Fix scope (#2625) 2022-04-27 16:27:39 +05:30
zomars f51513841e Merge branch 'main' into enterprise-license 2022-04-26 09:35:41 -06:00
alannnc c22b6ca670
Fix/login with provider (#2594) 2022-04-26 15:12:08 +00:00
sean-brydon d61238c832
Loader Components (#2616)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-04-26 14:11:02 +00:00
Hariom Balhara 4360ada3e4
Improve logs for 500 error in datadog for /book/event (#2593) 2022-04-26 11:31:57 +00:00
sean-brydon 6d5db1cb3a
Feat/impersonate users (#2503)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-04-26 14:18:17 +05:30
kodiakhq[bot] 11bb968a02
Merge branch 'main' into enterprise-license 2022-04-26 04:22:36 +00:00
sean-brydon 9fffaa20a2
Fix providerName (#2589)
Co-authored-by: Omar López <zomars@me.com>
2022-04-26 04:20:13 +00:00
zomars 0d07c191c4 Merge branch 'main' into enterprise-license 2022-04-25 18:21:49 -06:00
Hariom Balhara 93c75b5fef
Embed Miscellaneous Improvements and Fixes (#2499) 2022-04-25 10:03:00 +05:30
zomars 810700531d Merge branch 'main' into enterprise-license 2022-04-24 13:54:44 -06:00
zomars dc33da59f7 Adds staging/prod admin console links 2022-04-24 13:51:35 -06:00
Agusti Fernandez 8bc5a75249
Feature: Verify login on signup with magic link. (#2122)
* manual migration to rename verificationtoken, maybe it could be dropped and create a new table instead if we're not using it, will consult @zomars

* feat: rename verificationRequest --> verificationToken in schema.prisma

* fix: rename verificationRequest -> verificationToken in the codebase

* feat: add default cookies for next-auth

* fix: moves @lib/serverConfig to @calcom/lib so it can be called by website too

* fix: make self-certificate work in dev env by not rejecting tls in serverConfig

* fix verificationTokenToken typo

Co-authored-by: Omar López <zomars@me.com>

* Adds domain: .cal.com if not dev env in cookies

* Adds default-cookies to apps/web, and nextauth_domain to turbo website build deps"a

* update NEXTAUTH_DOMAIN to NEXTAUTH_COOKIE_DOMAIN

* Updates website submodule

* Removes deprecated env vars

* Consolidates auth logic in one place

* Updates website module

* Signup fixes

* Build fixes

* Updates example

* Updates example

* Fixes

* Fix Email Verification

* fix: move csrf-token cookiePrefix from __Host -> __Secure

* Removes console log

* Fixes link in email template

* Removed irrelevant coment

* Testing with a 32 bit secret

* Fixes for cookien in E2E

* E2E fixes

* Fixes Stripe tests locally

* Temp fix for E2E

Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
2022-04-21 14:32:25 -06:00
kodiakhq[bot] 20c4777d83
Merge branch 'main' into enterprise-license 2022-04-21 18:18:58 +00:00
Joe Au-Yeung 97e4cca252
Remove global app installed button (#2561)
* Remove global app installed button

* Add Jitsi add button

* Find app credentials based on variant

* Make huddle installable

* Remove default installed message from installed apps page

* Display Jitsi and Huddle as locations if installed

* Reverse global app changes and made Jitsi and Huddle non global

* Changes to app page refrence #2556

* Fix type errors

* Revert code

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-04-21 12:17:56 -06:00
kodiakhq[bot] 45af3e1b3f
Merge branch 'main' into enterprise-license 2022-04-21 17:06:49 +00:00
sean-brydon 18d41b52a2
Add chat public scope to slack scopes (#2564)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-04-21 19:04:38 +02:00
kodiakhq[bot] 9f95de6256
Merge branch 'main' into enterprise-license 2022-04-21 15:28:25 +00:00
manuelgu 26c0f82edf
fix: typo in slack app description (#2563)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-04-21 17:25:43 +02:00
kodiakhq[bot] db7e31a84c
Merge branch 'main' into enterprise-license 2022-04-20 21:39:33 +00:00
alannnc 6e82d38249
Fix for appstore and wipemycal render (#2556)
* Fix for appstores and wipe-my-cal

* Fix email subject for reschedule

* Fix email subject for reschedule

* Fix api add wipemycal return

* Now we ask on a endpoint if app its installed

* Fix types

Co-authored-by: Omar López <zomars@me.com>
2022-04-20 23:37:25 +02:00
kodiakhq[bot] a3d9227818
Merge branch 'main' into enterprise-license 2022-04-20 20:22:24 +00:00
zomars 9f63299a1a Fixes hubspot metadata 2022-04-20 14:20:02 -06:00
zomars b2be2f68f5 Updates license checker URL 2022-04-20 14:14:46 -06:00
zomars 702f31c935 Prepares prettier for local modules 2022-04-20 12:37:03 -06:00
zomars 08db282a07 Extracts EmptyScreen 2022-04-20 12:00:49 -06:00
zomars 8fb429e073 Renames package
# Conflicts:
#	package.json
2022-04-20 11:51:26 -06:00
zomars afbfb982fd Renames package 2022-04-20 11:50:54 -06:00
kodiakhq[bot] 17763aca61
Merge branch 'main' into enterprise-license 2022-04-20 00:36:38 +00:00
Afzal Sayed 00a3ff89e4
Uniquely index event-type with teamId and slug (#2452) 2022-04-19 18:35:12 -06:00
zomars 48522390ea Merge branch 'main' into enterprise-license
# Conflicts:
#	apps/web/ee/components/team/availability/TeamAvailabilityModal.tsx
#	apps/web/pages/settings/security.tsx
#	yarn.lock
2022-04-19 17:12:11 -06:00
zomars 4b83fef672 WIP 2022-04-19 15:42:17 -06:00
zomars 3c5686171c Merge branch 'main' into enterprise-license
# Conflicts:
#	apps/web/ee/components/team/availability/TeamAvailabilityModal.tsx
#	apps/web/pages/settings/profile.tsx
2022-04-19 11:34:15 -06:00
zomars d0918cd9be WIP 2022-04-19 11:31:14 -06:00
Peer Richelsen f214830d0f
Update README.mdx (#2544) 2022-04-18 22:08:49 +02:00
Hariom Balhara 7fd57b88dc
Fix mobile reschedule actions (#2534) 2022-04-17 17:37:16 +02:00
Peer Richelsen 73c97e85d4
overflow scroll for categories (#2502) 2022-04-16 20:37:19 +00:00
Hariom Balhara 2e9d4125ed
Fix Embed Documentation (#2525) 2022-04-16 06:17:47 +00:00
Agusti Fernandez faa67e0bb6
Feature: Adds api keys to cal.com webapp (#2277)
* feat: add ApiKey model for new Api auth, owned by a user

* fix: remove metadata:Json and add note:String instead in new apiKey model

* fix: rename apiKey to apiKeys in moder User relation in schema.prisma

* feat: add hashedKey to apiKey and lastUsedAt datetime to keep track of usage of keys and makiung them securely stored in db

* fix 30 day -> 30 days in expiresAt

* feat: api keys frontend in security page

* adds hashedKey to api key model, add frontend api keys in security page

* Make frontend work to create api keys with or without expiry, note, defaults to 1 month expiry

* remove migration for now, add env.example to swagger, sync api

* feat: hashed api keys

* fix: minor refactor and cleanup in apiKeys generator

* add api key success modal

* sync apps/api

* feat: We have API Keys in Security =)

* remove swagger env from pr

* apps api sync

* remove comments in password section

* feat: migration for api keys schema

* sync api w main

* delete apps/api

* add back apps/api

* make min date and disabled optional props in datepicker

* feat fix type check errors

* fix : types

* fix: rmeove renaming of verificationrequest token indexes in migration

* fix: remove extra div

* Fixes for feedback in PR

* fix button />

* fix: rename weird naming of translation for you_will_only_view_it_once

* fix: remove ternary and use && to avoid null for false

* fix sync apps/api with main not old commit

* fix empty className

* fix: remove unused imports

* fix remove commented jsx fragment close

* fix rename editing

* improve translations

* feat: adds beta tag in security tab under api keys

* fix: use api keys everywhere

* fix: cleanup code in api keys

* fix: use watch and controller for neverexpires/datepicker

* Fixes: improve api key never expires

* add back change password h2 title section in security page

* fix update env API_KEY_ prefix default to cal_

* fix: improve eidt api keys modal

* fix: update edit mutation in viewer.apiKeys

* Update apps/web/ee/components/apiKeys/ApiKeyListItem.tsx

Co-authored-by: Alex van Andel <me@alexvanandel.com>

* fix: item: any to pass build

Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2022-04-15 20:58:34 -06:00
Leo Giovanetti ffebe8e901
HubSpot App (#2380)
* Initial changes

* OAuth done and credentials stored

* Added "other" integrations

* Switching to hubspot api client

* Event creation for all attendees

* Update and delete done

* Doc update

* Fixing types

* App label is not mandatory

* Fixing bad merge: App label deleted

* Fixing bad automerge

* Removing  c.log

Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-04-15 23:23:38 -03:00
Hariom Balhara 6843347dd7
Embed: Bump Versions and update Readmes and descriptions (#2507) 2022-04-15 18:55:36 +01:00
Hariom Balhara 8132b04a27
Fix Duplicat elocations (#2512) 2022-04-15 11:29:45 -06:00
alannnc c06d8164bc
feature/app wipe my cal (#2496) 2022-04-15 10:09:40 +00:00
sean-brydon 080f2bb845
Updating App-Infomation + pics (#2489) 2022-04-15 10:35:50 +01:00
Peer Richelsen 25e4e28c2a
small app store fixes (#2501)
* added new other illustration, fixed dialog styling

* revert color change
2022-04-15 08:54:09 +00:00
alannnc 5b90ace8cf
feature/app wipe my cal (#2487)
* WIP bookings page ui changes, created api endpoint

* Ui changes mobile/desktop

* Added translations

* Fix lib import and common names

* WIP reschedule

* WIP

* Save wip

* [WIP] builder and class for CalendarEvent, email for attende

* update rescheduled emails, booking view and availability page view

* Working version reschedule

* Fix for req.user as array

* Added missing translation and refactor dialog to self component

* Test for reschedule

* update on types

* Update lib no required

* Update type on createBooking

* fix types

* remove preview stripe sub

* remove unused file

* remove unused import

* Fix reschedule test

* Refactor and cleaning up code

* Email reschedule title fixes

* Adding calendar delete and recreate placeholder of cancelled

* Add translation

* Removed logs, notes, fixed types

* Fixes process.env types

* Use strict compare

* Fixes type inference

* Type fixing is my middle name

* Update apps/web/components/booking/BookingListItem.tsx

* Update apps/web/components/dialog/RescheduleDialog.tsx

* Update packages/core/builders/CalendarEvent/director.ts

* Update apps/web/pages/success.tsx

* Updates rescheduling labels

* Update packages/core/builders/CalendarEvent/builder.ts

* Type fixes

* Update packages/core/builders/CalendarEvent/builder.ts

* Only validating input blocked once

* E2E fixes

* Stripe tests fixes

* Wipe my cal init commit

* Fixes circular dependencies

* Added conditional display for wipe my cal button

* Added placeholder image for app category

* Fix type string for conditional validation

Co-authored-by: Peer Richelsen <peer@cal.com>
Co-authored-by: zomars <zomars@me.com>
2022-04-14 20:24:27 -06:00