Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/purple-rice-tell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@clerk/localizations": minor
"@clerk/clerk-js": minor
"@clerk/types": minor
---

Support connecting Coinbase Wallet via <UserProfile />
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/resources/User.ts
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,10 @@ export class User extends BaseResource implements UserResource {
return this.externalAccounts.filter(externalAccount => externalAccount.verification?.status != 'verified');
}

get verifiedWeb3Wallets() {
return this.web3Wallets.filter(web3Wallet => web3Wallet.verification?.status == 'verified');
}

get hasVerifiedEmailAddress() {
return this.emailAddresses.filter(email => email.verification.status === 'verified').length > 0;
}
Expand Down
36 changes: 21 additions & 15 deletions packages/clerk-js/src/ui/components/UserProfile/Web3Form.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useUser } from '@clerk/shared/react';
import type { Web3Strategy } from '@clerk/types';
import type { Web3Provider, Web3Strategy } from '@clerk/types';

import { generateSignatureWithMetamask, getMetamaskIdentifier } from '../../../utils/web3';
import { generateWeb3Signature, getWeb3Identifier } from '../../../utils/web3';
import { descriptors, Image, localizationKeys } from '../../customizables';
import { ProfileSection, useCardState, withCardStateProvider } from '../../elements';
import { useEnabledThirdPartyProviders } from '../../hooks';
Expand All @@ -10,33 +10,33 @@ import { getFieldError, handleError } from '../../utils';
export const AddWeb3WalletActionMenu = withCardStateProvider(() => {
const card = useCardState();
const { user } = useUser();
const { strategyToDisplayData } = useEnabledThirdPartyProviders();
const { strategies, strategyToDisplayData } = useEnabledThirdPartyProviders();

const enabledStrategies = strategies.filter(s => s.startsWith('web3')) as Web3Strategy[];
const connectedStrategies = user?.verifiedWeb3Wallets.map(w => w.verification.strategy) as Web3Strategy[];
const unconnectedStrategies = enabledStrategies.filter(strategy => {
return !connectedStrategies.includes(strategy);
});

// TODO: This logic is very similar to AddConnectedAccount but only metamask is supported right now
// const enabledStrategies = strategies.filter(s => s.startsWith('web3')) as Web3Strategy[];
// const connectedStrategies = user.web3Wallets.map(w => w.web3Wallet) as OAuthStrategy[];
const unconnectedStrategies: Web3Strategy[] =
user?.web3Wallets.filter(w => w.verification?.status === 'verified').length === 0
? ['web3_metamask_signature']
: [];
const connect = async (strategy: Web3Strategy) => {
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;

try {
card.setLoading(strategy);
const identifier = await getMetamaskIdentifier();
const identifier = await getWeb3Identifier({ provider });

if (!user) {
throw new Error('user is not defined');
}

let web3Wallet = await user.createWeb3Wallet({ web3Wallet: identifier });
web3Wallet = await web3Wallet.prepareVerification({ strategy: 'web3_metamask_signature' });
web3Wallet = await web3Wallet.prepareVerification({ strategy });
const nonce = web3Wallet.verification.nonce as string;
const signature = await generateSignatureWithMetamask({ identifier, nonce });
const signature = await generateWeb3Signature({ identifier, nonce, provider });
await web3Wallet.attemptVerification({ signature });
card.setIdle();
} catch (err) {
card.setIdle();
console.log(err);
const fieldError = getFieldError(err);
if (fieldError) {
card.setError(fieldError.longMessage);
Expand All @@ -62,7 +62,13 @@ export const AddWeb3WalletActionMenu = withCardStateProvider(() => {
onClick={() => connect(strategy)}
isLoading={card.loadingMetadata === strategy}
isDisabled={card.isLoading}
localizationKey={`Connect ${strategyToDisplayData[strategy].name} wallet`}
localizationKey={localizationKeys('userProfile.web3WalletPage.web3WalletButtonsBlockButton', {
provider: strategyToDisplayData[strategy].name,
})}
sx={t => ({
justifyContent: 'start',
gap: t.space.$2,
})}
leftIcon={
<Image
elementDescriptor={descriptors.providerIcon}
Expand Down
34 changes: 25 additions & 9 deletions packages/clerk-js/src/utils/web3.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
import type { Web3Provider } from '@clerk/types';

import { toHex } from './hex';

export async function getMetamaskIdentifier(): Promise<string> {
type GetWeb3IdentifierParams = {
provider: Web3Provider;
};

export async function getWeb3Identifier(_: GetWeb3IdentifierParams): Promise<string> {
// @ts-ignore
if (!global.ethereum) {
// Do nothing when ethereum doesn't exist. We might revise this in the future
// to offer an Install Metamask prompt to our users.
Copy link
Member

Choose a reason for hiding this comment

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

Is this recommendation not viable ? (just curious)

Copy link
Member Author

Choose a reason for hiding this comment

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

Not sure if it's possible or what's the recommended way (hopefully we will find out soon), but removed the comment until we have a concrete plan in place

// Do nothing when ethereum doesn't exist.
return '';
}

Expand All @@ -16,24 +21,35 @@ export async function getMetamaskIdentifier(): Promise<string> {
return (identifiers && identifiers[0]) || '';
}

export type GenerateSignatureParams = {
type GenerateWeb3SignatureParams = {
identifier: string;
nonce: string;
provider: Web3Provider;
};

export async function generateSignatureWithMetamask({ identifier, nonce }: GenerateSignatureParams): Promise<string> {
export async function generateWeb3Signature({ identifier, nonce }: GenerateWeb3SignatureParams): Promise<string> {
// @ts-ignore
if (!global.ethereum) {
// Do nothing when ethereum doesn't exist. We might revise this in the future
// to offer an Install Metamask prompt to our users.
// Do nothing when ethereum doesn't exist.
return '';
}

// @ts-ignore
const signature: string = await global.ethereum.request({
return await global.ethereum.request({
method: 'personal_sign',
params: [`0x${toHex(nonce)}`, identifier],
});
}

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

return signature;
type GenerateSignatureParams = {
identifier: string;
nonce: string;
};

export async function generateSignatureWithMetamask({ identifier, nonce }: GenerateSignatureParams): Promise<string> {
return await generateWeb3Signature({ identifier, nonce, provider: 'metamask' });
}
3 changes: 2 additions & 1 deletion packages/localizations/src/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ export const enUS: LocalizationResource = {
},
web3WalletsSection: {
destructiveAction: 'Remove wallet',
primaryButton: 'Web3 wallets',
primaryButton: 'Connect wallet',
title: 'Web3 wallets',
},
},
Expand All @@ -810,6 +810,7 @@ export const enUS: LocalizationResource = {
},
subtitle__availableWallets: 'Select a web3 wallet to connect to your account.',
subtitle__unavailableWallets: 'There are no available web3 wallets.',
web3WalletButtonsBlockButton: '{{provider|titleize}}',
successMessage: 'The wallet has been added to your account.',
title: 'Add web3 wallet',
},
Expand Down
1 change: 1 addition & 0 deletions packages/types/src/localization.ts
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ type _LocalizationResource = {
title: LocalizationValue;
subtitle__availableWallets: LocalizationValue;
subtitle__unavailableWallets: LocalizationValue;
web3WalletButtonsBlockButton: LocalizationValue;
successMessage: LocalizationValue;
removeResource: {
title: LocalizationValue;
Expand Down
2 changes: 2 additions & 0 deletions packages/types/src/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ export interface UserResource extends ClerkResource {

get unverifiedExternalAccounts(): ExternalAccountResource[];

get verifiedWeb3Wallets(): Web3WalletResource[];

get hasVerifiedEmailAddress(): boolean;

get hasVerifiedPhoneNumber(): boolean;
Expand Down