chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider#4092

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.

Sign up for GitHub

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
chanioxaris merged 2 commits into from
Sep 4, 2024
+13 −110
Merged

chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider #4092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fc8d40
chore(clerk-js,types,clerk-react,elements): Drop support for deprecat…
Sep 4, 2024
7fa822c
Apply code review suggestion
Sep 4, 2024
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
8 changes: 8 additions & 0 deletions .changeset/light-donuts-shake.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": patch
"@clerk/elements": patch
"@clerk/clerk-react": patch
"@clerk/types": patch
---

Drop support for deprecated Coinbase Web3 provider
13 changes: 2 additions & 11 deletions packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -75,7 +74,6 @@ import {
createPageLifecycle,
disabledOrganizationsFeature,
errorThrower,
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getClerkQueryParam,
Expand DownExpand Up@@ -1406,10 +1404,6 @@ export class Clerk implements ClerkInterface {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_metamask_signature' });
};

public authenticateWithCoinbase = async (props: AuthenticateWithCoinbaseParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_signature' });
};

public authenticateWithCoinbaseWallet = async (props: AuthenticateWithCoinbaseWalletParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_wallet_signature' });
};
Expand All@@ -1427,11 +1421,8 @@ export class Clerk implements ClerkInterface {
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await getWeb3Identifier({ provider });
const generateSignature =
provider === 'metamask'
? generateSignatureWithMetamask
: provider === 'coinbase'
? generateSignatureWithCoinbase
: generateSignatureWithCoinbaseWallet;
provider === 'metamask' ? generateSignatureWithMetamask : generateSignatureWithCoinbaseWallet;

const navigate = (to: string) =>
customNavigate && typeof customNavigate === 'function' ? customNavigate(to) : this.navigate(to);

Expand Down
14 changes: 0 additions & 14 deletions packages/clerk-js/src/core/resources/SignIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,10 +33,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -116,9 +114,6 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_metamask_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_wallet_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
Expand DownExpand Up@@ -281,15 +276,6 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

public authenticateWithCoinbase = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseWalletIdentifier();
return this.authenticateWithWeb3({
Expand Down
12 changes: 0 additions & 12 deletions packages/clerk-js/src/core/resources/SignUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -223,16 +221,6 @@ export class SignUp extends BaseResource implements SignUpResource {
});
};

public authenticateWithCoinbase = async (params?: SignUpAuthenticateWithWeb3Params): Promise<SignUpResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
unsafeMetadata: params?.unsafeMetadata,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (
params?: SignUpAuthenticateWithWeb3Params,
): Promise<SignUpResource> => {
Expand Down
4 changes: 0 additions & 4 deletions packages/clerk-js/src/ui/common/constants.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,10 +92,6 @@ export const WEB3_PROVIDERS: Web3Providers = Object.freeze({
id: 'metamask',
name: 'MetaMask',
},
coinbase: {
id: 'coinbase',
name: 'Coinbase Wallet',
},
coinbase_wallet: {
id: 'coinbase_wallet',
name: 'Coinbase Wallet',
Expand Down
5 changes: 2 additions & 3 deletions packages/clerk-js/src/utils/injectedWeb3Providers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { CoinbaseWeb3Provider, MetamaskWeb3Provider } from '@clerk/types';
import type { MetamaskWeb3Provider } from '@clerk/types';

//https://eips.ethereum.org/EIPS/eip-6963

Expand DownExpand Up@@ -27,12 +27,11 @@ interface EIP6963ProviderDetail {
}

type EIP6963AnnounceProviderEvent = CustomEvent;
type InjectedWeb3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider;
type InjectedWeb3Provider = MetamaskWeb3Provider;

@octoperoctoperSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ We don't need CoinbaseWalletWeb3Provider here?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No because CoinbaseWallet is not an injected provider but it's handled via the coinbase wallet sdk


class InjectedWeb3Providers {
#providers: EIP6963ProviderDetail[] = [];
#providerIdMap: Record<InjectedWeb3Provider, string> = {
coinbase: 'Coinbase Wallet',
metamask: 'MetaMask',
} as const;
static #instance: InjectedWeb3Providers | null = null;
Expand Down
8 changes: 0 additions & 8 deletions packages/clerk-js/src/utils/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,10 +46,6 @@ export async function getMetamaskIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'metamask' });
}

export async function getCoinbaseIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase' });
}

export async function getCoinbaseWalletIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase_wallet' });
}
Expand All@@ -63,10 +59,6 @@ export async function generateSignatureWithMetamask({ identifier, nonce }: Gener
return await generateWeb3Signature({ identifier, nonce, provider: 'metamask' });
}

export async function generateSignatureWithCoinbase({ identifier, nonce }: GenerateSignatureParams): Promise<string> {
return await generateWeb3Signature({ identifier, nonce, provider: 'coinbase' });
}

export async function generateSignatureWithCoinbaseWallet({
identifier,
nonce,
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-in/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,9 +29,6 @@ export const SignInStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbaseWallet();
}
Expand Down
11 changes: 0 additions & 11 deletions packages/elements/src/internals/machines/sign-in/verification.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -448,17 +448,6 @@ export const SignInFirstFactorMachine = SignInVerificationMachine.provide({

break;
}
case 'web3_coinbase_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase signature');

attemptParams = {
strategy,
signature,
} satisfies Web3Attempt;

break;
}
Comment on lines -451 to -461

@panteliselefpanteliselefSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we removing the elements support for Coinbase completely or are we replacing it with Coinbase Wallet ? Will this be done in a follow up PR ?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR we are removing the support for the deprecated Coinbase completely. There is a separate PR #4103 to handle the new Coinbase Wallet provider

case 'web3_coinbase_wallet_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase Wallet signature');
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-up/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,6 @@ export const SignUpStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbaseWallet();
}
Expand Down
4 changes: 0 additions & 4 deletions packages/elements/src/react/hooks/use-third-party-provider.hook.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,6 @@ export const useThirdPartyProvider = <
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_metamask_signature' });
}

if (provider === 'coinbase') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_signature' });
}

