Skip to content

Commit 27a5ae1

Browse files
authored
chore(origins): include xoauth origins when requesting permissions (#12315)
1 parent 92dc51c commit 27a5ae1

File tree

1 file changed

+11
-11
lines changed
  • packages/mask/dashboard/pages/SetupPersona/Permissions

1 file changed

+11
-11
lines changed

packages/mask/dashboard/pages/SetupPersona/Permissions/index.tsx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1+
import Services from '#services'
2+
import { Trans } from '@lingui/react/macro'
13
import { Icons } from '@masknet/icons'
4+
import { SOCIAL_MEDIA_ROUND_ICON_MAPPING } from '@masknet/shared'
5+
import { DashboardRoutes, EMPTY_LIST } from '@masknet/shared-base'
26
import { makeStyles } from '@masknet/theme'
37
import { Typography } from '@mui/material'
8+
import { sortBy } from 'lodash-es'
49
import { memo, useCallback } from 'react'
5-
import Services from '#services'
10+
import { useNavigate } from 'react-router-dom'
611
import { useAsync } from 'react-use'
7-
import { sortBy } from 'lodash-es'
8-
import { SOCIAL_MEDIA_ROUND_ICON_MAPPING } from '@masknet/shared'
12+
import { requestPermissionFromExtensionPage } from '../../../../shared-ui/index.js'
13+
import { definedSiteAdaptors } from '../../../../shared/site-adaptors/definitions.js'
914
import { PrimaryButton } from '../../../components/PrimaryButton/index.js'
1015
import { SecondaryButton } from '../../../components/SecondaryButton/index.js'
1116
import { SetupFrameController } from '../../../components/SetupFrame/index.js'
12-
import { requestPermissionFromExtensionPage } from '../../../../shared-ui/index.js'
13-
import { definedSiteAdaptors } from '../../../../shared/site-adaptors/definitions.js'
14-
import { DashboardRoutes, EMPTY_LIST } from '@masknet/shared-base'
15-
import { useNavigate } from 'react-router-dom'
16-
import { Trans } from '@lingui/react/macro'
17+
import { XOAuthRequestOrigins } from '../../../../shared/definitions/extension.js'
1718

1819
const useStyles = makeStyles()((theme) => ({
1920
title: {
@@ -85,9 +86,8 @@ export const Component = memo(function Permission() {
8586
}, [])
8687

8788
const handleAgree = useCallback(async () => {
88-
const granted = await requestPermissionFromExtensionPage(
89-
[...definedSiteAdaptors.values()].flatMap((x) => x.declarativePermissions.origins),
90-
)
89+
const siteOrigins = [...definedSiteAdaptors.values()].flatMap((x) => x.declarativePermissions.origins)
90+
const granted = await requestPermissionFromExtensionPage([...siteOrigins, ...XOAuthRequestOrigins])
9191
if (!granted) return
9292
navigate(DashboardRoutes.PermissionsOnboarding, { replace: true })
9393
}, [])

0 commit comments

Comments
 (0)