fix(core): update
This commit is contained in:
		
							
								
								
									
										5
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -8,9 +8,12 @@ pages/ | |||||||
| # installs | # installs | ||||||
| node_modules/ | node_modules/ | ||||||
|  |  | ||||||
| # caches and builds | # caches | ||||||
| .yarn/ | .yarn/ | ||||||
| .cache/ | .cache/ | ||||||
|  | .rpt2_cache | ||||||
|  |  | ||||||
|  | # builds | ||||||
| dist/ | dist/ | ||||||
| dist_web/ | dist_web/ | ||||||
| dist_serve/ | dist_serve/ | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| # gitzone standard | # gitzone ci_default | ||||||
| image: hosttoday/ht-docker-node:npmci | image: registry.gitlab.com/hosttoday/ht-docker-node:npmci | ||||||
|  |  | ||||||
| cache: | cache: | ||||||
|   paths: |   paths: | ||||||
| @@ -34,48 +34,11 @@ snyk: | |||||||
|   - docker |   - docker | ||||||
|   - notpriv |   - 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 | # test stage | ||||||
| # ==================== | # ==================== | ||||||
|  |  | ||||||
| testLTS: | testStable: | ||||||
|   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: |  | ||||||
|   stage: test |   stage: test | ||||||
|   script: |   script: | ||||||
|   - npmci npm prepare |   - npmci npm prepare | ||||||
| @@ -85,6 +48,18 @@ testSTABLE: | |||||||
|   coverage: /\d+.?\d+?\%\s*coverage/ |   coverage: /\d+.?\d+?\%\s*coverage/ | ||||||
|   tags: |   tags: | ||||||
|   - docker |   - 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 |   - notpriv | ||||||
|  |  | ||||||
| release: | release: | ||||||
| @@ -103,19 +78,12 @@ release: | |||||||
| # ==================== | # ==================== | ||||||
| codequality: | codequality: | ||||||
|   stage: metadata |   stage: metadata | ||||||
|   image: docker:stable |  | ||||||
|   allow_failure: true |   allow_failure: true | ||||||
|   services: |  | ||||||
|     - docker:stable-dind |  | ||||||
|   script: |   script: | ||||||
|     - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') |     - npmci command npm install -g tslint typescript | ||||||
|     - docker run |     - npmci npm prepare | ||||||
|         --env SOURCE_CODE="$PWD" |     - npmci npm install | ||||||
|         --volume "$PWD":/code |     - npmci command "tslint -c tslint.json ./ts/**/*.ts" | ||||||
|         --volume /var/run/docker.sock:/var/run/docker.sock |  | ||||||
|         "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code |  | ||||||
|   artifacts: |  | ||||||
|     paths: [codeclimate.json] |  | ||||||
|   tags: |   tags: | ||||||
|   - docker |   - docker | ||||||
|   - priv |   - priv | ||||||
| @@ -131,13 +99,15 @@ trigger: | |||||||
|   - notpriv |   - notpriv | ||||||
|  |  | ||||||
| pages: | pages: | ||||||
|   image: hosttoday/ht-docker-node:npmci |   image: hosttoday/ht-docker-dbase:npmci | ||||||
|  |   services: | ||||||
|  |    - docker:stable-dind | ||||||
|   stage: metadata |   stage: metadata | ||||||
|   script: |   script: | ||||||
|     - npmci command npm install -g typedoc typescript |     - npmci command npm install -g @gitzone/tsdoc | ||||||
|     - npmci npm prepare |     - npmci npm prepare | ||||||
|     - npmci npm install |     - npmci npm install | ||||||
|     - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/ |     - npmci command tsdoc | ||||||
|   tags: |   tags: | ||||||
|     - docker |     - docker | ||||||
|     - notpriv |     - notpriv | ||||||
|   | |||||||
							
								
								
									
										15
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								package.json
									
									
									
									
									
								
							| @@ -24,5 +24,16 @@ | |||||||
|     "@pushrocks/smartcrypto": "^1.0.7", |     "@pushrocks/smartcrypto": "^1.0.7", | ||||||
|     "@types/jsonwebtoken": "^8.3.4", |     "@types/jsonwebtoken": "^8.3.4", | ||||||
|     "jsonwebtoken": "^8.5.1" |     "jsonwebtoken": "^8.5.1" | ||||||
|   } |   }, | ||||||
| } |   "files": [ | ||||||
|  |     "ts/*", | ||||||
|  |     "ts_web/*", | ||||||
|  |     "dist/*", | ||||||
|  |     "dist_web/*", | ||||||
|  |     "dist_ts_web/*", | ||||||
|  |     "assets/*", | ||||||
|  |     "cli.js", | ||||||
|  |     "npmextra.json", | ||||||
|  |     "readme.md" | ||||||
|  |   ] | ||||||
|  | } | ||||||
| @@ -20,9 +20,7 @@ a package for handling jwt | |||||||
|  |  | ||||||
| For further information read the linked docs at the top of this readme. | 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) | > 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) | ||||||
|  |  | ||||||
| [](https://maintainedby.lossless.com) | [](https://maintainedby.lossless.com) | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ export class SmartJwt { | |||||||
|   public publicKey: plugins.smartcrypto.PublicKey; |   public publicKey: plugins.smartcrypto.PublicKey; | ||||||
|   public privateKey: plugins.smartcrypto.PrivateKey; |   public privateKey: plugins.smartcrypto.PrivateKey; | ||||||
|  |  | ||||||
|   constructor() {}; |   constructor() {} | ||||||
|  |  | ||||||
|   /** |   /** | ||||||
|    * creates a JWT |    * 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) { |   public async setPublicKey(publicKey: plugins.smartcrypto.PublicKey) { | ||||||
|     this.publicKey = publicKey; |     this.publicKey = publicKey; | ||||||
| @@ -65,7 +65,6 @@ export class SmartJwt { | |||||||
|     this.publicKey = plugins.smartcrypto.PublicKey.fromPemString(jsonKeyPair.publicPem); |     this.publicKey = plugins.smartcrypto.PublicKey.fromPemString(jsonKeyPair.publicPem); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  |  | ||||||
|   /** |   /** | ||||||
|    * creates a new keypair |    * creates a new keypair | ||||||
|    */ |    */ | ||||||
| @@ -74,4 +73,4 @@ export class SmartJwt { | |||||||
|     this.setPrivateKey(keypair.privateKey); |     this.setPrivateKey(keypair.privateKey); | ||||||
|     this.setPublicKey(keypair.publicKey); |     this.setPublicKey(keypair.publicKey); | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,12 +1,8 @@ | |||||||
| // @pushrocks scope | // @pushrocks scope | ||||||
| import * as smartcrypto from '@pushrocks/smartcrypto'; | import * as smartcrypto from '@pushrocks/smartcrypto'; | ||||||
|  |  | ||||||
| export { | export { smartcrypto }; | ||||||
|   smartcrypto |  | ||||||
| }; |  | ||||||
|  |  | ||||||
| // thirdparty scope | // thirdparty scope | ||||||
| import * as jsonwebtoken from 'jsonwebtoken'; | import * as jsonwebtoken from 'jsonwebtoken'; | ||||||
| export { | export { jsonwebtoken }; | ||||||
|   jsonwebtoken |  | ||||||
| }; |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user