ep_openid_connect 2.5.3 → 2.5.7
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/.github/dependabot.yml
CHANGED
|
@@ -8,66 +8,68 @@ jobs:
|
|
|
8
8
|
# run on pushes to any branch
|
|
9
9
|
# run on PRs from external forks
|
|
10
10
|
if: |
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
(github.event_name != 'pull_request')
|
|
12
|
+
|| (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
|
|
13
13
|
name: with Plugins
|
|
14
14
|
runs-on: ubuntu-latest
|
|
15
15
|
|
|
16
16
|
steps:
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
17
|
+
-
|
|
18
|
+
name: Install libreoffice
|
|
19
|
+
run: |
|
|
20
|
+
sudo add-apt-repository -y ppa:libreoffice/ppa
|
|
21
|
+
sudo apt update
|
|
22
|
+
sudo apt install -y --no-install-recommends libreoffice libreoffice-pdfimport
|
|
23
|
+
-
|
|
24
|
+
name: Install etherpad core
|
|
25
|
+
uses: actions/checkout@v2
|
|
26
|
+
with:
|
|
27
|
+
repository: ether/etherpad-lite
|
|
28
|
+
-
|
|
29
|
+
name: Checkout plugin repository
|
|
30
|
+
uses: actions/checkout@v2
|
|
31
|
+
with:
|
|
32
|
+
path: ./node_modules/__tmp
|
|
33
|
+
-
|
|
34
|
+
name: Determine plugin name
|
|
35
|
+
id: plugin_name
|
|
36
|
+
run: |
|
|
37
|
+
cd ./node_modules/__tmp
|
|
38
|
+
npx -c 'printf %s\\n "::set-output name=plugin_name::${npm_package_name}"'
|
|
39
|
+
-
|
|
40
|
+
name: Rename plugin directory
|
|
41
|
+
run: |
|
|
42
|
+
mv ./node_modules/__tmp ./node_modules/"${PLUGIN_NAME}"
|
|
43
|
+
env:
|
|
44
|
+
PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
|
|
45
|
+
-
|
|
46
|
+
uses: actions/setup-node@v2
|
|
47
|
+
with:
|
|
48
|
+
node-version: 12
|
|
49
|
+
cache: 'npm'
|
|
50
|
+
cache-dependency-path: |
|
|
51
|
+
src/package-lock.json
|
|
52
|
+
src/bin/doc/package-lock.json
|
|
53
|
+
node_modules/${{ steps.plugin_name.outputs.plugin_name }}/package-lock.json
|
|
54
|
+
-
|
|
55
|
+
name: Install plugin dependencies
|
|
56
|
+
run: |
|
|
57
|
+
cd ./node_modules/"${PLUGIN_NAME}"
|
|
58
|
+
npm ci
|
|
59
|
+
env:
|
|
60
|
+
PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
|
|
61
|
+
# Etherpad core dependencies must be installed after installing the
|
|
62
|
+
# plugin's dependencies, otherwise npm will try to hoist common
|
|
63
|
+
# dependencies by removing them from src/node_modules and installing them
|
|
64
|
+
# in the top-level node_modules. As of v6.14.10, npm's hoist logic appears
|
|
65
|
+
# to be buggy, because it sometimes removes dependencies from
|
|
66
|
+
# src/node_modules but fails to add them to the top-level node_modules.
|
|
67
|
+
# Even if npm correctly hoists the dependencies, the hoisting seems to
|
|
68
|
+
# confuse tools such as `npm outdated`, `npm update`, and some ESLint
|
|
69
|
+
# rules.
|
|
70
|
+
-
|
|
71
|
+
name: Install Etherpad core dependencies
|
|
72
|
+
run: src/bin/installDeps.sh
|
|
73
|
+
-
|
|
74
|
+
name: Run the backend tests
|
|
75
|
+
run: cd src && npm test
|
|
@@ -9,88 +9,102 @@ jobs:
|
|
|
9
9
|
runs-on: ubuntu-latest
|
|
10
10
|
|
|
11
11
|
steps:
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
12
|
+
-
|
|
13
|
+
name: Fail if Dependabot
|
|
14
|
+
if: github.actor == 'dependabot[bot]'
|
|
15
|
+
run: |
|
|
16
|
+
cat <<EOF >&2
|
|
17
|
+
Frontend tests skipped because Dependabot can't access secrets.
|
|
18
|
+
Manually re-run the jobs to run the frontend tests.
|
|
19
|
+
For more information, see:
|
|
20
|
+
https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/
|
|
21
|
+
EOF
|
|
22
|
+
exit 1
|
|
23
|
+
-
|
|
24
|
+
name: Generate Sauce Labs strings
|
|
25
|
+
id: sauce_strings
|
|
26
|
+
run: |
|
|
27
|
+
printf %s\\n '::set-output name=name::${{github.event.repository.name}} ${{ github.workflow }} - ${{ github.job }}'
|
|
28
|
+
printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}'
|
|
29
|
+
-
|
|
30
|
+
name: Check out Etherpad core
|
|
31
|
+
uses: actions/checkout@v2
|
|
32
|
+
with:
|
|
33
|
+
repository: ether/etherpad-lite
|
|
34
|
+
-
|
|
35
|
+
uses: actions/setup-node@v2
|
|
36
|
+
with:
|
|
37
|
+
node-version: 12
|
|
38
|
+
cache: 'npm'
|
|
39
|
+
cache-dependency-path: |
|
|
40
|
+
src/package-lock.json
|
|
41
|
+
src/bin/doc/package-lock.json
|
|
42
|
+
-
|
|
43
|
+
name: Check out the plugin
|
|
44
|
+
uses: actions/checkout@v2
|
|
45
|
+
with:
|
|
46
|
+
path: ./node_modules/__tmp
|
|
47
|
+
-
|
|
48
|
+
name: export GIT_HASH to env
|
|
49
|
+
id: environment
|
|
50
|
+
run: |
|
|
51
|
+
cd ./node_modules/__tmp
|
|
52
|
+
echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
|
|
53
|
+
-
|
|
54
|
+
name: Determine plugin name
|
|
55
|
+
id: plugin_name
|
|
56
|
+
run: |
|
|
57
|
+
cd ./node_modules/__tmp
|
|
58
|
+
npx -c 'printf %s\\n "::set-output name=plugin_name::${npm_package_name}"'
|
|
59
|
+
-
|
|
60
|
+
name: Rename plugin directory
|
|
61
|
+
env:
|
|
62
|
+
PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
|
|
63
|
+
run: |
|
|
64
|
+
mv ./node_modules/__tmp ./node_modules/"${PLUGIN_NAME}"
|
|
65
|
+
-
|
|
66
|
+
name: Install plugin dependencies
|
|
67
|
+
env:
|
|
68
|
+
PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
|
|
69
|
+
run: |
|
|
70
|
+
cd ./node_modules/"${PLUGIN_NAME}"
|
|
71
|
+
npm ci
|
|
72
|
+
# Etherpad core dependencies must be installed after installing the
|
|
73
|
+
# plugin's dependencies, otherwise npm will try to hoist common
|
|
74
|
+
# dependencies by removing them from src/node_modules and installing them
|
|
75
|
+
# in the top-level node_modules. As of v6.14.10, npm's hoist logic appears
|
|
76
|
+
# to be buggy, because it sometimes removes dependencies from
|
|
77
|
+
# src/node_modules but fails to add them to the top-level node_modules.
|
|
78
|
+
# Even if npm correctly hoists the dependencies, the hoisting seems to
|
|
79
|
+
# confuse tools such as `npm outdated`, `npm update`, and some ESLint
|
|
80
|
+
# rules.
|
|
81
|
+
-
|
|
82
|
+
name: Install Etherpad core dependencies
|
|
83
|
+
run: src/bin/installDeps.sh
|
|
84
|
+
-
|
|
85
|
+
name: Create settings.json
|
|
86
|
+
run: cp settings.json.template settings.json
|
|
87
|
+
-
|
|
88
|
+
name: Disable import/export rate limiting
|
|
89
|
+
run: |
|
|
90
|
+
sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 0/' -i settings.json
|
|
91
|
+
-
|
|
92
|
+
name: Remove standard frontend test files
|
|
93
|
+
run: rm -rf src/tests/frontend/specs
|
|
94
|
+
-
|
|
95
|
+
uses: saucelabs/sauce-connect-action@v2.1.1
|
|
96
|
+
with:
|
|
97
|
+
username: ${{ secrets.SAUCE_USERNAME }}
|
|
98
|
+
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
|
|
99
|
+
tunnelIdentifier: ${{ steps.sauce_strings.outputs.tunnel_id }}
|
|
100
|
+
-
|
|
101
|
+
name: Run the frontend tests
|
|
102
|
+
shell: bash
|
|
103
|
+
env:
|
|
104
|
+
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
|
|
105
|
+
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
|
|
106
|
+
SAUCE_NAME: ${{ steps.sauce_strings.outputs.name }}
|
|
107
|
+
TRAVIS_JOB_NUMBER: ${{ steps.sauce_strings.outputs.tunnel_id }}
|
|
108
|
+
GIT_HASH: ${{ steps.environment.outputs.sha_short }}
|
|
109
|
+
run: |
|
|
110
|
+
src/tests/frontend/travis/runner.sh
|
|
@@ -21,21 +21,26 @@ jobs:
|
|
|
21
21
|
# cloned to etherpad-lite then moved to ../etherpad-lite. To avoid
|
|
22
22
|
# conflicts with this plugin's clone, etherpad-lite must be cloned and
|
|
23
23
|
# moved out before this plugin's repo is cloned to $GITHUB_WORKSPACE.
|
|
24
|
-
-
|
|
24
|
+
-
|
|
25
|
+
uses: actions/checkout@v2
|
|
25
26
|
with:
|
|
26
27
|
repository: ether/etherpad-lite
|
|
27
28
|
path: etherpad-lite
|
|
28
|
-
-
|
|
29
|
+
-
|
|
30
|
+
run: mv etherpad-lite ..
|
|
29
31
|
# etherpad-lite has been moved outside of $GITHUB_WORKSPACE, so it is now
|
|
30
32
|
# safe to clone this plugin's repo to $GITHUB_WORKSPACE.
|
|
31
|
-
-
|
|
33
|
+
-
|
|
34
|
+
uses: actions/checkout@v2
|
|
32
35
|
# This is necessary for actions/setup-node because '..' can't be used in
|
|
33
36
|
# cache-dependency-path.
|
|
34
|
-
-
|
|
37
|
+
-
|
|
38
|
+
name: Create ep_etherpad-lite symlink
|
|
35
39
|
run: |
|
|
36
40
|
mkdir -p node_modules
|
|
37
41
|
ln -s ../../etherpad-lite/src node_modules/ep_etherpad-lite
|
|
38
|
-
-
|
|
42
|
+
-
|
|
43
|
+
uses: actions/setup-node@v2
|
|
39
44
|
with:
|
|
40
45
|
node-version: 12
|
|
41
46
|
cache: 'npm'
|
|
@@ -49,32 +54,40 @@ jobs:
|
|
|
49
54
|
# Etherpad plugins from piggybacking off of ep_etherpad-lite's
|
|
50
55
|
# devDependencies. If we had that, we could change this line to only
|
|
51
56
|
# install production dependencies.
|
|
52
|
-
-
|
|
53
|
-
|
|
57
|
+
-
|
|
58
|
+
run: cd ../etherpad-lite/src && npm ci
|
|
59
|
+
-
|
|
60
|
+
run: npm ci
|
|
54
61
|
# This runs some sanity checks and creates a symlink at
|
|
55
62
|
# node_modules/ep_etherpad-lite that points to ../../etherpad-lite/src.
|
|
56
63
|
# This step must be done after `npm ci` installs the plugin's dependencies
|
|
57
64
|
# because npm "helpfully" cleans up such symlinks. :( Installing
|
|
58
65
|
# ep_etherpad-lite in the plugin's node_modules prevents lint errors and
|
|
59
66
|
# unit test failures if the plugin does `require('ep_etherpad-lite/foo')`.
|
|
60
|
-
-
|
|
61
|
-
|
|
62
|
-
-
|
|
67
|
+
-
|
|
68
|
+
run: npm install --no-save ep_etherpad-lite@file:../etherpad-lite/src
|
|
69
|
+
-
|
|
70
|
+
run: npm test
|
|
71
|
+
-
|
|
72
|
+
run: npm run lint
|
|
63
73
|
|
|
64
74
|
publish-npm:
|
|
65
75
|
if: github.event_name == 'push'
|
|
66
76
|
needs: test
|
|
67
77
|
runs-on: ubuntu-latest
|
|
68
78
|
steps:
|
|
69
|
-
-
|
|
79
|
+
-
|
|
80
|
+
uses: actions/checkout@v2
|
|
70
81
|
with:
|
|
71
82
|
fetch-depth: 0
|
|
72
|
-
-
|
|
83
|
+
-
|
|
84
|
+
uses: actions/setup-node@v2
|
|
73
85
|
with:
|
|
74
86
|
node-version: 12
|
|
75
87
|
registry-url: https://registry.npmjs.org/
|
|
76
88
|
cache: 'npm'
|
|
77
|
-
-
|
|
89
|
+
-
|
|
90
|
+
name: Bump version (patch)
|
|
78
91
|
run: |
|
|
79
92
|
LATEST_TAG=$(git describe --tags --abbrev=0) || exit 1
|
|
80
93
|
NEW_COMMITS=$(git rev-list --count "${LATEST_TAG}"..) || exit 1
|
|
@@ -94,10 +107,12 @@ jobs:
|
|
|
94
107
|
# already-used version number. By running `npm publish` after `git push`,
|
|
95
108
|
# back-to-back merges will cause the first merge's workflow to fail but
|
|
96
109
|
# the second's will succeed.
|
|
97
|
-
-
|
|
110
|
+
-
|
|
111
|
+
run: npm publish
|
|
98
112
|
env:
|
|
99
113
|
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
|
|
100
|
-
-
|
|
114
|
+
-
|
|
115
|
+
name: Add package to etherpad organization
|
|
101
116
|
run: npm access grant read-write etherpad:developers
|
|
102
117
|
env:
|
|
103
118
|
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ep_openid_connect",
|
|
3
|
-
"version": "2.5.
|
|
3
|
+
"version": "2.5.7",
|
|
4
4
|
"description": "Etherpad plugin to authenticate users against an OpenID Connect provider.",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"repository": {
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"eslint": "^7.32.0",
|
|
30
|
-
"eslint-config-etherpad": "^2.0.
|
|
30
|
+
"eslint-config-etherpad": "^2.0.3",
|
|
31
31
|
"eslint-plugin-cypress": "^2.12.1",
|
|
32
32
|
"eslint-plugin-eslint-comments": "^3.2.0",
|
|
33
33
|
"eslint-plugin-mocha": "^9.0.0",
|