Skip to content

Commit 8bccf92

Browse files
simonredfernsimonredfern
committed
Fixing regression with VITE_OBP_OIDC_CLIENT_ID and
VITE_OBP_OIDC_CLIENT_SECRET env names
1 parent 72af473 commit 8bccf92

13 files changed

Lines changed: 58 additions & 58 deletions

‎IMPLEMENTATION-COMPLETE.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ UPDATED:
103103
Environment Variables (per provider):
104104

105105
# OBP-OIDC
106-
VITE_OBP_OAUTH2_CLIENT_ID=your-client-id
107-
VITE_OBP_OAUTH2_CLIENT_SECRET=your-secret
106+
VITE_OBP_OIDC_CLIENT_ID=your-client-id
107+
VITE_OBP_OIDC_CLIENT_SECRET=your-secret
108108
VITE_OBP_OAUTH2_REDIRECT_URL=http://localhost:5173/api/oauth2/callback
109109

110110
# Keycloak

‎MULTI-OIDC-FLOW-DIAGRAM.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
▼
1111
┌─────────────────────────────────────────┐
1212
│ Load Environment Variables │
13-
│ - VITE_OBP_OAUTH2_CLIENT_ID │
13+
│ - VITE_OBP_OIDC_CLIENT_ID │
1414
│ - VITE_KEYCLOAK_CLIENT_ID │
1515
│ - VITE_GOOGLE_CLIENT_ID (optional) │
1616
└─────────────────────────────────────────┘

‎MULTI-OIDC-IMPLEMENTATION-STATUS.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ This document tracks the implementation status of multiple OIDC provider support
188188

