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

api/controllers/console/setup.py

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

web/app/install/page.tsx

 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'
-      )}>
-        <div className={
-          classNames(
-            'flex w-full flex-col bg-white shadow rounded-2xl shrink-0',
-            'md:w-[608px] space-between'
-          )
-        }>
-          <Header />
-          <InstallForm />
-          <div className='px-8 py-6 text-sm font-normal text-gray-500'>
-            © {new Date().getFullYear()} Dify, Inc. All rights reserved.
-          </div>
+    <div className={classNames(
+      style.background,
+      'flex w-full min-h-screen',
+      'p-4 lg:p-8',
+      'gap-x-20',
+      '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',
+        )
+      }>
+        <Header />
+        <InstallForm />
+        <div className='px-8 py-6 text-sm font-normal text-gray-500'>
+          © {new Date().getFullYear()} Dify, Inc. All rights reserved.
         </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>
 }