feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile />#4030

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 1 commit into from
Aug 28, 2024
Merged

feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile /> #4030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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.

@panteliselefpanteliselefAug 27, 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.

Is this recommendation not viable ? (just curious)

@chanioxarischanioxarisAug 28, 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.

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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 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
feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile />#4030

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 1 commit into

from

Aug 28, 2024
 Merged


feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile />
#4030
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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.
@panteliselefpanteliselefAug 27, 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.

Is this recommendation not viable ? (just curious)
@chanioxarischanioxarisAug 28, 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.

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, '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
feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile />#4030

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 1 commit into

from

Aug 28, 2024
 Merged


feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile />
#4030
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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.
@panteliselefpanteliselefAug 27, 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.

Is this recommendation not viable ? (just curious)
@chanioxarischanioxarisAug 28, 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.

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, '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 > 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
feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile />#4030

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 1 commit into

from

Aug 28, 2024
 Merged


feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile />
#4030
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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.
@panteliselefpanteliselefAug 27, 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.

Is this recommendation not viable ? (just curious)
@chanioxarischanioxarisAug 28, 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.

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, '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
feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile />#4030

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 1 commit into

from

Aug 28, 2024
 Merged


feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile />
#4030
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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.
@panteliselefpanteliselefAug 27, 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.

Is this recommendation not viable ? (just curious)
@chanioxarischanioxarisAug 28, 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.

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, '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
feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile />#4030

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 1 commit into

from

Aug 28, 2024
 Merged


feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile />
#4030
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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.
@panteliselefpanteliselefAug 27, 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.

Is this recommendation not viable ? (just curious)
@chanioxarischanioxarisAug 28, 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.

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, '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
feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile />#4030

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 1 commit into

from

Aug 28, 2024
 Merged


feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile />
#4030
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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.
@panteliselefpanteliselefAug 27, 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.

Is this recommendation not viable ? (just curious)
@chanioxarischanioxarisAug 28, 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.

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, '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
feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile />#4030

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 1 commit into

from

Aug 28, 2024
 Merged


feat(clerk-js,types): Support connecting Coinbase Wallet via <UserProfile />
#4030
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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.
@panteliselefpanteliselefAug 27, 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.

Is this recommendation not viable ? (just curious)
@chanioxarischanioxarisAug 28, 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.

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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