@@ -53,11 +53,11 @@ backend:
|
||||
auth:
|
||||
externalAccess:
|
||||
- type: static
|
||||
config:
|
||||
options:
|
||||
token: ${CICD_TOKEN}
|
||||
subject: cicd-system-completion-events
|
||||
- type: static
|
||||
config:
|
||||
options:
|
||||
token: ${ADMIN_CURL_TOKEN}
|
||||
subject: admin-curl-access
|
||||
```
|
||||
@@ -99,11 +99,11 @@ backend:
|
||||
auth:
|
||||
externalAccess:
|
||||
- type: legacy
|
||||
config:
|
||||
options:
|
||||
secret: my-secret-key-catalog
|
||||
subject: legacy-catalog
|
||||
- type: legacy
|
||||
config:
|
||||
options:
|
||||
secret: my-secret-key-scaffolder
|
||||
subject: legacy-scaffolder
|
||||
```
|
||||
|
||||
@@ -244,7 +244,7 @@ describe('ServerTokenManager', () => {
|
||||
auth: {
|
||||
keys: [{ secret: oldSecret }],
|
||||
externalAccess: [
|
||||
{ type: 'legacy', config: { secret: newSecret } },
|
||||
{ type: 'legacy', options: { secret: newSecret } },
|
||||
],
|
||||
},
|
||||
},
|
||||
|
||||
@@ -80,7 +80,7 @@ export class ServerTokenManager implements TokenManager {
|
||||
const newSecrets = config
|
||||
.getOptionalConfigArray('backend.auth.externalAccess')
|
||||
?.filter(c => c.getString('type') === 'legacy')
|
||||
.map(c => c.getString('config.secret'));
|
||||
.map(c => c.getString('options.secret'));
|
||||
const secrets = [...(oldSecrets ?? []), ...(newSecrets ?? [])];
|
||||
|
||||
if (secrets.length) {
|
||||
|
||||
Reference in New Issue
Block a user