Skip to content

Commit 8e7bcc6

Browse files
committed
default required to false
1 parent f781447 commit 8e7bcc6

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

docs/snippets/schemas/v3/identityProvider.schema.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
},
109109
"required": {
110110
"type": "boolean",
111-
"default": true
111+
"default": false
112112
}
113113
},
114114
"required": [
@@ -222,7 +222,7 @@
222222
},
223223
"required": {
224224
"type": "boolean",
225-
"default": true
225+
"default": false
226226
}
227227
},
228228
"required": [
@@ -765,7 +765,7 @@
765765
},
766766
"required": {
767767
"type": "boolean",
768-
"default": true
768+
"default": false
769769
}
770770
},
771771
"required": [
@@ -879,7 +879,7 @@
879879
},
880880
"required": {
881881
"type": "boolean",
882-
"default": true
882+
"default": false
883883
}
884884
},
885885
"required": [

docs/snippets/schemas/v3/index.schema.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4512,7 +4512,7 @@
45124512
},
45134513
"required": {
45144514
"type": "boolean",
4515-
"default": true
4515+
"default": false
45164516
}
45174517
},
45184518
"required": [
@@ -4626,7 +4626,7 @@
46264626
},
46274627
"required": {
46284628
"type": "boolean",
4629-
"default": true
4629+
"default": false
46304630
}
46314631
},
46324632
"required": [
@@ -5169,7 +5169,7 @@
51695169
},
51705170
"required": {
51715171
"type": "boolean",
5172-
"default": true
5172+
"default": false
51735173
}
51745174
},
51755175
"required": [
@@ -5283,7 +5283,7 @@
52835283
},
52845284
"required": {
52855285
"type": "boolean",
5286-
"default": true
5286+
"default": false
52875287
}
52885288
},
52895289
"required": [

packages/schemas/src/v3/identityProvider.schema.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ const schema = {
107107
},
108108
"required": {
109109
"type": "boolean",
110-
"default": true
110+
"default": false
111111
}
112112
},
113113
"required": [
@@ -221,7 +221,7 @@ const schema = {
221221
},
222222
"required": {
223223
"type": "boolean",
224-
"default": true
224+
"default": false
225225
}
226226
},
227227
"required": [
@@ -764,7 +764,7 @@ const schema = {
764764
},
765765
"required": {
766766
"type": "boolean",
767-
"default": true
767+
"default": false
768768
}
769769
},
770770
"required": [
@@ -878,7 +878,7 @@ const schema = {
878878
},
879879
"required": {
880880
"type": "boolean",
881-
"default": true
881+
"default": false
882882
}
883883
},
884884
"required": [

packages/schemas/src/v3/index.schema.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4511,7 +4511,7 @@ const schema = {
45114511
},
45124512
"required": {
45134513
"type": "boolean",
4514-
"default": true
4514+
"default": false
45154515
}
45164516
},
45174517
"required": [
@@ -4625,7 +4625,7 @@ const schema = {
46254625
},
46264626
"required": {
46274627
"type": "boolean",
4628-
"default": true
4628+
"default": false
46294629
}
46304630
},
46314631
"required": [
@@ -5168,7 +5168,7 @@ const schema = {
51685168
},
51695169
"required": {
51705170
"type": "boolean",
5171-
"default": true
5171+
"default": false
51725172
}
51735173
},
51745174
"required": [
@@ -5282,7 +5282,7 @@ const schema = {
52825282
},
52835283
"required": {
52845284
"type": "boolean",
5285-
"default": true
5285+
"default": false
52865286
}
52875287
},
52885288
"required": [

packages/web/src/ee/features/permissionSyncing/actions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export const getIntegrationProviderStates = async () => sew(() =>
4343
);
4444

4545
const isLinked = !!linkedAccount;
46-
const isRequired = integrationProviderConfig.required ?? true;
46+
const isRequired = integrationProviderConfig.required ?? false;
4747
const providerError = providerErrors?.[integrationProviderConfig.provider];
4848

4949
integrationProviderState.push({
@@ -85,7 +85,7 @@ export const unlinkIntegrationProvider = async (provider: string) => sew(() =>
8585

8686
// 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
8787
// user the option of linking optional providers in the same link accounts screen
88-
const isRequired = providerConfig.required ?? true;
88+
const isRequired = providerConfig.required ?? false;
8989
if (isRequired) {
9090
const cookieStore = await cookies();
9191
cookieStore.delete(OPTIONAL_PROVIDERS_LINK_SKIPPED_COOKIE_NAME);

packages/web/src/ee/features/sso/sso.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ export const getEEIdentityProviders = async (): Promise<IdentityProvider[]> => {
3131
const clientId = await getTokenFromConfig(providerConfig.clientId);
3232
const clientSecret = await getTokenFromConfig(providerConfig.clientSecret);
3333
const baseUrl = providerConfig.baseUrl ? await getTokenFromConfig(providerConfig.baseUrl) : undefined;
34-
providers.push({ provider: createGitHubProvider(clientId, clientSecret, baseUrl), purpose: providerConfig.purpose, required: providerConfig.required ?? true });
34+
providers.push({ provider: createGitHubProvider(clientId, clientSecret, baseUrl), purpose: providerConfig.purpose, required: providerConfig.required ?? false});
3535
}
3636
if (identityProvider.provider === "gitlab") {
3737
const providerConfig = identityProvider as GitLabIdentityProviderConfig;
3838
const clientId = await getTokenFromConfig(providerConfig.clientId);
3939
const clientSecret = await getTokenFromConfig(providerConfig.clientSecret);
4040
const baseUrl = providerConfig.baseUrl ? await getTokenFromConfig(providerConfig.baseUrl) : undefined;
41-
providers.push({ provider: createGitLabProvider(clientId, clientSecret, baseUrl), purpose: providerConfig.purpose, required: providerConfig.required ?? true });
41+
providers.push({ provider: createGitLabProvider(clientId, clientSecret, baseUrl), purpose: providerConfig.purpose, required: providerConfig.required ?? false});
4242
}
4343
if (identityProvider.provider === "google") {
4444
const providerConfig = identityProvider as GoogleIdentityProviderConfig;

packages/web/src/lib/identityProviders.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ export const getIdentityProviderMetadata = (): IdentityProviderMetadata[] => {
1616
id: providerInfo.id,
1717
name: providerInfo.name,
1818
purpose: provider.purpose,
19-
required: provider.required ?? true,
19+
required: provider.required ?? false,
2020
};
2121
} else {
2222
return {
2323
id: provider.provider.id,
2424
name: provider.provider.name,
2525
purpose: provider.purpose,
26-
required: provider.required ?? true,
26+
required: provider.required ?? false,
2727
};
2828
}
2929
});

schemas/v3/identityProvider.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"required": {
2424
"type": "boolean",
25-
"default": true
25+
"default": false
2626
}
2727
},
2828
"required": ["provider", "purpose", "clientId", "clientSecret"]
@@ -47,7 +47,7 @@
4747
},
4848
"required": {
4949
"type": "boolean",
50-
"default": true
50+
"default": false
5151
}
5252
},
5353
"required": ["provider", "purpose", "clientId", "clientSecret"]

0 commit comments

Comments
 (0)