Skip to content

Commit 4b4799d

Browse files
paulrobertlloydpaulrobertlloyd
committed
refactor: don’t use alias for i18n __ local object
1 parent bdbb5e3 commit 4b4799d

File tree

34 files changed

+137
-98
lines changed

34 files changed

+137
-98
lines changed

‎packages/endpoint-auth/lib/controllers/authorization.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,23 @@ export const authorizationController = {
3232
]) {
3333
if (!request.query[parameter]) {
3434
throw IndiekitError.badRequest(
35-
response.__("BadRequestError.missingParameter", parameter)
35+
response.locals.__("BadRequestError.missingParameter", parameter)
3636
);
3737
}
3838
}
3939

4040
// `response_type` must be `code` (or deprecated `id`)
4141
if (!/^(code|id)$/.test(request.query.response_type)) {
4242
throw IndiekitError.badRequest(
43-
response.__("BadRequestError.invalidValue", "response_type")
43+
response.locals.__("BadRequestError.invalidValue", "response_type")
4444
);
4545
}
4646

4747
// `client_id`, `redirect_uri` and `me` (optional) must be valid URLs
4848
for (const uri of ["client_id", "me", "redirect_uri"]) {
4949
if (request.query[uri] && !isUrl(request.query[uri])) {
5050
throw IndiekitError.badRequest(
51-
response.__("BadRequestError.invalidValue", uri)
51+
response.locals.__("BadRequestError.invalidValue", uri)
5252
);
5353
}
5454

@@ -65,7 +65,7 @@ export const authorizationController = {
6565
const validRedirect = validateRedirect(redirect_uri, client_id);
6666
if (!validRedirect) {
6767
throw IndiekitError.badRequest(
68-
response.__("BadRequestError.invalidValue", "redirect_uri")
68+
response.locals.__("BadRequestError.invalidValue", "redirect_uri")
6969
);
7070
}
7171

‎packages/endpoint-auth/lib/controllers/consent.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export const consentController = {
1414
get(request, response) {
1515
if (!request.query.request_uri) {
1616
throw IndiekitError.badRequest(
17-
response.__("BadRequestError.missingParameter", "request_uri")
17+
response.locals.__("BadRequestError.missingParameter", "request_uri")
1818
);
1919
}
2020

@@ -24,7 +24,7 @@ export const consentController = {
2424

2525
if (process.env.PASSWORD_SECRET) {
2626
response.render("consent", {
27-
title: response.__(`auth.consent.${authType}.title`),
27+
title: response.locals.__(`auth.consent.${authType}.title`),
2828
authType,
2929
me,
3030
redirect_uri,
@@ -35,7 +35,7 @@ export const consentController = {
3535
}
3636
} catch {
3737
throw IndiekitError.badRequest(
38-
response.__("BadRequestError.invalidValue", "request_uri")
38+
response.locals.__("BadRequestError.invalidValue", "request_uri")
3939
);
4040
}
4141
},
@@ -60,7 +60,7 @@ export const consentController = {
6060
const errors = validationResult(request);
6161
if (!errors.isEmpty()) {
6262
return response.status(422).render("consent", {
63-
title: response.__(`auth.consent.${authType}.title`),
63+
title: response.locals.__(`auth.consent.${authType}.title`),
6464
authType,
6565
errors: errors.mapped(),
6666
me,

‎packages/endpoint-auth/lib/controllers/documentation.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
export const documentationController = (error, request, response, next) => {
66
if (request.accepts("html")) {
77
response.render("auth", {
8-
title: response.__("auth.guidance.title"),
8+
title: response.locals.__("auth.guidance.title"),
99
error: error.message,
1010
});
1111
} else if (request.accepts("json")) {

‎packages/endpoint-auth/lib/controllers/password.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ export const passwordController = {
1010
const { name } = request.app.locals.application;
1111

1212
response.render("new-password", {
13-
title: response.__("auth.newPassword.title"),
13+
title: response.locals.__("auth.newPassword.title"),
1414
notice: request.query.setup
15-
? response.__("auth.newPassword.setup.text", { app: name })
15+
? response.locals.__("auth.newPassword.setup.text", { app: name })
1616
: false,
1717
});
1818
},
@@ -27,7 +27,7 @@ export const passwordController = {
2727
const errors = validationResult(request);
2828
if (!errors.isEmpty()) {
2929
return response.status(422).render("new-password", {
30-
title: response.__("auth.newPassword.title"),
30+
title: response.locals.__("auth.newPassword.title"),
3131
errors: errors.mapped(),
3232
});
3333
}
@@ -36,7 +36,7 @@ export const passwordController = {
3636
const secret = await createPasswordHash(password);
3737

3838
response.render("new-password", {
39-
title: response.__("auth.newPassword.title"),
39+
title: response.locals.__("auth.newPassword.title"),
4040
password,
4141
secret,
4242
});

‎packages/endpoint-auth/lib/controllers/token.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export const tokenController = {
2222
accessToken = verifyToken(bearerToken);
2323
} catch {
2424
throw IndiekitError.unauthorized(
25-
response.__("UnauthorizedError.invalidToken")
25+
response.locals.__("UnauthorizedError.invalidToken")
2626
);
2727
}
2828

‎packages/endpoint-auth/lib/middleware/code.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,30 @@ export const codeValidator = (request, response, next) => {
2424
]) {
2525
if (!Object.keys(parameters).includes(parameter)) {
2626
throw IndiekitError.badRequest(
27-
response.__("BadRequestError.missingParameter", parameter)
27+
response.locals.__("BadRequestError.missingParameter", parameter)
2828
);
2929
}
3030
}
3131

3232
// `grant_type` must equal `authorization_code`
3333
if (grant_type !== "authorization_code") {
3434
throw IndiekitError.badRequest(
35-
response.__("BadRequestError.invalidValue", "grant_type")
35+
response.locals.__("BadRequestError.invalidValue", "grant_type")
3636
);
3737
}
3838

3939
// Validate `client_id` against that provided in authorization request
4040
if (getCanonicalUrl(client_id) !== client.url) {
4141
throw IndiekitError.unauthorized(
42-
response.__("BadRequestError.invalidValue", "client_id")
42+
response.locals.__("BadRequestError.invalidValue", "client_id")
4343
);
4444
}
4545

4646
// Validate `redirect_uri`
4747
const validRedirect = validateRedirect(redirect_uri, client_id);
4848
if (!validRedirect) {
4949
throw IndiekitError.badRequest(
50-
response.__("BadRequestError.invalidValue", "redirect_uri")
50+
response.locals.__("BadRequestError.invalidValue", "redirect_uri")
5151
);
5252
}
5353

@@ -56,7 +56,7 @@ export const codeValidator = (request, response, next) => {
5656
request.verifiedToken = verifyToken(code);
5757
} catch {
5858
throw IndiekitError.unauthorized(
59-
response.__("UnauthorizedError.invalidToken")
59+
response.locals.__("UnauthorizedError.invalidToken")
6060
);
6161
}
6262

@@ -66,7 +66,7 @@ export const codeValidator = (request, response, next) => {
6666
const verifiedCode = verifyCode(code_verifier, code_challenge);
6767
if (!verifiedCode) {
6868
throw IndiekitError.unauthorized(
69-
response.__("BadRequestError.invalidValue", "code_verifier")
69+
response.locals.__("BadRequestError.invalidValue", "code_verifier")
7070
);
7171
}
7272
}

‎packages/endpoint-auth/lib/middleware/secret.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { IndiekitError } from "@indiekit/error";
88
export const hasSecret = (request, response, next) => {
99
if (!process.env.SECRET) {
1010
const error = IndiekitError.notImplemented(
11-
response.__("NotImplementedError.secret")
11+
response.locals.__("NotImplementedError.secret")
1212
);
1313

1414
next(error);

‎packages/endpoint-auth/lib/scope.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const scopes = ["create", "update", "draft", "media", "delete"];
88
*/
99
export function getScopeItems(scope, response) {
1010
return scopes.map((value) => ({
11-
text: response.__(`scope.${value}.label`),
11+
text: response.locals.__(`scope.${value}.label`),
1212
value,
1313
checked: scope?.includes(value),
1414
}));

‎packages/endpoint-auth/tests/unit/scope.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import test from "ava";
22
import { getScopeItems } from "../../lib/scope.js";
33

44
test("Gets `items` object for checkboxes component", (t) => {
5-
const response = { __: (value) => value };
5+
const response = {
6+
locals: { __: (value) => value },
7+
};
68
const result = getScopeItems("create update", response);
79

810
t.is(result.length, 5);

‎packages/endpoint-files/lib/controllers/delete.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export const deleteController = {
1010

1111
if (scope.includes("delete")) {
1212
return response.render("file-delete", {
13-
title: response.__("files.delete.title"),
13+
title: response.locals.__("files.delete.title"),
1414
back,
1515
parent: { text: fileName },
1616
});
@@ -39,7 +39,7 @@ export const deleteController = {
3939
} catch (error) {
4040
response.status(error.status || 500);
4141
response.render("file-delete", {
42-
title: response.__("files.delete.title"),
42+
title: response.locals.__("files.delete.title"),
4343
parent: { text: fileName },
4444
error: error.message,
4545
});

0 commit comments

Comments
 (0)