Merge branch 'deploy/dev' of https://github.com/langgenius/dify into …

…deploy/dev

* 'deploy/dev' of https://github.com/langgenius/dify:
  revert yarn.lock
  fix
  fix: OAuth link update
  fix: move countdown to components
  fix: lint

web/app/components/app/configuration/dataset-config/params-config/config-content.tsx

@@ -52,7 +52,7 @@ const ConfigContent: FC<Props> = ({
       onChange({
         ...datasetConfigs,
         retrieval_model: RETRIEVE_TYPE.multiWay,
-      })
+      }, isInWorkflow)
     }
   }, [type])
 

web/app/reset-password/check-code/countdown.tsx → web/app/components/signin/countdown.tsx

@@ -3,7 +3,7 @@ import { useCountDown } from 'ahooks'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
-const COUNT_DOWN_TIME_MS = 59000
+export const COUNT_DOWN_TIME_MS = 59000
 const COUNT_DOWN_KEY = 'leftTime'
 
 type CountdownProps = {

web/app/reset-password/check-code/page.tsx

@@ -4,7 +4,7 @@ import { RiArrowLeftLine, RiMailSendFill } from '@remixicon/react'
 import { useTranslation } from 'react-i18next'
 import { useState } from 'react'
 import { useRouter, useSearchParams } from 'next/navigation'
-import Countdown from './countdown'
+import Countdown from '@/app/components/signin/countdown'
 import Button from '@/app/components/base/button'
 import Input from '@/app/components/base/input'
 import Toast from '@/app/components/base/toast'

web/app/signin/check-code/page.tsx

@@ -4,7 +4,7 @@ import { RiArrowLeftLine, RiMailSendFill } from '@remixicon/react'
 import { useTranslation } from 'react-i18next'
 import { useState } from 'react'
 import { useRouter, useSearchParams } from 'next/navigation'
-import Countdown from './countdown'
+import Countdown from '@/app/components/signin/countdown'
 import Button from '@/app/components/base/button'
 import Input from '@/app/components/base/input'
 import Toast from '@/app/components/base/toast'

web/app/signin/components/mail-and-code-auth.tsx

@@ -6,6 +6,7 @@ import Button from '@/app/components/base/button'
 import { emailRegex } from '@/config'
 import Toast from '@/app/components/base/toast'
 import { sendEMailLoginCode } from '@/service/common'
+import { COUNT_DOWN_TIME_MS } from '@/app/components/signin/countdown'
 
 type MailAndCodeAuthProps = {
   isInvite: boolean
@@ -36,7 +37,7 @@ export default function MailAndCodeAuth({ isInvite }: MailAndCodeAuthProps) {
       setIsLoading(true)
       const ret = await sendEMailLoginCode(email)
       if (ret.result === 'success') {
-        localStorage.setItem('leftTime', '59000')
+        localStorage.setItem('leftTime', `${COUNT_DOWN_TIME_MS}`)
         const params = new URLSearchParams(searchParams)
         params.set('email', encodeURIComponent(email))
         params.set('token', encodeURIComponent(ret.data))

web/app/signin/components/social-auth.tsx

@@ -13,12 +13,11 @@ type SocialAuthProps = {
 export default function SocialAuth(props: SocialAuthProps) {
   const { t } = useTranslation()
   const searchParams = useSearchParams()
-  const invite_token = decodeURIComponent(searchParams.get('invite_token') || '')
 
   const getOAuthLink = (href: string) => {
     const url = getPurifyHref(`${apiPrefix}${href}`)
-    if (invite_token)
-      return `${url}?invite_token=${invite_token}`
+    if (searchParams.has('invite_token'))
+      return `${url}?${searchParams.toString()}`
 
     return url
   }

web/app/signin/oneMoreStep.tsx

@@ -4,15 +4,13 @@ import { useTranslation } from 'react-i18next'
 import Link from 'next/link'
 import useSWR from 'swr'
 import { useRouter, useSearchParams } from 'next/navigation'
-// import { useContext } from 'use-context-selector'
 import Button from '@/app/components/base/button'
 import Tooltip from '@/app/components/base/tooltip'
 import { SimpleSelect } from '@/app/components/base/select'
 import { timezones } from '@/utils/timezone'
 import { LanguagesSupported, languages } from '@/i18n/language'
 import { oneMoreStep } from '@/service/common'
 import Toast from '@/app/components/base/toast'
-// import I18n from '@/context/i18n'
 
 type IState = {
   formState: 'processing' | 'error' | 'success' | 'initial'
@@ -47,7 +45,6 @@ const OneMoreStep = () => {
   const { t } = useTranslation()
   const router = useRouter()
   const searchParams = useSearchParams()
-  // const { locale } = useContext(I18n)
 
   const [state, dispatch] = useReducer(reducer, {
     formState: 'initial',

web/service/base.ts

@@ -119,7 +119,6 @@ function unicodeToChar(text: string) {
 }
 
 function requiredWebSSOLogin() {
-  console.log(globalThis.location.pathname)
   globalThis.location.href = `/webapp-signin?redirect_url=${globalThis.location.pathname}`
 }
 

web/service/common.ts

@@ -156,8 +156,8 @@ export const updatePluginProviderAIKey: Fetcher<UpdateOpenAIKeyResponse, { url:
   return post<UpdateOpenAIKeyResponse>(url, { body })
 }
 
-export const invitationCheck: Fetcher<CommonResponse & { is_valid: boolean; data: { workspace_name: string;email: string;workspace_id: string } }, { url: string; params: { workspace_id?: string; email?: string; token: string } }> = ({ url, params }) => {
-  return get<CommonResponse & { is_valid: boolean; data: { workspace_name: string;email: string;workspace_id: string } }>(url, { params })
+export const invitationCheck: Fetcher<CommonResponse & { is_valid: boolean; data: { workspace_name: string; email: string; workspace_id: string } }, { url: string; params: { workspace_id?: string; email?: string; token: string } }> = ({ url, params }) => {
+  return get<CommonResponse & { is_valid: boolean; data: { workspace_name: string; email: string; workspace_id: string } }>(url, { params })
 }
 
 export const activateMember: Fetcher<CommonResponse & { data: string }, { url: string; body: any }> = ({ url, body }) => {