Studio: Update "Create a free account" link to redirect to magic sign…

…up flow (#123) With this change, we update the "Create a free account" link in the Studio app to redirect to the new signup flow.
Automattic · May 14, 2024 · dfb8f8b · dfb8f8b
1 parent b8be32b
commit dfb8f8b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/components/content-tab-snapshots.tsx b/src/components/content-tab-snapshots.tsx
@@ -4,6 +4,7 @@ import { __, sprintf } from '@wordpress/i18n';
 import { Icon, check, external } from '@wordpress/icons';
 import { useI18n } from '@wordpress/react-i18n';
 import { PropsWithChildren, useEffect } from 'react';
+import { CLIENT_ID, PROTOCOL_PREFIX, WP_AUTHORIZE_ENDPOINT, SCOPES } from '../constants';
 import { useArchiveSite } from '../hooks/use-archive-site';
 import { useAuth } from '../hooks/use-auth';
 import { useDeleteSnapshot } from '../hooks/use-delete-snapshot';
@@ -336,7 +337,12 @@ function NoAuth( { selectedSite }: React.ComponentProps< typeof EmptyGeneric > )
 										if ( isOffline ) {
 											return;
 										}
-										getIpcApi().openURL( 'https://wordpress.com/start/account/user-social' );
+										const baseURL = 'https://wordpress.com/log-in/link';
+										const authURL = encodeURIComponent(
+											`${ WP_AUTHORIZE_ENDPOINT }?response_type=token&client_id=${ CLIENT_ID }&redirect_uri=${ PROTOCOL_PREFIX }%3A%2F%2Fauth&scope=${ SCOPES }&from-calypso=1`
+										);
+										const finalURL = `${ baseURL }?redirect_to=${ authURL }&client_id=${ CLIENT_ID }`;
+										getIpcApi().openURL( finalURL );
 									} }
 								/>
 							),

diff --git a/src/constants.ts b/src/constants.ts
@@ -8,3 +8,8 @@ export const AUTO_UPDATE_INTERVAL_MS = 60 * 60 * 1000;
 export const WINDOWS_TITLEBAR_HEIGHT = 32;
 export const STUDIO_DOCS_URL = `https://developer.wordpress.com/docs/developer-tools/studio/`;
 export const WPCOM_PROFILE_URL = `https://wordpress.com/me`;
+// OAuth constants
+export const CLIENT_ID = '95109';
+export const PROTOCOL_PREFIX = 'wpcom-local-dev';
+export const WP_AUTHORIZE_ENDPOINT = 'https://public-api.wordpress.com/oauth2/authorize';
+export const SCOPES = 'global';
diff --git a/src/index.ts b/src/index.ts
@@ -11,10 +11,11 @@ import path from 'path';
 import * as Sentry from '@sentry/electron/main';
 import { __, defaultI18n } from '@wordpress/i18n';
 import packageJson from '../package.json';
+import { PROTOCOL_PREFIX } from './constants';
 import * as ipcHandlers from './ipc-handlers';
 import { bumpAggregatedUniqueStat } from './lib/bump-stats';
 import { getLocaleData, getSupportedLocale } from './lib/locale';
-import { PROTOCOL_PREFIX, handleAuthCallback, setUpAuthCallbackHandler } from './lib/oauth';
+import { handleAuthCallback, setUpAuthCallbackHandler } from './lib/oauth';
 import { setupLogging } from './logging';
 import { createMainWindow, withMainWindow } from './main-window';
 import {

diff --git a/src/lib/oauth.ts b/src/lib/oauth.ts
@@ -1,6 +1,7 @@
 import { ipcMain, shell } from 'electron';
 import * as Sentry from '@sentry/electron/main';
 import wpcom from 'wpcom';
+import { PROTOCOL_PREFIX, WP_AUTHORIZE_ENDPOINT, CLIENT_ID, SCOPES } from '../constants';
 import { withMainWindow } from '../main-window';
 import { loadUserData, saveUserData } from '../storage/user-data';
 
@@ -11,14 +12,7 @@ export interface StoredToken {
 	email?: string;
 	displayName?: string;
 }
-
-export const PROTOCOL_PREFIX = 'wpcom-local-dev';
-
-const WP_AUTHORIZE_ENDPOINT = 'https://public-api.wordpress.com/oauth2/authorize';
-const CLIENT_ID = '95109';
 const REDIRECT_URI = `${ PROTOCOL_PREFIX }://auth`;
-
-const SCOPES = 'global';
 const TOKEN_KEY = 'authToken';
 
 async function getToken(): Promise< StoredToken | null > {