Revamp social login in two flows: login and link

clients/apps/web/src/components/Auth/GithubLoginButton.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import { usePostHog, type EventName } from '@/hooks/posthog'
-import { getGitHubAuthorizeURL } from '@/utils/auth'
+import { getGitHubAuthorizeLoginURL } from '@/utils/auth'
 import { schemas } from '@polar-sh/client'
 import Button from '@polar-sh/ui/components/atoms/Button'
 import Link from 'next/link'
@@ -18,7 +18,7 @@ const GithubLoginButton = (props: {
   const posthog = usePostHog()
   const signup = props.signup
 
-  const authorizeURL = getGitHubAuthorizeURL({
+  const authorizeURL = getGitHubAuthorizeLoginURL({
     return_to: props.returnTo,
     attribution: JSON.stringify(signup),
   })

clients/apps/web/src/components/Auth/GoogleLoginButton.tsx

@@ -1,5 +1,5 @@
 import { usePostHog, type EventName } from '@/hooks/posthog'
-import { getGoogleAuthorizeURL } from '@/utils/auth'
+import { getGoogleAuthorizeLoginURL } from '@/utils/auth'
 import Google from '@mui/icons-material/Google'
 import { schemas } from '@polar-sh/client'
 import Button from '@polar-sh/ui/components/atoms/Button'
@@ -26,7 +26,7 @@ const GoogleLoginButton = ({ returnTo, signup }: GoogleLoginButtonProps) => {
 
   return (
     <Link
-      href={getGoogleAuthorizeURL({
+      href={getGoogleAuthorizeLoginURL({
         return_to: returnTo,
         attribution: JSON.stringify(signup),
       })}

clients/apps/web/src/components/Settings/AuthenticationSettings.tsx

@@ -6,7 +6,10 @@ import {
   useGitHubAccount,
   useGoogleAccount,
 } from '@/hooks'
-import { getGitHubAuthorizeURL, getGoogleAuthorizeURL } from '@/utils/auth'
+import {
+  getGitHubAuthorizeLinkURL,
+  getGoogleAuthorizeLinkURL,
+} from '@/utils/auth'
 import AlternateEmailOutlined from '@mui/icons-material/AlternateEmailOutlined'
 import GitHub from '@mui/icons-material/GitHub'
 import Google from '@mui/icons-material/Google'
@@ -56,7 +59,7 @@ const GitHubAuthenticationMethod: React.FC<GitHubAuthenticationMethodProps> = ({
   onDisconnect,
   isDisconnecting,
 }) => {
-  const authorizeURL = getGitHubAuthorizeURL({ return_to: returnTo })
+  const authorizeURL = getGitHubAuthorizeLinkURL({ return_to: returnTo })
 
   return (
     <AuthenticationMethod
@@ -115,7 +118,7 @@ const GoogleAuthenticationMethod: React.FC<GoogleAuthenticationMethodProps> = ({
   onDisconnect,
   isDisconnecting,
 }) => {
-  const authorizeURL = getGoogleAuthorizeURL({ return_to: returnTo })
+  const authorizeURL = getGoogleAuthorizeLinkURL({ return_to: returnTo })
 
   return (
     <AuthenticationMethod

clients/apps/web/src/utils/auth.ts

@@ -1,9 +1,9 @@
 import { getPublicServerURL } from '@/utils/api'
 import { operations } from '@polar-sh/client'
 
-export const getGitHubAuthorizeURL = (
+export const getGitHubAuthorizeLoginURL = (
   params: NonNullable<
-    operations['integrations_github:integrations.github.authorize']['parameters']['query']
+    operations['integrations_github:integrations_github_login:integrations.github.login.authorize']['parameters']['query']
   >,
 ): string => {
   const searchParams = new URLSearchParams()
@@ -13,12 +13,24 @@ export const getGitHubAuthorizeURL = (
   if (params.attribution) {
     searchParams.set('attribution', params.attribution)
   }
-  return `${getPublicServerURL()}/v1/integrations/github/authorize?${searchParams}`
+  return `${getPublicServerURL()}/v1/integrations/github/login/authorize?${searchParams}`
 }
 
-export const getGoogleAuthorizeURL = (
+export const getGitHubAuthorizeLinkURL = (
   params: NonNullable<
-    operations['integrations_google:integrations.google.authorize']['parameters']['query']
+    operations['integrations_github:integrations_github_link:integrations.github.link.authorize']['parameters']['query']
+  >,
+): string => {
+  const searchParams = new URLSearchParams()
+  if (params.return_to) {
+    searchParams.set('return_to', params.return_to)
+  }
+  return `${getPublicServerURL()}/v1/integrations/github/link/authorize?${searchParams}`
+}
+
+export const getGoogleAuthorizeLoginURL = (
+  params: NonNullable<
+    operations['integrations_google:integrations_google_login:integrations.google.login.authorize']['parameters']['query']
   >,
 ): string => {
   const searchParams = new URLSearchParams()
@@ -28,7 +40,19 @@ export const getGoogleAuthorizeURL = (
   if (params.attribution) {
     searchParams.set('attribution', params.attribution)
   }
-  return `${getPublicServerURL()}/v1/integrations/google/authorize?${searchParams}`
+  return `${getPublicServerURL()}/v1/integrations/google/login/authorize?${searchParams}`
+}
+
+export const getGoogleAuthorizeLinkURL = (
+  params: NonNullable<
+    operations['integrations_google:integrations_google_link:integrations.google.link.authorize']['parameters']['query']
+  >,
+): string => {
+  const searchParams = new URLSearchParams()
+  if (params.return_to) {
+    searchParams.set('return_to', params.return_to)
+  }
+  return `${getPublicServerURL()}/v1/integrations/google/link/authorize?${searchParams}`
 }
 
 export const getAppleAuthorizeURL = (