diff --git a/.gitignore b/.gitignore index e713ab4..91c0db0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,9 +8,12 @@ pages/ # installs node_modules/ -# caches and builds +# caches .yarn/ .cache/ +.rpt2_cache + +# builds dist/ dist_web/ dist_serve/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0dfb491..0b92fd3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ -# gitzone standard -image: hosttoday/ht-docker-node:npmci +# gitzone ci_default +image: registry.gitlab.com/hosttoday/ht-docker-node:npmci cache: paths: @@ -34,48 +34,11 @@ snyk: - docker - notpriv -sast: - stage: security - image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci - variables: - DOCKER_DRIVER: overlay2 - allow_failure: true - services: - - docker:stable-dind - script: - - npmci npm prepare - - npmci npm install - - npmci command npm run build - - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - - docker run - --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}" - --volume "$PWD:/code" - --volume /var/run/docker.sock:/var/run/docker.sock - "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code - artifacts: - reports: - sast: gl-sast-report.json - tags: - - docker - - priv - # ==================== # test stage # ==================== -testLTS: - stage: test - script: - - npmci npm prepare - - npmci node install lts - - npmci npm install - - npmci npm test - coverage: /\d+.?\d+?\%\s*coverage/ - tags: - - docker - - notpriv - -testSTABLE: +testStable: stage: test script: - npmci npm prepare @@ -85,6 +48,18 @@ testSTABLE: coverage: /\d+.?\d+?\%\s*coverage/ tags: - docker + - priv + +testBuild: + stage: test + script: + - npmci npm prepare + - npmci node install stable + - npmci npm install + - npmci command npm run build + coverage: /\d+.?\d+?\%\s*coverage/ + tags: + - docker - notpriv release: @@ -103,19 +78,12 @@ release: # ==================== codequality: stage: metadata - image: docker:stable allow_failure: true - services: - - docker:stable-dind script: - - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - - docker run - --env SOURCE_CODE="$PWD" - --volume "$PWD":/code - --volume /var/run/docker.sock:/var/run/docker.sock - "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code - artifacts: - paths: [codeclimate.json] + - npmci command npm install -g tslint typescript + - npmci npm prepare + - npmci npm install + - npmci command "tslint -c tslint.json ./ts/**/*.ts" tags: - docker - priv @@ -131,13 +99,15 @@ trigger: - notpriv pages: - image: hosttoday/ht-docker-node:npmci + image: hosttoday/ht-docker-dbase:npmci + services: + - docker:stable-dind stage: metadata script: - - npmci command npm install -g typedoc typescript + - npmci command npm install -g @gitzone/tsdoc - npmci npm prepare - npmci npm install - - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/ + - npmci command tsdoc tags: - docker - notpriv diff --git a/package.json b/package.json index 39cc0a3..9c2a3e8 100644 --- a/package.json +++ b/package.json @@ -24,5 +24,16 @@ "@pushrocks/smartcrypto": "^1.0.7", "@types/jsonwebtoken": "^8.3.4", "jsonwebtoken": "^8.5.1" - } -} + }, + "files": [ + "ts/*", + "ts_web/*", + "dist/*", + "dist_web/*", + "dist_ts_web/*", + "assets/*", + "cli.js", + "npmextra.json", + "readme.md" + ] +} \ No newline at end of file diff --git a/readme.md b/readme.md index 858afb9..54f6419 100644 --- a/readme.md +++ b/readme.md @@ -20,9 +20,7 @@ a package for handling jwt For further information read the linked docs at the top of this readme. -This package is intended for being used serverside. There is a corresponding client package for browsers calls @pushrocks/webtoken - > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh) -| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html) +| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy) -[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com) +[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com) diff --git a/ts/smartjwt.classes.smartjwt.ts b/ts/smartjwt.classes.smartjwt.ts index 210881d..0b077bd 100644 --- a/ts/smartjwt.classes.smartjwt.ts +++ b/ts/smartjwt.classes.smartjwt.ts @@ -13,7 +13,7 @@ export class SmartJwt { public publicKey: plugins.smartcrypto.PublicKey; public privateKey: plugins.smartcrypto.PrivateKey; - constructor() {}; + constructor() {} /** * creates a JWT @@ -41,7 +41,7 @@ export class SmartJwt { } /** - * sets a public key + * sets a public key */ public async setPublicKey(publicKey: plugins.smartcrypto.PublicKey) { this.publicKey = publicKey; @@ -65,7 +65,6 @@ export class SmartJwt { this.publicKey = plugins.smartcrypto.PublicKey.fromPemString(jsonKeyPair.publicPem); } - /** * creates a new keypair */ @@ -74,4 +73,4 @@ export class SmartJwt { this.setPrivateKey(keypair.privateKey); this.setPublicKey(keypair.publicKey); } -} \ No newline at end of file +} diff --git a/ts/smartjwt.plugins.ts b/ts/smartjwt.plugins.ts index bf87334..57611b6 100644 --- a/ts/smartjwt.plugins.ts +++ b/ts/smartjwt.plugins.ts @@ -1,12 +1,8 @@ // @pushrocks scope import * as smartcrypto from '@pushrocks/smartcrypto'; -export { - smartcrypto -}; +export { smartcrypto }; // thirdparty scope import * as jsonwebtoken from 'jsonwebtoken'; -export { - jsonwebtoken -}; +export { jsonwebtoken };