feat: mf-6735 integrate privy wallet support #12281
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -104,3 +104,4 @@ | |
|
|
||
| ; FIREFLY_X_CLIENT_ID= | ||
| ; FIREFLY_X_CLIENT_SECRET= | ||
| ; PRIVY_APP_ID= | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ approvedList.set('string-width-cjs', 'npm:string-width@^4.2.0') | |
| approvedList.set('strip-ansi-cjs', 'npm:strip-ansi@^6.0.1') | ||
| approvedList.set('wrap-ansi-cjs', ['npm:wrap-ansi@^6.0.1', 'npm:wrap-ansi@^7.0.0']) | ||
|
|
||
| approvedList.set('cbw-sdk', ['npm:@coinbase/[email protected]']) | ||
| /** | ||
| * @param {string} parentPackage The current resolving parentPackage | ||
| * @param {string} dependedPackage The package it depends on | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,34 @@ | ||||||
| import { PersistentStorages } from '@masknet/shared-base' | ||||||
|
|
||||||
| export async function loginFireflyViaTwitter() { | ||||||
| const data = await browser.storage.local.get('firefly_x_oauth') | ||||||
| if (!data?.firefly_x_oauth) throw new Error('X OAuth token not found') | ||||||
| const oauth: Record<string, string> = data.firefly_x_oauth | ||||||
|
|
||||||
| const res = await fetch('https://firefly.social/api/twitter/auth', { | ||||||
| method: 'POST', | ||||||
| headers: { | ||||||
| 'X-Access-Token': oauth.oauth_token, | ||||||
| 'X-Access-Token-Secret': oauth.oauth_token_secret, | ||||||
| 'X-Client-Id': oauth.oauth_token.split('-')[0], | ||||||
| 'X-Consumer-Key': process.env.FIREFLY_X_CLIENT_ID, | ||||||
| 'X-Consumer-Secret': '[HIDE_FROM_CLIENT]', | ||||||
|
There was a problem hiding this comment. Hardcoded placeholder '[HIDE_FROM_CLIENT]' for consumer secret suggests incomplete implementation. This should use the actual environment variable or be properly handled to avoid authentication failures.
Suggested change
Copilot uses AI. Check for mistakes. |
||||||
| }, | ||||||
| }) | ||||||
| const json = await res.json() | ||||||
| if (!json.success) throw new Error(json.message) | ||||||
|
|
||||||
| const res2 = await fetch('https://api.firefly.land/v3/auth/exchange/twitter', { | ||||||
| method: 'POST', | ||||||
| headers: { | ||||||
| 'Content-Type': 'application/json', | ||||||
| }, | ||||||
| body: JSON.stringify({ | ||||||
| data: json.data, | ||||||
| }), | ||||||
| }) | ||||||
| const json2 = await res2.json() | ||||||
| await browser.storage.local.set({ firefly_account: json2.data }) | ||||||
| await PersistentStorages.Settings.storage.firefly_account.setValue(json2.data) | ||||||
| return json2.data | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,51 @@ | ||
| import { i18n } from '@lingui/core' | ||
| import { useSiteThemeMode } from '@masknet/plugin-infra/content-script' | ||
| import { LinguiProviderHMR, SharedContextProvider, PrivySetup } from '@masknet/shared' | ||
| import { queryClient } from '@masknet/shared-base-ui' | ||
| import { DialogStackingProvider, MaskThemeProvider } from '@masknet/theme' | ||
| import { RootWeb3ContextProvider } from '@masknet/web3-hooks-base' | ||
| import { QueryClientProvider } from '@tanstack/react-query' | ||
| import { ReactQueryDevtools } from '@tanstack/react-query-devtools' | ||
| import { PersistQueryClientProvider } from '@tanstack/react-query-persist-client' | ||
| import { Suspense } from 'react' | ||
| import { createPortal } from 'react-dom' | ||
| import { queryPersistOptions } from '../../../shared-ui/utils/persistOptions.js' | ||
| import { useMaskSiteAdaptorMixedTheme } from '../../components/useMaskSiteAdaptorMixedTheme.js' | ||
|
|
||
| export function ContentScriptGlobalProvider(children: React.ReactNode) { | ||
|
There was a problem hiding this comment. Why remove the usage of There was a problem hiding this comment. It is suitable to compose single-child jsx, if there are multiple children, it might end up xml style. You can see there is a Besides, it causes every component renders twice, once for the original, once for the cloned one. There was a problem hiding this comment. What do you mean by renders twice? Does that mean the JSX tree is being duplicated in the final rendering tree? There was a problem hiding this comment.
Sorry, it might be that I misread it at the time. |
||
| const jsx = | ||
| process.env.NODE_ENV === 'development' ? | ||
| <> | ||
| {/* https://github.com/TanStack/query/issues/5417 */} | ||
| {createPortal(<ReactQueryDevtools buttonPosition="bottom-right" />, document.body)} | ||
| {children} | ||
| </> | ||
|
Comment on lines
18
to
22
There was a problem hiding this comment. Multiple children should go here. Does that answer your question? There was a problem hiding this comment. I think xml style would be more convenient, it's inconvenient to add siblings. Like if you prepend a sibling before I think To avoid deep indent, we can reduce the indent width, that's why I ignored prettier for this, or we can group those providers by dimensions, like Anyway, I can revert to |
||
| : children | ||
|
|
||
| // eslint-disable: react-compiler/react-compiler | ||
| // prettier-ignore | ||
| return ( | ||
| <Suspense> | ||
| <DialogStackingProvider hasGlobalBackdrop={false}> | ||
| <QueryClientProvider client={queryClient}> | ||
| <PersistQueryClientProvider client={queryClient} persistOptions={queryPersistOptions}> | ||
| <RootWeb3ContextProvider> | ||
| <PrivySetup /> | ||
| <SharedContextProvider> | ||
| <LinguiProviderHMR i18n={i18n}> | ||
| <MaskThemeProvider | ||
| // eslint-disable-next-line react-compiler/react-compiler | ||
| useMaskIconPalette={useSiteThemeMode} | ||
| // eslint-disable-next-line react-compiler/react-compiler | ||
| useTheme={useMaskSiteAdaptorMixedTheme}> | ||
| {jsx} | ||
| </MaskThemeProvider> | ||
| </LinguiProviderHMR> | ||
| </SharedContextProvider> | ||
| </RootWeb3ContextProvider> | ||
| </PersistQueryClientProvider> | ||
| </QueryClientProvider> | ||
| </DialogStackingProvider> | ||
| </Suspense> | ||
| ) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,21 @@ | ||
| import { Suspense } from 'react' | ||
| import { CSSVariableInjector, CustomSnackbarProvider } from '@masknet/theme' | ||
| import { ErrorBoundary } from '@masknet/shared-base-ui' | ||
| import { Sniffings } from '@masknet/shared-base' | ||
|
|
||
| // Providers added here will be added to ALL ShadowRoots, if you're mean to add a global one, add it in ./SiteUIProvider.tsx | ||
| export function ShadowRootAttachPointRoot(children: React.ReactNode) { | ||
|
There was a problem hiding this comment. Let lines of code, and clear hierarchical relation at a glance. |
||
| return ( | ||
| <Suspense> | ||
| <ErrorBoundary> | ||
| <CustomSnackbarProvider | ||
| disableWindowBlurListener={false} | ||
| anchorOrigin={{ vertical: 'top', horizontal: 'right' }} | ||
| offsetY={Sniffings.is_facebook_page ? 80 : undefined}> | ||
| <CSSVariableInjector /> | ||
| {children} | ||
| </CustomSnackbarProvider> | ||
| </ErrorBoundary> | ||
| </Suspense> | ||
| ) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.