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

chore: remove license v3 public key envvar #30646

Merged
merged 1 commit into from
Oct 17, 2023
Merged

chore: remove license v3 public key envvar #30646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions ee/packages/license/babel.config.json
View file
Open in desktop

This file was deleted.

9 changes: 1 addition & 8 deletions ee/packages/license/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,11 @@
"version": "0.0.1",
"private": true,
"devDependencies": {
"@babel/cli": "^7.23.0",
"@babel/core": "^7.23.0",
"@babel/preset-env": "^7.22.20",
"@babel/preset-typescript": "^7.23.0",
"@swc/core": "^1.3.66",
"@swc/jest": "^0.2.26",
"@types/babel__core": "^7",
"@types/babel__preset-env": "^7",
"@types/bcrypt": "^5.0.0",
"@types/jest": "~29.5.3",
"@types/ws": "^8.5.5",
"babel-plugin-transform-inline-environment-variables": "^0.4.4",
"eslint": "~8.45.0",
"jest": "~29.6.1",
"jest-environment-jsdom": "~29.6.1",
Expand All @@ -29,7 +22,7 @@
"testunit": "jest",
"build": "npm run build:types && npm run build:js",
"build:types": "tsc --emitDeclarationOnly",
"build:js": "babel src --out-dir dist --extensions \".ts,.tsx\" --source-maps inline",
"build:js": "rm -rf dist && tsc -p tsconfig.json",
"dev": "tsc -p tsconfig.json --watch --preserveWatchOutput"
},
"main": "./dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion ee/packages/license/src/token.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type { ILicenseV3 } from './definition/ILicenseV3';
const PUBLIC_LICENSE_KEY_V2 =
'LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQ0lqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUFxV1Nza2Q5LzZ6Ung4a3lQY2ljcwpiMzJ3Mnd4VnV3N3lCVDk2clEvOEQreU1lQ01POXdTU3BIYS85bkZ5d293RXRpZ3B0L3dyb1BOK1ZHU3didHdQCkZYQmVxRWxCbmRHRkFsODZlNStFbGlIOEt6L2hHbkNtSk5tWHB4RUsyUkUwM1g0SXhzWVg3RERCN010eC9pcXMKY2pCL091dlNCa2ppU2xlUzdibE5JVC9kQTdLNC9DSjNvaXUwMmJMNEV4Y2xDSGVwenFOTWVQM3dVWmdweE9uZgpOT3VkOElYWUs3M3pTY3VFOEUxNTdZd3B6Q0twVmFIWDdaSmY4UXVOc09PNVcvYUlqS2wzTDYyNjkrZUlPRXJHCndPTm1hSG56Zmc5RkxwSmh6Z3BPMzhhVm43NnZENUtLakJhaldza1krNGEyZ1NRbUtOZUZxYXFPb3p5RUZNMGUKY0ZXWlZWWjNMZWg0dkVNb1lWUHlJeng5Nng4ZjIveW1QbmhJdXZRdjV3TjRmeWVwYTdFWTVVQ2NwNzF6OGtmUAo0RmNVelBBMElEV3lNaWhYUi9HNlhnUVFaNEdiL3FCQmh2cnZpSkNGemZZRGNKZ0w3RmVnRllIUDNQR0wwN1FnCnZMZXZNSytpUVpQcnhyYnh5U3FkUE9rZ3VyS2pWclhUVXI0QTlUZ2lMeUlYNVVsSnEzRS9SVjdtZk9xWm5MVGEKU0NWWEhCaHVQbG5DR1pSMDFUb1RDZktoTUcxdTBDRm5MMisxNWhDOWZxT21XdjlRa2U0M3FsSjBQZ0YzVkovWAp1eC9tVHBuazlnbmJHOUpIK21mSDM5Um9GdlROaW5Zd1NNdll6dXRWT242OXNPemR3aERsYTkwbDNBQ2g0eENWCks3Sk9YK3VIa29OdTNnMmlWeGlaVU0wQ0F3RUFBUT09Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo=';

const PUBLIC_LICENSE_KEY_V3 = process.env.PUBLIC_LICENSE_KEY_V3 || PUBLIC_LICENSE_KEY_V2;
const PUBLIC_LICENSE_KEY_V3 = PUBLIC_LICENSE_KEY_V2;

let TEST_KEYS: [string, string] | undefined = undefined;

Expand Down
65 changes: 5 additions & 60 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,33 +966,6 @@ __metadata:
languageName: node
linkType: hard

"@babel/cli@npm:^7.23.0":
version: 7.23.0
resolution: "@babel/cli@npm:7.23.0"
dependencies:
"@jridgewell/trace-mapping": ^0.3.17
"@nicolo-ribaudo/chokidar-2": 2.1.8-no-fsevents.3
chokidar: ^3.4.0
commander: ^4.0.1
convert-source-map: ^2.0.0
fs-readdir-recursive: ^1.1.0
glob: ^7.2.0
make-dir: ^2.1.0
slash: ^2.0.0
peerDependencies:
"@babel/core": ^7.0.0-0
dependenciesMeta:
"@nicolo-ribaudo/chokidar-2":
optional: true
chokidar:
optional: true
bin:
babel: ./bin/babel.js
babel-external-helpers: ./bin/babel-external-helpers.js
checksum: beeb189560bf9c4ea951ef637eefa5214654678fb09c4aaa6695921037059c1e1553c610fe95fbd19a9cdfd9f5598a812fc13df40a6b9a9ea899e43fc6c42052
languageName: node
linkType: hard

