Skip to content

[PB-4095]: fix/credential-renewal-tokens #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
larryrider merged 1 commit into from
Apr 29, 2025
Merged

[PB-4095]: fix/credential-renewal-tokens #242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/services/auth.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@ export class AuthService {
*/
public getAuthDetails = async (): Promise<LoginCredentials> => {
let loginCreds = await ConfigService.instance.readUser();
if (!(loginCreds?.newToken && loginCreds?.token && loginCreds?.user?.mnemonic)) {
if (!loginCreds?.newToken || !loginCreds?.token || !loginCreds?.user?.mnemonic) {
throw new MissingCredentialsError();
}

const oldTokenDetails = ValidationService.instance.validateTokenAndCheckExpiration(loginCreds.token);
const newTokenDetails = ValidationService.instance.validateTokenAndCheckExpiration(loginCreds.newToken);
const isValidMnemonic = ValidationService.instance.validateMnemonic(loginCreds.user.mnemonic);
if (!(oldTokenDetails.isValid && newTokenDetails.isValid && isValidMnemonic)) {
if (!oldTokenDetails.isValid || !newTokenDetails.isValid || !isValidMnemonic) {
throw new InvalidCredentialsError();
}

Expand All @@ -113,6 +113,10 @@ export class AuthService {
* @returns The user details and its auth tokens
*/
public refreshUserTokens = async (oldCreds: LoginCredentials): Promise<LoginCredentials> => {
SdkManager.init({
token: oldCreds.token,
newToken: oldCreds.newToken,
});
const usersClient = SdkManager.instance.getUsers(true);
const newCreds = await usersClient.getUserData({ userUuid: oldCreds.user.uuid });

Expand All @@ -127,6 +131,10 @@ export class AuthService {
lastLoggedInAt: oldCreds.lastLoggedInAt,
lastTokenRefreshAt: new Date().toISOString(),
};
SdkManager.init({
token: newCreds.oldToken,
newToken: newCreds.newToken,
});
return loginCreds;
};
}
Loading