if (provider === 'coinbase_wallet') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_wallet_signature' });
}
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/react/utils/map-scope-to-strategy.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,6 @@ export function mapScopeToStrategy<T extends `provider:${Strategy}`>(scope: T):
if (scope === 'provider:metamask') {
return 'web3_metamask_signature';
}
if (scope === 'provider:coinbase') {
return 'web3_coinbase_signature';
}
if (scope === 'provider:coinbase_wallet') {
return 'web3_coinbase_wallet_signature';
}
Expand Down
12 changes: 0 additions & 12 deletions packages/react/src/isomorphicClerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -96,7 +95,6 @@ type IsomorphicLoadedClerk = Without<
| 'handleGoogleOneTapCallback'
| 'handleUnauthenticated'
| 'authenticateWithMetamask'
| 'authenticateWithCoinbase'
| 'authenticateWithCoinbaseWallet'
| 'authenticateWithWeb3'
| 'authenticateWithGoogleOneTap'
Expand All@@ -119,7 +117,6 @@ type IsomorphicLoadedClerk = Without<
handleUnauthenticated: () => void;
// TODO: Align Promise unknown
authenticateWithMetamask: (params: AuthenticateWithMetamaskParams) => Promise<void>;
authenticateWithCoinbase: (params: AuthenticateWithCoinbaseParams) => Promise<void>;
authenticateWithCoinbaseWallet: (params: AuthenticateWithCoinbaseWalletParams) => Promise<void>;
authenticateWithWeb3: (params: ClerkAuthenticateWithWeb3Params) => Promise<void>;
authenticateWithGoogleOneTap: (
Expand DownExpand Up@@ -1066,15 +1063,6 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

authenticateWithCoinbase = async (params: AuthenticateWithCoinbaseParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbase(params);
if (this.clerkjs && this.#loaded) {
return callback() as Promise<void>;
} else {
this.premountMethodCalls.set('authenticateWithCoinbase', callback);
}
};

authenticateWithCoinbaseWallet = async (params: AuthenticateWithCoinbaseWalletParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbaseWallet(params);
if (this.clerkjs && this.#loaded) {
Expand Down
12 changes: 0 additions & 12 deletions packages/types/src/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,11 +528,6 @@ export interface Clerk {
*/
authenticateWithMetamask: (params?: AuthenticateWithMetamaskParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Wallet browser extension
*/
authenticateWithCoinbase: (params?: AuthenticateWithCoinbaseParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Smart Wallet and browser extension
*/
Expand DownExpand Up@@ -1267,13 +1262,6 @@ export interface AuthenticateWithMetamaskParams {
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
signUpContinueUrl?: string;
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseWalletParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
Expand Down
2 changes: 0 additions & 2 deletions packages/types/src/signIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,8 +98,6 @@ export interface SignInResource extends ClerkResource {

authenticateWithMetamask: () => Promise<SignInResource>;

authenticateWithCoinbase: () => Promise<SignInResource>;

authenticateWithCoinbaseWallet: () => Promise<SignInResource>;

authenticateWithPasskey: (params?: AuthenticateWithPasskeyParams) => Promise<SignInResource>;
Expand Down
1 change: 0 additions & 1 deletion packages/types/src/signUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,6 @@ export interface SignUpResource extends ClerkResource {
) => Promise<SignUpResource>;

authenticateWithMetamask: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbase: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbaseWallet: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
}

Expand Down
8 changes: 1 addition & 7 deletions packages/types/src/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,22 +7,16 @@ export interface Web3ProviderData {
}

export type MetamaskWeb3Provider = 'metamask';
export type CoinbaseWeb3Provider = 'coinbase';
export type CoinbaseWalletWeb3Provider = 'coinbase_wallet';

export type Web3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider | CoinbaseWalletWeb3Provider;
export type Web3Provider = MetamaskWeb3Provider | CoinbaseWalletWeb3Provider;

export const WEB3_PROVIDERS: Web3ProviderData[] = [
{
provider: 'metamask',
strategy: 'web3_metamask_signature',
name: 'MetaMask',
},
{
provider: 'coinbase',
strategy: 'web3_coinbase_signature',
name: 'Coinbase Wallet',
},
{
provider: 'coinbase_wallet',
strategy: 'web3_coinbase_wallet_signature',
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider#4092

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.

Sign up for GitHub

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
chanioxaris merged 2 commits into from
Sep 4, 2024
+13 −110
Merged

chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider #4092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fc8d40
chore(clerk-js,types,clerk-react,elements): Drop support for deprecat…
Sep 4, 2024
7fa822c
Apply code review suggestion
Sep 4, 2024
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
8 changes: 8 additions & 0 deletions .changeset/light-donuts-shake.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": patch
"@clerk/elements": patch
"@clerk/clerk-react": patch
"@clerk/types": patch
---

Drop support for deprecated Coinbase Web3 provider
13 changes: 2 additions & 11 deletions packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -75,7 +74,6 @@ import {
createPageLifecycle,
disabledOrganizationsFeature,
errorThrower,
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getClerkQueryParam,
Expand DownExpand Up@@ -1406,10 +1404,6 @@ export class Clerk implements ClerkInterface {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_metamask_signature' });
};

public authenticateWithCoinbase = async (props: AuthenticateWithCoinbaseParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_signature' });
};

public authenticateWithCoinbaseWallet = async (props: AuthenticateWithCoinbaseWalletParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_wallet_signature' });
};
Expand All@@ -1427,11 +1421,8 @@ export class Clerk implements ClerkInterface {
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await getWeb3Identifier({ provider });
const generateSignature =
provider === 'metamask'
? generateSignatureWithMetamask
: provider === 'coinbase'
? generateSignatureWithCoinbase
: generateSignatureWithCoinbaseWallet;
provider === 'metamask' ? generateSignatureWithMetamask : generateSignatureWithCoinbaseWallet;

const navigate = (to: string) =>
customNavigate && typeof customNavigate === 'function' ? customNavigate(to) : this.navigate(to);

Expand Down
14 changes: 0 additions & 14 deletions packages/clerk-js/src/core/resources/SignIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,10 +33,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -116,9 +114,6 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_metamask_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_wallet_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
Expand DownExpand Up@@ -281,15 +276,6 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

public authenticateWithCoinbase = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseWalletIdentifier();
return this.authenticateWithWeb3({
Expand Down
12 changes: 0 additions & 12 deletions packages/clerk-js/src/core/resources/SignUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -223,16 +221,6 @@ export class SignUp extends BaseResource implements SignUpResource {
});
};

public authenticateWithCoinbase = async (params?: SignUpAuthenticateWithWeb3Params): Promise<SignUpResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
unsafeMetadata: params?.unsafeMetadata,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (
params?: SignUpAuthenticateWithWeb3Params,
): Promise<SignUpResource> => {
Expand Down
4 changes: 0 additions & 4 deletions packages/clerk-js/src/ui/common/constants.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,10 +92,6 @@ export const WEB3_PROVIDERS: Web3Providers = Object.freeze({
id: 'metamask',
name: 'MetaMask',
},
coinbase: {
id: 'coinbase',
name: 'Coinbase Wallet',
},
coinbase_wallet: {
id: 'coinbase_wallet',
name: 'Coinbase Wallet',
Expand Down
5 changes: 2 additions & 3 deletions packages/clerk-js/src/utils/injectedWeb3Providers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { CoinbaseWeb3Provider, MetamaskWeb3Provider } from '@clerk/types';
import type { MetamaskWeb3Provider } from '@clerk/types';

//https://eips.ethereum.org/EIPS/eip-6963

Expand DownExpand Up@@ -27,12 +27,11 @@ interface EIP6963ProviderDetail {
}

type EIP6963AnnounceProviderEvent = CustomEvent;
type InjectedWeb3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider;
type InjectedWeb3Provider = MetamaskWeb3Provider;

@octoperoctoperSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ We don't need CoinbaseWalletWeb3Provider here?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No because CoinbaseWallet is not an injected provider but it's handled via the coinbase wallet sdk


class InjectedWeb3Providers {
#providers: EIP6963ProviderDetail[] = [];
#providerIdMap: Record<InjectedWeb3Provider, string> = {
coinbase: 'Coinbase Wallet',
metamask: 'MetaMask',
} as const;
static #instance: InjectedWeb3Providers | null = null;
Expand Down
8 changes: 0 additions & 8 deletions packages/clerk-js/src/utils/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,10 +46,6 @@ export async function getMetamaskIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'metamask' });
}

export async function getCoinbaseIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase' });
}

export async function getCoinbaseWalletIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase_wallet' });
}
Expand All@@ -63,10 +59,6 @@ export async function generateSignatureWithMetamask({ identifier, nonce }: Gener
return await generateWeb3Signature({ identifier, nonce, provider: 'metamask' });
}

export async function generateSignatureWithCoinbase({ identifier, nonce }: GenerateSignatureParams): Promise<string> {
return await generateWeb3Signature({ identifier, nonce, provider: 'coinbase' });
}

export async function generateSignatureWithCoinbaseWallet({
identifier,
nonce,
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-in/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,9 +29,6 @@ export const SignInStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbaseWallet();
}
Expand Down
11 changes: 0 additions & 11 deletions packages/elements/src/internals/machines/sign-in/verification.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -448,17 +448,6 @@ export const SignInFirstFactorMachine = SignInVerificationMachine.provide({

break;
}
case 'web3_coinbase_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase signature');

attemptParams = {
strategy,
signature,
} satisfies Web3Attempt;

break;
}
Comment on lines -451 to -461

@panteliselefpanteliselefSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we removing the elements support for Coinbase completely or are we replacing it with Coinbase Wallet ? Will this be done in a follow up PR ?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR we are removing the support for the deprecated Coinbase completely. There is a separate PR #4103 to handle the new Coinbase Wallet provider

case 'web3_coinbase_wallet_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase Wallet signature');
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-up/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,6 @@ export const SignUpStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbaseWallet();
}
Expand Down
4 changes: 0 additions & 4 deletions packages/elements/src/react/hooks/use-third-party-provider.hook.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,6 @@ export const useThirdPartyProvider = <
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_metamask_signature' });
}

if (provider === 'coinbase') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_signature' });
}

if (provider === 'coinbase_wallet') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_wallet_signature' });
}
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/react/utils/map-scope-to-strategy.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,6 @@ export function mapScopeToStrategy<T extends `provider:${Strategy}`>(scope: T):
if (scope === 'provider:metamask') {
return 'web3_metamask_signature';
}
if (scope === 'provider:coinbase') {
return 'web3_coinbase_signature';
}
if (scope === 'provider:coinbase_wallet') {
return 'web3_coinbase_wallet_signature';
}
Expand Down
12 changes: 0 additions & 12 deletions packages/react/src/isomorphicClerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -96,7 +95,6 @@ type IsomorphicLoadedClerk = Without<
| 'handleGoogleOneTapCallback'
| 'handleUnauthenticated'
| 'authenticateWithMetamask'
| 'authenticateWithCoinbase'
| 'authenticateWithCoinbaseWallet'
| 'authenticateWithWeb3'
| 'authenticateWithGoogleOneTap'
Expand All@@ -119,7 +117,6 @@ type IsomorphicLoadedClerk = Without<
handleUnauthenticated: () => void;
// TODO: Align Promise unknown
authenticateWithMetamask: (params: AuthenticateWithMetamaskParams) => Promise<void>;
authenticateWithCoinbase: (params: AuthenticateWithCoinbaseParams) => Promise<void>;
authenticateWithCoinbaseWallet: (params: AuthenticateWithCoinbaseWalletParams) => Promise<void>;
authenticateWithWeb3: (params: ClerkAuthenticateWithWeb3Params) => Promise<void>;
authenticateWithGoogleOneTap: (
Expand DownExpand Up@@ -1066,15 +1063,6 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

authenticateWithCoinbase = async (params: AuthenticateWithCoinbaseParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbase(params);
if (this.clerkjs && this.#loaded) {
return callback() as Promise<void>;
} else {
this.premountMethodCalls.set('authenticateWithCoinbase', callback);
}
};

authenticateWithCoinbaseWallet = async (params: AuthenticateWithCoinbaseWalletParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbaseWallet(params);
if (this.clerkjs && this.#loaded) {
Expand Down
12 changes: 0 additions & 12 deletions packages/types/src/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,11 +528,6 @@ export interface Clerk {
*/
authenticateWithMetamask: (params?: AuthenticateWithMetamaskParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Wallet browser extension
*/
authenticateWithCoinbase: (params?: AuthenticateWithCoinbaseParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Smart Wallet and browser extension
*/
Expand DownExpand Up@@ -1267,13 +1262,6 @@ export interface AuthenticateWithMetamaskParams {
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
signUpContinueUrl?: string;
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseWalletParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
Expand Down
2 changes: 0 additions & 2 deletions packages/types/src/signIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,8 +98,6 @@ export interface SignInResource extends ClerkResource {

authenticateWithMetamask: () => Promise<SignInResource>;

authenticateWithCoinbase: () => Promise<SignInResource>;

authenticateWithCoinbaseWallet: () => Promise<SignInResource>;

authenticateWithPasskey: (params?: AuthenticateWithPasskeyParams) => Promise<SignInResource>;
Expand Down
1 change: 0 additions & 1 deletion packages/types/src/signUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,6 @@ export interface SignUpResource extends ClerkResource {
) => Promise<SignUpResource>;

authenticateWithMetamask: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbase: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbaseWallet: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
}

Expand Down
8 changes: 1 addition & 7 deletions packages/types/src/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,22 +7,16 @@ export interface Web3ProviderData {
}

export type MetamaskWeb3Provider = 'metamask';
export type CoinbaseWeb3Provider = 'coinbase';
export type CoinbaseWalletWeb3Provider = 'coinbase_wallet';

export type Web3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider | CoinbaseWalletWeb3Provider;
export type Web3Provider = MetamaskWeb3Provider | CoinbaseWalletWeb3Provider;

export const WEB3_PROVIDERS: Web3ProviderData[] = [
{
provider: 'metamask',
strategy: 'web3_metamask_signature',
name: 'MetaMask',
},
{
provider: 'coinbase',
strategy: 'web3_coinbase_signature',
name: 'Coinbase Wallet',
},
{
provider: 'coinbase_wallet',
strategy: 'web3_coinbase_wallet_signature',
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider#4092

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.

Sign up for GitHub

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
chanioxaris merged 2 commits into from
Sep 4, 2024
+13 −110
Merged

chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider #4092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fc8d40
chore(clerk-js,types,clerk-react,elements): Drop support for deprecat…
Sep 4, 2024
7fa822c
Apply code review suggestion
Sep 4, 2024
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
8 changes: 8 additions & 0 deletions .changeset/light-donuts-shake.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": patch
"@clerk/elements": patch
"@clerk/clerk-react": patch
"@clerk/types": patch
---

Drop support for deprecated Coinbase Web3 provider
13 changes: 2 additions & 11 deletions packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -75,7 +74,6 @@ import {
createPageLifecycle,
disabledOrganizationsFeature,
errorThrower,
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getClerkQueryParam,
Expand DownExpand Up@@ -1406,10 +1404,6 @@ export class Clerk implements ClerkInterface {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_metamask_signature' });
};

public authenticateWithCoinbase = async (props: AuthenticateWithCoinbaseParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_signature' });
};

public authenticateWithCoinbaseWallet = async (props: AuthenticateWithCoinbaseWalletParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_wallet_signature' });
};
Expand All@@ -1427,11 +1421,8 @@ export class Clerk implements ClerkInterface {
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await getWeb3Identifier({ provider });
const generateSignature =
provider === 'metamask'
? generateSignatureWithMetamask
: provider === 'coinbase'
? generateSignatureWithCoinbase
: generateSignatureWithCoinbaseWallet;
provider === 'metamask' ? generateSignatureWithMetamask : generateSignatureWithCoinbaseWallet;

const navigate = (to: string) =>
customNavigate && typeof customNavigate === 'function' ? customNavigate(to) : this.navigate(to);

Expand Down
14 changes: 0 additions & 14 deletions packages/clerk-js/src/core/resources/SignIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,10 +33,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -116,9 +114,6 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_metamask_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_wallet_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
Expand DownExpand Up@@ -281,15 +276,6 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

public authenticateWithCoinbase = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseWalletIdentifier();
return this.authenticateWithWeb3({
Expand Down
12 changes: 0 additions & 12 deletions packages/clerk-js/src/core/resources/SignUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -223,16 +221,6 @@ export class SignUp extends BaseResource implements SignUpResource {
});
};

public authenticateWithCoinbase = async (params?: SignUpAuthenticateWithWeb3Params): Promise<SignUpResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
unsafeMetadata: params?.unsafeMetadata,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (
params?: SignUpAuthenticateWithWeb3Params,
): Promise<SignUpResource> => {
Expand Down
4 changes: 0 additions & 4 deletions packages/clerk-js/src/ui/common/constants.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,10 +92,6 @@ export const WEB3_PROVIDERS: Web3Providers = Object.freeze({
id: 'metamask',
name: 'MetaMask',
},
coinbase: {
id: 'coinbase',
name: 'Coinbase Wallet',
},
coinbase_wallet: {
id: 'coinbase_wallet',
name: 'Coinbase Wallet',
Expand Down
5 changes: 2 additions & 3 deletions packages/clerk-js/src/utils/injectedWeb3Providers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { CoinbaseWeb3Provider, MetamaskWeb3Provider } from '@clerk/types';
import type { MetamaskWeb3Provider } from '@clerk/types';

//https://eips.ethereum.org/EIPS/eip-6963

Expand DownExpand Up@@ -27,12 +27,11 @@ interface EIP6963ProviderDetail {
}

type EIP6963AnnounceProviderEvent = CustomEvent;
type InjectedWeb3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider;
type InjectedWeb3Provider = MetamaskWeb3Provider;

@octoperoctoperSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ We don't need CoinbaseWalletWeb3Provider here?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No because CoinbaseWallet is not an injected provider but it's handled via the coinbase wallet sdk


class InjectedWeb3Providers {
#providers: EIP6963ProviderDetail[] = [];
#providerIdMap: Record<InjectedWeb3Provider, string> = {
coinbase: 'Coinbase Wallet',
metamask: 'MetaMask',
} as const;
static #instance: InjectedWeb3Providers | null = null;
Expand Down
8 changes: 0 additions & 8 deletions packages/clerk-js/src/utils/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,10 +46,6 @@ export async function getMetamaskIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'metamask' });
}

export async function getCoinbaseIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase' });
}

export async function getCoinbaseWalletIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase_wallet' });
}
Expand All@@ -63,10 +59,6 @@ export async function generateSignatureWithMetamask({ identifier, nonce }: Gener
return await generateWeb3Signature({ identifier, nonce, provider: 'metamask' });
}

export async function generateSignatureWithCoinbase({ identifier, nonce }: GenerateSignatureParams): Promise<string> {
return await generateWeb3Signature({ identifier, nonce, provider: 'coinbase' });
}

export async function generateSignatureWithCoinbaseWallet({
identifier,
nonce,
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-in/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,9 +29,6 @@ export const SignInStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbaseWallet();
}
Expand Down
11 changes: 0 additions & 11 deletions packages/elements/src/internals/machines/sign-in/verification.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -448,17 +448,6 @@ export const SignInFirstFactorMachine = SignInVerificationMachine.provide({

break;
}
case 'web3_coinbase_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase signature');

attemptParams = {
strategy,
signature,
} satisfies Web3Attempt;

break;
}
Comment on lines -451 to -461

@panteliselefpanteliselefSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we removing the elements support for Coinbase completely or are we replacing it with Coinbase Wallet ? Will this be done in a follow up PR ?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR we are removing the support for the deprecated Coinbase completely. There is a separate PR #4103 to handle the new Coinbase Wallet provider

case 'web3_coinbase_wallet_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase Wallet signature');
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-up/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,6 @@ export const SignUpStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbaseWallet();
}
Expand Down
4 changes: 0 additions & 4 deletions packages/elements/src/react/hooks/use-third-party-provider.hook.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,6 @@ export const useThirdPartyProvider = <
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_metamask_signature' });
}

if (provider === 'coinbase') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_signature' });
}

if (provider === 'coinbase_wallet') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_wallet_signature' });
}
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/react/utils/map-scope-to-strategy.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,6 @@ export function mapScopeToStrategy<T extends `provider:${Strategy}`>(scope: T):
if (scope === 'provider:metamask') {
return 'web3_metamask_signature';
}
if (scope === 'provider:coinbase') {
return 'web3_coinbase_signature';
}
if (scope === 'provider:coinbase_wallet') {
return 'web3_coinbase_wallet_signature';
}
Expand Down
12 changes: 0 additions & 12 deletions packages/react/src/isomorphicClerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -96,7 +95,6 @@ type IsomorphicLoadedClerk = Without<
| 'handleGoogleOneTapCallback'
| 'handleUnauthenticated'
| 'authenticateWithMetamask'
| 'authenticateWithCoinbase'
| 'authenticateWithCoinbaseWallet'
| 'authenticateWithWeb3'
| 'authenticateWithGoogleOneTap'
Expand All@@ -119,7 +117,6 @@ type IsomorphicLoadedClerk = Without<
handleUnauthenticated: () => void;
// TODO: Align Promise unknown
authenticateWithMetamask: (params: AuthenticateWithMetamaskParams) => Promise<void>;
authenticateWithCoinbase: (params: AuthenticateWithCoinbaseParams) => Promise<void>;
authenticateWithCoinbaseWallet: (params: AuthenticateWithCoinbaseWalletParams) => Promise<void>;
authenticateWithWeb3: (params: ClerkAuthenticateWithWeb3Params) => Promise<void>;
authenticateWithGoogleOneTap: (
Expand DownExpand Up@@ -1066,15 +1063,6 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

authenticateWithCoinbase = async (params: AuthenticateWithCoinbaseParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbase(params);
if (this.clerkjs && this.#loaded) {
return callback() as Promise<void>;
} else {
this.premountMethodCalls.set('authenticateWithCoinbase', callback);
}
};

authenticateWithCoinbaseWallet = async (params: AuthenticateWithCoinbaseWalletParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbaseWallet(params);
if (this.clerkjs && this.#loaded) {
Expand Down
12 changes: 0 additions & 12 deletions packages/types/src/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,11 +528,6 @@ export interface Clerk {
*/
authenticateWithMetamask: (params?: AuthenticateWithMetamaskParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Wallet browser extension
*/
authenticateWithCoinbase: (params?: AuthenticateWithCoinbaseParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Smart Wallet and browser extension
*/
Expand DownExpand Up@@ -1267,13 +1262,6 @@ export interface AuthenticateWithMetamaskParams {
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
signUpContinueUrl?: string;
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseWalletParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
Expand Down
2 changes: 0 additions & 2 deletions packages/types/src/signIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,8 +98,6 @@ export interface SignInResource extends ClerkResource {

authenticateWithMetamask: () => Promise<SignInResource>;

authenticateWithCoinbase: () => Promise<SignInResource>;

authenticateWithCoinbaseWallet: () => Promise<SignInResource>;

authenticateWithPasskey: (params?: AuthenticateWithPasskeyParams) => Promise<SignInResource>;
Expand Down
1 change: 0 additions & 1 deletion packages/types/src/signUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,6 @@ export interface SignUpResource extends ClerkResource {
) => Promise<SignUpResource>;

authenticateWithMetamask: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbase: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbaseWallet: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
}

Expand Down
8 changes: 1 addition & 7 deletions packages/types/src/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,22 +7,16 @@ export interface Web3ProviderData {
}

export type MetamaskWeb3Provider = 'metamask';
export type CoinbaseWeb3Provider = 'coinbase';
export type CoinbaseWalletWeb3Provider = 'coinbase_wallet';

export type Web3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider | CoinbaseWalletWeb3Provider;
export type Web3Provider = MetamaskWeb3Provider | CoinbaseWalletWeb3Provider;

export const WEB3_PROVIDERS: Web3ProviderData[] = [
{
provider: 'metamask',
strategy: 'web3_metamask_signature',
name: 'MetaMask',
},
{
provider: 'coinbase',
strategy: 'web3_coinbase_signature',
name: 'Coinbase Wallet',
},
{
provider: 'coinbase_wallet',
strategy: 'web3_coinbase_wallet_signature',
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider#4092

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.

Sign up for GitHub

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
chanioxaris merged 2 commits into from
Sep 4, 2024
+13 −110
Merged

chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider #4092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fc8d40
chore(clerk-js,types,clerk-react,elements): Drop support for deprecat…
Sep 4, 2024
7fa822c
Apply code review suggestion
Sep 4, 2024
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
8 changes: 8 additions & 0 deletions .changeset/light-donuts-shake.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": patch
"@clerk/elements": patch
"@clerk/clerk-react": patch
"@clerk/types": patch
---

Drop support for deprecated Coinbase Web3 provider
13 changes: 2 additions & 11 deletions packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -75,7 +74,6 @@ import {
createPageLifecycle,
disabledOrganizationsFeature,
errorThrower,
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getClerkQueryParam,
Expand DownExpand Up@@ -1406,10 +1404,6 @@ export class Clerk implements ClerkInterface {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_metamask_signature' });
};

public authenticateWithCoinbase = async (props: AuthenticateWithCoinbaseParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_signature' });
};

public authenticateWithCoinbaseWallet = async (props: AuthenticateWithCoinbaseWalletParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_wallet_signature' });
};
Expand All@@ -1427,11 +1421,8 @@ export class Clerk implements ClerkInterface {
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await getWeb3Identifier({ provider });
const generateSignature =
provider === 'metamask'
? generateSignatureWithMetamask
: provider === 'coinbase'
? generateSignatureWithCoinbase
: generateSignatureWithCoinbaseWallet;
provider === 'metamask' ? generateSignatureWithMetamask : generateSignatureWithCoinbaseWallet;

const navigate = (to: string) =>
customNavigate && typeof customNavigate === 'function' ? customNavigate(to) : this.navigate(to);

Expand Down
14 changes: 0 additions & 14 deletions packages/clerk-js/src/core/resources/SignIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,10 +33,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -116,9 +114,6 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_metamask_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_wallet_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
Expand DownExpand Up@@ -281,15 +276,6 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

public authenticateWithCoinbase = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseWalletIdentifier();
return this.authenticateWithWeb3({
Expand Down
12 changes: 0 additions & 12 deletions packages/clerk-js/src/core/resources/SignUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -223,16 +221,6 @@ export class SignUp extends BaseResource implements SignUpResource {
});
};

public authenticateWithCoinbase = async (params?: SignUpAuthenticateWithWeb3Params): Promise<SignUpResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
unsafeMetadata: params?.unsafeMetadata,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (
params?: SignUpAuthenticateWithWeb3Params,
): Promise<SignUpResource> => {
Expand Down
4 changes: 0 additions & 4 deletions packages/clerk-js/src/ui/common/constants.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,10 +92,6 @@ export const WEB3_PROVIDERS: Web3Providers = Object.freeze({
id: 'metamask',
name: 'MetaMask',
},
coinbase: {
id: 'coinbase',
name: 'Coinbase Wallet',
},
coinbase_wallet: {
id: 'coinbase_wallet',
name: 'Coinbase Wallet',
Expand Down
5 changes: 2 additions & 3 deletions packages/clerk-js/src/utils/injectedWeb3Providers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { CoinbaseWeb3Provider, MetamaskWeb3Provider } from '@clerk/types';
import type { MetamaskWeb3Provider } from '@clerk/types';

//https://eips.ethereum.org/EIPS/eip-6963

Expand DownExpand Up@@ -27,12 +27,11 @@ interface EIP6963ProviderDetail {
}

type EIP6963AnnounceProviderEvent = CustomEvent;
type InjectedWeb3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider;
type InjectedWeb3Provider = MetamaskWeb3Provider;

@octoperoctoperSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ We don't need CoinbaseWalletWeb3Provider here?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No because CoinbaseWallet is not an injected provider but it's handled via the coinbase wallet sdk


class InjectedWeb3Providers {
#providers: EIP6963ProviderDetail[] = [];
#providerIdMap: Record<InjectedWeb3Provider, string> = {
coinbase: 'Coinbase Wallet',
metamask: 'MetaMask',
} as const;
static #instance: InjectedWeb3Providers | null = null;
Expand Down
8 changes: 0 additions & 8 deletions packages/clerk-js/src/utils/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,10 +46,6 @@ export async function getMetamaskIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'metamask' });
}

export async function getCoinbaseIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase' });
}

export async function getCoinbaseWalletIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase_wallet' });
}
Expand All@@ -63,10 +59,6 @@ export async function generateSignatureWithMetamask({ identifier, nonce }: Gener
return await generateWeb3Signature({ identifier, nonce, provider: 'metamask' });
}

export async function generateSignatureWithCoinbase({ identifier, nonce }: GenerateSignatureParams): Promise<string> {
return await generateWeb3Signature({ identifier, nonce, provider: 'coinbase' });
}

export async function generateSignatureWithCoinbaseWallet({
identifier,
nonce,
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-in/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,9 +29,6 @@ export const SignInStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbaseWallet();
}
Expand Down
11 changes: 0 additions & 11 deletions packages/elements/src/internals/machines/sign-in/verification.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -448,17 +448,6 @@ export const SignInFirstFactorMachine = SignInVerificationMachine.provide({

break;
}
case 'web3_coinbase_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase signature');

attemptParams = {
strategy,
signature,
} satisfies Web3Attempt;

break;
}
Comment on lines -451 to -461

@panteliselefpanteliselefSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we removing the elements support for Coinbase completely or are we replacing it with Coinbase Wallet ? Will this be done in a follow up PR ?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR we are removing the support for the deprecated Coinbase completely. There is a separate PR #4103 to handle the new Coinbase Wallet provider

case 'web3_coinbase_wallet_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase Wallet signature');
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-up/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,6 @@ export const SignUpStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbaseWallet();
}
Expand Down
4 changes: 0 additions & 4 deletions packages/elements/src/react/hooks/use-third-party-provider.hook.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,6 @@ export const useThirdPartyProvider = <
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_metamask_signature' });
}

if (provider === 'coinbase') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_signature' });
}

if (provider === 'coinbase_wallet') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_wallet_signature' });
}
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/react/utils/map-scope-to-strategy.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,6 @@ export function mapScopeToStrategy<T extends `provider:${Strategy}`>(scope: T):
if (scope === 'provider:metamask') {
return 'web3_metamask_signature';
}
if (scope === 'provider:coinbase') {
return 'web3_coinbase_signature';
}
if (scope === 'provider:coinbase_wallet') {
return 'web3_coinbase_wallet_signature';
}
Expand Down
12 changes: 0 additions & 12 deletions packages/react/src/isomorphicClerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -96,7 +95,6 @@ type IsomorphicLoadedClerk = Without<
| 'handleGoogleOneTapCallback'
| 'handleUnauthenticated'
| 'authenticateWithMetamask'
| 'authenticateWithCoinbase'
| 'authenticateWithCoinbaseWallet'
| 'authenticateWithWeb3'
| 'authenticateWithGoogleOneTap'
Expand All@@ -119,7 +117,6 @@ type IsomorphicLoadedClerk = Without<
handleUnauthenticated: () => void;
// TODO: Align Promise unknown
authenticateWithMetamask: (params: AuthenticateWithMetamaskParams) => Promise<void>;
authenticateWithCoinbase: (params: AuthenticateWithCoinbaseParams) => Promise<void>;
authenticateWithCoinbaseWallet: (params: AuthenticateWithCoinbaseWalletParams) => Promise<void>;
authenticateWithWeb3: (params: ClerkAuthenticateWithWeb3Params) => Promise<void>;
authenticateWithGoogleOneTap: (
Expand DownExpand Up@@ -1066,15 +1063,6 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

authenticateWithCoinbase = async (params: AuthenticateWithCoinbaseParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbase(params);
if (this.clerkjs && this.#loaded) {
return callback() as Promise<void>;
} else {
this.premountMethodCalls.set('authenticateWithCoinbase', callback);
}
};

authenticateWithCoinbaseWallet = async (params: AuthenticateWithCoinbaseWalletParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbaseWallet(params);
if (this.clerkjs && this.#loaded) {
Expand Down
12 changes: 0 additions & 12 deletions packages/types/src/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,11 +528,6 @@ export interface Clerk {
*/
authenticateWithMetamask: (params?: AuthenticateWithMetamaskParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Wallet browser extension
*/
authenticateWithCoinbase: (params?: AuthenticateWithCoinbaseParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Smart Wallet and browser extension
*/
Expand DownExpand Up@@ -1267,13 +1262,6 @@ export interface AuthenticateWithMetamaskParams {
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
signUpContinueUrl?: string;
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseWalletParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
Expand Down
2 changes: 0 additions & 2 deletions packages/types/src/signIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,8 +98,6 @@ export interface SignInResource extends ClerkResource {

authenticateWithMetamask: () => Promise<SignInResource>;

authenticateWithCoinbase: () => Promise<SignInResource>;

authenticateWithCoinbaseWallet: () => Promise<SignInResource>;

authenticateWithPasskey: (params?: AuthenticateWithPasskeyParams) => Promise<SignInResource>;
Expand Down
1 change: 0 additions & 1 deletion packages/types/src/signUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,6 @@ export interface SignUpResource extends ClerkResource {
) => Promise<SignUpResource>;

authenticateWithMetamask: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbase: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbaseWallet: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
}

Expand Down
8 changes: 1 addition & 7 deletions packages/types/src/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,22 +7,16 @@ export interface Web3ProviderData {
}

export type MetamaskWeb3Provider = 'metamask';
export type CoinbaseWeb3Provider = 'coinbase';
export type CoinbaseWalletWeb3Provider = 'coinbase_wallet';

export type Web3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider | CoinbaseWalletWeb3Provider;
export type Web3Provider = MetamaskWeb3Provider | CoinbaseWalletWeb3Provider;

export const WEB3_PROVIDERS: Web3ProviderData[] = [
{
provider: 'metamask',
strategy: 'web3_metamask_signature',
name: 'MetaMask',
},
{
provider: 'coinbase',
strategy: 'web3_coinbase_signature',
name: 'Coinbase Wallet',
},
{
provider: 'coinbase_wallet',
strategy: 'web3_coinbase_wallet_signature',
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider#4092

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.

Sign up for GitHub

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
chanioxaris merged 2 commits into from
Sep 4, 2024
+13 −110
Merged

chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider #4092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fc8d40
chore(clerk-js,types,clerk-react,elements): Drop support for deprecat…
Sep 4, 2024
7fa822c
Apply code review suggestion
Sep 4, 2024
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
8 changes: 8 additions & 0 deletions .changeset/light-donuts-shake.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": patch
"@clerk/elements": patch
"@clerk/clerk-react": patch
"@clerk/types": patch
---

Drop support for deprecated Coinbase Web3 provider
13 changes: 2 additions & 11 deletions packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -75,7 +74,6 @@ import {
createPageLifecycle,
disabledOrganizationsFeature,
errorThrower,
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getClerkQueryParam,
Expand DownExpand Up@@ -1406,10 +1404,6 @@ export class Clerk implements ClerkInterface {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_metamask_signature' });
};

public authenticateWithCoinbase = async (props: AuthenticateWithCoinbaseParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_signature' });
};

public authenticateWithCoinbaseWallet = async (props: AuthenticateWithCoinbaseWalletParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_wallet_signature' });
};
Expand All@@ -1427,11 +1421,8 @@ export class Clerk implements ClerkInterface {
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await getWeb3Identifier({ provider });
const generateSignature =
provider === 'metamask'
? generateSignatureWithMetamask
: provider === 'coinbase'
? generateSignatureWithCoinbase
: generateSignatureWithCoinbaseWallet;
provider === 'metamask' ? generateSignatureWithMetamask : generateSignatureWithCoinbaseWallet;

const navigate = (to: string) =>
customNavigate && typeof customNavigate === 'function' ? customNavigate(to) : this.navigate(to);

Expand Down
14 changes: 0 additions & 14 deletions packages/clerk-js/src/core/resources/SignIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,10 +33,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -116,9 +114,6 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_metamask_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_wallet_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
Expand DownExpand Up@@ -281,15 +276,6 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

public authenticateWithCoinbase = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseWalletIdentifier();
return this.authenticateWithWeb3({
Expand Down
12 changes: 0 additions & 12 deletions packages/clerk-js/src/core/resources/SignUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -223,16 +221,6 @@ export class SignUp extends BaseResource implements SignUpResource {
});
};

public authenticateWithCoinbase = async (params?: SignUpAuthenticateWithWeb3Params): Promise<SignUpResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
unsafeMetadata: params?.unsafeMetadata,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (
params?: SignUpAuthenticateWithWeb3Params,
): Promise<SignUpResource> => {
Expand Down
4 changes: 0 additions & 4 deletions packages/clerk-js/src/ui/common/constants.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,10 +92,6 @@ export const WEB3_PROVIDERS: Web3Providers = Object.freeze({
id: 'metamask',
name: 'MetaMask',
},
coinbase: {
id: 'coinbase',
name: 'Coinbase Wallet',
},
coinbase_wallet: {
id: 'coinbase_wallet',
name: 'Coinbase Wallet',
Expand Down
5 changes: 2 additions & 3 deletions packages/clerk-js/src/utils/injectedWeb3Providers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { CoinbaseWeb3Provider, MetamaskWeb3Provider } from '@clerk/types';
import type { MetamaskWeb3Provider } from '@clerk/types';

//https://eips.ethereum.org/EIPS/eip-6963

Expand DownExpand Up@@ -27,12 +27,11 @@ interface EIP6963ProviderDetail {
}

type EIP6963AnnounceProviderEvent = CustomEvent;
type InjectedWeb3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider;
type InjectedWeb3Provider = MetamaskWeb3Provider;

@octoperoctoperSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ We don't need CoinbaseWalletWeb3Provider here?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No because CoinbaseWallet is not an injected provider but it's handled via the coinbase wallet sdk


class InjectedWeb3Providers {
#providers: EIP6963ProviderDetail[] = [];
#providerIdMap: Record<InjectedWeb3Provider, string> = {
coinbase: 'Coinbase Wallet',
metamask: 'MetaMask',
} as const;
static #instance: InjectedWeb3Providers | null = null;
Expand Down
8 changes: 0 additions & 8 deletions packages/clerk-js/src/utils/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,10 +46,6 @@ export async function getMetamaskIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'metamask' });
}

export async function getCoinbaseIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase' });
}

export async function getCoinbaseWalletIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase_wallet' });
}
Expand All@@ -63,10 +59,6 @@ export async function generateSignatureWithMetamask({ identifier, nonce }: Gener
return await generateWeb3Signature({ identifier, nonce, provider: 'metamask' });
}

export async function generateSignatureWithCoinbase({ identifier, nonce }: GenerateSignatureParams): Promise<string> {
return await generateWeb3Signature({ identifier, nonce, provider: 'coinbase' });
}

export async function generateSignatureWithCoinbaseWallet({
identifier,
nonce,
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-in/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,9 +29,6 @@ export const SignInStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbaseWallet();
}
Expand Down
11 changes: 0 additions & 11 deletions packages/elements/src/internals/machines/sign-in/verification.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -448,17 +448,6 @@ export const SignInFirstFactorMachine = SignInVerificationMachine.provide({

break;
}
case 'web3_coinbase_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase signature');

attemptParams = {
strategy,
signature,
} satisfies Web3Attempt;

break;
}
Comment on lines -451 to -461

@panteliselefpanteliselefSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we removing the elements support for Coinbase completely or are we replacing it with Coinbase Wallet ? Will this be done in a follow up PR ?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR we are removing the support for the deprecated Coinbase completely. There is a separate PR #4103 to handle the new Coinbase Wallet provider

case 'web3_coinbase_wallet_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase Wallet signature');
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-up/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,6 @@ export const SignUpStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbaseWallet();
}
Expand Down
4 changes: 0 additions & 4 deletions packages/elements/src/react/hooks/use-third-party-provider.hook.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,6 @@ export const useThirdPartyProvider = <
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_metamask_signature' });
}

if (provider === 'coinbase') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_signature' });
}

if (provider === 'coinbase_wallet') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_wallet_signature' });
}
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/react/utils/map-scope-to-strategy.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,6 @@ export function mapScopeToStrategy<T extends `provider:${Strategy}`>(scope: T):
if (scope === 'provider:metamask') {
return 'web3_metamask_signature';
}
if (scope === 'provider:coinbase') {
return 'web3_coinbase_signature';
}
if (scope === 'provider:coinbase_wallet') {
return 'web3_coinbase_wallet_signature';
}
Expand Down
12 changes: 0 additions & 12 deletions packages/react/src/isomorphicClerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -96,7 +95,6 @@ type IsomorphicLoadedClerk = Without<
| 'handleGoogleOneTapCallback'
| 'handleUnauthenticated'
| 'authenticateWithMetamask'
| 'authenticateWithCoinbase'
| 'authenticateWithCoinbaseWallet'
| 'authenticateWithWeb3'
| 'authenticateWithGoogleOneTap'
Expand All@@ -119,7 +117,6 @@ type IsomorphicLoadedClerk = Without<
handleUnauthenticated: () => void;
// TODO: Align Promise unknown
authenticateWithMetamask: (params: AuthenticateWithMetamaskParams) => Promise<void>;
authenticateWithCoinbase: (params: AuthenticateWithCoinbaseParams) => Promise<void>;
authenticateWithCoinbaseWallet: (params: AuthenticateWithCoinbaseWalletParams) => Promise<void>;
authenticateWithWeb3: (params: ClerkAuthenticateWithWeb3Params) => Promise<void>;
authenticateWithGoogleOneTap: (
Expand DownExpand Up@@ -1066,15 +1063,6 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

authenticateWithCoinbase = async (params: AuthenticateWithCoinbaseParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbase(params);
if (this.clerkjs && this.#loaded) {
return callback() as Promise<void>;
} else {
this.premountMethodCalls.set('authenticateWithCoinbase', callback);
}
};

authenticateWithCoinbaseWallet = async (params: AuthenticateWithCoinbaseWalletParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbaseWallet(params);
if (this.clerkjs && this.#loaded) {
Expand Down
12 changes: 0 additions & 12 deletions packages/types/src/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,11 +528,6 @@ export interface Clerk {
*/
authenticateWithMetamask: (params?: AuthenticateWithMetamaskParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Wallet browser extension
*/
authenticateWithCoinbase: (params?: AuthenticateWithCoinbaseParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Smart Wallet and browser extension
*/
Expand DownExpand Up@@ -1267,13 +1262,6 @@ export interface AuthenticateWithMetamaskParams {
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
signUpContinueUrl?: string;
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseWalletParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
Expand Down
2 changes: 0 additions & 2 deletions packages/types/src/signIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,8 +98,6 @@ export interface SignInResource extends ClerkResource {

authenticateWithMetamask: () => Promise<SignInResource>;

authenticateWithCoinbase: () => Promise<SignInResource>;

authenticateWithCoinbaseWallet: () => Promise<SignInResource>;

authenticateWithPasskey: (params?: AuthenticateWithPasskeyParams) => Promise<SignInResource>;
Expand Down
1 change: 0 additions & 1 deletion packages/types/src/signUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,6 @@ export interface SignUpResource extends ClerkResource {
) => Promise<SignUpResource>;

authenticateWithMetamask: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbase: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbaseWallet: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
}

Expand Down
8 changes: 1 addition & 7 deletions packages/types/src/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,22 +7,16 @@ export interface Web3ProviderData {
}

export type MetamaskWeb3Provider = 'metamask';
export type CoinbaseWeb3Provider = 'coinbase';
export type CoinbaseWalletWeb3Provider = 'coinbase_wallet';

export type Web3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider | CoinbaseWalletWeb3Provider;
export type Web3Provider = MetamaskWeb3Provider | CoinbaseWalletWeb3Provider;

export const WEB3_PROVIDERS: Web3ProviderData[] = [
{
provider: 'metamask',
strategy: 'web3_metamask_signature',
name: 'MetaMask',
},
{
provider: 'coinbase',
strategy: 'web3_coinbase_signature',
name: 'Coinbase Wallet',
},
{
provider: 'coinbase_wallet',
strategy: 'web3_coinbase_wallet_signature',
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider#4092

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.

Sign up for GitHub

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
chanioxaris merged 2 commits into from
Sep 4, 2024
+13 −110
Merged

chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider #4092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fc8d40
chore(clerk-js,types,clerk-react,elements): Drop support for deprecat…
Sep 4, 2024
7fa822c
Apply code review suggestion
Sep 4, 2024
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
8 changes: 8 additions & 0 deletions .changeset/light-donuts-shake.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": patch
"@clerk/elements": patch
"@clerk/clerk-react": patch
"@clerk/types": patch
---

Drop support for deprecated Coinbase Web3 provider
13 changes: 2 additions & 11 deletions packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -75,7 +74,6 @@ import {
createPageLifecycle,
disabledOrganizationsFeature,
errorThrower,
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getClerkQueryParam,
Expand DownExpand Up@@ -1406,10 +1404,6 @@ export class Clerk implements ClerkInterface {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_metamask_signature' });
};

public authenticateWithCoinbase = async (props: AuthenticateWithCoinbaseParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_signature' });
};

public authenticateWithCoinbaseWallet = async (props: AuthenticateWithCoinbaseWalletParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_wallet_signature' });
};
Expand All@@ -1427,11 +1421,8 @@ export class Clerk implements ClerkInterface {
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await getWeb3Identifier({ provider });
const generateSignature =
provider === 'metamask'
? generateSignatureWithMetamask
: provider === 'coinbase'
? generateSignatureWithCoinbase
: generateSignatureWithCoinbaseWallet;
provider === 'metamask' ? generateSignatureWithMetamask : generateSignatureWithCoinbaseWallet;

const navigate = (to: string) =>
customNavigate && typeof customNavigate === 'function' ? customNavigate(to) : this.navigate(to);

Expand Down
14 changes: 0 additions & 14 deletions packages/clerk-js/src/core/resources/SignIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,10 +33,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -116,9 +114,6 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_metamask_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_wallet_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
Expand DownExpand Up@@ -281,15 +276,6 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

public authenticateWithCoinbase = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseWalletIdentifier();
return this.authenticateWithWeb3({
Expand Down
12 changes: 0 additions & 12 deletions packages/clerk-js/src/core/resources/SignUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -223,16 +221,6 @@ export class SignUp extends BaseResource implements SignUpResource {
});
};

public authenticateWithCoinbase = async (params?: SignUpAuthenticateWithWeb3Params): Promise<SignUpResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
unsafeMetadata: params?.unsafeMetadata,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (
params?: SignUpAuthenticateWithWeb3Params,
): Promise<SignUpResource> => {
Expand Down
4 changes: 0 additions & 4 deletions packages/clerk-js/src/ui/common/constants.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,10 +92,6 @@ export const WEB3_PROVIDERS: Web3Providers = Object.freeze({
id: 'metamask',
name: 'MetaMask',
},
coinbase: {
id: 'coinbase',
name: 'Coinbase Wallet',
},
coinbase_wallet: {
id: 'coinbase_wallet',
name: 'Coinbase Wallet',
Expand Down
5 changes: 2 additions & 3 deletions packages/clerk-js/src/utils/injectedWeb3Providers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { CoinbaseWeb3Provider, MetamaskWeb3Provider } from '@clerk/types';
import type { MetamaskWeb3Provider } from '@clerk/types';

//https://eips.ethereum.org/EIPS/eip-6963

Expand DownExpand Up@@ -27,12 +27,11 @@ interface EIP6963ProviderDetail {
}

type EIP6963AnnounceProviderEvent = CustomEvent;
type InjectedWeb3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider;
type InjectedWeb3Provider = MetamaskWeb3Provider;

@octoperoctoperSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ We don't need CoinbaseWalletWeb3Provider here?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No because CoinbaseWallet is not an injected provider but it's handled via the coinbase wallet sdk


class InjectedWeb3Providers {
#providers: EIP6963ProviderDetail[] = [];
#providerIdMap: Record<InjectedWeb3Provider, string> = {
coinbase: 'Coinbase Wallet',
metamask: 'MetaMask',
} as const;
static #instance: InjectedWeb3Providers | null = null;
Expand Down
8 changes: 0 additions & 8 deletions packages/clerk-js/src/utils/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,10 +46,6 @@ export async function getMetamaskIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'metamask' });
}

export async function getCoinbaseIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase' });
}

export async function getCoinbaseWalletIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase_wallet' });
}
Expand All@@ -63,10 +59,6 @@ export async function generateSignatureWithMetamask({ identifier, nonce }: Gener
return await generateWeb3Signature({ identifier, nonce, provider: 'metamask' });
}

export async function generateSignatureWithCoinbase({ identifier, nonce }: GenerateSignatureParams): Promise<string> {
return await generateWeb3Signature({ identifier, nonce, provider: 'coinbase' });
}

export async function generateSignatureWithCoinbaseWallet({
identifier,
nonce,
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-in/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,9 +29,6 @@ export const SignInStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbaseWallet();
}
Expand Down
11 changes: 0 additions & 11 deletions packages/elements/src/internals/machines/sign-in/verification.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -448,17 +448,6 @@ export const SignInFirstFactorMachine = SignInVerificationMachine.provide({

break;
}
case 'web3_coinbase_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase signature');

attemptParams = {
strategy,
signature,
} satisfies Web3Attempt;

break;
}
Comment on lines -451 to -461

@panteliselefpanteliselefSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we removing the elements support for Coinbase completely or are we replacing it with Coinbase Wallet ? Will this be done in a follow up PR ?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR we are removing the support for the deprecated Coinbase completely. There is a separate PR #4103 to handle the new Coinbase Wallet provider

case 'web3_coinbase_wallet_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase Wallet signature');
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-up/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,6 @@ export const SignUpStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbaseWallet();
}
Expand Down
4 changes: 0 additions & 4 deletions packages/elements/src/react/hooks/use-third-party-provider.hook.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,6 @@ export const useThirdPartyProvider = <
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_metamask_signature' });
}

if (provider === 'coinbase') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_signature' });
}

if (provider === 'coinbase_wallet') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_wallet_signature' });
}
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/react/utils/map-scope-to-strategy.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,6 @@ export function mapScopeToStrategy<T extends `provider:${Strategy}`>(scope: T):
if (scope === 'provider:metamask') {
return 'web3_metamask_signature';
}
if (scope === 'provider:coinbase') {
return 'web3_coinbase_signature';
}
if (scope === 'provider:coinbase_wallet') {
return 'web3_coinbase_wallet_signature';
}
Expand Down
12 changes: 0 additions & 12 deletions packages/react/src/isomorphicClerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -96,7 +95,6 @@ type IsomorphicLoadedClerk = Without<
| 'handleGoogleOneTapCallback'
| 'handleUnauthenticated'
| 'authenticateWithMetamask'
| 'authenticateWithCoinbase'
| 'authenticateWithCoinbaseWallet'
| 'authenticateWithWeb3'
| 'authenticateWithGoogleOneTap'
Expand All@@ -119,7 +117,6 @@ type IsomorphicLoadedClerk = Without<
handleUnauthenticated: () => void;
// TODO: Align Promise unknown
authenticateWithMetamask: (params: AuthenticateWithMetamaskParams) => Promise<void>;
authenticateWithCoinbase: (params: AuthenticateWithCoinbaseParams) => Promise<void>;
authenticateWithCoinbaseWallet: (params: AuthenticateWithCoinbaseWalletParams) => Promise<void>;
authenticateWithWeb3: (params: ClerkAuthenticateWithWeb3Params) => Promise<void>;
authenticateWithGoogleOneTap: (
Expand DownExpand Up@@ -1066,15 +1063,6 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

authenticateWithCoinbase = async (params: AuthenticateWithCoinbaseParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbase(params);
if (this.clerkjs && this.#loaded) {
return callback() as Promise<void>;
} else {
this.premountMethodCalls.set('authenticateWithCoinbase', callback);
}
};

authenticateWithCoinbaseWallet = async (params: AuthenticateWithCoinbaseWalletParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbaseWallet(params);
if (this.clerkjs && this.#loaded) {
Expand Down
12 changes: 0 additions & 12 deletions packages/types/src/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,11 +528,6 @@ export interface Clerk {
*/
authenticateWithMetamask: (params?: AuthenticateWithMetamaskParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Wallet browser extension
*/
authenticateWithCoinbase: (params?: AuthenticateWithCoinbaseParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Smart Wallet and browser extension
*/
Expand DownExpand Up@@ -1267,13 +1262,6 @@ export interface AuthenticateWithMetamaskParams {
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
signUpContinueUrl?: string;
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseWalletParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
Expand Down
2 changes: 0 additions & 2 deletions packages/types/src/signIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,8 +98,6 @@ export interface SignInResource extends ClerkResource {

authenticateWithMetamask: () => Promise<SignInResource>;

authenticateWithCoinbase: () => Promise<SignInResource>;

authenticateWithCoinbaseWallet: () => Promise<SignInResource>;

authenticateWithPasskey: (params?: AuthenticateWithPasskeyParams) => Promise<SignInResource>;
Expand Down
1 change: 0 additions & 1 deletion packages/types/src/signUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,6 @@ export interface SignUpResource extends ClerkResource {
) => Promise<SignUpResource>;

authenticateWithMetamask: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbase: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbaseWallet: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
}

Expand Down
8 changes: 1 addition & 7 deletions packages/types/src/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,22 +7,16 @@ export interface Web3ProviderData {
}

export type MetamaskWeb3Provider = 'metamask';
export type CoinbaseWeb3Provider = 'coinbase';
export type CoinbaseWalletWeb3Provider = 'coinbase_wallet';

export type Web3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider | CoinbaseWalletWeb3Provider;
export type Web3Provider = MetamaskWeb3Provider | CoinbaseWalletWeb3Provider;

export const WEB3_PROVIDERS: Web3ProviderData[] = [
{
provider: 'metamask',
strategy: 'web3_metamask_signature',
name: 'MetaMask',
},
{
provider: 'coinbase',
strategy: 'web3_coinbase_signature',
name: 'Coinbase Wallet',
},
{
provider: 'coinbase_wallet',
strategy: 'web3_coinbase_wallet_signature',
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider#4092

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.

Sign up for GitHub

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
chanioxaris merged 2 commits into from
Sep 4, 2024
+13 −110
Merged

chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider #4092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fc8d40
chore(clerk-js,types,clerk-react,elements): Drop support for deprecat…
Sep 4, 2024
7fa822c
Apply code review suggestion
Sep 4, 2024
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
8 changes: 8 additions & 0 deletions .changeset/light-donuts-shake.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": patch
"@clerk/elements": patch
"@clerk/clerk-react": patch
"@clerk/types": patch
---

Drop support for deprecated Coinbase Web3 provider
13 changes: 2 additions & 11 deletions packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -75,7 +74,6 @@ import {
createPageLifecycle,
disabledOrganizationsFeature,
errorThrower,
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getClerkQueryParam,
Expand DownExpand Up@@ -1406,10 +1404,6 @@ export class Clerk implements ClerkInterface {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_metamask_signature' });
};

public authenticateWithCoinbase = async (props: AuthenticateWithCoinbaseParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_signature' });
};

public authenticateWithCoinbaseWallet = async (props: AuthenticateWithCoinbaseWalletParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_wallet_signature' });
};
Expand All@@ -1427,11 +1421,8 @@ export class Clerk implements ClerkInterface {
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await getWeb3Identifier({ provider });
const generateSignature =
provider === 'metamask'
? generateSignatureWithMetamask
: provider === 'coinbase'
? generateSignatureWithCoinbase
: generateSignatureWithCoinbaseWallet;
provider === 'metamask' ? generateSignatureWithMetamask : generateSignatureWithCoinbaseWallet;

const navigate = (to: string) =>
customNavigate && typeof customNavigate === 'function' ? customNavigate(to) : this.navigate(to);

Expand Down
14 changes: 0 additions & 14 deletions packages/clerk-js/src/core/resources/SignIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,10 +33,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -116,9 +114,6 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_metamask_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_wallet_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
Expand DownExpand Up@@ -281,15 +276,6 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

public authenticateWithCoinbase = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseWalletIdentifier();
return this.authenticateWithWeb3({
Expand Down
12 changes: 0 additions & 12 deletions packages/clerk-js/src/core/resources/SignUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -223,16 +221,6 @@ export class SignUp extends BaseResource implements SignUpResource {
});
};

public authenticateWithCoinbase = async (params?: SignUpAuthenticateWithWeb3Params): Promise<SignUpResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
unsafeMetadata: params?.unsafeMetadata,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (
params?: SignUpAuthenticateWithWeb3Params,
): Promise<SignUpResource> => {
Expand Down
4 changes: 0 additions & 4 deletions packages/clerk-js/src/ui/common/constants.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,10 +92,6 @@ export const WEB3_PROVIDERS: Web3Providers = Object.freeze({
id: 'metamask',
name: 'MetaMask',
},
coinbase: {
id: 'coinbase',
name: 'Coinbase Wallet',
},
coinbase_wallet: {
id: 'coinbase_wallet',
name: 'Coinbase Wallet',
Expand Down
5 changes: 2 additions & 3 deletions packages/clerk-js/src/utils/injectedWeb3Providers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { CoinbaseWeb3Provider, MetamaskWeb3Provider } from '@clerk/types';
import type { MetamaskWeb3Provider } from '@clerk/types';

//https://eips.ethereum.org/EIPS/eip-6963

Expand DownExpand Up@@ -27,12 +27,11 @@ interface EIP6963ProviderDetail {
}

type EIP6963AnnounceProviderEvent = CustomEvent;
type InjectedWeb3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider;
type InjectedWeb3Provider = MetamaskWeb3Provider;

@octoperoctoperSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ We don't need CoinbaseWalletWeb3Provider here?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No because CoinbaseWallet is not an injected provider but it's handled via the coinbase wallet sdk


class InjectedWeb3Providers {
#providers: EIP6963ProviderDetail[] = [];
#providerIdMap: Record<InjectedWeb3Provider, string> = {
coinbase: 'Coinbase Wallet',
metamask: 'MetaMask',
} as const;
static #instance: InjectedWeb3Providers | null = null;
Expand Down
8 changes: 0 additions & 8 deletions packages/clerk-js/src/utils/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,10 +46,6 @@ export async function getMetamaskIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'metamask' });
}

export async function getCoinbaseIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase' });
}

export async function getCoinbaseWalletIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase_wallet' });
}
Expand All@@ -63,10 +59,6 @@ export async function generateSignatureWithMetamask({ identifier, nonce }: Gener
return await generateWeb3Signature({ identifier, nonce, provider: 'metamask' });
}

export async function generateSignatureWithCoinbase({ identifier, nonce }: GenerateSignatureParams): Promise<string> {
return await generateWeb3Signature({ identifier, nonce, provider: 'coinbase' });
}

export async function generateSignatureWithCoinbaseWallet({
identifier,
nonce,
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-in/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,9 +29,6 @@ export const SignInStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbaseWallet();
}
Expand Down
11 changes: 0 additions & 11 deletions packages/elements/src/internals/machines/sign-in/verification.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -448,17 +448,6 @@ export const SignInFirstFactorMachine = SignInVerificationMachine.provide({

break;
}
case 'web3_coinbase_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase signature');

attemptParams = {
strategy,
signature,
} satisfies Web3Attempt;

break;
}
Comment on lines -451 to -461

@panteliselefpanteliselefSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we removing the elements support for Coinbase completely or are we replacing it with Coinbase Wallet ? Will this be done in a follow up PR ?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR we are removing the support for the deprecated Coinbase completely. There is a separate PR #4103 to handle the new Coinbase Wallet provider

case 'web3_coinbase_wallet_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase Wallet signature');
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-up/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,6 @@ export const SignUpStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbaseWallet();
}
Expand Down
4 changes: 0 additions & 4 deletions packages/elements/src/react/hooks/use-third-party-provider.hook.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,6 @@ export const useThirdPartyProvider = <
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_metamask_signature' });
}

if (provider === 'coinbase') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_signature' });
}

if (provider === 'coinbase_wallet') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_wallet_signature' });
}
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/react/utils/map-scope-to-strategy.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,6 @@ export function mapScopeToStrategy<T extends `provider:${Strategy}`>(scope: T):
if (scope === 'provider:metamask') {
return 'web3_metamask_signature';
}
if (scope === 'provider:coinbase') {
return 'web3_coinbase_signature';
}
if (scope === 'provider:coinbase_wallet') {
return 'web3_coinbase_wallet_signature';
}
Expand Down
12 changes: 0 additions & 12 deletions packages/react/src/isomorphicClerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -96,7 +95,6 @@ type IsomorphicLoadedClerk = Without<
| 'handleGoogleOneTapCallback'
| 'handleUnauthenticated'
| 'authenticateWithMetamask'
| 'authenticateWithCoinbase'
| 'authenticateWithCoinbaseWallet'
| 'authenticateWithWeb3'
| 'authenticateWithGoogleOneTap'
Expand All@@ -119,7 +117,6 @@ type IsomorphicLoadedClerk = Without<
handleUnauthenticated: () => void;
// TODO: Align Promise unknown
authenticateWithMetamask: (params: AuthenticateWithMetamaskParams) => Promise<void>;
authenticateWithCoinbase: (params: AuthenticateWithCoinbaseParams) => Promise<void>;
authenticateWithCoinbaseWallet: (params: AuthenticateWithCoinbaseWalletParams) => Promise<void>;
authenticateWithWeb3: (params: ClerkAuthenticateWithWeb3Params) => Promise<void>;
authenticateWithGoogleOneTap: (
Expand DownExpand Up@@ -1066,15 +1063,6 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

authenticateWithCoinbase = async (params: AuthenticateWithCoinbaseParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbase(params);
if (this.clerkjs && this.#loaded) {
return callback() as Promise<void>;
} else {
this.premountMethodCalls.set('authenticateWithCoinbase', callback);
}
};

authenticateWithCoinbaseWallet = async (params: AuthenticateWithCoinbaseWalletParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbaseWallet(params);
if (this.clerkjs && this.#loaded) {
Expand Down
12 changes: 0 additions & 12 deletions packages/types/src/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,11 +528,6 @@ export interface Clerk {
*/
authenticateWithMetamask: (params?: AuthenticateWithMetamaskParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Wallet browser extension
*/
authenticateWithCoinbase: (params?: AuthenticateWithCoinbaseParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Smart Wallet and browser extension
*/
Expand DownExpand Up@@ -1267,13 +1262,6 @@ export interface AuthenticateWithMetamaskParams {
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
signUpContinueUrl?: string;
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseWalletParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
Expand Down
2 changes: 0 additions & 2 deletions packages/types/src/signIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,8 +98,6 @@ export interface SignInResource extends ClerkResource {

authenticateWithMetamask: () => Promise<SignInResource>;

authenticateWithCoinbase: () => Promise<SignInResource>;

authenticateWithCoinbaseWallet: () => Promise<SignInResource>;

authenticateWithPasskey: (params?: AuthenticateWithPasskeyParams) => Promise<SignInResource>;
Expand Down
1 change: 0 additions & 1 deletion packages/types/src/signUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,6 @@ export interface SignUpResource extends ClerkResource {
) => Promise<SignUpResource>;

authenticateWithMetamask: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbase: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbaseWallet: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
}

Expand Down
8 changes: 1 addition & 7 deletions packages/types/src/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,22 +7,16 @@ export interface Web3ProviderData {
}

export type MetamaskWeb3Provider = 'metamask';
export type CoinbaseWeb3Provider = 'coinbase';
export type CoinbaseWalletWeb3Provider = 'coinbase_wallet';

export type Web3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider | CoinbaseWalletWeb3Provider;
export type Web3Provider = MetamaskWeb3Provider | CoinbaseWalletWeb3Provider;

export const WEB3_PROVIDERS: Web3ProviderData[] = [
{
provider: 'metamask',
strategy: 'web3_metamask_signature',
name: 'MetaMask',
},
{
provider: 'coinbase',
strategy: 'web3_coinbase_signature',
name: 'Coinbase Wallet',
},
{
provider: 'coinbase_wallet',
strategy: 'web3_coinbase_wallet_signature',
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider#4092

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.

Sign up for GitHub

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
chanioxaris merged 2 commits into from
Sep 4, 2024
+13 −110
Merged

chore(clerk-js,types,clerk-react,elements): Drop coinbase web3 provider #4092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fc8d40
chore(clerk-js,types,clerk-react,elements): Drop support for deprecat…
Sep 4, 2024
7fa822c
Apply code review suggestion
Sep 4, 2024
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
8 changes: 8 additions & 0 deletions .changeset/light-donuts-shake.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
"@clerk/clerk-js": patch
"@clerk/elements": patch
"@clerk/clerk-react": patch
"@clerk/types": patch
---

Drop support for deprecated Coinbase Web3 provider
13 changes: 2 additions & 11 deletions packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -75,7 +74,6 @@ import {
createPageLifecycle,
disabledOrganizationsFeature,
errorThrower,
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getClerkQueryParam,
Expand DownExpand Up@@ -1406,10 +1404,6 @@ export class Clerk implements ClerkInterface {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_metamask_signature' });
};

public authenticateWithCoinbase = async (props: AuthenticateWithCoinbaseParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_signature' });
};

public authenticateWithCoinbaseWallet = async (props: AuthenticateWithCoinbaseWalletParams = {}): Promise<void> => {
await this.authenticateWithWeb3({ ...props, strategy: 'web3_coinbase_wallet_signature' });
};
Expand All@@ -1427,11 +1421,8 @@ export class Clerk implements ClerkInterface {
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await getWeb3Identifier({ provider });
const generateSignature =
provider === 'metamask'
? generateSignatureWithMetamask
: provider === 'coinbase'
? generateSignatureWithCoinbase
: generateSignatureWithCoinbaseWallet;
provider === 'metamask' ? generateSignatureWithMetamask : generateSignatureWithCoinbaseWallet;

const navigate = (to: string) =>
customNavigate && typeof customNavigate === 'function' ? customNavigate(to) : this.navigate(to);

Expand Down
14 changes: 0 additions & 14 deletions packages/clerk-js/src/core/resources/SignIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,10 +33,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -116,9 +114,6 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_metamask_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
case 'web3_coinbase_wallet_signature':
config = { web3WalletId: factor.web3WalletId } as Web3SignatureConfig;
break;
Expand DownExpand Up@@ -281,15 +276,6 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

public authenticateWithCoinbase = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (): Promise<SignInResource> => {
const identifier = await getCoinbaseWalletIdentifier();
return this.authenticateWithWeb3({
Expand Down
12 changes: 0 additions & 12 deletions packages/clerk-js/src/core/resources/SignUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,8 @@ import type {
} from '@clerk/types';

import {
generateSignatureWithCoinbase,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
getCoinbaseIdentifier,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
windowNavigate,
Expand DownExpand Up@@ -223,16 +221,6 @@ export class SignUp extends BaseResource implements SignUpResource {
});
};

public authenticateWithCoinbase = async (params?: SignUpAuthenticateWithWeb3Params): Promise<SignUpResource> => {
const identifier = await getCoinbaseIdentifier();
return this.authenticateWithWeb3({
identifier,
generateSignature: generateSignatureWithCoinbase,
unsafeMetadata: params?.unsafeMetadata,
strategy: 'web3_coinbase_signature',
});
};

public authenticateWithCoinbaseWallet = async (
params?: SignUpAuthenticateWithWeb3Params,
): Promise<SignUpResource> => {
Expand Down
4 changes: 0 additions & 4 deletions packages/clerk-js/src/ui/common/constants.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,10 +92,6 @@ export const WEB3_PROVIDERS: Web3Providers = Object.freeze({
id: 'metamask',
name: 'MetaMask',
},
coinbase: {
id: 'coinbase',
name: 'Coinbase Wallet',
},
coinbase_wallet: {
id: 'coinbase_wallet',
name: 'Coinbase Wallet',
Expand Down
5 changes: 2 additions & 3 deletions packages/clerk-js/src/utils/injectedWeb3Providers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { CoinbaseWeb3Provider, MetamaskWeb3Provider } from '@clerk/types';
import type { MetamaskWeb3Provider } from '@clerk/types';

//https://eips.ethereum.org/EIPS/eip-6963

Expand DownExpand Up@@ -27,12 +27,11 @@ interface EIP6963ProviderDetail {
}

type EIP6963AnnounceProviderEvent = CustomEvent;
type InjectedWeb3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider;
type InjectedWeb3Provider = MetamaskWeb3Provider;

@octoperoctoperSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ We don't need CoinbaseWalletWeb3Provider here?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No because CoinbaseWallet is not an injected provider but it's handled via the coinbase wallet sdk


class InjectedWeb3Providers {
#providers: EIP6963ProviderDetail[] = [];
#providerIdMap: Record<InjectedWeb3Provider, string> = {
coinbase: 'Coinbase Wallet',
metamask: 'MetaMask',
} as const;
static #instance: InjectedWeb3Providers | null = null;
Expand Down
8 changes: 0 additions & 8 deletions packages/clerk-js/src/utils/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,10 +46,6 @@ export async function getMetamaskIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'metamask' });
}

export async function getCoinbaseIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase' });
}

export async function getCoinbaseWalletIdentifier(): Promise<string> {
return await getWeb3Identifier({ provider: 'coinbase_wallet' });
}
Expand All@@ -63,10 +59,6 @@ export async function generateSignatureWithMetamask({ identifier, nonce }: Gener
return await generateWeb3Signature({ identifier, nonce, provider: 'metamask' });
}

export async function generateSignatureWithCoinbase({ identifier, nonce }: GenerateSignatureParams): Promise<string> {
return await generateWeb3Signature({ identifier, nonce, provider: 'coinbase' });
}

export async function generateSignatureWithCoinbaseWallet({
identifier,
nonce,
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-in/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,9 +29,6 @@ export const SignInStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signIn.authenticateWithCoinbaseWallet();
}
Expand Down
11 changes: 0 additions & 11 deletions packages/elements/src/internals/machines/sign-in/verification.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -448,17 +448,6 @@ export const SignInFirstFactorMachine = SignInVerificationMachine.provide({

break;
}
case 'web3_coinbase_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase signature');

attemptParams = {
strategy,
signature,
} satisfies Web3Attempt;

break;
}
Comment on lines -451 to -461

@panteliselefpanteliselefSep 4, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we removing the elements support for Coinbase completely or are we replacing it with Coinbase Wallet ? Will this be done in a follow up PR ?

@chanioxarischanioxarisSep 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR we are removing the support for the deprecated Coinbase completely. There is a separate PR #4103 to handle the new Coinbase Wallet provider

case 'web3_coinbase_wallet_signature': {
const signature = fields.get('signature')?.value as string | undefined;
assertIsDefined(signature, 'Web3 Coinbase Wallet signature');
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/internals/machines/sign-up/start.machine.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,6 @@ export const SignUpStartMachine = setup({
if (strategy === 'web3_metamask_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithMetamask();
}
if (strategy === 'web3_coinbase_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbase();
}
if (strategy === 'web3_coinbase_wallet_signature') {
return parent.getSnapshot().context.clerk.client.signUp.authenticateWithCoinbaseWallet();
}
Expand Down
4 changes: 0 additions & 4 deletions packages/elements/src/react/hooks/use-third-party-provider.hook.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,10 +67,6 @@ export const useThirdPartyProvider = <
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_metamask_signature' });
}

if (provider === 'coinbase') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_signature' });
}

if (provider === 'coinbase_wallet') {
return ref.send({ type: 'AUTHENTICATE.WEB3', strategy: 'web3_coinbase_wallet_signature' });
}
Expand Down
3 changes: 0 additions & 3 deletions packages/elements/src/react/utils/map-scope-to-strategy.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,6 @@ export function mapScopeToStrategy<T extends `provider:${Strategy}`>(scope: T):
if (scope === 'provider:metamask') {
return 'web3_metamask_signature';
}
if (scope === 'provider:coinbase') {
return 'web3_coinbase_signature';
}
if (scope === 'provider:coinbase_wallet') {
return 'web3_coinbase_wallet_signature';
}
Expand Down
12 changes: 0 additions & 12 deletions packages/react/src/isomorphicClerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import type {
__experimental_UserVerificationModalProps,
__experimental_UserVerificationProps,
ActiveSessionResource,
AuthenticateWithCoinbaseParams,
AuthenticateWithCoinbaseWalletParams,
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
Expand DownExpand Up@@ -96,7 +95,6 @@ type IsomorphicLoadedClerk = Without<
| 'handleGoogleOneTapCallback'
| 'handleUnauthenticated'
| 'authenticateWithMetamask'
| 'authenticateWithCoinbase'
| 'authenticateWithCoinbaseWallet'
| 'authenticateWithWeb3'
| 'authenticateWithGoogleOneTap'
Expand All@@ -119,7 +117,6 @@ type IsomorphicLoadedClerk = Without<
handleUnauthenticated: () => void;
// TODO: Align Promise unknown
authenticateWithMetamask: (params: AuthenticateWithMetamaskParams) => Promise<void>;
authenticateWithCoinbase: (params: AuthenticateWithCoinbaseParams) => Promise<void>;
authenticateWithCoinbaseWallet: (params: AuthenticateWithCoinbaseWalletParams) => Promise<void>;
authenticateWithWeb3: (params: ClerkAuthenticateWithWeb3Params) => Promise<void>;
authenticateWithGoogleOneTap: (
Expand DownExpand Up@@ -1066,15 +1063,6 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

authenticateWithCoinbase = async (params: AuthenticateWithCoinbaseParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbase(params);
if (this.clerkjs && this.#loaded) {
return callback() as Promise<void>;
} else {
this.premountMethodCalls.set('authenticateWithCoinbase', callback);
}
};

authenticateWithCoinbaseWallet = async (params: AuthenticateWithCoinbaseWalletParams): Promise<void> => {
const callback = () => this.clerkjs?.authenticateWithCoinbaseWallet(params);
if (this.clerkjs && this.#loaded) {
Expand Down
12 changes: 0 additions & 12 deletions packages/types/src/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,11 +528,6 @@ export interface Clerk {
*/
authenticateWithMetamask: (params?: AuthenticateWithMetamaskParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Wallet browser extension
*/
authenticateWithCoinbase: (params?: AuthenticateWithCoinbaseParams) => Promise<unknown>;

/**
* Authenticates user using their Coinbase Smart Wallet and browser extension
*/
Expand DownExpand Up@@ -1267,13 +1262,6 @@ export interface AuthenticateWithMetamaskParams {
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
signUpContinueUrl?: string;
unsafeMetadata?: SignUpUnsafeMetadata;
}

export interface AuthenticateWithCoinbaseWalletParams {
customNavigate?: (to: string) => Promise<unknown>;
redirectUrl?: string;
Expand Down
2 changes: 0 additions & 2 deletions packages/types/src/signIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,8 +98,6 @@ export interface SignInResource extends ClerkResource {

authenticateWithMetamask: () => Promise<SignInResource>;

authenticateWithCoinbase: () => Promise<SignInResource>;

authenticateWithCoinbaseWallet: () => Promise<SignInResource>;

authenticateWithPasskey: (params?: AuthenticateWithPasskeyParams) => Promise<SignInResource>;
Expand Down
1 change: 0 additions & 1 deletion packages/types/src/signUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,6 @@ export interface SignUpResource extends ClerkResource {
) => Promise<SignUpResource>;

authenticateWithMetamask: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbase: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
authenticateWithCoinbaseWallet: (params?: SignUpAuthenticateWithWeb3Params) => Promise<SignUpResource>;
}

Expand Down
8 changes: 1 addition & 7 deletions packages/types/src/web3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,22 +7,16 @@ export interface Web3ProviderData {
}

export type MetamaskWeb3Provider = 'metamask';
export type CoinbaseWeb3Provider = 'coinbase';
export type CoinbaseWalletWeb3Provider = 'coinbase_wallet';

export type Web3Provider = MetamaskWeb3Provider | CoinbaseWeb3Provider | CoinbaseWalletWeb3Provider;
export type Web3Provider = MetamaskWeb3Provider | CoinbaseWalletWeb3Provider;

export const WEB3_PROVIDERS: Web3ProviderData[] = [
{
provider: 'metamask',
strategy: 'web3_metamask_signature',
name: 'MetaMask',
},
{
provider: 'coinbase',
strategy: 'web3_coinbase_signature',
name: 'Coinbase Wallet',
},
{
provider: 'coinbase_wallet',
strategy: 'web3_coinbase_wallet_signature',
Expand Down