adapt-authoring-sessions 0.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintignore +1 -0
- package/.eslintrc +14 -0
- package/.github/ISSUE_TEMPLATE/bug_report.yml +55 -0
- package/.github/ISSUE_TEMPLATE/config.yml +1 -0
- package/.github/ISSUE_TEMPLATE/feature_request.yml +22 -0
- package/.github/dependabot.yml +11 -0
- package/.github/pull_request_template.md +25 -0
- package/.github/workflows/labelled_prs.yml +16 -0
- package/.github/workflows/new.yml +19 -0
- package/adapt-authoring.json +5 -0
- package/conf/config.schema.json +41 -0
- package/errors/errors.json +9 -0
- package/index.js +5 -0
- package/lib/SessionsModule.js +73 -0
- package/package.json +22 -0
package/.eslintignore
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
node_modules
|
package/.eslintrc
ADDED
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
name: Bug Report
|
|
2
|
+
description: File a bug report
|
|
3
|
+
labels: ["bug"]
|
|
4
|
+
body:
|
|
5
|
+
- type: markdown
|
|
6
|
+
attributes:
|
|
7
|
+
value: |
|
|
8
|
+
Thanks for taking the time to fill out this bug report!
|
|
9
|
+
- type: textarea
|
|
10
|
+
id: description
|
|
11
|
+
attributes:
|
|
12
|
+
label: What happened?
|
|
13
|
+
description: Please describe the issue
|
|
14
|
+
validations:
|
|
15
|
+
required: true
|
|
16
|
+
- type: textarea
|
|
17
|
+
id: expected
|
|
18
|
+
attributes:
|
|
19
|
+
label: Expected behaviour
|
|
20
|
+
description: Tell us what should have happened
|
|
21
|
+
- type: textarea
|
|
22
|
+
id: repro-steps
|
|
23
|
+
attributes:
|
|
24
|
+
label: Steps to reproduce
|
|
25
|
+
description: Tell us how to reproduce the issue
|
|
26
|
+
validations:
|
|
27
|
+
required: true
|
|
28
|
+
- type: input
|
|
29
|
+
id: aat-version
|
|
30
|
+
attributes:
|
|
31
|
+
label: Authoring tool version
|
|
32
|
+
description: What version of the Adapt authoring tool are you running?
|
|
33
|
+
validations:
|
|
34
|
+
required: true
|
|
35
|
+
- type: input
|
|
36
|
+
id: fw-version
|
|
37
|
+
attributes:
|
|
38
|
+
label: Framework version
|
|
39
|
+
description: What version of the Adapt framework are you running?
|
|
40
|
+
- type: dropdown
|
|
41
|
+
id: browsers
|
|
42
|
+
attributes:
|
|
43
|
+
label: What browsers are you seeing the problem on?
|
|
44
|
+
multiple: true
|
|
45
|
+
options:
|
|
46
|
+
- Firefox
|
|
47
|
+
- Chrome
|
|
48
|
+
- Safari
|
|
49
|
+
- Microsoft Edge
|
|
50
|
+
- type: textarea
|
|
51
|
+
id: logs
|
|
52
|
+
attributes:
|
|
53
|
+
label: Relevant log output
|
|
54
|
+
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
|
|
55
|
+
render: sh
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
blank_issues_enabled: false
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
name: Feature request
|
|
2
|
+
description: Request a new feature
|
|
3
|
+
labels: ["enhancement"]
|
|
4
|
+
body:
|
|
5
|
+
- type: markdown
|
|
6
|
+
attributes:
|
|
7
|
+
value: |
|
|
8
|
+
Thanks for taking the time to request a new feature in the Adapt authoring tool! The Adapt team will consider all new feature requests, but unfortunately cannot commit to every one.
|
|
9
|
+
- type: textarea
|
|
10
|
+
id: description
|
|
11
|
+
attributes:
|
|
12
|
+
label: Feature description
|
|
13
|
+
description: Please describe your feature request
|
|
14
|
+
validations:
|
|
15
|
+
required: true
|
|
16
|
+
- type: checkboxes
|
|
17
|
+
id: contribute
|
|
18
|
+
attributes:
|
|
19
|
+
label: Can you work on this feature?
|
|
20
|
+
description: If you are able to commit your own time to work on this feature, it will greatly increase the liklihood of it being implemented by the core dev team. Otherwise, it will be triaged and prioritised alongside the core team's current priorities.
|
|
21
|
+
options:
|
|
22
|
+
- label: I can contribute
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
# To get started with Dependabot version updates, you'll need to specify which
|
|
2
|
+
# package ecosystems to update and where the package manifests are located.
|
|
3
|
+
# Please see the documentation for all configuration options:
|
|
4
|
+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
|
|
5
|
+
|
|
6
|
+
version: 2
|
|
7
|
+
updates:
|
|
8
|
+
- package-ecosystem: "npm" # See documentation for possible values
|
|
9
|
+
directory: "/" # Location of package manifests
|
|
10
|
+
schedule:
|
|
11
|
+
interval: "weekly"
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
[//]: # (Please title your PR according to eslint commit conventions)
|
|
2
|
+
[//]: # (See https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-eslint#eslint-convention for details)
|
|
3
|
+
|
|
4
|
+
[//]: # (Add a link to the original issue)
|
|
5
|
+
|
|
6
|
+
[//]: # (Delete as appropriate)
|
|
7
|
+
### Fix
|
|
8
|
+
* A sentence describing each fix
|
|
9
|
+
|
|
10
|
+
### Update
|
|
11
|
+
* A sentence describing each udpate
|
|
12
|
+
|
|
13
|
+
### New
|
|
14
|
+
* A sentence describing each new feature
|
|
15
|
+
|
|
16
|
+
### Breaking
|
|
17
|
+
* A sentence describing each breaking change
|
|
18
|
+
|
|
19
|
+
[//]: # (List appropriate steps for testing if needed)
|
|
20
|
+
### Testing
|
|
21
|
+
1. Steps for testing
|
|
22
|
+
|
|
23
|
+
[//]: # (Mention any other dependencies)
|
|
24
|
+
|
|
25
|
+
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
name: Add labelled PRs to project
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
pull_request:
|
|
5
|
+
types: [ labeled ]
|
|
6
|
+
|
|
7
|
+
jobs:
|
|
8
|
+
add-to-project:
|
|
9
|
+
if: ${{ github.event.label.name == 'dependencies' }}
|
|
10
|
+
name: Add to main project
|
|
11
|
+
runs-on: ubuntu-latest
|
|
12
|
+
steps:
|
|
13
|
+
- uses: actions/add-to-project@v0.1.0
|
|
14
|
+
with:
|
|
15
|
+
project-url: https://github.com/orgs/adapt-security/projects/5
|
|
16
|
+
github-token: ${{ secrets.PROJECTS_SECRET }}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
name: Add to main project
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
issues:
|
|
5
|
+
types:
|
|
6
|
+
- opened
|
|
7
|
+
pull_request:
|
|
8
|
+
types:
|
|
9
|
+
- opened
|
|
10
|
+
|
|
11
|
+
jobs:
|
|
12
|
+
add-to-project:
|
|
13
|
+
name: Add to main project
|
|
14
|
+
runs-on: ubuntu-latest
|
|
15
|
+
steps:
|
|
16
|
+
- uses: actions/add-to-project@v0.1.0
|
|
17
|
+
with:
|
|
18
|
+
project-url: https://github.com/orgs/adapt-security/projects/5
|
|
19
|
+
github-token: ${{ secrets.PROJECTS_SECRET }}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
|
3
|
+
"type": "object",
|
|
4
|
+
"properties": {
|
|
5
|
+
"collectionName": {
|
|
6
|
+
"description": "Name of the database collection used to store user session data",
|
|
7
|
+
"type": "string",
|
|
8
|
+
"default": "usersessions"
|
|
9
|
+
},
|
|
10
|
+
"lifespan": {
|
|
11
|
+
"description": "The amount of time a session should remain valid",
|
|
12
|
+
"type": "string",
|
|
13
|
+
"isTimeMs": true,
|
|
14
|
+
"default": "1h"
|
|
15
|
+
},
|
|
16
|
+
"rolling": {
|
|
17
|
+
"description": "Determines whether sessions should only expire after a period of inactivity (max age determined by the lifespan option)",
|
|
18
|
+
"type": "boolean",
|
|
19
|
+
"default": true
|
|
20
|
+
},
|
|
21
|
+
"sameSite": {
|
|
22
|
+
"description": "Asserts that a cookie must not be sent with cross-origin requests",
|
|
23
|
+
"type": "string",
|
|
24
|
+
"default": "strict"
|
|
25
|
+
},
|
|
26
|
+
"secret": {
|
|
27
|
+
"description": "A secret used to encode/decode user sessions",
|
|
28
|
+
"type": "string",
|
|
29
|
+
"minLength": 10,
|
|
30
|
+
"_adapt": {
|
|
31
|
+
"isSecret": true
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
"secure": {
|
|
35
|
+
"description": "If true, cookie is only sent to the server when a request is made with the https scheme",
|
|
36
|
+
"type": ["boolean", "string"],
|
|
37
|
+
"default": false
|
|
38
|
+
}
|
|
39
|
+
},
|
|
40
|
+
"required": ["secret"]
|
|
41
|
+
}
|
package/index.js
ADDED
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { AbstractModule } from 'adapt-authoring-core'
|
|
2
|
+
import MongoDBStore from 'connect-mongo'
|
|
3
|
+
import session from 'express-session'
|
|
4
|
+
/**
|
|
5
|
+
* Module which implements user sessions
|
|
6
|
+
* @memberof sessions
|
|
7
|
+
* @extends {AbstractModule}
|
|
8
|
+
*/
|
|
9
|
+
class SessionsModule extends AbstractModule {
|
|
10
|
+
/** @override */
|
|
11
|
+
async init () {
|
|
12
|
+
await super.init()
|
|
13
|
+
|
|
14
|
+
const [auth, mongodb, server] = await this.app.waitForModule('auth', 'mongodb', 'server')
|
|
15
|
+
|
|
16
|
+
server.expressApp.use(
|
|
17
|
+
session({
|
|
18
|
+
name: 'adapt.user_session',
|
|
19
|
+
resave: false,
|
|
20
|
+
rolling: this.getConfig('rolling'),
|
|
21
|
+
saveUninitialized: true,
|
|
22
|
+
secret: this.getConfig('secret'),
|
|
23
|
+
unset: 'destroy',
|
|
24
|
+
cookie: {
|
|
25
|
+
domain: this.getConfig('host'),
|
|
26
|
+
maxAge: this.getConfig('lifespan'),
|
|
27
|
+
sameSite: this.getConfig('sameSite'),
|
|
28
|
+
secure: this.getConfig('secure')
|
|
29
|
+
},
|
|
30
|
+
store: MongoDBStore.create({
|
|
31
|
+
client: mongodb.client,
|
|
32
|
+
collection: this.getConfig('collectionName'),
|
|
33
|
+
stringify: false
|
|
34
|
+
})
|
|
35
|
+
}),
|
|
36
|
+
this.storeAuthHeader
|
|
37
|
+
)
|
|
38
|
+
auth.secureRoute('/api/session/clear', 'post', ['clear:session'])
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/**
|
|
42
|
+
* Stores the session token as an auth header if none present
|
|
43
|
+
* @param {external:ExpressRequest} req
|
|
44
|
+
* @param {external:ExpressResponse} res
|
|
45
|
+
* @param {function} next
|
|
46
|
+
*/
|
|
47
|
+
storeAuthHeader (req, res, next) {
|
|
48
|
+
const token = req?.session?.token
|
|
49
|
+
if (token && !req.headers.Authorization) {
|
|
50
|
+
req.headers.Authorization = `Bearer ${token}`
|
|
51
|
+
}
|
|
52
|
+
next()
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/**
|
|
56
|
+
* Handles clearing of the current request session
|
|
57
|
+
* @param {external:ExpressRequest} req
|
|
58
|
+
* @return {Promise} Resolves when the session has been cleared
|
|
59
|
+
*/
|
|
60
|
+
async clearSession (req) {
|
|
61
|
+
if (!req.session) {
|
|
62
|
+
return
|
|
63
|
+
}
|
|
64
|
+
return new Promise((resolve, reject) => {
|
|
65
|
+
req.session.destroy(e => {
|
|
66
|
+
if (e) return reject(this.app.errors.DESTROY_SESSION_FAIL.setData({ error: e.message }))
|
|
67
|
+
resolve()
|
|
68
|
+
})
|
|
69
|
+
})
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
export default SessionsModule
|
package/package.json
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "adapt-authoring-sessions",
|
|
3
|
+
"version": "0.0.1",
|
|
4
|
+
"description": "Module which stores users sessions in the MongoDB",
|
|
5
|
+
"homepage": "https://github.com/adapt-security/adapt-authoring-sessions",
|
|
6
|
+
"license": "GPL-3.0",
|
|
7
|
+
"type": "module",
|
|
8
|
+
"main": "index.js",
|
|
9
|
+
"repository": "github:adapt-security/adapt-authoring-sessions",
|
|
10
|
+
"dependencies": {
|
|
11
|
+
"connect-mongo": "^5.1.0",
|
|
12
|
+
"express-session": "^1.18.0"
|
|
13
|
+
},
|
|
14
|
+
"peerDependencies": {
|
|
15
|
+
"adapt-authoring-auth": "github:adapt-security/adapt-authoring-auth",
|
|
16
|
+
"adapt-authoring-core": "github:adapt-security/adapt-authoring-core"
|
|
17
|
+
},
|
|
18
|
+
"devDependencies": {
|
|
19
|
+
"eslint": "^9.12.0",
|
|
20
|
+
"standard": "^17.1.0"
|
|
21
|
+
}
|
|
22
|
+
}
|