189189
```bash
190190
# OBP-OIDC Provider (Required for OBP-OIDC)
191-
VITE_OBP_OAUTH2_CLIENT_ID=48ac28e9-9ee3-47fd-8448-69a62764b779
192-
VITE_OBP_OAUTH2_CLIENT_SECRET=fOTQF7jfg8C74u7ZhSjVQpoBYvD0KpWfM5UsEZBSFFM
191+
VITE_OBP_OIDC_CLIENT_ID=48ac28e9-9ee3-47fd-8448-69a62764b779
192+
VITE_OBP_OIDC_CLIENT_SECRET=fOTQF7jfg8C74u7ZhSjVQpoBYvD0KpWfM5UsEZBSFFM
193193
VITE_OBP_OAUTH2_REDIRECT_URL=http://localhost:5173/api/oauth2/callback
194194

195195
# Keycloak Provider (Optional)

‎MULTI-OIDC-PROVIDER-IMPLEMENTATION.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ export class OAuth2Service {
6464
private wellKnownUrl: string = ''
6565

6666
constructor() {
67-
this.clientId = process.env.VITE_OBP_OAUTH2_CLIENT_ID || ''
68-
this.clientSecret = process.env.VITE_OBP_OAUTH2_CLIENT_SECRET || ''
67+
this.clientId = process.env.VITE_OBP_OIDC_CLIENT_ID || ''
68+
this.clientSecret = process.env.VITE_OBP_OIDC_CLIENT_SECRET || ''
6969
this.redirectUri = process.env.VITE_OBP_OAUTH2_REDIRECT_URL || ''
7070
this.client = new OAuth2Client(this.clientId, this.clientSecret, this.redirectUri)
7171
}
@@ -83,8 +83,8 @@ export class OAuth2Service {
8383

8484
```bash
8585
VITE_OBP_OAUTH2_WELL_KNOWN_URL=http://127.0.0.1:9000/obp-oidc/.well-known/openid-configuration
86-
VITE_OBP_OAUTH2_CLIENT_ID=48ac28e9-9ee3-47fd-8448-69a62764b779
87-
VITE_OBP_OAUTH2_CLIENT_SECRET=fOTQF7jfg8C74u7ZhSjVQpoBYvD0KpWfM5UsEZBSFFM
86+
VITE_OBP_OIDC_CLIENT_ID=48ac28e9-9ee3-47fd-8448-69a62764b779
87+
VITE_OBP_OIDC_CLIENT_SECRET=fOTQF7jfg8C74u7ZhSjVQpoBYvD0KpWfM5UsEZBSFFM
8888
VITE_OBP_OAUTH2_REDIRECT_URL=http://localhost:5173/api/oauth2/callback
8989
```
9090

@@ -727,10 +727,10 @@ export class OAuth2ProviderFactory {
727727
console.log('OAuth2ProviderFactory: Loading provider strategies...')
728728

729729
// OBP-OIDC Strategy
730-
if (process.env.VITE_OBP_OAUTH2_CLIENT_ID) {
730+
if (process.env.VITE_OBP_OIDC_CLIENT_ID) {
731731
this.strategies.set('obp-oidc', {
732-
clientId: process.env.VITE_OBP_OAUTH2_CLIENT_ID,
733-
clientSecret: process.env.VITE_OBP_OAUTH2_CLIENT_SECRET || '',
732+
clientId: process.env.VITE_OBP_OIDC_CLIENT_ID,
733+
clientSecret: process.env.VITE_OBP_OIDC_CLIENT_SECRET || '',
734734
redirectUri:
735735
process.env.VITE_OBP_OAUTH2_REDIRECT_URL || 'http://localhost:5173/api/oauth2/callback',
736736
scopes: ['openid', 'profile', 'email']
@@ -1658,8 +1658,8 @@ VITE_OBP_API_VERSION=v5.1.0
16581658
# ============================================
16591659

16601660
# OBP-OIDC Provider
1661-
VITE_OBP_OAUTH2_CLIENT_ID=48ac28e9-9ee3-47fd-8448-69a62764b779
1662-
VITE_OBP_OAUTH2_CLIENT_SECRET=fOTQF7jfg8C74u7ZhSjVQpoBYvD0KpWfM5UsEZBSFFM
1661+
VITE_OBP_OIDC_CLIENT_ID=48ac28e9-9ee3-47fd-8448-69a62764b779
1662+
VITE_OBP_OIDC_CLIENT_SECRET=fOTQF7jfg8C74u7ZhSjVQpoBYvD0KpWfM5UsEZBSFFM
16631663
VITE_OBP_OAUTH2_REDIRECT_URL=http://localhost:5173/api/oauth2/callback
16641664

16651665
# Keycloak Provider (Optional)

‎MULTI-OIDC-PROVIDER-SUMMARY.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ This document provides a high-level summary of implementing multiple OIDC provid
1212

1313
```bash
1414
VITE_OBP_OAUTH2_WELL_KNOWN_URL=http://localhost:9000/obp-oidc/.well-known/openid-configuration
15-
VITE_OBP_OAUTH2_CLIENT_ID=<client-id>
16-
VITE_OBP_OAUTH2_CLIENT_SECRET=<client-secret>
15+
VITE_OBP_OIDC_CLIENT_ID=<client-id>
16+
VITE_OBP_OIDC_CLIENT_SECRET=<client-secret>
1717
```
1818

1919
**Limitations:**
@@ -86,8 +86,8 @@ GET /obp/v5.1.0/well-known
8686
**Strategy Pattern:**
8787
```typescript
8888
strategies.set('obp-oidc', {
89-
clientId: process.env.VITE_OBP_OAUTH2_CLIENT_ID,
90-
clientSecret: process.env.VITE_OBP_OAUTH2_CLIENT_SECRET,
89+
clientId: process.env.VITE_OBP_OIDC_CLIENT_ID,
90+
clientSecret: process.env.VITE_OBP_OIDC_CLIENT_SECRET,
9191
redirectUri: process.env.VITE_OBP_OAUTH2_REDIRECT_URL
9292
})
9393

