bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 07:43:35 +00:00
Code Issues Releases Wiki Activity

[PM-16171] Simplelogin alias generation only generate random words instead the domain name (#13024)

Browse Source 
* Exposes URI property from the cipher form.
* Updates credential generator to accept the URI using a `website` attribute

---------

Co-authored-by: ✨ Audrey ✨ <audrey@audreyality.com>
This commit is contained in:
albertboyd5
2025-02-20 10:33:40 -06:00
committed by GitHub
parent d5764a2b5e
commit ca41ecba29
24 changed files with 282 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
libs/common/src/tools/integration/rpc/rest-client.spec.ts
View File

@@ -51,52 +51,52 @@ describe("RestClient", () => {
expect(api.nativeFetch).toHaveBeenCalledWith(expectedRpc.fetchRequest);
});
it.each([[401] /*,[403]*/])(
"throws an invalid token error when HTTP status is %i",
async (status) => {
const client = new RestClient(api, i18n);
const request: IntegrationRequest = { website: null };
const response = mock<Response>({ status, statusText: null });
api.nativeFetch.mockResolvedValue(response);
it.each([
[401, "forwaderInvalidToken"],
[403, "forwaderInvalidOperation"],
])("throws an invalid token error when HTTP status is %i", async (status, messageKey) => {
const client = new RestClient(api, i18n);
const request: IntegrationRequest = { website: null };
const response = mock<Response>({ status, statusText: null });
api.nativeFetch.mockResolvedValue(response);
const result = client.fetchJson(rpc, request);
const result = client.fetchJson(rpc, request);
await expect(result).rejects.toEqual("forwaderInvalidToken");
},
);
await expect(result).rejects.toEqual(messageKey);
});
it.each([
[401, null, null],
[401, undefined, undefined],
[401, undefined, null],
[403, null, null],
[403, undefined, undefined],
[403, undefined, null],
[401, null, null, "forwaderInvalidToken"],
[401, undefined, undefined, "forwaderInvalidToken"],
[401, undefined, null, "forwaderInvalidToken"],
[403, null, null, "forwaderInvalidOperation"],
[403, undefined, undefined, "forwaderInvalidOperation"],
[403, undefined, null, "forwaderInvalidOperation"],
])(
"throws an invalid token error when HTTP status is %i, message is %p, and error is %p",
async (status) => {
async (status, message, error, messageKey) => {
const client = new RestClient(api, i18n);
const request: IntegrationRequest = { website: null };
const response = mock<Response>({
status,
text: () => Promise.resolve(`{ "message": null, "error": null }`),
text: () => Promise.resolve(JSON.stringify({ message, error })),
});
api.nativeFetch.mockResolvedValue(response);
const result = client.fetchJson(rpc, request);
await expect(result).rejects.toEqual("forwaderInvalidToken");
await expect(result).rejects.toEqual(messageKey);
},
);
it.each([
[401, "message"],
[403, "message"],
[401, "error"],
[403, "error"],
[401, "message", "forwaderInvalidTokenWithMessage"],
[403, "message", "forwaderInvalidOperationWithMessage"],
[401, "error", "forwaderInvalidTokenWithMessage"],
[403, "error", "forwaderInvalidOperationWithMessage"],
])(
"throws an invalid token detailed error when HTTP status is %i and the payload has a %s",
async (status, property) => {
async (status, property, messageKey) => {
const client = new RestClient(api, i18n);
const request: IntegrationRequest = { website: null };
const response = mock<Response>({
@@ -107,18 +107,17 @@ describe("RestClient", () => {
const result = client.fetchJson(rpc, request);
await expect(result).rejects.toEqual("forwaderInvalidTokenWithMessage");
expect(i18n.t).toHaveBeenCalledWith(
"forwaderInvalidTokenWithMessage",
"mock",
"expected message",
);
await expect(result).rejects.toEqual(messageKey);
expect(i18n.t).toHaveBeenCalledWith(messageKey, "mock", "expected message");
},
);
it.each([[401], [403]])(
it.each([
[401, "forwaderInvalidTokenWithMessage"],
[403, "forwaderInvalidOperationWithMessage"],
])(
"throws an invalid token detailed error when HTTP status is %i and the payload has a %s",
async (status) => {
async (status, messageKey) => {
const client = new RestClient(api, i18n);
const request: IntegrationRequest = { website: null };
const response = mock<Response>({
@@ -130,12 +129,8 @@ describe("RestClient", () => {
const result = client.fetchJson(rpc, request);
await expect(result).rejects.toEqual("forwaderInvalidTokenWithMessage");
expect(i18n.t).toHaveBeenCalledWith(
"forwaderInvalidTokenWithMessage",
"mock",
"that happened: expected message",
);
await expect(result).rejects.toEqual(messageKey);
expect(i18n.t).toHaveBeenCalledWith(messageKey, "mock", "that happened: expected message");
},
);

6
libs/common/src/tools/integration/rpc/rest-client.ts
View File

@@ -46,10 +46,14 @@ export class RestClient {
}
private async detectCommonErrors(response: Response): Promise<[string, string] | undefined> {
if (response.status === 401 || response.status === 403) {
if (response.status === 401) {
const message = await this.tryGetErrorMessage(response);
const key = message ? "forwaderInvalidTokenWithMessage" : "forwaderInvalidToken";
return [key, message];
} else if (response.status === 403) {
const message = await this.tryGetErrorMessage(response);
const key = message ? "forwaderInvalidOperationWithMessage" : "forwaderInvalidOperation";
return [key, message];
} else if (response.status >= 400) {
const message = await this.tryGetErrorMessage(response);
const key = message ? "forwarderError" : "forwarderUnknownError";