Lisbet Alvarez
72f7c8a92d
* fix: 🐛 properly show username for oidc auth method in user menu * test: 💍 fix admin ui tests * test: 💍 fix desktop ui tests * refactor: 💡 admin to not store username in authenticated object * refactor: 💡 use getter in app controller * test: 💍 POC for how we could update our tests to use auth account * refactor: 💡 remove unused service * test: 💍 fix all tests in ui/admin * test: 💍 revert one change * refactor: 💡 update ui/desktop w/ feedback + fix tests * refactor: 💡 add in error handling * refactor: 💡 cleanup unused service * test: 💍 fix e2e test selector ✅ Closes: https://hashicorp.atlassian.net/browse/ICU-17231
56 lines
1.6 KiB
JavaScript
56 lines
1.6 KiB
JavaScript
/**
|
|
* Copyright (c) HashiCorp, Inc.
|
|
* SPDX-License-Identifier: BUSL-1.1
|
|
*/
|
|
|
|
import { service } from '@ember/service';
|
|
import BaseSessionService from 'ember-simple-auth/services/session';
|
|
import { notifyError } from 'core/decorators/notify';
|
|
import { tracked } from '@glimmer/tracking';
|
|
|
|
export default class SessionService extends BaseSessionService {
|
|
@service ipc;
|
|
@service store;
|
|
|
|
@tracked username;
|
|
|
|
/**
|
|
* Extend ember simple auth's handleAuthentication method
|
|
* so we can hook in and add the user's token to the cache daemon
|
|
*/
|
|
@notifyError(({ message }) => message, { catch: true })
|
|
async handleAuthentication() {
|
|
super.handleAuthentication(...arguments);
|
|
|
|
if (this.session.isAuthenticated) {
|
|
const sessionData = this.data?.authenticated;
|
|
await this.ipc.invoke('addTokenToDaemons', {
|
|
tokenId: sessionData?.id,
|
|
token: sessionData?.token,
|
|
});
|
|
await this.loadAuthenticatedAccount();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Loads account used to authenticate so that it can be used to display
|
|
* the authenticated username.
|
|
*/
|
|
async loadAuthenticatedAccount() {
|
|
if (this.data?.authenticated?.account_id) {
|
|
try {
|
|
const account = await this.store.findRecord(
|
|
'account',
|
|
this.data.authenticated.account_id,
|
|
);
|
|
this.username = account.accountName;
|
|
} catch (e) {
|
|
// We are purposefully ignoring errors since loading the
|
|
// authenticated account should not block a user because
|
|
// account information is for populating a username.
|
|
console.error(e);
|
|
}
|
|
}
|
|
}
|
|
}
|