Merge branch 'fix/webapp-access-scope' into deploy/enterprise

This commit is contained in:
NFish 2025-06-04 10:53:50 +08:00
commit ce9ca206fa
2 changed files with 4 additions and 4 deletions

View File

@ -1,5 +1,4 @@
'use client'
import Header from '@/app/signin/_header'
import cn from '@/utils/classnames'
import { useGlobalPublicStore } from '@/context/global-public-context'
@ -11,9 +10,9 @@ export default function SignInLayout({ children }: any) {
return <>
<div className={cn('flex min-h-screen w-full justify-center bg-background-default-burn p-6')}>
<div className={cn('flex w-full shrink-0 flex-col rounded-2xl border border-effects-highlight bg-background-default-subtle')}>
<Header />
{/* <Header /> */}
<div className={cn('flex w-full grow flex-col items-center justify-center px-6 md:px-[108px]')}>
<div className='flex flex-col md:w-[400px] lg:w-[600px]'>
<div className='flex flex-col md:w-[440px] lg:w-[600px]'>
{children}
</div>
</div>

View File

@ -25,7 +25,8 @@ export const checkOrSetAccessToken = async (appCode?: string) => {
}
if (!accessTokenJson[sharedToken]?.[userId || 'DEFAULT']) {
const res = await fetchAccessToken({ appCode: sharedToken, userId })
const webAppAccessToken = localStorage.getItem('webapp_access_token')
const res = await fetchAccessToken({ appCode: sharedToken, userId, webAppAccessToken })
accessTokenJson[sharedToken] = {
...accessTokenJson[sharedToken],
[userId || 'DEFAULT']: res.access_token,