Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/open id connect web service plugin #145

Closed
wants to merge 8 commits into from
Closed

Feature/open id connect web service plugin #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
40edf90
docs(template-launch-json): cmd-api-server launcher task updated afte…
petermetz May 22, 2020
6c1983b
style: fixing typos in spec files, readmes, etc
petermetz May 22, 2020
1d43860
fix(cmd-api-server): schema for the plugin array custom type
petermetz May 22, 2020
ca86665
build(plugin-web-service-consortium): fix the order of tasks by havin…
petermetz May 22, 2020
aee986d
ci(travis): include NodeJS 12 and 14 with 10 among the tested versions
petermetz May 22, 2020
2e35ad1
build(webpack,tsc): add webpack cache-loader and tsc incremental flag…
petermetz May 22, 2020
d6cd73f
feat(plugin-web-service-oidc): add Open ID Connect auth plugin
petermetz May 22, 2020
0db358b
build(package-json): refactor how tests are executed to get a unified…
petermetz May 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
language: node_js
node_js:
- 10
- 12
- 14

os: linux

Expand All @@ -10,7 +12,7 @@ services:
- docker

script:
- CI_CONTAINERS_WAIT_TIME=12 CI_NO_CORDA=true ./tools/ci.sh
- ./tools/ci.sh

after_script:
- docker ps -a
13 changes: 5 additions & 8 deletions .vscode/template.launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@
{
"type": "node",
"request": "launch",
"name": "cactus-cmd-api-server",
"name": "cmd-api-server",
"program": "${workspaceFolder}/packages/cactus-cmd-api-server/dist/lib/main/typescript/cmd/cactus-api.js",
"args": [
"--public-key=03aa57b5c6506a6e5a2851dcbc14bf2b3d2b9196aecacc946f630eab5203dca8c4",
"--private-key=da43d3ce06f7b0eef447ca209c00cf2efdef02a761fb5ba2aaf7fc601ceaf555",
"--api-cors-domain-csv=http://editor.swagger.io"
"--api-cors-domain-csv=http://editor.swagger.io",
"--config-file=.config.json"
],
"outFiles": [
"/packages/cactus-cmd-api-server/dist/lib/**/*"
],
"skipFiles": [
"<node_internals>/**"
]
"outFiles": ["/packages/cactus-cmd-api-server/dist/lib/**/*"],
"skipFiles": ["<node_internals>/**"]
},
{
"type": "node",
Expand Down
110 changes: 110 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 22 additions & 16 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,44 @@
"name": "@hyperledger-labs/cactus",
"private": true,
"scripts": {
"run-ci": "./tools/ci.sh",
"configure": "lerna clean --yes && lerna bootstrap && npm-run-all build generate-api-server-config",
"generate-api-server-config": "node ./tools/generate-api-server-config.js",
"start:api-server": "node ./packages/cactus-cmd-api-server/dist/lib/main/typescript/cmd/cactus-api.js --config-file=.config.json",
"export-open-api-spec": "ts-node -e 'import(\"./packages/cactus-cmd-api-server/src/main/typescript/openapi-spec\").then((x) => x.exportToFileSystemAsJson());'",
"pregenerate-sdk": "npm-run-all export-open-api-spec",
"generate-sdk": "openapi-generator generate --input-spec cactus-openapi-spec.json -g typescript-axios -o packages/cactus-sdk/src/main/typescript/generated/openapi/typescript-axios/",
"tsc": "lerna run tsc",
"clean": "lerna exec --stream --ignore '*/*cockpit' -- del-cli dist/** && del-cli packages/cactus-sdk/src/main/typescript/generated/openapi/typescript-axios/*",
"build": "npm-run-all build:backend build:frontend",
"build:frontend": "lerna exec --stream --scope '*/*cockpit' -- ng build --prod",
"build:backend": "npm-run-all lint clean generate-sdk tsc webpack",
"lint": "lerna exec --stream --ignore '*/*cockpit' -- cross-env DEBUG= tslint --project tsconfig.json",
"tsc": "lerna run tsc",
"build": "npm-run-all build:dev build:prod",
"build:prod": "npm-run-all build:prod:backend webpack:prod:web build:prod:frontend",
"build:prod:backend": "npm-run-all webpack:prod:node",
"build:prod:frontend": "lerna run build:prod:frontend",
"build:dev": "npm-run-all build:dev:backend webpack:dev:web build:dev:frontend",
"build:dev:backend": "npm-run-all lint clean generate-sdk tsc webpack:dev:node",
"build:dev:frontend": "lerna run build:dev:frontend",
"build:dev:cmd-api-server": "lerna exec --stream --scope '*/*api-server' -- 'del-cli dist/** && tsc --project ./tsconfig.json && webpack --env=dev --target=node --config ../../webpack.config.js'",
"build:dev:common": "lerna exec --stream --scope '*/*common' -- 'del-cli dist/** && tsc --project ./tsconfig.json && webpack --env=dev --target=node --config ../../webpack.config.js'",
"build:dev:core-api": "lerna exec --stream --scope '*/*core-api' -- 'del-cli dist/** && tsc --project ./tsconfig.json && webpack --env=dev --target=node --config ../../webpack.config.js'",
"build:dev:test-tooling": "lerna exec --stream --scope '*/*test-tooling' -- 'del-cli dist/** && tsc --project ./tsconfig.json && webpack --env=dev --target=node --config ../../webpack.config.js'",
"build:dev:plugin-ledger-connector-quorum": "lerna exec --stream --scope '*/*connector-quorum' -- 'del-cli dist/** && tsc --project ./tsconfig.json && webpack --env=dev --target=node --config ../../webpack.config.js'",
"build:dev:plugin-web-service-consortium": "lerna exec --stream --scope '*/*web-service-consortium' -- 'del-cli dist/** && tsc --project ./tsconfig.json && webpack --env=dev --target=node --config ../../webpack.config.js'",
"build:dev:plugin-web-service-oidc": "lerna exec --stream --scope '*/*web-service-oidc' -- 'del-cli dist/** && tsc --project ./tsconfig.json && webpack --env=dev --target=node --config ../../webpack.config.js'",
"build:dev:sdk": "lerna exec --stream --scope '*/*sdk' -- 'del-cli dist/** && tsc --project ./tsconfig.json && webpack --env=dev --target=node --config ../../webpack.config.js'",
"webpack": "npm-run-all webpack:web:dev webpack:node:dev webpack:web:prod webpack:node:prod",
"webpack:web:prod": "lerna exec --stream --ignore '*/*{cockpit,server,test-tooling}' -- webpack --env=prod --target=web --config ../../webpack.config.js",
"webpack:web:dev": "lerna exec --stream --ignore '*/*{cockpit,server,test-tooling}' -- webpack --env=dev --target=web --config ../../webpack.config.js",
"webpack:node:prod": "lerna exec --stream --ignore '*/*cockpit' -- webpack --env=prod --target=node --config ../../webpack.config.js",
"webpack:node:dev": "lerna exec --stream --ignore '*/*cockpit' -- webpack --env=dev --target=node --config ../../webpack.config.js",
"webpack": "npm-run-all webpack:dev webpack:prod",
"webpack:dev": "lerna run webpack:dev",
"webpack:dev:web": "lerna run webpack:dev:web",
"webpack:dev:node": "lerna run webpack:dev:node",
"webpack:prod": "lerna run webpack:prod",
"webpack:prod:web": "lerna run webpack:prod:web",
"webpack:prod:node": "lerna run webpack:prod:node",
"test:all": "tap --jobs=1 --timeout=600 \"packages/cactus-*/src/test/typescript/{unit,integration}/\"",
"test:unit": "tap --timeout=600 \"packages/cactus-*/src/test/typescript/unit/\"",
"test:integration": "tap --jobs=1 --timeout=600 \"packages/cactus-*/src/test/typescript/integration/\"",
"changelog": "conventional-changelog --infile CHANGELOG.md --outfile CHANGELOG.md && git add CHANGELOG.md",
"commit": "git-cz --signoff",
"prettier": "prettier --write --config .prettierrc.json \"./**/*.{ts,js}\"",
"setup": "lerna exec --stream --ignore '*/*cockpit' -- rm -rf node_modules package-lock.json",
"lint": "lerna exec --stream --ignore '*/*cockpit' -- cross-env DEBUG= tslint --project tsconfig.json",
"test": "lerna exec --stream --ignore '*/*cockpit' -- tap --timeout=600 src/test/typescript/unit/",
"test:cactus-test-tooling": "lerna exec --stream --scope '*/*test-tooling' -- tap --timeout=600 src/test/typescript/integration/",
"test-coverage": "lerna exec --stream --ignore '*/*cockpit' -- tap --timeout=600 src/test/typescript/unit/ --cov",
"test-coverage-html": "lerna exec --stream --ignore '*/*cockpit' -- tap --timeout=600 src/test/typescript/unit/ --cov --coverage-report=lcov",
"test-integration": "lerna exec --stream --ignore '*/*cockpit' -- tap --timeout=600 src/test/typescript/integration/",
"version": "lerna version --no-push --conventional-commits --sign-git-commit --sign-git-tag"
},
"devDependencies": {
Expand All @@ -43,6 +48,7 @@
"@openapitools/openapi-generator-cli": "1.0.10-4.2.3",
"@types/node-fetch": "2.5.4",
"@types/uuid": "3.4.6",
"cache-loader": "4.1.0",
"commitizen": "4.0.3",
"conventional-changelog-cli": "2.0.28",
"cross-env": "5.2.0",
Expand Down
15 changes: 14 additions & 1 deletion packages/cactus-cmd-api-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,22 @@
],
"main": "dist/cactus-core-api.node.umd.js",
"mainMinified": "dist/cactus-core-api.node.umd.min.js",
"browser": "dist/cactus-core-api.web.umd.js",
"browserMinified": "dist/cactus-core-api.web.umd.min.js",
"module": "dist/lib/main/typescript/index.js",
"types": "dist/types/main/typescript/index.d.ts",
"scripts": {
"tsc": "tsc --project ./tsconfig.json"
"tsc": "tsc --project ./tsconfig.json",

"webpack": "npm-run-all webpack:dev webpack:prod",

"webpack:dev": "npm-run-all webpack:dev:node webpack:dev:web",
"webpack:dev:web": "webpack --env=dev --target=web --config ../../webpack.config.js",
"webpack:dev:node": "webpack --env=dev --target=node --config ../../webpack.config.js",

"webpack:prod": "npm-run-all webpack:prod:node webpack:prod:web",
"webpack:prod:web": "webpack --env=prod --target=web --config ../../webpack.config.js",
"webpack:prod:node": "webpack --env=prod --target=node --config ../../webpack.config.js"
},
"engines": {
"node": ">=10",
Expand Down Expand Up @@ -59,6 +71,7 @@
"@hyperledger/cactus-plugin-keychain-memory": "0.2.0",
"@hyperledger/cactus-plugin-kv-storage-memory": "0.2.0",
"@hyperledger/cactus-plugin-web-service-consortium": "0.2.0",
"@hyperledger/cactus-plugin-web-service-oidc": "0.2.0",
"body-parser": "1.19.0",
"compression": "1.7.4",
"convict": "6.0.0",
Expand Down