mirror of
https://github.com/sourcebot-dev/sourcebot.git
synced 2025-12-12 12:25:22 +00:00
default required to false
This commit is contained in:
parent
f781447a0b
commit
8e7bcc6459
8 changed files with 24 additions and 24 deletions
|
|
@ -108,7 +108,7 @@
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
@ -222,7 +222,7 @@
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
@ -765,7 +765,7 @@
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
@ -879,7 +879,7 @@
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
|
||||||
|
|
@ -4512,7 +4512,7 @@
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
@ -4626,7 +4626,7 @@
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
@ -5169,7 +5169,7 @@
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
@ -5283,7 +5283,7 @@
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ const schema = {
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
@ -221,7 +221,7 @@ const schema = {
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
@ -764,7 +764,7 @@ const schema = {
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
@ -878,7 +878,7 @@ const schema = {
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
|
||||||
|
|
@ -4511,7 +4511,7 @@ const schema = {
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
@ -4625,7 +4625,7 @@ const schema = {
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
@ -5168,7 +5168,7 @@ const schema = {
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
@ -5282,7 +5282,7 @@ const schema = {
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ export const getIntegrationProviderStates = async () => sew(() =>
|
||||||
);
|
);
|
||||||
|
|
||||||
const isLinked = !!linkedAccount;
|
const isLinked = !!linkedAccount;
|
||||||
const isRequired = integrationProviderConfig.required ?? true;
|
const isRequired = integrationProviderConfig.required ?? false;
|
||||||
const providerError = providerErrors?.[integrationProviderConfig.provider];
|
const providerError = providerErrors?.[integrationProviderConfig.provider];
|
||||||
|
|
||||||
integrationProviderState.push({
|
integrationProviderState.push({
|
||||||
|
|
@ -85,7 +85,7 @@ export const unlinkIntegrationProvider = async (provider: string) => sew(() =>
|
||||||
|
|
||||||
// If we're unlinking a required identity provider then we want to wipe the optional skip cookie if it exists so that we give the
|
// If we're unlinking a required identity provider then we want to wipe the optional skip cookie if it exists so that we give the
|
||||||
// user the option of linking optional providers in the same link accounts screen
|
// user the option of linking optional providers in the same link accounts screen
|
||||||
const isRequired = providerConfig.required ?? true;
|
const isRequired = providerConfig.required ?? false;
|
||||||
if (isRequired) {
|
if (isRequired) {
|
||||||
const cookieStore = await cookies();
|
const cookieStore = await cookies();
|
||||||
cookieStore.delete(OPTIONAL_PROVIDERS_LINK_SKIPPED_COOKIE_NAME);
|
cookieStore.delete(OPTIONAL_PROVIDERS_LINK_SKIPPED_COOKIE_NAME);
|
||||||
|
|
|
||||||
|
|
@ -31,14 +31,14 @@ export const getEEIdentityProviders = async (): Promise<IdentityProvider[]> => {
|
||||||
const clientId = await getTokenFromConfig(providerConfig.clientId);
|
const clientId = await getTokenFromConfig(providerConfig.clientId);
|
||||||
const clientSecret = await getTokenFromConfig(providerConfig.clientSecret);
|
const clientSecret = await getTokenFromConfig(providerConfig.clientSecret);
|
||||||
const baseUrl = providerConfig.baseUrl ? await getTokenFromConfig(providerConfig.baseUrl) : undefined;
|
const baseUrl = providerConfig.baseUrl ? await getTokenFromConfig(providerConfig.baseUrl) : undefined;
|
||||||
providers.push({ provider: createGitHubProvider(clientId, clientSecret, baseUrl), purpose: providerConfig.purpose, required: providerConfig.required ?? true });
|
providers.push({ provider: createGitHubProvider(clientId, clientSecret, baseUrl), purpose: providerConfig.purpose, required: providerConfig.required ?? false});
|
||||||
}
|
}
|
||||||
if (identityProvider.provider === "gitlab") {
|
if (identityProvider.provider === "gitlab") {
|
||||||
const providerConfig = identityProvider as GitLabIdentityProviderConfig;
|
const providerConfig = identityProvider as GitLabIdentityProviderConfig;
|
||||||
const clientId = await getTokenFromConfig(providerConfig.clientId);
|
const clientId = await getTokenFromConfig(providerConfig.clientId);
|
||||||
const clientSecret = await getTokenFromConfig(providerConfig.clientSecret);
|
const clientSecret = await getTokenFromConfig(providerConfig.clientSecret);
|
||||||
const baseUrl = providerConfig.baseUrl ? await getTokenFromConfig(providerConfig.baseUrl) : undefined;
|
const baseUrl = providerConfig.baseUrl ? await getTokenFromConfig(providerConfig.baseUrl) : undefined;
|
||||||
providers.push({ provider: createGitLabProvider(clientId, clientSecret, baseUrl), purpose: providerConfig.purpose, required: providerConfig.required ?? true });
|
providers.push({ provider: createGitLabProvider(clientId, clientSecret, baseUrl), purpose: providerConfig.purpose, required: providerConfig.required ?? false});
|
||||||
}
|
}
|
||||||
if (identityProvider.provider === "google") {
|
if (identityProvider.provider === "google") {
|
||||||
const providerConfig = identityProvider as GoogleIdentityProviderConfig;
|
const providerConfig = identityProvider as GoogleIdentityProviderConfig;
|
||||||
|
|
|
||||||
|
|
@ -16,14 +16,14 @@ export const getIdentityProviderMetadata = (): IdentityProviderMetadata[] => {
|
||||||
id: providerInfo.id,
|
id: providerInfo.id,
|
||||||
name: providerInfo.name,
|
name: providerInfo.name,
|
||||||
purpose: provider.purpose,
|
purpose: provider.purpose,
|
||||||
required: provider.required ?? true,
|
required: provider.required ?? false,
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
return {
|
return {
|
||||||
id: provider.provider.id,
|
id: provider.provider.id,
|
||||||
name: provider.provider.name,
|
name: provider.provider.name,
|
||||||
purpose: provider.purpose,
|
purpose: provider.purpose,
|
||||||
required: provider.required ?? true,
|
required: provider.required ?? false,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": ["provider", "purpose", "clientId", "clientSecret"]
|
"required": ["provider", "purpose", "clientId", "clientSecret"]
|
||||||
|
|
@ -47,7 +47,7 @@
|
||||||
},
|
},
|
||||||
"required": {
|
"required": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"default": true
|
"default": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": ["provider", "purpose", "clientId", "clientSecret"]
|
"required": ["provider", "purpose", "clientId", "clientSecret"]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue