devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

PM-7392 - Swap logout reason from enum to type.

This commit is contained in:
Jared Snider 2024-05-07 14:35:52 -04:00
parent 28d2a8797c
commit 26eb13280f
No known key found for this signature in database
GPG Key ID: A149DDD612516286
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/desktop/src/locales/en/messages.json
View File

@ -2312,10 +2312,10 @@
"important": {
"message": "Important:"
},
"logoutReasonAccessTokenUnableToBeDecrypted": {
"accessTokenUnableToBeDecrypted": {
"message": "You have been logged out because your access token could not be decrypted. Please log in again to resolve this issue."
},
"logoutReasonRefreshTokenSecureStorageRetrievalFailure": {
"refreshTokenSecureStorageRetrievalFailure": {
"message": "You have been logged out because your refresh token could not be retrieved. Please log in again to resolve this issue."
},
"masterPasswordHint": {

7
libs/common/src/auth/enums/logout-reason.enum.ts
View File

@ -1,4 +1,3 @@
export enum LogoutReason {
ACCESS_TOKEN_DECRYPTION_FAILED = "logoutReasonAccessTokenUnableToBeDecrypted",
REFRESH_TOKEN_SECURE_STORAGE_RETRIEVAL_FAILED = "logoutReasonRefreshTokenSecureStorageRetrievalFailure",
}
export type LogoutReason =
| "accessTokenUnableToBeDecrypted"
| "refreshTokenSecureStorageRetrievalFailure";

9
libs/common/src/auth/services/token.service.spec.ts
View File

@ -13,7 +13,6 @@ import { StorageOptions } from "../../platform/models/domain/storage-options";
import { SymmetricCryptoKey } from "../../platform/models/domain/symmetric-crypto-key";
import { CsprngArray } from "../../types/csprng";
import { UserId } from "../../types/guid";
import { LogoutReason } from "../enums/logout-reason.enum";
import { ACCOUNT_ACTIVE_ACCOUNT_ID } from "./account.service";
import { AccessTokenKey, DecodedAccessToken, TokenService } from "./token.service";
@ -536,7 +535,7 @@ describe("TokenService", () => {
// assert that we logged the user out
expect(messagingService.send).toHaveBeenCalledWith("logout", {
userId: userIdFromAccessToken,
reason: LogoutReason.ACCESS_TOKEN_DECRYPTION_FAILED,
reason: "accessTokenUnableToBeDecrypted",
});
});
@ -571,7 +570,7 @@ describe("TokenService", () => {
// assert that we logged the user out
expect(messagingService.send).toHaveBeenCalledWith("logout", {
userId: userIdFromAccessToken,
reason: LogoutReason.ACCESS_TOKEN_DECRYPTION_FAILED,
reason: "accessTokenUnableToBeDecrypted",
});
});
});
@ -1428,7 +1427,7 @@ describe("TokenService", () => {
// assert that we logged the user out
expect(messagingService.send).toHaveBeenCalledWith("logout", {
userId: userIdFromAccessToken,
reason: LogoutReason.ACCESS_TOKEN_DECRYPTION_FAILED,
reason: "accessTokenUnableToBeDecrypted",
});
});
});
@ -1691,7 +1690,7 @@ describe("TokenService", () => {
expect(messagingService.send).toHaveBeenCalledWith("logout", {
userId: userIdFromAccessToken,
reason: LogoutReason.REFRESH_TOKEN_SECURE_STORAGE_RETRIEVAL_FAILED,
reason: "refreshTokenSecureStorageRetrievalFailure",
});
});
});

9
libs/common/src/auth/services/token.service.ts
View File

@ -21,7 +21,6 @@ import {
} from "../../platform/state";
import { UserId } from "../../types/guid";
import { TokenService as TokenServiceAbstraction } from "../abstractions/token.service";
import { LogoutReason } from "../enums/logout-reason.enum";
import { ACCOUNT_ACTIVE_ACCOUNT_ID } from "./account.service";
import {
@ -413,7 +412,7 @@ export class TokenService implements TokenServiceAbstraction {
);
this.messageSender.send("logout", {
userId,
reason: LogoutReason.ACCESS_TOKEN_DECRYPTION_FAILED,
reason: "accessTokenUnableToBeDecrypted",
});
return null;
}
@ -435,7 +434,7 @@ export class TokenService implements TokenServiceAbstraction {
);
this.messageSender.send("logout", {
userId,
reason: LogoutReason.ACCESS_TOKEN_DECRYPTION_FAILED,
reason: "accessTokenUnableToBeDecrypted",
});
return null;
}
@ -459,7 +458,7 @@ export class TokenService implements TokenServiceAbstraction {
this.logService.error(`Failed to decrypt access token`, error);
this.messageSender.send("logout", {
userId,
reason: LogoutReason.ACCESS_TOKEN_DECRYPTION_FAILED,
reason: "accessTokenUnableToBeDecrypted",
});
return null;
}
@ -594,7 +593,7 @@ export class TokenService implements TokenServiceAbstraction {
// logout reason if we do so.
this.messageSender.send("logout", {
userId,
reason: LogoutReason.REFRESH_TOKEN_SECURE_STORAGE_RETRIEVAL_FAILED,
reason: "refreshTokenSecureStorageRetrievalFailure",
});
}
}