luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Fix `TokenSecretID`-handling

This commit is contained in:
Michael Klein 2022-10-18 16:07:48 +02:00
parent 12a923c658
commit 955949998f
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ui/packages/consul-ui/app/routes/application.js
View File

@ -16,23 +16,26 @@ export default class ApplicationRoute extends Route.extend(WithBlockingActions)
async model() { async model() {
if (this.env.var('CONSUL_ACLS_ENABLED')) { if (this.env.var('CONSUL_ACLS_ENABLED')) {
const secret = this.env.var('CONSUL_HTTP_TOKEN'); const secret = this.env.var('CONSUL_HTTP_TOKEN');
const existing = await this.settings.findBySlug('token'); if (secret) {
if (!existing.AccessorID && secret) { const existing = await this.settings.findBySlug('token');
try {
const token = await this.tokenRepo.self({ if (secret && secret !== existing.SecretID) {
secret: secret, try {
dc: this.env.var('CONSUL_DATACENTER_LOCAL'), const token = await this.tokenRepo.self({
}); secret: secret,
await this.settings.persist({ dc: this.env.var('CONSUL_DATACENTER_LOCAL'),
token: { });
AccessorID: token.AccessorID, await this.settings.persist({
SecretID: token.SecretID, token: {
Namespace: token.Namespace, AccessorID: token.AccessorID,
Partition: token.Partition, SecretID: token.SecretID,
}, Namespace: token.Namespace,
}); Partition: token.Partition,
} catch (e) { },
runInDebug((_) => console.error(e)); });
} catch (e) {
runInDebug((_) => console.error(e));
}
} }
} }
} }