Skip to content

Commit 907b101

Browse files
HarshMN2345HarshMN2345
committed
fix:Require App ID and App Secret, update button logic for all
1 parent 42a0291 commit 907b101

File tree

9 files changed

+103
-60
lines changed

9 files changed

+103
-60
lines changed

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

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,11 @@
6060
label="Services ID"
6161
autofocus={true}
6262
placeholder="com.company.appname"
63-
bind:value={appId} />
64-
<InputText id="keyID" label="Key ID" placeholder="SHAB13ROFN" bind:value={keyID} />
65-
<InputText id="teamID" label="Team ID" placeholder="ELA2CD3AED" bind:value={teamID} />
66-
<InputTextarea id="p8" label="P8 File" placeholder="" bind:value={p8} />
63+
bind:value={appId}
64+
required />
65+
<InputText id="keyID" label="Key ID" placeholder="SHAB13ROFN" bind:value={keyID} required />
66+
<InputText id="teamID" label="Team ID" placeholder="ELA2CD3AED" bind:value={teamID} required />
67+
<InputTextarea id="p8" label="P8 File" placeholder="" bind:value={p8} required />
6768
<Alert.Inline status="info">
6869
To complete set up, add this OAuth2 redirect URI to your {provider.name} app configuration.
6970
</Alert.Inline>
@@ -73,9 +74,13 @@
7374
<svelte:fragment slot="footer">
7475
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
7576
<Button
76-
disabled={secret === provider.secret &&
77-
enabled === provider.enabled &&
78-
appId === provider.appId}
77+
disabled={!appId ||
78+
!keyID ||
79+
!teamID ||
80+
!p8 ||
81+
(secret === provider.secret &&
82+
enabled === provider.enabled &&
83+
appId === provider.appId)}
7984
submit>Update</Button>
8085
</svelte:fragment>
8186
</Modal>

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,25 @@
5252
</svelte:fragment>
5353
<InputSwitch id="state" bind:value={enabled} label={enabled ? 'Enabled' : 'Disabled'} />
5454
<InputText
55-
id="clientID"
55+
id="appID"
5656
label="Client ID"
5757
autofocus={true}
5858
placeholder="Enter ID"
59-
bind:value={appId} />
59+
bind:value={appId}
60+
required />
6061
<InputPassword
6162
id="secret"
6263
label="Client Secret"
6364
placeholder="Enter Client Secret"
6465
minlength={0}
65-
bind:value={clientSecret} />
66+
bind:value={clientSecret}
67+
required />
6668
<InputText
67-
id="domain"
69+
id="auth0Domain"
6870
label="Auth0 Domain"
69-
placeholder="Your Auth0 domain"
70-
bind:value={auth0Domain} />
71+
placeholder="your-tenant.auth0.com"
72+
bind:value={auth0Domain}
73+
required />
7174
<Alert.Inline status="info">
7275
To complete set up, add this OAuth2 redirect URI to your {provider.name} app configuration.
7376
</Alert.Inline>
@@ -77,9 +80,12 @@
7780
<svelte:fragment slot="footer">
7881
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
7982
<Button
80-
disabled={secret === provider.secret &&
81-
enabled === provider.enabled &&
82-
appId === provider.appId}
83+
disabled={!appId ||
84+
!clientSecret ||
85+
!auth0Domain ||
86+
(secret === provider.secret &&
87+
enabled === provider.enabled &&
88+
appId === provider.appId)}
8389
submit>Update</Button>
8490
</svelte:fragment>
8591
</Modal>

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,21 @@
6060
label="Client ID"
6161
autofocus={true}
6262
placeholder="Enter ID"
63-
bind:value={appId} />
63+
bind:value={appId}
64+
required />
6465
<InputPassword
6566
id="secret"
6667
label="Client Secret"
6768
placeholder="Enter Client Secret"
6869
minlength={0}
69-
bind:value={clientSecret} />
70+
bind:value={clientSecret}
71+
required />
7072
<InputText
7173
id="domain"
7274
label="Authentik Base-Domain"
7375
placeholder="Your Authentik domain"
74-
bind:value={authentikDomain} />
76+
bind:value={authentikDomain}
77+
required />
7578
<Alert.Inline status="info">
7679
To complete set up, add this OAuth2 redirect URI to your {provider.name} app configuration.
7780
</Alert.Inline>
@@ -81,9 +84,12 @@
8184
<svelte:fragment slot="footer">
8285
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
8386
<Button
84-
disabled={secret === provider.secret &&
85-
enabled === provider.enabled &&
86-
appId === provider.appId}
87+
disabled={!appId ||
88+
!clientSecret ||
89+
!authentikDomain ||
90+
(secret === provider.secret &&
91+
enabled === provider.enabled &&
92+
appId === provider.appId)}
8793
submit>Update</Button>
8894
</svelte:fragment>
8995
</Modal>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,16 @@
5555
label="App ID"
5656
autofocus={true}
5757
placeholder="Enter ID"
58-
bind:value={appId} />
58+
bind:value={appId}
59+
required />
5960
<InputPassword
6061
id="secret"
6162
label="App Secret"
6263
placeholder="Enter App Secret"
6364
minlength={0}
64-
bind:value={clientSecret} />
65-
<InputText
66-
id="endpoint"
67-
label="Endpoint (optional)"
68-
placeholder="Your endpoint"
69-
bind:value={endpoint} />
65+
bind:value={clientSecret}
66+
required />
67+
<InputText id="endpoint" label="Endpoint" placeholder="Your endpoint" bind:value={endpoint} />
7068
<Alert.Inline status="info">
7169
To complete set up, add this OAuth2 redirect URI to your {provider.name} app configuration.
7270
</Alert.Inline>
@@ -76,9 +74,11 @@
7674
<svelte:fragment slot="footer">
7775
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
7876
<Button
79-
disabled={secret === provider.secret &&
80-
enabled === provider.enabled &&
81-
appId === provider.appId}
77+
disabled={!appId ||
78+
!clientSecret ||
79+
(secret === provider.secret &&
80+
enabled === provider.enabled &&
81+
appId === provider.appId)}
8282
submit>Update</Button>
8383
</svelte:fragment>
8484
</Modal>

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,15 @@
5454
label="App ID"
5555
autofocus={true}
5656
placeholder="Enter ID"
57-
bind:value={appId} />
57+
bind:value={appId}
58+
required />
5859
<InputPassword
5960
id="secret"
6061
label="App Secret"
6162
placeholder="Enter App Secret"
6263
minlength={0}
63-
bind:value={secret} />
64+
bind:value={secret}
65+
required />
6466
<Alert.Inline status="info">
6567
To complete the setup, create an OAuth2 client ID with "Web application" as the application
6668
type, then add this redirect URI to your {provider.name} configuration.
@@ -72,9 +74,11 @@
7274
<svelte:fragment slot="footer">
7375
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
7476
<Button
75-
disabled={secret === provider.secret &&
76-
enabled === provider.enabled &&
77-
appId === provider.appId}
77+
disabled={!appId ||
78+
!secret ||
79+
(secret === provider.secret &&
80+
enabled === provider.enabled &&
81+
appId === provider.appId)}
7882
submit>Update</Button>
7983
</svelte:fragment>
8084
</Modal>

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,15 @@
5555
label="App ID"
5656
autofocus={true}
5757
placeholder="Enter ID"
58-
bind:value={appId} />
58+
bind:value={appId}
59+
required />
5960
<InputPassword
6061
id="secret"
6162
label="App Secret"
6263
placeholder="Enter App Secret"
6364
minlength={0}
64-
bind:value={secret} />
65+
bind:value={secret}
66+
required />
6567
<Alert.Inline status="info">
6668
To complete set up, add this OAuth2 redirect URI to your {provider.name} app configuration.
6769
</Alert.Inline>
@@ -71,9 +73,11 @@
7173
<svelte:fragment slot="footer">
7274
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
7375
<Button
74-
disabled={secret === provider.secret &&
75-
enabled === provider.enabled &&
76-
appId === provider.appId}
76+
disabled={!appId ||
77+
!secret ||
78+
(secret === provider.secret &&
79+
enabled === provider.enabled &&
80+
appId === provider.appId)}
7781
submit>Update</Button>
7882
</svelte:fragment>
7983
</Modal>

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,15 @@
5656
label="Application (client) ID"
5757
autofocus={true}
5858
placeholder="Enter ID"
59-
bind:value={appId} />
59+
bind:value={appId}
60+
required />
6061
<InputPassword
6162
id="secret"
6263
label="Client Secret"
6364
placeholder="Enter Client Secret"
6465
minlength={0}
65-
bind:value={clientSecret} />
66+
bind:value={clientSecret}
67+
required />
6668
<InputText
6769
id="tenant"
6870
label="Target Tenant"
@@ -77,9 +79,11 @@
7779
<svelte:fragment slot="footer">
7880
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
7981
<Button
80-
disabled={secret === provider.secret &&
81-
enabled === provider.enabled &&
82-
appId === provider.appId}
82+
disabled={!appId ||
83+
!clientSecret ||
84+
(secret === provider.secret &&
85+
enabled === provider.enabled &&
86+
appId === provider.appId)}
8387
submit>Update</Button>
8488
</svelte:fragment>
8589
</Modal>

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,21 @@
7878
label="Client ID"
7979
autofocus={true}
8080
placeholder="Enter ID"
81-
bind:value={appId} />
81+
bind:value={appId}
82+
required />
8283
<InputPassword
8384
id="secret"
8485
label="Client Secret"
8586
placeholder="Enter Client Secret"
8687
minlength={0}
87-
bind:value={clientSecret} />
88+
bind:value={clientSecret}
89+
required />
8890
<InputText
8991
id="well-known-endpoint"
9092
label="Well-Known Endpoint"
9193
placeholder="https://example.com/.well-known/openid-configuration"
92-
bind:value={wellKnownEndpoint} />
94+
bind:value={wellKnownEndpoint}
95+
required />
9396
<InputText
9497
id="authorization-endpoint"
9598
label="Authorization Endpoint"
@@ -115,9 +118,12 @@
115118
<svelte:fragment slot="footer">
116119
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
117120
<Button
118-
disabled={secret === provider.secret &&
119-
enabled === provider.enabled &&
120-
appId === provider.appId}
121+
disabled={!appId ||
122+
!clientSecret ||
123+
!wellKnownEndpoint ||
124+
(secret === provider.secret &&
125+
enabled === provider.enabled &&
126+
appId === provider.appId)}
121127
submit>Update</Button>
122128
</svelte:fragment>
123129
</Modal>

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,23 +66,27 @@
6666
label="Client ID"
6767
autofocus={true}
6868
placeholder="Enter ID"
69-
bind:value={appId} />
69+
bind:value={appId}
70+
required />
7071
<InputPassword
7172
id="secret"
7273
label="Client Secret"
7374
placeholder="Enter Client Secret"
7475
minlength={0}
75-
bind:value={clientSecret} />
76+
bind:value={clientSecret}
77+
required />
7678
<InputText
7779
id="domain"
7880
label="Okta Domain"
7981
placeholder="dev-1337.okta.com"
80-
bind:value={oktaDomain} />
82+
bind:value={oktaDomain}
83+
required />
8184
<InputText
8285
id="serverID"
8386
label="Authorization Server ID"
8487
placeholder="default"
85-
bind:value={authorizationServerId} />
88+
bind:value={authorizationServerId}
89+
required />
8690

8791
<Alert.Inline status="info">
8892
To complete set up, add this OAuth2 redirect URI to your {provider.name} app configuration.
@@ -93,9 +97,13 @@
9397
<svelte:fragment slot="footer">
9498
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
9599
<Button
96-
disabled={secret === provider.secret &&
97-
enabled === provider.enabled &&
98-
appId === provider.appId}
100+
disabled={!appId ||
101+
!clientSecret ||
102+
!oktaDomain ||
103+
!authorizationServerId ||
104+
(secret === provider.secret &&
105+
enabled === provider.enabled &&
106+
appId === provider.appId)}
99107
submit>Update</Button>
100108
</svelte:fragment>
101109
</Modal>

0 commit comments

Comments
 (0)