Skip to content

fixup! chore(origins): include xoauth origins when requesting permiss… #12316

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
guanbinrui merged 1 commit into from
Nov 7, 2025
+14 −15
Merged

fixup! chore(origins): include xoauth origins when requesting permiss… #12316

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
23 changes: 11 additions & 12 deletions packages/mask/dashboard/pages/SetupPersona/Onboarding/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import { memo, useCallback, useEffect, useMemo } from 'react'
import { Box, Typography, useTheme } from '@mui/material'
import { SetupFrameController } from '../../../components/SetupFrame/index.js'
import { PrimaryButton } from '../../../components/PrimaryButton/index.js'
import { makeStyles, useCustomSnackbar } from '@masknet/theme'
import { Icons } from '@masknet/icons'
import { Trend } from '../../../assets/index.js'
import { CrossIsolationMessages, EnhanceableSite, PopupRoutes, userGuideStatus } from '@masknet/shared-base'
import { makeStyles, useCustomSnackbar } from '@masknet/theme'
import { Box, Typography } from '@mui/material'
import { memo, useCallback, useEffect, useMemo } from 'react'
import { Trend } from '../../../assets/index.js'
import { PrimaryButton } from '../../../components/PrimaryButton/index.js'
import { SetupFrameController } from '../../../components/SetupFrame/index.js'

import Services from '#services'
import { plural } from '@lingui/core/macro'
import { Trans, useLingui } from '@lingui/react/macro'
import { delay } from '@masknet/kit'
import { OnboardingWriter } from '../../../components/OnboardingWriter/index.js'
import { useSearchParams } from 'react-router-dom'
import { isZero } from '@masknet/web3-shared-base'
import { useSearchParams } from 'react-router-dom'
import { useAsyncRetry } from 'react-use'
import { TwitterAdaptor } from '../../../../shared/site-adaptors/implementations/twitter.com.js'
import { requestPermissionFromExtensionPage } from '../../../../shared-ui/index.js'
import { Trans, useLingui } from '@lingui/react/macro'
import { plural } from '@lingui/core/macro'
import { TwitterAdaptor } from '../../../../shared/site-adaptors/implementations/twitter.com.js'
import { OnboardingWriter } from '../../../components/OnboardingWriter/index.js'

const useStyles = makeStyles()((theme) => ({
card: {
Expand Down Expand Up @@ -81,7 +81,6 @@ export const Component = memo(function Onboarding() {

const [params] = useSearchParams()
const { showSnackbar } = useCustomSnackbar()
const theme = useTheme()
const isCreate = params.get('isCreate')
const count = params.get('count')
const { value: hasPaymentPassword, loading, retry } = useAsyncRetry(Services.Wallet.hasPassword, [])
Expand Down
6 changes: 3 additions & 3 deletions packages/mask/dashboard/pages/SetupPersona/Welcome/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { SecondaryButton } from '../../../components/SecondaryButton/index.js'
import { SetupFrameController } from '../../../components/SetupFrame/index.js'
import { TermsAgreedContext } from '../../../hooks/useTermsAgreed.js'
import { Article } from './Article.js'
import { XOAuthRequestOrigins } from '../../../../shared/definitions/extension.js'

const useStyles = makeStyles()((theme) => ({
title: {
Expand Down Expand Up @@ -65,9 +66,8 @@ export const Component = memo(function Welcome() {
setAgreed(true)

try {
const granted = await requestPermissionFromExtensionPage(
[...definedSiteAdaptors.values()].flatMap((x) => x.declarativePermissions.origins),
)
const siteOrigins = [...definedSiteAdaptors.values()].flatMap((x) => x.declarativePermissions.origins)
const granted = await requestPermissionFromExtensionPage([...siteOrigins, ...XOAuthRequestOrigins])
if (!granted) return
if (!userGuideStatus[EnhanceableSite.Twitter].value) userGuideStatus[EnhanceableSite.Twitter].value = '1'
} catch (err) {
Expand Down