Skip to content

Commit 42a0291

Browse files
HarshMN2345HarshMN2345
committed
fix: Enable Update button for any field change in all OAuth provider modals
1 parent 414fd53 commit 42a0291

File tree

9 files changed

+30
-37
lines changed

9 files changed

+30
-37
lines changed

‎src/routes/(console)/project-[region]-[project]/auth/(providers)/appleOAuth.svelte

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,9 @@
7373
<svelte:fragment slot="footer">
7474
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
7575
<Button
76-
disabled={(secret === provider.secret &&
76+
disabled={secret === provider.secret &&
7777
enabled === provider.enabled &&
78-
appId === provider.appId) ||
79-
!(appId && keyID && teamID && p8)}
78+
appId === provider.appId}
8079
submit>Update</Button>
8180
</svelte:fragment>
8281
</Modal>

‎src/routes/(console)/project-[region]-[project]/auth/(providers)/auth0OAuth.svelte

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,9 @@
7777
<svelte:fragment slot="footer">
7878
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
7979
<Button
80-
disabled={(secret === provider.secret &&
80+
disabled={secret === provider.secret &&
8181
enabled === provider.enabled &&
82-
appId === provider.appId) ||
83-
!(appId && clientSecret && auth0Domain)}
82+
appId === provider.appId}
8483
submit>Update</Button>
8584
</svelte:fragment>
8685
</Modal>

‎src/routes/(console)/project-[region]-[project]/auth/(providers)/authentikOAuth.svelte

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,9 @@
8181
<svelte:fragment slot="footer">
8282
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
8383
<Button
84-
disabled={(secret === provider.secret &&
84+
disabled={secret === provider.secret &&
8585
enabled === provider.enabled &&
86-
appId === provider.appId) ||
87-
!(appId && clientSecret && authentikDomain)}
86+
appId === provider.appId}
8887
submit>Update</Button>
8988
</svelte:fragment>
9089
</Modal>

‎src/routes/(console)/project-[region]-[project]/auth/(providers)/gitlabOAuth.svelte

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,9 @@
7676
<svelte:fragment slot="footer">
7777
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
7878
<Button
79-
disabled={(secret === provider.secret &&
79+
disabled={secret === provider.secret &&
8080
enabled === provider.enabled &&
81-
appId === provider.appId) ||
82-
!(appId && clientSecret)}
81+
appId === provider.appId}
8382
submit>Update</Button>
8483
</svelte:fragment>
8584
</Modal>

‎src/routes/(console)/project-[region]-[project]/auth/(providers)/googleOAuth.svelte

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,9 @@
7272
<svelte:fragment slot="footer">
7373
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
7474
<Button
75-
disabled={!appId ||
76-
!secret ||
77-
(appId === provider.appId &&
78-
secret === provider.secret &&
79-
enabled === provider.enabled)}
75+
disabled={secret === provider.secret &&
76+
enabled === provider.enabled &&
77+
appId === provider.appId}
8078
submit>Update</Button>
8179
</svelte:fragment>
8280
</Modal>

‎src/routes/(console)/project-[region]-[project]/auth/(providers)/mainOAuth.svelte

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,9 @@
7171
<svelte:fragment slot="footer">
7272
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
7373
<Button
74-
disabled={!appId ||
75-
!secret ||
76-
(appId === provider.appId &&
77-
secret === provider.secret &&
78-
enabled === provider.enabled)}
74+
disabled={secret === provider.secret &&
75+
enabled === provider.enabled &&
76+
appId === provider.appId}
7977
submit>Update</Button>
8078
</svelte:fragment>
8179
</Modal>

‎src/routes/(console)/project-[region]-[project]/auth/(providers)/microsoftOAuth.svelte

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@
4242
clientSecret && tenantID ? JSON.stringify({ clientSecret, tenantID }) : provider.secret;
4343
</script>
4444

45-
<Modal {error} onSubmit={update} bind:show on:close>
46-
<svelte:fragment slot="title">{provider.name} OAuth2 settings</svelte:fragment>
47-
<p>
45+
<Modal {error} onSubmit={update} bind:show on:close title={`${provider.name} OAuth2 settings`}>
46+
<p slot="description">
4847
To use {provider.name} authentication in your application, first fill in this form. For more
4948
info you can
5049
<a class="link" href={oAuthProvider?.docs} target="_blank" rel="noopener noreferrer">
@@ -78,10 +77,9 @@
7877
<svelte:fragment slot="footer">
7978
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
8079
<Button
81-
disabled={(secret === provider.secret &&
80+
disabled={secret === provider.secret &&
8281
enabled === provider.enabled &&
83-
appId === provider.appId) ||
84-
!(appId && clientSecret && tenantID)}
82+
appId === provider.appId}
8583
submit>Update</Button>
8684
</svelte:fragment>
8785
</Modal>

‎src/routes/(console)/project-[region]-[project]/auth/(providers)/oidcOAuth.svelte

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,9 @@
115115
<svelte:fragment slot="footer">
116116
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
117117
<Button
118-
disabled={(secret === provider.secret &&
118+
disabled={secret === provider.secret &&
119119
enabled === provider.enabled &&
120-
appId === provider.appId) ||
121-
!(appId && isValidSecret)}
120+
appId === provider.appId}
122121
submit>Update</Button>
123122
</svelte:fragment>
124123
</Modal>

‎src/routes/(console)/project-[region]-[project]/auth/(providers)/oktaOAuth.svelte

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,14 @@
4747
: provider.secret;
4848
</script>
4949

50-
<Modal {error} onSubmit={update} size="l" bind:show on:close>
51-
<svelte:fragment slot="title">{provider.name} OAuth2 settings</svelte:fragment>
52-
<p>
50+
<Modal
51+
{error}
52+
onSubmit={update}
53+
size="m"
54+
bind:show
55+
on:close
56+
title={`${provider.name} OAuth2 settings`}>
57+
<p slot="description">
5358
To use {provider.name} authentication in your application, first fill in this form. For more
5459
info you can
5560
<a class="link" href={oAuthProvider?.docs} target="_blank" rel="noopener noreferrer"
@@ -88,10 +93,9 @@
8893
<svelte:fragment slot="footer">
8994
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
9095
<Button
91-
disabled={(secret === provider.secret &&
96+
disabled={secret === provider.secret &&
9297
enabled === provider.enabled &&
93-
appId === provider.appId) ||
94-
!(appId && clientSecret && oktaDomain && authorizationServerId)}
98+
appId === provider.appId}
9599
submit>Update</Button>
96100
</svelte:fragment>
97101
</Modal>

0 commit comments

Comments
 (0)