@@ -223,8 +223,8 @@ GET /api/oauth2/callback?code=xxx&state=yyy
223223
224224
```bash
225225
# OBP-OIDC Provider
226-
VITE_OBP_OAUTH2_CLIENT_ID=48ac28e9-9ee3-47fd-8448-69a62764b779
227-
VITE_OBP_OAUTH2_CLIENT_SECRET=fOTQF7jfg8C74u7ZhSjVQpoBYvD0KpWfM5UsEZBSFFM
226+
VITE_OBP_OIDC_CLIENT_ID=48ac28e9-9ee3-47fd-8448-69a62764b779
227+
VITE_OBP_OIDC_CLIENT_SECRET=fOTQF7jfg8C74u7ZhSjVQpoBYvD0KpWfM5UsEZBSFFM
228228
VITE_OBP_OAUTH2_REDIRECT_URL=http://localhost:5173/api/oauth2/callback
229229

230230
# Keycloak Provider

‎MULTI-OIDC-TESTING-GUIDE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ Set up your `.env` file with provider credentials:
6262
VITE_OBP_API_HOST=localhost:8080
6363

6464
# OBP-OIDC Provider
65-
VITE_OBP_OAUTH2_CLIENT_ID=48ac28e9-9ee3-47fd-8448-69a62764b779
66-
VITE_OBP_OAUTH2_CLIENT_SECRET=fOTQF7jfg8C74u7ZhSjVQpoBYvD0KpWfM5UsEZBSFFM
65+
VITE_OBP_OIDC_CLIENT_ID=48ac28e9-9ee3-47fd-8448-69a62764b779
66+
VITE_OBP_OIDC_CLIENT_SECRET=fOTQF7jfg8C74u7ZhSjVQpoBYvD0KpWfM5UsEZBSFFM
6767
VITE_OBP_OAUTH2_REDIRECT_URL=http://localhost:5173/api/oauth2/callback
6868

6969
# Keycloak Provider (optional)

‎OAUTH2-BEARER-TOKEN-IMPLEMENTATION.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ export const DEFAULT_OBP_API_VERSION = 'v6.0.0'
120120
**Changes:**
121121
```bash
122122
# Use actual CLIENT_ID UUID from OBP-OIDC, not the client name
123-
VITE_OBP_OAUTH2_CLIENT_ID=48ac28e9-9ee3-47fd-8448-69a62764b779
123+
VITE_OBP_OIDC_CLIENT_ID=48ac28e9-9ee3-47fd-8448-69a62764b779
124124

125125
# Use actual CLIENT_SECRET from OBP-OIDC
126-
VITE_OBP_OAUTH2_CLIENT_SECRET=fOTQF7jfg8C74u7ZhSjVQpoBYvD0KpWfM5UsEZBSFFM
126+
VITE_OBP_OIDC_CLIENT_SECRET=fOTQF7jfg8C74u7ZhSjVQpoBYvD0KpWfM5UsEZBSFFM
127127

128128
# Include /api prefix in redirect URL
129129
VITE_OBP_OAUTH2_REDIRECT_URL=http://localhost:5173/api/oauth2/callback
@@ -433,8 +433,8 @@ curl http://localhost:8085/api/status \
433433
VITE_OBP_OAUTH2_WELL_KNOWN_URL=https://auth.yourdomain.com/.well-known/openid-configuration
434434

435435
# Use production client credentials
436-
VITE_OBP_OAUTH2_CLIENT_ID=<production-client-uuid>
437-
VITE_OBP_OAUTH2_CLIENT_SECRET=<production-secret>
436+
VITE_OBP_OIDC_CLIENT_ID=<production-client-uuid>
437+
VITE_OBP_OIDC_CLIENT_SECRET=<production-secret>
438438

439439
# Use HTTPS redirect URL
440440
VITE_OBP_OAUTH2_REDIRECT_URL=https://explorer.yourdomain.com/api/oauth2/callback

‎OAUTH2-IMPLEMENTATION-STATUS.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@
250250
VITE_USE_OAUTH2=false|true
251251

252252
# Client Credentials
253-
VITE_OBP_OAUTH2_CLIENT_ID=obp-explorer-ii-client
254-
VITE_OBP_OAUTH2_CLIENT_SECRET=<secret>
253+
VITE_OBP_OIDC_CLIENT_ID=obp-explorer-ii-client
254+
VITE_OBP_OIDC_CLIENT_SECRET=<secret>
255255
VITE_OBP_OAUTH2_REDIRECT_URL=http://localhost:5173/oauth2/callback
256256

257257
# OIDC Provider

