Repository navigation
refactor: share oauth callback analytics and civil hour-line walk #4474
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
...alendar-web/src/auth/providers/authorization/record-oauth-signin-callback-landing.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| import * as signupFunnel from "@web/auth/posthog/signup-funnel"; | ||
| import * as trackModule from "@web/auth/posthog/track"; | ||
| import { recordOAuthSignInCallbackLanding } from "@web/auth/providers/authorization/record-oauth-signin-callback-landing"; | ||
| import { afterEach, describe, expect, it, mock, spyOn } from "bun:test"; | ||
|
|
||
| describe("recordOAuthSignInCallbackLanding", () => { | ||
| const realFetch = globalThis.fetch; | ||
|
|
||
| afterEach(() => { | ||
| globalThis.fetch = realFetch; | ||
| }); | ||
|
|
||
| it("relays then records the client landing events in order", () => { | ||
| const calls: string[] = []; | ||
| const fetchMock = mock(async () => { | ||
| calls.push("relay"); | ||
| return new Response(null, { status: 204 }); | ||
| }); | ||
| globalThis.fetch = fetchMock as unknown as typeof fetch; | ||
| const stepSpy = spyOn(signupFunnel, "trackSignupStep").mockImplementation( | ||
| () => { | ||
| calls.push("step"); | ||
| }, | ||
| ); | ||
| const trackSpy = spyOn(trackModule, "track").mockImplementation(() => { | ||
| calls.push("track"); | ||
| }); | ||
|
|
||
| recordOAuthSignInCallbackLanding("google", "?state=abc&code=1"); | ||
|
|
||
| expect(fetchMock).toHaveBeenCalledTimes(1); | ||
| const firstCall = fetchMock.mock.calls[0]; | ||
| expect(firstCall).toBeDefined(); | ||
| const [url, init] = firstCall as unknown as [string, RequestInit]; | ||
| expect(url).toContain("/auth/google/callback?state=abc"); | ||
| expect(init.headers).toEqual( | ||
| expect.objectContaining({ "X-Compass-OAuth-Telemetry": "1" }), | ||
| ); | ||
| expect(stepSpy).toHaveBeenCalledWith("oauth_callback_returned", { | ||
| method: "google", | ||
| }); | ||
| expect(trackSpy).toHaveBeenCalledWith("oauth_callback_received", { | ||
| provider: "google", | ||
| }); | ||
| expect(calls).toEqual(["relay", "step", "track"]); | ||
|
|
||
| stepSpy.mockRestore(); | ||
| trackSpy.mockRestore(); | ||
| }); | ||
| }); |
18 changes: 18 additions & 0 deletions
18
apps/calendar-web/src/auth/providers/authorization/record-oauth-signin-callback-landing.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import { OAUTH_CALLBACK_RECEIVED_EVENT } from "@core/analytics/oauth-signup.events"; | ||
| import { type ProviderKind } from "@core/types/sync/identity.contracts"; | ||
| import { trackSignupStep } from "@web/auth/posthog/signup-funnel"; | ||
| import { track } from "@web/auth/posthog/track"; | ||
| import { relayProviderOAuthCallbackTelemetry } from "@web/auth/providers/authorization/relay-provider-oauth-callback-telemetry"; | ||
|
|
||
| /** | ||
| * Records that the user returned from the provider before any success or | ||
| * failure branch. Order: server relay, then client funnel + landing events. | ||
| */ | ||
| export function recordOAuthSignInCallbackLanding( | ||
| provider: ProviderKind, | ||
| search: string, | ||
| ): void { | ||
| relayProviderOAuthCallbackTelemetry(provider, search); | ||
| trackSignupStep("oauth_callback_returned", { method: provider }); | ||
| track(OAUTH_CALLBACK_RECEIVED_EVENT, { provider }); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now-line uses host calendar date
Medium Severity
getCurrentPercentOfDaynow passes an unzoneddayjs()intocivilDayLengthMinutes. That helper reads the calendar date from its input without converting, so when the host timezone andtimeZonefall on different dates the now-line uses the wrong day length, most visibly on a DST transition.Reviewed by Cursor Bugbot for commit 38e3cd5. Configure here.