From d78b90f6d2c91ddd356d56941b3aa4050d0c2d9c Mon Sep 17 00:00:00 2001 From: Derrick Mehaffy Date: Mon, 10 Jan 2022 15:03:47 -0700 Subject: [PATCH 1/5] Fix JWT using wrong file and structure --- .../latest/plugins/users-permissions.md | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/docs/developer-docs/latest/plugins/users-permissions.md b/docs/developer-docs/latest/plugins/users-permissions.md index 863f440a87..e69283f259 100644 --- a/docs/developer-docs/latest/plugins/users-permissions.md +++ b/docs/developer-docs/latest/plugins/users-permissions.md @@ -79,22 +79,29 @@ axios ### JWT configuration -You can configure option for the JWT generation by creating `extensions/users-permissions/config/security.json` file. +You can configure option for the JWT generation by using the plugin config `./config/plugins.js` file. See more information about this file in our [configuration](/developer-docs/latest/setup-deployment-guides/configurations/optional/plugins.md) section. We are using [jsonwebtoken](https://www.npmjs.com/package/jsonwebtoken) to generate the JWT. Available options: -- `expiresIn`: expressed in seconds or a string describing a time span zeit/ms.
+- `jwtSecret`: random string used to create new JWTs, typically set using the `JWT_SECRET` environment variable. +- `jwt.expiresIn`: expressed in seconds or a string describing a time span zeit/ms.
Eg: 60, "45m", "10h", "2 days", "7d", "2y". A numeric value is interpreted as a seconds count. If you use a string be sure you provide the time units (minutes, hours, days, years, etc), otherwise milliseconds unit is used by default ("120" is equal to "120ms"). -**Path —** `extensions/users-permissions/config/security.json` +**Path —** `./config/plugins.js` -```json -{ - "jwt": { - "expiresIn": "1d" - } -} +```js +module.exports = ({ env }) => ({ + // ... + 'users-permissions': { + config: { + jwt: { + expiresIn: '7d', + }, + }, + }, + // ... +}); ``` :::warning From d4c2cbf2d39eac26609fd745653a7597e250cbbe Mon Sep 17 00:00:00 2001 From: DMehaffy Date: Thu, 13 Jan 2022 13:28:29 -0800 Subject: [PATCH 2/5] Update docs/developer-docs/latest/plugins/users-permissions.md Co-authored-by: Pierre Wizla --- docs/developer-docs/latest/plugins/users-permissions.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/developer-docs/latest/plugins/users-permissions.md b/docs/developer-docs/latest/plugins/users-permissions.md index e69283f259..79d1fe4491 100644 --- a/docs/developer-docs/latest/plugins/users-permissions.md +++ b/docs/developer-docs/latest/plugins/users-permissions.md @@ -91,6 +91,8 @@ Available options: **Path —** `./config/plugins.js` ```js +// path: ./config/plugins.js + module.exports = ({ env }) => ({ // ... 'users-permissions': { From 72cfc28d9e18c7feb573a8b6615e209104c38ad0 Mon Sep 17 00:00:00 2001 From: DMehaffy Date: Thu, 13 Jan 2022 13:28:48 -0800 Subject: [PATCH 3/5] Update docs/developer-docs/latest/plugins/users-permissions.md Co-authored-by: Pierre Wizla --- docs/developer-docs/latest/plugins/users-permissions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer-docs/latest/plugins/users-permissions.md b/docs/developer-docs/latest/plugins/users-permissions.md index 79d1fe4491..75ad8c6c0f 100644 --- a/docs/developer-docs/latest/plugins/users-permissions.md +++ b/docs/developer-docs/latest/plugins/users-permissions.md @@ -79,7 +79,7 @@ axios ### JWT configuration -You can configure option for the JWT generation by using the plugin config `./config/plugins.js` file. See more information about this file in our [configuration](/developer-docs/latest/setup-deployment-guides/configurations/optional/plugins.md) section. +You can configure the JWT generation by using the [plugins configuration file](/developer-docs/latest/setup-deployment-guides/configurations/optional/plugins.md). We are using [jsonwebtoken](https://www.npmjs.com/package/jsonwebtoken) to generate the JWT. Available options: From f6bb713bba53e539ef66f605bdaf8de6f658d790 Mon Sep 17 00:00:00 2001 From: DMehaffy Date: Thu, 13 Jan 2022 13:29:45 -0800 Subject: [PATCH 4/5] Update docs/developer-docs/latest/plugins/users-permissions.md Co-authored-by: Pierre Wizla --- docs/developer-docs/latest/plugins/users-permissions.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/developer-docs/latest/plugins/users-permissions.md b/docs/developer-docs/latest/plugins/users-permissions.md index 75ad8c6c0f..1a59c2ea1a 100644 --- a/docs/developer-docs/latest/plugins/users-permissions.md +++ b/docs/developer-docs/latest/plugins/users-permissions.md @@ -88,7 +88,6 @@ Available options: - `jwt.expiresIn`: expressed in seconds or a string describing a time span zeit/ms.
Eg: 60, "45m", "10h", "2 days", "7d", "2y". A numeric value is interpreted as a seconds count. If you use a string be sure you provide the time units (minutes, hours, days, years, etc), otherwise milliseconds unit is used by default ("120" is equal to "120ms"). -**Path —** `./config/plugins.js` ```js // path: ./config/plugins.js From 51c041cd5a930216ae1e988dfaa92666bda5e7c7 Mon Sep 17 00:00:00 2001 From: DMehaffy Date: Thu, 13 Jan 2022 13:31:06 -0800 Subject: [PATCH 5/5] add link to env --- docs/developer-docs/latest/plugins/users-permissions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer-docs/latest/plugins/users-permissions.md b/docs/developer-docs/latest/plugins/users-permissions.md index 1a59c2ea1a..8c7163ed4d 100644 --- a/docs/developer-docs/latest/plugins/users-permissions.md +++ b/docs/developer-docs/latest/plugins/users-permissions.md @@ -84,7 +84,7 @@ We are using [jsonwebtoken](https://www.npmjs.com/package/jsonwebtoken) to gener Available options: -- `jwtSecret`: random string used to create new JWTs, typically set using the `JWT_SECRET` environment variable. +- `jwtSecret`: random string used to create new JWTs, typically set using the `JWT_SECRET` [environment variable](/developer-docs/latest/setup-deployment-guides/configurations/optional/environment.md#strapi-s-environment-variables). - `jwt.expiresIn`: expressed in seconds or a string describing a time span zeit/ms.
Eg: 60, "45m", "10h", "2 days", "7d", "2y". A numeric value is interpreted as a seconds count. If you use a string be sure you provide the time units (minutes, hours, days, years, etc), otherwise milliseconds unit is used by default ("120" is equal to "120ms").