AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-15 10:45:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Hotfix/revert webapp login page (#18706)

Browse Source
This commit is contained in:
NFish 2025-04-24 17:54:03 +08:00 committed by GitHub
parent 7c1116f139
commit 7c31e3b6ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/app/(shareLayout)/webapp-signin/page.tsx
View File

@ -8,7 +8,6 @@ import cn from '@/utils/classnames'
import Toast from '@/app/components/base/toast' import Toast from '@/app/components/base/toast'
import { fetchWebOAuth2SSOUrl, fetchWebOIDCSSOUrl, fetchWebSAMLSSOUrl } from '@/service/share' import { fetchWebOAuth2SSOUrl, fetchWebOIDCSSOUrl, fetchWebSAMLSSOUrl } from '@/service/share'
import { setAccessToken } from '@/app/components/share/utils' import { setAccessToken } from '@/app/components/share/utils'
import Button from '@/app/components/base/button'
import { useGlobalPublicStore } from '@/context/global-public-context' import { useGlobalPublicStore } from '@/context/global-public-context'
import { SSOProtocol } from '@/types/feature' import { SSOProtocol } from '@/types/feature'
import Loading from '@/app/components/base/loading' import Loading from '@/app/components/base/loading'
@ -97,10 +96,11 @@ const WebSSOForm: FC = () => {
if (systemFeatures.webapp_auth.enabled) { if (systemFeatures.webapp_auth.enabled) {
if (systemFeatures.webapp_auth.allow_sso) { if (systemFeatures.webapp_auth.allow_sso) {
handleSSOLogin()
return ( return (
<div className="flex items-center justify-center h-full"> <div className="flex items-center justify-center h-full">
<div className={cn('flex flex-col items-center w-full grow justify-center', 'px-6', 'md:px-[108px]')}> <div className={cn('flex flex-col items-center w-full grow justify-center', 'px-6', 'md:px-[108px]')}>
<Button variant='primary' onClick={() => { handleSSOLogin() }}>{t('login.withSSO')}</Button> <Loading />
</div> </div>
</div> </div>
) )

2
web/app/components/app/app-access-control/add-member-or-group-pop.tsx
View File

@ -3,6 +3,7 @@ import { RiAddCircleFill, RiArrowRightSLine, RiOrganizationChart } from '@remixi
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { useCallback, useEffect, useRef, useState } from 'react' import { useCallback, useEffect, useRef, useState } from 'react'
import { useDebounce } from 'ahooks' import { useDebounce } from 'ahooks'
import { FloatingOverlay } from '@floating-ui/react'
import Avatar from '../../base/avatar' import Avatar from '../../base/avatar'
import Button from '../../base/button' import Button from '../../base/button'
import Checkbox from '../../base/checkbox' import Checkbox from '../../base/checkbox'
@ -50,6 +51,7 @@ export default function AddMemberOrGroupDialog() {
<span>{t('common.operation.add')}</span> <span>{t('common.operation.add')}</span>
</Button> </Button>
</PortalToFollowElemTrigger> </PortalToFollowElemTrigger>
{open && <FloatingOverlay />}
<PortalToFollowElemContent className='z-[25]'> <PortalToFollowElemContent className='z-[25]'>
<div className='w-[400px] max-h-[400px] relative overflow-y-auto flex flex-col border-[0.5px] border-components-panel-border rounded-xl bg-components-panel-bg-blur backdrop-blur-[5px] shadow-lg'> <div className='w-[400px] max-h-[400px] relative overflow-y-auto flex flex-col border-[0.5px] border-components-panel-border rounded-xl bg-components-panel-bg-blur backdrop-blur-[5px] shadow-lg'>
<div className='p-2 pb-0.5 sticky top-0 bg-components-panel-bg-blur backdrop-blur-[5px] z-1'> <div className='p-2 pb-0.5 sticky top-0 bg-components-panel-bg-blur backdrop-blur-[5px] z-1'>

2
web/app/components/share/text-generation/menu-dropdown.tsx
View File

@ -83,7 +83,7 @@ const MenuDropdown: FC<Props> = ({
}} }}
className='system-md-regular cursor-pointer rounded-lg px-3 py-1.5 text-text-secondary hover:bg-state-base-hover' className='system-md-regular cursor-pointer rounded-lg px-3 py-1.5 text-text-secondary hover:bg-state-base-hover'
>{t('common.userProfile.about')}</div> >{t('common.userProfile.about')}</div>
{!hideLogout && ( {false && (
<> <>
<Divider /> <Divider />
<div <div