Fix: Install page redirects to signin if Dify finished setup. (#762)

api/controllers/console/setup.py

@@ -19,8 +19,8 @@ from .wraps import only_edition_self_hosted
 
 class SetupApi(Resource):
 
-    @only_edition_self_hosted
     def get(self):
+        if current_app.config['EDITION'] == 'SELF_HOSTED':
             setup_status = get_setup_status()
             if setup_status:
                 return {
@@ -28,6 +28,7 @@ class SetupApi(Resource):
                     'setup_at': setup_status.setup_at.isoformat()
                 }
             return {'step': 'not_start'}
+        return {'step': 'finished'}
 
     @only_edition_self_hosted
     def post(self):

web/app/install/installForm.tsx

@@ -1,13 +1,15 @@
 'use client'
-import React from 'react'
+import React, { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import Link from 'next/link'
 import { useRouter } from 'next/navigation'
 import { useContext } from 'use-context-selector'
 import Toast from '../components/base/toast'
+import Loading from '../components/base/loading'
 import Button from '@/app/components/base/button'
-import { setup } from '@/service/common'
 import I18n from '@/context/i18n'
+import { fetchSetupStatus, setup } from '@/service/common'
+import type { SetupStatusResponse } from '@/models/common'
 
 const validEmailReg = /^[\w\.-]+@([\w-]+\.)+[\w-]{2,}$/
 const validPassword = /^(?=.*[a-zA-Z])(?=.*\d).{8,}$/
@@ -21,6 +23,8 @@ const InstallForm = () => {
   const [name, setName] = React.useState('')
   const [password, setPassword] = React.useState('')
   const [showPassword, setShowPassword] = React.useState(false)
+  const [loading, setLoading] = React.useState(true)
+
   const showErrorMessage = (message: string) => {
     Toast.notify({
       type: 'error',
@@ -61,8 +65,20 @@ const InstallForm = () => {
     })
     router.push('/signin')
   }
+
+  useEffect(() => {
+    fetchSetupStatus().then((res: SetupStatusResponse) => {
+      if (res.step === 'finished')
+        window.location.href = '/signin'
+      else
+        setLoading(false)
+    })
+  }, [])
+
   return (
-    <>
+    loading
+      ? <Loading />
+      : <>
         <div className="sm:mx-auto sm:w-full sm:max-w-md">
           <h2 className="text-[32px] font-bold text-gray-900">{t('login.setAdminAccount')}</h2>
           <p className='

web/app/install/page.tsx

@@ -1,24 +1,22 @@
 import React from 'react'
-import InstallForm from './installForm'
+import classNames from 'classnames'
 import Header from '../signin/_header'
 import style from '../signin/page.module.css'
-import classNames from 'classnames'
-
-const SignIn = () => {
+import InstallForm from './installForm'
 
+const Install = () => {
   return (
-    <>
     <div className={classNames(
       style.background,
       'flex w-full min-h-screen',
       'p-4 lg:p-8',
       'gap-x-20',
-        'justify-center lg:justify-start'
+      'justify-center lg:justify-start',
     )}>
       <div className={
         classNames(
           'flex w-full flex-col bg-white shadow rounded-2xl shrink-0',
-            'md:w-[608px] space-between'
+          'md:w-[608px] space-between',
         )
       }>
         <Header />
@@ -28,9 +26,7 @@ const SignIn = () => {
         </div>
       </div>
     </div>
-
-    </>
   )
 }
 
-export default SignIn
+export default Install

web/models/common.ts

@@ -6,6 +6,11 @@ export type OauthResponse = {
   redirect_url: string
 }
 
+export type SetupStatusResponse = {
+  step: 'finished' | 'not_started'
+  setup_at?: Date
+}
+
 export type UserProfileResponse = {
   id: string
   name: string

web/service/common.ts

@@ -3,8 +3,8 @@ import { del, get, patch, post, put } from './base'
 import type {
   AccountIntegrate, CommonResponse, DataSourceNotion,
   IWorkspace, LangGeniusVersionResponse, Member,
-  OauthResponse, PluginProvider, Provider, ProviderAnthropicToken, ProviderAzureToken, TenantInfoResponse,
-  UserProfileOriginResponse,
+  OauthResponse, PluginProvider, Provider, ProviderAnthropicToken, ProviderAzureToken,
+  SetupStatusResponse, TenantInfoResponse, UserProfileOriginResponse,
 } from '@/models/common'
 import type {
   UpdateOpenAIKeyResponse,
@@ -19,6 +19,10 @@ export const setup: Fetcher<CommonResponse, { body: Record<string, any> }> = ({
   return post('/setup', { body }) as Promise<CommonResponse>
 }
 
+export const fetchSetupStatus = () => {
+  return get('/setup') as Promise<SetupStatusResponse>
+}
+
 export const fetchUserProfile: Fetcher<UserProfileOriginResponse, { url: string; params: Record<string, any> }> = ({ url, params }) => {
   return get(url, params, { needAllResponseContent: true }) as Promise<UserProfileOriginResponse>
 }