"@babel/code-frame@npm:7.12.11":
version: 7.12.11
resolution: "@babel/code-frame@npm:7.12.11"
Expand Down Expand Up @@ -1043,7 +1016,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/core@npm:^7.1.0, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.20.7, @babel/core@npm:^7.21.4, @babel/core@npm:^7.23.0, @babel/core@npm:^7.7.5":
"@babel/core@npm:^7.1.0, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.20.7, @babel/core@npm:^7.21.4, @babel/core@npm:^7.7.5":
version: 7.23.0
resolution: "@babel/core@npm:7.23.0"
dependencies:
Expand Down Expand Up @@ -2513,7 +2486,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/preset-env@npm:^7.12.11, @babel/preset-env@npm:^7.22.20, @babel/preset-env@npm:~7.22.10, @babel/preset-env@npm:~7.22.9":
"@babel/preset-env@npm:^7.12.11, @babel/preset-env@npm:~7.22.10, @babel/preset-env@npm:~7.22.9":
version: 7.22.20
resolution: "@babel/preset-env@npm:7.22.20"
dependencies:
Expand Down Expand Up @@ -2645,7 +2618,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/preset-typescript@npm:^7.12.7, @babel/preset-typescript@npm:^7.23.0":
"@babel/preset-typescript@npm:^7.12.7":
version: 7.23.0
resolution: "@babel/preset-typescript@npm:7.23.0"
dependencies:
Expand Down Expand Up @@ -4588,13 +4561,6 @@ __metadata:
languageName: node
linkType: hard

"@nicolo-ribaudo/chokidar-2@npm:2.1.8-no-fsevents.3":
version: 2.1.8-no-fsevents.3
resolution: "@nicolo-ribaudo/chokidar-2@npm:2.1.8-no-fsevents.3"
checksum: ee55cc9241aeea7eb94b8a8551bfa4246c56c53bc71ecda0a2104018fcc328ba5723b33686bdf9cc65d4df4ae65e8016b89e0bbdeb94e0309fe91bb9ced42344
languageName: node
linkType: hard

"@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1":
version: 5.1.1-v1
resolution: "@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1"
Expand Down Expand Up @@ -8474,21 +8440,14 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/license@workspace:ee/packages/license"
dependencies:
"@babel/cli": ^7.23.0
"@babel/core": ^7.23.0
"@babel/preset-env": ^7.22.20
"@babel/preset-typescript": ^7.23.0
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/jwt": "workspace:^"
"@rocket.chat/logger": "workspace:^"
"@swc/core": ^1.3.66
"@swc/jest": ^0.2.26
"@types/babel__core": ^7
"@types/babel__preset-env": ^7
"@types/bcrypt": ^5.0.0
"@types/jest": ~29.5.3
"@types/ws": ^8.5.5
babel-plugin-transform-inline-environment-variables: ^0.4.4
bcrypt: ^5.0.1
eslint: ~8.45.0
jest: ~29.6.1
Expand Down Expand Up @@ -15433,13 +15392,6 @@ __metadata:
languageName: node
linkType: hard

"babel-plugin-transform-inline-environment-variables@npm:^0.4.4":
version: 0.4.4
resolution: "babel-plugin-transform-inline-environment-variables@npm:0.4.4"
checksum: fa361287411301237fd8ce332aff4f8e8ccb8db30e87a2ddc7224c8bf7cd792eda47aca24dc2e09e70bce4c027bc8cbe22f4999056be37a25d2472945df21ef5
languageName: node
linkType: hard

"babel-polyfill@npm:^6.2.0":
version: 6.26.0
resolution: "babel-polyfill@npm:6.26.0"
Expand Down Expand Up @@ -16964,7 +16916,7 @@ __metadata:
languageName: node
linkType: hard

"chokidar@npm:3.5.3, chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.4.0, chokidar@npm:^3.4.1, chokidar@npm:^3.4.2, chokidar@npm:^3.5.1, chokidar@npm:^3.5.3":
"chokidar@npm:3.5.3, chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.4.1, chokidar@npm:^3.4.2, chokidar@npm:^3.5.1, chokidar@npm:^3.5.3":
version: 3.5.3
resolution: "chokidar@npm:3.5.3"
dependencies:
Expand Down Expand Up @@ -17513,7 +17465,7 @@ __metadata:
languageName: node
linkType: hard

"commander@npm:^4.0.0, commander@npm:^4.0.1, commander@npm:^4.1.1":
"commander@npm:^4.0.0, commander@npm:^4.1.1":
version: 4.1.1
resolution: "commander@npm:4.1.1"
checksum: d7b9913ff92cae20cb577a4ac6fcc121bd6223319e54a40f51a14740a681ad5c574fd29a57da478a5f234a6fa6c52cbf0b7c641353e03c648b1ae85ba670b977
Expand Down Expand Up @@ -22120,13 +22072,6 @@ __metadata:
languageName: node
linkType: hard

"fs-readdir-recursive@npm:^1.1.0":
version: 1.1.0
resolution: "fs-readdir-recursive@npm:1.1.0"
checksum: 29d50f3d2128391c7fc9fd051c8b7ea45bcc8aa84daf31ef52b17218e20bfd2bd34d02382742801954cc8d1905832b68227f6b680a666ce525d8b6b75068ad1e
languageName: node
linkType: hard

"fs-write-stream-atomic@npm:^1.0.8":
version: 1.0.10
resolution: "fs-write-stream-atomic@npm:1.0.10"
Expand Down
Loading