ChatGPT/FastGPT
1
0
Fork 0
mirror of https://github.com/labring/FastGPT.git synced 2025-07-23 13:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

microsoft oauth tenantId & custom button name (#3300)

Browse Source
This commit is contained in:
heheer
2024-12-03 15:28:56 +08:00
committed by GitHub
parent cb56d1e53e
commit 7faa427e84
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/global/common/system/types/index.d.ts vendored
View File

@@ -56,7 +56,11 @@ export type FastGPTFeConfigsType = {
github?: string; github?: string;
google?: string; google?: string;
wechat?: string; wechat?: string;
microsoft?: string; microsoft?: {
clientId?: string;
tenantId?: string;
customButton?: string;
};
}; };
limit?: { limit?: {
exportDatasetLimitMinutes?: number; exportDatasetLimitMinutes?: number;

5
projects/app/src/pages/login/components/LoginForm/components/FormLayout.tsx
View File

@@ -62,10 +62,11 @@ const FormLayout = ({ children, setPageType, pageType }: Props) => {
...(feConfigs?.oauth?.microsoft ...(feConfigs?.oauth?.microsoft
? [ ? [
{ {
label: t('common:support.user.login.Microsoft'), label:
feConfigs?.oauth?.microsoft?.customButton || t('common:support.user.login.Microsoft'),
provider: OAuthEnum.microsoft, provider: OAuthEnum.microsoft,
icon: 'common/microsoft', icon: 'common/microsoft',
redirectUrl: `https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=${feConfigs?.oauth?.microsoft}&response_type=code&redirect_uri=${redirectUri}&response_mode=query&scope=https%3A%2F%2Fgraph.microsoft.com%2Fuser.read&state=${state.current}` redirectUrl: `https://login.microsoftonline.com/${feConfigs?.oauth?.microsoft?.tenantId || 'common'}/oauth2/v2.0/authorize?client_id=${feConfigs?.oauth?.microsoft?.clientId}&response_type=code&redirect_uri=${redirectUri}&response_mode=query&scope=https%3A%2F%2Fgraph.microsoft.com%2Fuser.read&state=${state.current}`
} }
] ]
: []), : []),