Skip to content

Commit

Permalink
🐛 fix: fix /file/[id] 500 issue (#5812)
Browse files Browse the repository at this point in the history
* fix files 500

* improve provider 500 issue fix
  • Loading branch information
arvinxx authored Feb 6, 2025
1 parent 27edbb2 commit 9bb387e
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
2 changes: 0 additions & 2 deletions src/app/[variants]/(main)/files/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@ export default ({ children }: PropsWithChildren) => {

return children;
};

export const dynamic = 'force-static';
56 changes: 28 additions & 28 deletions src/app/[variants]/(main)/settings/provider/(detail)/[id]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// import { redirect } from 'next/navigation';
import { redirect } from 'next/navigation';

import { DEFAULT_MODEL_PROVIDER_LIST } from '@/config/modelProviders';
// import { isServerMode } from '@/const/version';
// import { AiInfraRepos } from '@/database/repositories/aiInfra';
// import { serverDB } from '@/database/server';
// import { getServerGlobalConfig } from '@/server/globalConfig';
// import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
import { isServerMode } from '@/const/version';
import { AiInfraRepos } from '@/database/repositories/aiInfra';
import { serverDB } from '@/database/server';
import { getServerGlobalConfig } from '@/server/globalConfig';
import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
import { PagePropsWithId } from '@/types/next';

// import { ProviderConfig } from '@/types/user/settings';
// import { getUserAuth } from '@/utils/server/auth';
import { ProviderConfig } from '@/types/user/settings';
import { getUserAuth } from '@/utils/server/auth';

import ClientMode from './ClientMode';
import ProviderDetail from './index';
Expand All @@ -21,25 +21,25 @@ const Page = async (props: PagePropsWithId) => {
if (!!builtinProviderCard) return <ProviderDetail source={'builtin'} {...builtinProviderCard} />;

// if user custom provider
// if (isServerMode) {
// const { userId } = await getUserAuth();
//
// const { aiProvider } = getServerGlobalConfig();
// const aiInfraRepos = new AiInfraRepos(
// serverDB,
// userId!,
// aiProvider as Record<string, ProviderConfig>,
// );
//
// const userCard = await aiInfraRepos.getAiProviderDetail(
// params.id,
// KeyVaultsGateKeeper.getUserKeyVaults,
// );
//
// if (!userCard) return redirect('/settings/provider');

// return <ProviderDetail {...userCard} />;
// }
if (isServerMode) {
const { userId } = await getUserAuth();

const { aiProvider } = getServerGlobalConfig();
const aiInfraRepos = new AiInfraRepos(
serverDB,
userId!,
aiProvider as Record<string, ProviderConfig>,
);

const userCard = await aiInfraRepos.getAiProviderDetail(
params.id,
KeyVaultsGateKeeper.getUserKeyVaults,
);

if (!userCard) return redirect('/settings/provider');

return <ProviderDetail {...userCard} />;
}

return <ClientMode id={params.id} />;
};
Expand Down
2 changes: 2 additions & 0 deletions src/app/[variants]/(main)/settings/provider/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ const ProviderSettingsLayout = ({ children, ...res }: PropsWithChildren) => {
ProviderSettingsLayout.displayName = 'ProviderSettingsLayout';

export default ProviderSettingsLayout;

export const dynamic = 'auto';

0 comments on commit 9bb387e

Please # to comment.