‎OAUTH2-OIDC-INTEGRATION-PREP.md‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -513,8 +513,8 @@ export class OAuth2Service {
513513
private oidcConfig: OIDCConfiguration | null = null
514514
515515
constructor() {
516-
const clientId = process.env.VITE_OBP_OAUTH2_CLIENT_ID
517-
const clientSecret = process.env.VITE_OBP_OAUTH2_CLIENT_SECRET
516+
const clientId = process.env.VITE_OBP_OIDC_CLIENT_ID
517+
const clientSecret = process.env.VITE_OBP_OIDC_CLIENT_SECRET
518518
const redirectUri = process.env.VITE_OBP_OAUTH2_REDIRECT_URL
519519
520520
this.client = new OAuth2Client(clientId, clientSecret, redirectUri)
@@ -832,8 +832,8 @@ VITE_OBP_REDIRECT_URL=http://localhost:5173/api/callback
832832
VITE_USE_OAUTH2=false
833833
834834
# OAuth2 Client Credentials (from OBP-OIDC)
835-
VITE_OBP_OAUTH2_CLIENT_ID=obp-explorer-ii-client
836-
VITE_OBP_OAUTH2_CLIENT_SECRET=<your_secure_secret>
835+
VITE_OBP_OIDC_CLIENT_ID=obp-explorer-ii-client
836+
VITE_OBP_OIDC_CLIENT_SECRET=<your_secure_secret>
837837
VITE_OBP_OAUTH2_REDIRECT_URL=http://localhost:5173/oauth2/callback
838838
839839
# OIDC Well-Known Configuration URL
@@ -1106,8 +1106,8 @@ Modern OAuth2 with OpenID Connect support.
11061106
11071107
```bash
11081108
VITE_USE_OAUTH2=true
1109-
VITE_OBP_OAUTH2_CLIENT_ID=obp-explorer-ii-client
1110-
VITE_OBP_OAUTH2_CLIENT_SECRET=<your_client_secret>
1109+
VITE_OBP_OIDC_CLIENT_ID=obp-explorer-ii-client
1110+
VITE_OBP_OIDC_CLIENT_SECRET=<your_client_secret>
11111111
VITE_OBP_OAUTH2_REDIRECT_URL=http://localhost:5173/oauth2/callback
11121112
VITE_OBP_OAUTH2_WELL_KNOWN_URL=http://127.0.0.1:9000/obp-oidc/.well-known/openid-configuration
11131113
```
@@ -1157,8 +1157,8 @@ VITE_OBP_OAUTH2_WELL_KNOWN_URL=http://127.0.0.1:9000/obp-oidc/.well-known/openid
11571157
11581158
```bash
11591159
VITE_USE_OAUTH2=true
1160-
VITE_OBP_OAUTH2_CLIENT_ID=obp-explorer-ii-client
1161-
VITE_OBP_OAUTH2_CLIENT_SECRET=<secret>
1160+
VITE_OBP_OIDC_CLIENT_ID=obp-explorer-ii-client
1161+
VITE_OBP_OIDC_CLIENT_SECRET=<secret>
11621162
VITE_OBP_OAUTH2_REDIRECT_URL=http://localhost:5173/oauth2/callback
11631163
VITE_OBP_OAUTH2_WELL_KNOWN_URL=http://127.0.0.1:9000/obp-oidc/.well-known/openid-configuration
11641164
```
@@ -1205,8 +1205,8 @@ If issues occur:
12051205
12061206
```bash
12071207
VITE_USE_OAUTH2=true
1208-
VITE_OBP_OAUTH2_CLIENT_ID=<production_client_id>
1209-
VITE_OBP_OAUTH2_CLIENT_SECRET=<production_secret>
1208+
VITE_OBP_OIDC_CLIENT_ID=<production_client_id>
1209+
VITE_OBP_OIDC_CLIENT_SECRET=<production_secret>
12101210
VITE_OBP_OAUTH2_REDIRECT_URL=https://explorer.yourdomain.com/oauth2/callback
12111211
VITE_OBP_OAUTH2_WELL_KNOWN_URL=https://auth.yourdomain.com/.well-known/openid-configuration
12121212
```
@@ -1250,7 +1250,7 @@ If issues occur:
12501250
**Cause**: Client credentials invalid
12511251
12521252
**Solution**:
1253-
- Verify `VITE_OBP_OAUTH2_CLIENT_ID` and `VITE_OBP_OAUTH2_CLIENT_SECRET`
1253+
- Verify `VITE_OBP_OIDC_CLIENT_ID` and `VITE_OBP_OIDC_CLIENT_SECRET`
12541254
- Check client is registered in OBP-OIDC
12551255
- Verify redirect URI matches exactly
12561256
@@ -1393,8 +1393,8 @@ See: `OBP-API/obp-api/src/main/scripts/sql/OIDC/`
13931393
VITE_USE_OAUTH2=false # Set to 'true' to enable OAuth2
13941394
13951395
# OAuth2 Client Configuration
1396-
VITE_OBP_OAUTH2_CLIENT_ID=obp-explorer-ii-client
1397-
VITE_OBP_OAUTH2_CLIENT_SECRET=<secure_secret>
1396+
VITE_OBP_OIDC_CLIENT_ID=obp-explorer-ii-client
1397+
VITE_OBP_OIDC_CLIENT_SECRET=<secure_secret>
13981398
VITE_OBP_OAUTH2_REDIRECT_URL=http://localhost:5173/oauth2/callback
13991399
14001400
# OIDC Provider Configuration
@@ -1748,7 +1748,7 @@ server {
17481748
17491749
```bash
17501750
VITE_USE_OAUTH2=true
1751-
VITE_OBP_OAUTH2_CLIENT_ID=obp-explorer-ii-client-dev
1751+
VITE_OBP_OIDC_CLIENT_ID=obp-explorer-ii-client-dev
17521752
VITE_OBP_OAUTH2_REDIRECT_URL=http://localhost:5173/oauth2/callback
17531753
VITE_OBP_OAUTH2_WELL_KNOWN_URL=http://localhost:9000/obp-oidc/.well-known/openid-configuration
17541754
NODE_ENV=development
@@ -1758,7 +1758,7 @@ NODE_ENV=development
17581758
17591759
```bash
17601760
VITE_USE_OAUTH2=true
1761-
VITE_OBP_OAUTH2_CLIENT_ID=obp-explorer-ii-client-staging
1761+
VITE_OBP_OIDC_CLIENT_ID=obp-explorer-ii-client-staging
17621762
VITE_OBP_OAUTH2_REDIRECT_URL=https://staging-explorer.yourdomain.com/oauth2/callback
17631763
VITE_OBP_OAUTH2_WELL_KNOWN_URL=https://staging-auth.yourdomain.com/.well-known/openid-configuration
17641764
NODE_ENV=production
@@ -1768,7 +1768,7 @@ NODE_ENV=production
17681768
17691769
```bash
17701770
VITE_USE_OAUTH2=true
1771-
VITE_OBP_OAUTH2_CLIENT_ID=obp-explorer-ii-client-prod
1771+
VITE_OBP_OIDC_CLIENT_ID=obp-explorer-ii-client-prod
17721772
VITE_OBP_OAUTH2_REDIRECT_URL=https://explorer.yourdomain.com/oauth2/callback
17731773
VITE_OBP_OAUTH2_WELL_KNOWN_URL=https://auth.yourdomain.com/.well-known/openid-configuration
17741774
NODE_ENV=production
@@ -2071,8 +2071,8 @@ No data migration needed because:
20712071
VITE_USE_OAUTH2=true|false
20722072
20732073
# Client Credentials
2074-
VITE_OBP_OAUTH2_CLIENT_ID=<client_id>
2075-
VITE_OBP_OAUTH2_CLIENT_SECRET=<client_secret>
2074+
VITE_OBP_OIDC_CLIENT_ID=<client_id>
2075+
VITE_OBP_OIDC_CLIENT_SECRET=<client_secret>
20762076
20772077
# Endpoints
20782078
VITE_OBP_OAUTH2_REDIRECT_URL=<callback_url>

‎OAUTH2-QUICK-START.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ cat >> .env << EOF
4343
4444
# OAuth2/OIDC Configuration
4545
VITE_USE_OAUTH2=true
46-
VITE_OBP_OAUTH2_CLIENT_ID=obp-explorer-ii-client
47-
VITE_OBP_OAUTH2_CLIENT_SECRET=CHANGE_THIS_TO_EXPLORER_SECRET_2024
46+
VITE_OBP_OIDC_CLIENT_ID=obp-explorer-ii-client
47+
VITE_OBP_OIDC_CLIENT_SECRET=CHANGE_THIS_TO_EXPLORER_SECRET_2024
4848
VITE_OBP_OAUTH2_REDIRECT_URL=http://localhost:5173/oauth2/callback
4949
VITE_OBP_OAUTH2_WELL_KNOWN_URL=http://127.0.0.1:9000/obp-oidc/.well-known/openid-configuration
5050
EOF
@@ -163,8 +163,8 @@ export class OAuth2Service {
163163
private oidcConfig: OIDCConfiguration | null = null
164164

165165
constructor() {
166-
const clientId = process.env.VITE_OBP_OAUTH2_CLIENT_ID
167-
const clientSecret = process.env.VITE_OBP_OAUTH2_CLIENT_SECRET
166+
const clientId = process.env.VITE_OBP_OIDC_CLIENT_ID
167+
const clientSecret = process.env.VITE_OBP_OIDC_CLIENT_SECRET
168168
const redirectUri = process.env.VITE_OBP_OAUTH2_REDIRECT_URL
169169

170170
if (!clientId || !clientSecret || !redirectUri) {

0 commit comments

Comments
 (0)