Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
755a5c0
fix: trigger lingo.dev by removing duplicate value
retrogtx Apr 1, 2025
2b8e944
Merge branch 'calcom:main' into main
retrogtx Apr 1, 2025
eb090a1
Merge branch 'calcom:main' into main
retrogtx Apr 3, 2025
7bfe71f
Merge branch 'calcom:main' into main
retrogtx Apr 3, 2025
6b8b832
Merge branch 'calcom:main' into main
retrogtx Apr 3, 2025
00942e6
Merge branch 'calcom:main' into main
retrogtx Apr 3, 2025
d6dda16
Merge branch 'calcom:main' into main
retrogtx Apr 4, 2025
0c43f23
Merge branch 'calcom:main' into main
retrogtx Apr 4, 2025
5374610
Merge branch 'calcom:main' into main
retrogtx Apr 5, 2025
c3e016d
Merge branch 'calcom:main' into main
retrogtx Apr 7, 2025
3612d5a
Merge branch 'calcom:main' into main
retrogtx Apr 8, 2025
1147eb4
Merge branch 'calcom:main' into main
retrogtx Apr 9, 2025
e79dd41
Merge branch 'calcom:main' into main
retrogtx Apr 10, 2025
f10db66
Merge branch 'calcom:main' into main
retrogtx Apr 13, 2025
1f72789
under progress
retrogtx Apr 13, 2025
34e439b
wow this worked
retrogtx Apr 13, 2025
c64d20d
migrate schema
retrogtx Apr 13, 2025
7e47f53
fix types
retrogtx Apr 13, 2025
eb56070
fix import for google login
retrogtx Apr 13, 2025
940dc9e
Add onboarding tests for Azure (Microsoft sign up)
retrogtx Apr 14, 2025
b64139b
add comments back
retrogtx Apr 14, 2025
2a37ca1
fix failing test
retrogtx Apr 14, 2025
497680c
Merge branch 'main' into microsoft-auth
retrogtx Apr 17, 2025
308f1c4
fix: update Outlook login configuration and improve type safety in au…
retrogtx Apr 17, 2025
9b67d98
remove log
retrogtx Apr 17, 2025
c83cdd0
remove debug log from signin callback in next-auth options
retrogtx May 1, 2025
97f5c68
Merge branch 'main' into microsoft-auth
retrogtx May 1, 2025
537d94b
Merge branch 'main' into microsoft-auth
Devanshusharma2005 Aug 20, 2025
5b54030
Merge upstream/main into microsoft-auth
devin-ai-integration[bot] Jan 20, 2026
d07977c
Merge branch 'main' into microsoft-auth
Ryukemeister Jan 20, 2026
4b971f5
Merge branch 'main' into microsoft-auth
Ryukemeister Jan 20, 2026
a154e46
fixup
Ryukemeister Jan 20, 2026
574ffa5
Merge branch 'main' into microsoft-auth
Ryukemeister Jan 20, 2026
c01d689
chore: standardize naming
Ryukemeister Jan 20, 2026
d271a70
chore: add primary calendar for outlook, verify email and auto link o…
Ryukemeister Jan 21, 2026
be51d44
chore: helper fns
Ryukemeister Jan 21, 2026
948e761
Merge branch 'main' into microsoft-auth
Ryukemeister Jan 22, 2026
727c4e2
chore: implement cubic feedback
Ryukemeister Jan 22, 2026
ac8ad67
cleanup
Ryukemeister Jan 22, 2026
6c09010
chore: implement cubic feedback again
Ryukemeister Jan 22, 2026
3cb4b11
Merge branch 'main' into microsoft-auth
Ryukemeister Jan 22, 2026
6cee727
WIP design#
sean-brydon Jan 22, 2026
3db1388
feat: login design
sean-brydon Jan 22, 2026
59f58c3
Merge upstream/main into microsoft-auth
devin-ai-integration[bot] Jan 27, 2026
4f6f90e
fix: map identity provider names correctly
Ryukemeister Jan 27, 2026
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
7 changes: 6 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,19 @@ NEXT_PUBLIC_HELPSCOUT_KEY=
NEXT_PUBLIC_FRESHCHAT_TOKEN=
NEXT_PUBLIC_FRESHCHAT_HOST=

# Microsoft OAuth credentials
OUTLOOK_LOGIN_ENABLED=false
OUTLOOK_API_CREDENTIALS=
AZURE_AD_TENANT_ID=


# For holiday feature:
# Step-by-step: Get a Google Calendar API Key
# 1. Go to Google Cloud Console: https://console.cloud.google.com/
# 2. Select or Create a Project
# 3. Enable Google Calendar API (APIs & Services → Library , Search for Google Calendar API)
# 4. Create the API Key (APIs & Services → Credentials)
GOOGLE_CALENDAR_API_KEY=

# Google OAuth credentials
# To enable Login with Google you need to:
# 1. Set `GOOGLE_API_CREDENTIALS` below
Expand Down
4 changes: 3 additions & 1 deletion apps/web/lib/signup/getServerSideProps.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { GetServerSidePropsContext } from "next";
import { z } from "zod";

import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
import { IS_OUTLOOK_LOGIN_ENABLED } from "@calcom/features/auth/lib/outlook";
import { getOrgUsernameFromEmail } from "@calcom/features/auth/signup/utils/getOrgUsernameFromEmail";
import { checkPremiumUsername } from "@calcom/features/ee/common/lib/checkPremiumUsername";
import { isSAMLLoginEnabled } from "@calcom/features/ee/sso/lib/saml";
Expand All @@ -11,7 +12,7 @@ import { emailSchema } from "@calcom/lib/emailSchema";
import slugify from "@calcom/lib/slugify";
import { teamMetadataSchema } from "@calcom/prisma/zod-utils";

import { IS_GOOGLE_LOGIN_ENABLED } from "@server/lib/constants";
import { IS_GOOGLE_LOGIN_ENABLED } from "../../server/lib/constants";

const checkValidEmail = (email: string) => emailSchema.safeParse(email).success;

Expand Down Expand Up @@ -60,6 +61,7 @@ export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {
const props = {
redirectUrl,
isGoogleLoginEnabled: IS_GOOGLE_LOGIN_ENABLED,
isOutlookLoginEnabled: IS_OUTLOOK_LOGIN_ENABLED,
isSAMLLoginEnabled,
prepopulateFormValues: undefined,
emailVerificationEnabled,
Expand Down
2 changes: 1 addition & 1 deletion apps/web/modules/auth/hooks/useLastUsed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { localStorage } from "@calcom/lib/webstorage";
import classNames from "@calcom/ui/classNames";

type LoginType = "saml" | "google" | "credentials";
type LoginType = "saml" | "google" | "microsoft" | "credentials";

export function useLastUsed() {
const [lastUsed, setLastUsed] = useState<LoginType>();
Expand Down
Loading
Loading