From 2dc4d6a10023ad4472fc4841821d4e9f46f1a590 Mon Sep 17 00:00:00 2001 From: Andrey Platov Date: Sun, 8 Aug 2021 18:54:32 +0200 Subject: [PATCH] checkpoint Signed-off-by: Andrey Platov --- common/config/rush/pnpm-lock.yaml | 93 ++++++++++--------- dev/prod/.env-prod | 2 +- dev/prod/package.json | 3 +- dev/prod/src/platform.ts | 13 +-- dev/server/package.json | 5 +- dev/server/src/__start.ts | 5 + dev/server/src/server.ts | 5 + models/workbench/package.json | 3 +- models/workbench/src/plugin.ts | 1 + plugins/client-resources/src/index.ts | 10 +- plugins/client/src/index.ts | 7 +- plugins/login-resources/package.json | 3 +- .../src/components/LoginForm.svelte | 17 ++-- plugins/login-resources/src/plugin.ts | 3 - plugins/login-resources/src/utils.ts | 20 +++- plugins/login/package.json | 3 +- plugins/login/src/index.ts | 47 +++++----- plugins/workbench-resources/package.json | 3 +- .../src/components/Workbench.svelte | 63 +++++++------ .../src/components/WorkbenchApp.svelte | 17 +++- plugins/workbench-resources/src/plugin.ts | 4 - plugins/workbench/src/index.ts | 3 + server/ws/src/server.ts | 1 + 23 files changed, 181 insertions(+), 150 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 831b47fe1a..27b30fd020 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -8303,13 +8303,13 @@ packages: dev: false file:projects/chunter-assets.tgz: - resolution: {integrity: sha512-kRmElkS58/FJwkgz4yx35+C0wj3u/X+qJa1qJnHtcK9d2rnBwaWnU54+4OoFvNQj3L7vuHsrt7Nv2tiuHwRtyQ==, tarball: file:projects/chunter-assets.tgz} + resolution: {integrity: sha512-kMTEO1cP8cmeoA2tImDBtT2SXfjo4AW0MWEbzFvzhZkLZaMmJGtl5ZHclKn/Wwg/LBA1zDc21fKlpeahmuNS4A==, tarball: file:projects/chunter-assets.tgz} name: '@rush-temp/chunter-assets' version: 0.0.0 dev: false file:projects/chunter-resources.tgz_c38cf1a7a413db8918b0b4754c21e4c5: - resolution: {integrity: sha512-VP1784iSMDjU+I5KOnhTTogIUV0KXWPZilDfgbksztHlcphtRl3SMfD++sdfxjapqivJJ0cWPdYpEwEOEuTA4g==, tarball: file:projects/chunter-resources.tgz} + resolution: {integrity: sha512-TG4pfCUF3WiB0o44pUhJtRg29ie0bzMtsvttx/d1aUbPCYhD53pMVNnIfO+5I/RFzR7+36sT07RPNLQiefnLqQ==, tarball: file:projects/chunter-resources.tgz} id: file:projects/chunter-resources.tgz name: '@rush-temp/chunter-resources' version: 0.0.0 @@ -8332,7 +8332,7 @@ packages: dev: false file:projects/chunter.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-hmgD0Nd/V8tmm2gRjx+V4a0In4/B05vfI1sNPeD1CUd9zmaxCmP6zszeCGBSdT86eLAbTR6zgmmGuvPCEmfsvQ==, tarball: file:projects/chunter.tgz} + resolution: {integrity: sha512-Hq+07JHbMdd4SPj+3YaWlW2WHB3Cl6AmAkYraqZgj7rkcy3MnMwMCLUfmCb2C260sZ/MlLTcvjLuqD+FRGiKdg==, tarball: file:projects/chunter.tgz} id: file:projects/chunter.tgz name: '@rush-temp/chunter' version: 0.0.0 @@ -8350,7 +8350,7 @@ packages: dev: false file:projects/client-resources.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-sZx3SSO4spAS8S/DNgBlr8t/yz9UeCjmZsBU0foLLXOTijqUpAO/OvFfUW2H22pxg+sUVSElWeAKI/qRINishw==, tarball: file:projects/client-resources.tgz} + resolution: {integrity: sha512-rlYQkD4sNmrLlH39hREJsyDmDCLEXZaywvEFEyWapm+ycxuTD76hVP7V1M38CnIZkhmj9WvjXG6yYmrYVgVEzw==, tarball: file:projects/client-resources.tgz} id: file:projects/client-resources.tgz name: '@rush-temp/client-resources' version: 0.0.0 @@ -8368,7 +8368,7 @@ packages: dev: false file:projects/client.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-8YJou7AitxzzH2roWCno/zgd27SiQXlqrdDVyhAAvZrBZY7KGbxw4OxGkI+6eVK+Lk/zajS2FkGZ+oyZ+Bxe6g==, tarball: file:projects/client.tgz} + resolution: {integrity: sha512-D5PuQvFlF4M+dMtRg3CfvDdHoo8YIsZJmL+gEe31o07a8/A72X+6d2608837zN52GCIFoFDtMfzTdUBENOBL/Q==, tarball: file:projects/client.tgz} id: file:projects/client.tgz name: '@rush-temp/client' version: 0.0.0 @@ -8386,7 +8386,7 @@ packages: dev: false file:projects/contact-resources.tgz_c38cf1a7a413db8918b0b4754c21e4c5: - resolution: {integrity: sha512-hxKVzYp1g9NCpGSWJuYVo2qs2yYHq8ZV4dTqlqxLQ38zVhc7vmDgyGYoTzDyOrsNbuMdkeuTitlyT05c9Kip2g==, tarball: file:projects/contact-resources.tgz} + resolution: {integrity: sha512-/RPvbu0D+yxymleRRRCTto6xur5/Kv0XdGg2xnZwgLBaN1oAQ9ugsCv7XgxYWc1tCfXWTSpKqMXBhJ/q+3KQSg==, tarball: file:projects/contact-resources.tgz} id: file:projects/contact-resources.tgz name: '@rush-temp/contact-resources' version: 0.0.0 @@ -8409,7 +8409,7 @@ packages: dev: false file:projects/contact.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-E2FyqDyeXYb/VjF5t3ZQO4qMLhzN6gVVEFRFlLuM2Bvp0PGPdRBbMCK80r3Vc01JQ5gHE/ujJsSXoAVzSvBsOg==, tarball: file:projects/contact.tgz} + resolution: {integrity: sha512-nRL5QeqCbwiR52uqVwkYmFXZW2mWvD9Jt8l6RetqflhyHRU5dqcmJZ1pQwMJtx2ifqYC5CosaqoIQ7cEk8HZSw==, tarball: file:projects/contact.tgz} id: file:projects/contact.tgz name: '@rush-temp/contact' version: 0.0.0 @@ -8427,7 +8427,7 @@ packages: dev: false file:projects/core.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-H49oedby3HV+eR2uQZAI0kIJ8Yxh8uIR+sLg4Ox0JAy4UJtfP5AmyWltddqaUdQIcfYrb2BrhDSDSxddlDWhpg==, tarball: file:projects/core.tgz} + resolution: {integrity: sha512-fWkoCr8TR72MHkEELoLb1Gb1qp+mSrXOa0TlBvE4pPBdJ8nH1T96tmJ+1NYe3t2Q2PkZ/RueIqNrmgP5ky589A==, tarball: file:projects/core.tgz} id: file:projects/core.tgz name: '@rush-temp/core' version: 0.0.0 @@ -8446,7 +8446,7 @@ packages: dev: false file:projects/dev-account.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-TAqsbX91LUYsbg1ZILddY2vOiup5qwFbo+TDusmlMJb55egEniPQPfqkblGoSQY4jbPYYH599YhRLbvpap9EYw==, tarball: file:projects/dev-account.tgz} + resolution: {integrity: sha512-A/42cU3T+cUhg6wiy9sdY6DCRaRCYoJN1kYlZZgxiItB7e06YKtrTiqj024EhKqQuuko/QXE3z/FOawFbpvk3g==, tarball: file:projects/dev-account.tgz} id: file:projects/dev-account.tgz name: '@rush-temp/dev-account' version: 0.0.0 @@ -8466,7 +8466,7 @@ packages: dev: false file:projects/dev-client-resources.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-biw7Qe9DoDRjkgmEJ4Dl1MAxSzzm580Eb3cqU5ISPSrJ+1EIR+RqUf7W7fwN+PQQuZHy24/mR/tm6P2w8zJnwQ==, tarball: file:projects/dev-client-resources.tgz} + resolution: {integrity: sha512-Ny2RzsGwBjo5Lv1oe3FDHmscb/dthrWX14WpOoG7m8joendDyw3ZkksPgjqiErHV8gVrBm8Le04DPornFozlzw==, tarball: file:projects/dev-client-resources.tgz} id: file:projects/dev-client-resources.tgz name: '@rush-temp/dev-client-resources' version: 0.0.0 @@ -8484,7 +8484,7 @@ packages: dev: false file:projects/dev-server-chunter-resources.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-4fbCn1eq1hWfj33bXc56bZhoo49ETBCwcCMK7aH5RtGOlRlKaWc6v9Z0p8QKewYxNO1JX9sv84vknLx+guKDuA==, tarball: file:projects/dev-server-chunter-resources.tgz} + resolution: {integrity: sha512-hQ9h//2F2wYjLD3OUs9yD2Xq74rz2T06bWLjXU1kSicrnYBvGJENxqPkZxHTa43iSOXLW7qVyROYk2wysqHTAg==, tarball: file:projects/dev-server-chunter-resources.tgz} id: file:projects/dev-server-chunter-resources.tgz name: '@rush-temp/dev-server-chunter-resources' version: 0.0.0 @@ -8502,7 +8502,7 @@ packages: dev: false file:projects/dev-server.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-Zj6rBT3x7MGKM3H4RDuT7heWMI14fruf/LO0bAuLaJf99SWtkug9mNgFSnrLJyxoKUimhOBT1BHNVOH53MNOCg==, tarball: file:projects/dev-server.tgz} + resolution: {integrity: sha512-g+tpc3KKgIhVDzxyDhGaItW4ws4ZiIkrpBlI6T+pksMEgT0IFxj9Mn8J5dMlo5efhx8FG0CgumxlKoiyDvxP7A==, tarball: file:projects/dev-server.tgz} id: file:projects/dev-server.tgz name: '@rush-temp/dev-server' version: 0.0.0 @@ -8513,6 +8513,7 @@ packages: eslint-plugin-import: 2.23.4_eslint@7.32.0 eslint-plugin-node: 11.1.0_eslint@7.32.0 eslint-plugin-promise: 4.3.1 + jwt-simple: 0.5.6 ts-node: 10.1.0_typescript@4.3.5 transitivePeerDependencies: - '@swc/core' @@ -8524,7 +8525,7 @@ packages: dev: false file:projects/dev-storage.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-BH0Sx7BYFnR9Txy8IBwetWICRL7rMi8EXsiDCZsfdvtoxRMlYb9umorRv4yu5pJjIWtlgaTAGVID/1lSYHBvWg==, tarball: file:projects/dev-storage.tgz} + resolution: {integrity: sha512-sPfom62nn7715tHNlBCvWxoOv96GPJJDR9Qbh4wJULV74hwK6ZkcGyTKbRu/0pEHvF6fMIuG35oa3tH9RlTWJw==, tarball: file:projects/dev-storage.tgz} id: file:projects/dev-storage.tgz name: '@rush-temp/dev-storage' version: 0.0.0 @@ -8543,13 +8544,13 @@ packages: dev: false file:projects/login-assets.tgz: - resolution: {integrity: sha512-9zgHyYjB25jstXaa3q5FitulpLfvdXRJCG9G2klk9WewAXGx5X6brJT7CYZerN9G7p0jCjnz0JnMgJwmnz8ZeA==, tarball: file:projects/login-assets.tgz} + resolution: {integrity: sha512-C3n/VJ4/TjQCQR8kF5Qual3RTdYh0/rNFKjmE5nFP+R6yekznmBMALWlhfVTcxRBau2YoaBiEFiiGz2ADbz5Uw==, tarball: file:projects/login-assets.tgz} name: '@rush-temp/login-assets' version: 0.0.0 dev: false file:projects/login-resources.tgz_c38cf1a7a413db8918b0b4754c21e4c5: - resolution: {integrity: sha512-/y0RdsR15OZIqLJx1mwd8oOB51lbw7kKHWmy+CS2qRZufQcUZLU0R3Eo0wnoRynXRby11E6A17LxMglB8R1Txw==, tarball: file:projects/login-resources.tgz} + resolution: {integrity: sha512-DCgjcIKYQiP4kgSWd9CIZXNgTC0uRJYL7umhtf93perZ/xOQlhcUFw+3d0zJnmoE5FGa+xjseO7W5kThrZ54KA==, tarball: file:projects/login-resources.tgz} id: file:projects/login-resources.tgz name: '@rush-temp/login-resources' version: 0.0.0 @@ -8572,7 +8573,7 @@ packages: dev: false file:projects/login.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-LgyU874vSC22wRS0SqlBwfpLqCnznqQ4RMbbLAaZ0gPXX3PTW+wG263nX1D26kgcq2JZtOuf8F3+1/hRAzICVA==, tarball: file:projects/login.tgz} + resolution: {integrity: sha512-Fb2wanFSzCJTsrVcL8b/AXd5qFZgIPwhTzQxhX/a2hWzDrsWw0fQKHbIdtqECZ5si44aawISN33ika993aLgcg==, tarball: file:projects/login.tgz} id: file:projects/login.tgz name: '@rush-temp/login' version: 0.0.0 @@ -8611,7 +8612,7 @@ packages: dev: false file:projects/model-chunter.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-z+BvYl8lM7j/95oNcxYkOdOs47V01OyAkrSa7iZZ24+fDpPJvKIJ8Ty3MVITJCadprqD38WGPynWlAbjHvuOUA==, tarball: file:projects/model-chunter.tgz} + resolution: {integrity: sha512-JFaK3/9TaUCymsxxToNAV2nit1HPkjKi6qJCSJwr+7pFmArplyQKwTeS4e4wFbjRmPjE5DHuuRP0BnXuGI93jw==, tarball: file:projects/model-chunter.tgz} id: file:projects/model-chunter.tgz name: '@rush-temp/model-chunter' version: 0.0.0 @@ -8628,7 +8629,7 @@ packages: dev: false file:projects/model-contact.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-JlEMxKqXuBQ/W+rx/Y/8AzgpvNXgzYW07FdV4ttM4XHeVx6kOhrS7U9FPB7d6o9ABqNsxJEhK9bwg5zclnS0eQ==, tarball: file:projects/model-contact.tgz} + resolution: {integrity: sha512-2fdJwDavB6avDHOTBnxDQnnHCMtcwcfezqP6XVZFdsbgs474/7ld+kWI7+2gWdsbCu0ABnKfk/gc0hYDb+RK0g==, tarball: file:projects/model-contact.tgz} id: file:projects/model-contact.tgz name: '@rush-temp/model-contact' version: 0.0.0 @@ -8645,7 +8646,7 @@ packages: dev: false file:projects/model-core.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-b+T4XuPdhuCukXIUMmumuia+6h/NiXZYDFrCExC3qE30DcDgfvY8ugkOZwhsKblA2USCZlgex4HTN5w7KUrl2Q==, tarball: file:projects/model-core.tgz} + resolution: {integrity: sha512-w4i8ojBhXcj8BIU053rCxtahEmJdWooUxoKlX5Ra9wAoxQbip9RmxHLaP9SJuR7RmMdmGCnJq5H56t/52KI/cw==, tarball: file:projects/model-core.tgz} id: file:projects/model-core.tgz name: '@rush-temp/model-core' version: 0.0.0 @@ -8663,7 +8664,7 @@ packages: dev: false file:projects/model-demo.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-iWM9a2RmUcjpMTWmw2GNxYCA2krfK9os9qIrnyaktafwXwDAfgt9apVaGnhUgNWzDe+0SNS3VbuoXehAWgwB0g==, tarball: file:projects/model-demo.tgz} + resolution: {integrity: sha512-26590vLwNy0t3S5AV4F44mFa+wYwD8hBt1pAFNWYmdyfhkw2621/q9sHCrE5Bxtjio/M/EjzNmFoPsZVegHg/w==, tarball: file:projects/model-demo.tgz} id: file:projects/model-demo.tgz name: '@rush-temp/model-demo' version: 0.0.0 @@ -8680,7 +8681,7 @@ packages: dev: false file:projects/model-recruit.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-ZTZfTwGPFLYQ5+Ev7IN4fZyBtlh8CrWpRoubFvTgo8HKh9aSs/hQ3NclNYf+1iwzoiJiPaXrGgc9AodNMrJhLw==, tarball: file:projects/model-recruit.tgz} + resolution: {integrity: sha512-orDMhhsw5Wp+tRLyMn7NgP3p1cuGuutbs5QwrgrQVW5wEF+RIyWd898oixRlJimlgB8sfvukEG6SX8gAB20REA==, tarball: file:projects/model-recruit.tgz} id: file:projects/model-recruit.tgz name: '@rush-temp/model-recruit' version: 0.0.0 @@ -8717,7 +8718,7 @@ packages: dev: false file:projects/model-server-chunter.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-9w+dSGnK3lVyefpXR+04A+A9p8QFJM0mlec/cv1tAv4sp0ZUI1pA4VHb5AgyeeeaeCYmf501sKoGhZWD7hE4cQ==, tarball: file:projects/model-server-chunter.tgz} + resolution: {integrity: sha512-N4YH63WRJmw2dDoJ/eVfcT8wNM9RbELgo6Vn2PKL1PyHDz4y9bvHkU2e+cvhj7vi60hBn9q3447CGUQp6h2jpA==, tarball: file:projects/model-server-chunter.tgz} id: file:projects/model-server-chunter.tgz name: '@rush-temp/model-server-chunter' version: 0.0.0 @@ -8734,7 +8735,7 @@ packages: dev: false file:projects/model-server-core.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-zFzFBsZLMuvW/TQcs7k9cnlqkHYfrYiOWpFPIlrnkZHIO90oAzqsaB7BAH3NNJQFUYexjLNHziZKqqg51IgPow==, tarball: file:projects/model-server-core.tgz} + resolution: {integrity: sha512-lC0zrSiO83t1Oly+EXHvDyQxODOUqgL/NEOKLY15CXK+j+W9oP5XxbtABh9qzsCiKY6YkzCkSrNUUi1vRChRbQ==, tarball: file:projects/model-server-core.tgz} id: file:projects/model-server-core.tgz name: '@rush-temp/model-server-core' version: 0.0.0 @@ -8751,7 +8752,7 @@ packages: dev: false file:projects/model-task.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-A2mdU8kMVAWpivagmuOnG3ez/TPzDg5Y48x05OxCcq7HfLEIk51hsmCvuayU0o504l63kQav3cyGHXK5AKR+/A==, tarball: file:projects/model-task.tgz} + resolution: {integrity: sha512-SmN99iowAeBGX2mq0thgoNEHseMSlpucvlPxEFP+MNFKi/HxlyiqW3dIYLDWvms7BJ90k6ZWiwT1Xur1YfqGLw==, tarball: file:projects/model-task.tgz} id: file:projects/model-task.tgz name: '@rush-temp/model-task' version: 0.0.0 @@ -8768,7 +8769,7 @@ packages: dev: false file:projects/model-view.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-PZs8hdwec3zUdA0bOIW7W18xuw7Cu90GEEsLRx5YGYJfCVxfSVsbssDg5WphQPbnIslxCUZVS8hxLVM3q/FroA==, tarball: file:projects/model-view.tgz} + resolution: {integrity: sha512-85Nh/CK5K+RzZzOOWI3x9maaZMPgitGXk3sVtkMZS5bJEUiP1wpxwaOy2wUY2QkbdBVDI7zl9eP3MghRVfnX7w==, tarball: file:projects/model-view.tgz} id: file:projects/model-view.tgz name: '@rush-temp/model-view' version: 0.0.0 @@ -8785,7 +8786,7 @@ packages: dev: false file:projects/model-workbench.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-QV8gtCxPbFWNe3e2zV2XtK197RIGLFqpgP4KiN8Z6AieeAFP0HieLJgqovTLZT7lvDX2mtfnHuWGQxGg643taw==, tarball: file:projects/model-workbench.tgz} + resolution: {integrity: sha512-NUg7oigY8iveS9KTvhut7MLt8J/Mqcu4y+OjvBkrVl799bdzAT7Nj+ek1aAgaG7dxLVsXi+1htXb0cwGF+GS4w==, tarball: file:projects/model-workbench.tgz} id: file:projects/model-workbench.tgz name: '@rush-temp/model-workbench' version: 0.0.0 @@ -8802,7 +8803,7 @@ packages: dev: false file:projects/model.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-+U81cS6gjuC42PMvI6lh/tICT4o4DpJQZDFCcfDsK0EZRHlhnndytVgRGCmD/KTDv1Nvs7FDSLzsAADGmeP0JA==, tarball: file:projects/model.tgz} + resolution: {integrity: sha512-1ysc3XZSqzm8WDKOU4scG95CfR5+oQwevdi1g0cDbSMvRt+uW7X6PwWr52CK8w1lcZ+oZcPgzrCxGHr9wMr+lA==, tarball: file:projects/model.tgz} id: file:projects/model.tgz name: '@rush-temp/model' version: 0.0.0 @@ -8865,7 +8866,7 @@ packages: dev: false file:projects/presentation.tgz_c38cf1a7a413db8918b0b4754c21e4c5: - resolution: {integrity: sha512-0da7jIZ76QPDe/6DKiocyNFA3rzQvBBNMIpouw0nWZS9qgnOgDARiBB9mg+2vuw4u1FmRgFQUIdpMxrwRi2b/g==, tarball: file:projects/presentation.tgz} + resolution: {integrity: sha512-3VhIWGfCdEfsLQimlc+Te+LkqTylwYwSiw5otShizkVI7VOReODCs+Yh3EVnQ5hMKUWfLZr+jz+x/XPbGK/ABg==, tarball: file:projects/presentation.tgz} id: file:projects/presentation.tgz name: '@rush-temp/presentation' version: 0.0.0 @@ -8888,7 +8889,7 @@ packages: dev: false file:projects/prod.tgz_9242e79bee31c899aa4d2de67405a771: - resolution: {integrity: sha512-KQSRGEoTWonc4rmGhs4AtWnwwXsnL8Kk33UR/8GsUoWZxaptU37ARq4/T04TLSsjIqnaImi8Edq3vyN/3Rnyyw==, tarball: file:projects/prod.tgz} + resolution: {integrity: sha512-PO6YAhxsEyF+9ZzbD6vT0zvZbXyutwCZoDyKighbPDKx5VzPk4vjDSj1KKnlX6OvtR8CLZFq7NGZF08Q5xYk1A==, tarball: file:projects/prod.tgz} id: file:projects/prod.tgz name: '@rush-temp/prod' version: 0.0.0 @@ -8926,7 +8927,7 @@ packages: dev: false file:projects/query.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-9CUYPnThJmot4jmOsi6R7ugG/yTz+6emWtPfhSTK+1hqr3hXaYSXIXuYirvqpa6a434uRTUAe362U5VuNi4xdA==, tarball: file:projects/query.tgz} + resolution: {integrity: sha512-D+7dxEwHwNyIC27VN50pHLcHtO++x8XxUzthkSifOl9MFzNoZazDjiA8OghId3HsW4jTVKBZ7GKpGbrt+9BOaQ==, tarball: file:projects/query.tgz} id: file:projects/query.tgz name: '@rush-temp/query' version: 0.0.0 @@ -8945,13 +8946,13 @@ packages: dev: false file:projects/recruit-assets.tgz: - resolution: {integrity: sha512-vMhv0+mg/VEguAQ7zzIHr9ieE2F+3kf+lX+FvCpIN+CyDIluiDVzlxp2e2VQ/1pCA9Wkt+u6bwHklbwyU7WDFg==, tarball: file:projects/recruit-assets.tgz} + resolution: {integrity: sha512-iouQotNQvKMkaP9NDmzSSBJfVdB15GfLWT6NetioLe2wZWGQGlNfnLhznplyicMlaHbQRgq6JpZbLYZNRSGU7g==, tarball: file:projects/recruit-assets.tgz} name: '@rush-temp/recruit-assets' version: 0.0.0 dev: false file:projects/recruit-resources.tgz_c38cf1a7a413db8918b0b4754c21e4c5: - resolution: {integrity: sha512-e8G+P/AxPPLmj7mbc0Jzoj9Isc8uZJx0QOhpKXdbVIfpVwBAqIBKLBHaZJW75iSnnXGuD6wZVwrvzCLIHBTPag==, tarball: file:projects/recruit-resources.tgz} + resolution: {integrity: sha512-6uQhKzKyTZhz6ABS6ZmcKToBYisrERDW6t2a6hO/Ry9tB0tHT4fvNe+QAXvt+d64K4Z0LonA2H0QA2GNnpH4Mw==, tarball: file:projects/recruit-resources.tgz} id: file:projects/recruit-resources.tgz name: '@rush-temp/recruit-resources' version: 0.0.0 @@ -8974,7 +8975,7 @@ packages: dev: false file:projects/recruit.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-kVE1YZLi0qv2//sqMhM3SSVew4V36r58Tk0xcA4cP91HeGuozqi4h0V9eYLJocVX2vk3555kQPgTVCNDKM2uwg==, tarball: file:projects/recruit.tgz} + resolution: {integrity: sha512-pA4GnzPcIy+/RyPgGnEgh+Df+CC5fPRD0mrRTwiqKMsRA/DJhk8d1P6gJrkHFZuQ+bWtSFjUEGmsz+sFE+5Xsg==, tarball: file:projects/recruit.tgz} id: file:projects/recruit.tgz name: '@rush-temp/recruit' version: 0.0.0 @@ -8992,7 +8993,7 @@ packages: dev: false file:projects/server-chunter.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-pGco+NViUiZi9ZIi4EziDG5wgaPq6KleO7J1wyNuCLM2f0p2e2AZ3ZVYDRmnAghOo9IQJLSihOh9bO9RmTg97A==, tarball: file:projects/server-chunter.tgz} + resolution: {integrity: sha512-kcEqy1RGjuxk4RqkSWsS1Tnzl2russ7qz5WC6BRmjchmROXydYrmhFkoq4vhszmIZZLYKFNlr/E42WgiG42V9w==, tarball: file:projects/server-chunter.tgz} id: file:projects/server-chunter.tgz name: '@rush-temp/server-chunter' version: 0.0.0 @@ -9012,7 +9013,7 @@ packages: dev: false file:projects/server-core.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-lHE4PAWrX+WKdM9/Yy1rYZW6rCacwLMkSUIJakrXZeyGlNytXXSvH20bgfocVn73grez3Zjy6qlNm7H7EClgDQ==, tarball: file:projects/server-core.tgz} + resolution: {integrity: sha512-apnxNyttG0sG3lYNidf41xBm2f5TDiqep0b8VYWnuaCQwa3MYA1AZYh0Q7nQYtVw5FsLx8R+HnDeOKacuSHKGg==, tarball: file:projects/server-core.tgz} id: file:projects/server-core.tgz name: '@rush-temp/server-core' version: 0.0.0 @@ -9032,7 +9033,7 @@ packages: dev: false file:projects/server-ws.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-8bO8luxe1YvzgRj7tfSZdn8M59g82abZeSIEv8Kb9z8Yu9oin/teg61Uu4dPnxwcGyOB43WYYAdm2dW+aozC4Q==, tarball: file:projects/server-ws.tgz} + resolution: {integrity: sha512-S6EZC9Cu7lvd/CEurm4Y4t/wo22Zg1oJnvJ54F6zdrvUsK9xdhdYd7K975LfLQCqQjVLWJmFLbUBW3w2FWkIjg==, tarball: file:projects/server-ws.tgz} id: file:projects/server-ws.tgz name: '@rush-temp/server-ws' version: 0.0.0 @@ -9056,7 +9057,7 @@ packages: dev: false file:projects/server.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-wXZNomG+cesEB6aWjMYwJ1yTfc7qHi8wnRm6eLEYiEuvvnMXasZqHRuX+yIDObELwtaAJr7piexxaRoSO7u7kw==, tarball: file:projects/server.tgz} + resolution: {integrity: sha512-mAZSdTxdlzHdcedAVd6TcnTjvfVWiScG1r7aa0LXc4XMDAXn4Z4Y3T6J4sxUo4RA3/fq22MpNQsyHRhihl28YQ==, tarball: file:projects/server.tgz} id: file:projects/server.tgz name: '@rush-temp/server' version: 0.0.0 @@ -9076,13 +9077,13 @@ packages: dev: false file:projects/task-assets.tgz: - resolution: {integrity: sha512-pVX3oz4yQQLtHPWme4zhpR5tQnakkPWgH+VKyQiI0/BPis24KbZ/7jxl1KpvlHWAVOnfsxDue/MYqEcyCEZmtw==, tarball: file:projects/task-assets.tgz} + resolution: {integrity: sha512-iCE65Ymh4mzKwv/rdQLUKsr616J8EFXGjsfbPG35QwRNWStKMyiGTRxgnqs+ANKoZMztGdcZXq3DXemT1IZWeQ==, tarball: file:projects/task-assets.tgz} name: '@rush-temp/task-assets' version: 0.0.0 dev: false file:projects/task-resources.tgz_c38cf1a7a413db8918b0b4754c21e4c5: - resolution: {integrity: sha512-lAHLc5wRbzSEnbek1Xc+dXTyRDhDIt7DUNuCrPAjyjipXtVEZIXuT7R5kIVXMLWhlK8pjbshjlwsY5mfsDlz4Q==, tarball: file:projects/task-resources.tgz} + resolution: {integrity: sha512-l4GyZpxErT7Adw8YD7gNrlN1HhxhWiZ4YImIyOtUm5tTK455+hyOlaiWU1Bj6Irh94yV1DU4UUnI+6ioQ/uAkw==, tarball: file:projects/task-resources.tgz} id: file:projects/task-resources.tgz name: '@rush-temp/task-resources' version: 0.0.0 @@ -9105,7 +9106,7 @@ packages: dev: false file:projects/task.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-ek7KDmIP3XRC1qC7Z/ePwY/ZVbXXc4c6TfQTutmSPFnLzEZIzBgb6fWAlfp8zvYE3zJfF4k9r/n/c5wmmyzF3Q==, tarball: file:projects/task.tgz} + resolution: {integrity: sha512-F00QmEZwreZaHpfsrBb5P/FR1w5oNTd0PsW/usraYdwv+2iv0cTdyfIxZ8AXxB/pt5oludc/zUdxv/+nbfIO8Q==, tarball: file:projects/task.tgz} id: file:projects/task.tgz name: '@rush-temp/task' version: 0.0.0 @@ -9175,7 +9176,7 @@ packages: dev: false file:projects/ui.tgz_c38cf1a7a413db8918b0b4754c21e4c5: - resolution: {integrity: sha512-A8XuAvUmlsKDUJ9FX0NKxUZHadpO0h+e+3w70rqMXgI2MteRm48qYg51ByWld6mdQBaXVmAhsDE89t9Mo6nUeg==, tarball: file:projects/ui.tgz} + resolution: {integrity: sha512-nqw2XVY89MoFfK662WYoko9Cu+aLj4f32RjKFdamRPs6ZZRyECkCV3JxAC+d+AYvGEPTLcfQyX2FAHtw94JISA==, tarball: file:projects/ui.tgz} id: file:projects/ui.tgz name: '@rush-temp/ui' version: 0.0.0 @@ -9198,13 +9199,13 @@ packages: dev: false file:projects/view-assets.tgz: - resolution: {integrity: sha512-LqPgOBkrHOQGImFiLT73Za1nz6Ym9qealQxnxM+h62OwKsy/tmaeKWokIB59s2J37fE3bMRQcAzt3qydc/krSw==, tarball: file:projects/view-assets.tgz} + resolution: {integrity: sha512-dUheCsjUx+oFp4fsGElxwZoCjEUjqd+3jx7p6pnPyO2xA3uiw3F4Jqoj4P6Lu4yw2CavQKbGQIwOAkmcxPvUAg==, tarball: file:projects/view-assets.tgz} name: '@rush-temp/view-assets' version: 0.0.0 dev: false file:projects/view-resources.tgz_c38cf1a7a413db8918b0b4754c21e4c5: - resolution: {integrity: sha512-wfBBgfvTXLHrZ0eZa+e7/zktokOUMiuU/HgOqfGuejHYCc9HF+ly7XcCUyDdjtoOlVUjGKW6d8X2It7OL4jimw==, tarball: file:projects/view-resources.tgz} + resolution: {integrity: sha512-tcLu1I9S8pKexvq3B45gtKpGzkvI8S+R5aJ+fcww66rwkLPCozQUgufY+gXNuPMmKUCYpEKP4iWDipxGQRE7FA==, tarball: file:projects/view-resources.tgz} id: file:projects/view-resources.tgz name: '@rush-temp/view-resources' version: 0.0.0 @@ -9227,7 +9228,7 @@ packages: dev: false file:projects/view.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-BQgcAfVRNy1QO/Z8ATfQZbm090HU2b7jl5r38stX7rjzF0udaYKci9yDb9xECP1oYCEPWXbayUPlF/AwRqxZ4g==, tarball: file:projects/view.tgz} + resolution: {integrity: sha512-RU0wodkyTreTsan4u45d+A99WMzX0PCl2viYyBrQFrNjDZnFM2R2FbP0zdNX/yU3H6nmPazSWEOuCh2Y51fC+w==, tarball: file:projects/view.tgz} id: file:projects/view.tgz name: '@rush-temp/view' version: 0.0.0 @@ -9245,7 +9246,7 @@ packages: dev: false file:projects/workbench-resources.tgz_c38cf1a7a413db8918b0b4754c21e4c5: - resolution: {integrity: sha512-i2M+58McWVoRf331FyY9crFu/50O8YuU1x6WbnJ+hBqq+nuW3XJdqJcabrr6+ZYMMnPqfuXrKkZJoGipc9zwMA==, tarball: file:projects/workbench-resources.tgz} + resolution: {integrity: sha512-0TPSEnFtQXmhiIPLJcJ5piduJsF+h2TD7Cm9LI2/yPJjivc9d3CnSXPMwcpo9667KAkmUF+ybBTWnqB5CehVww==, tarball: file:projects/workbench-resources.tgz} id: file:projects/workbench-resources.tgz name: '@rush-temp/workbench-resources' version: 0.0.0 @@ -9268,7 +9269,7 @@ packages: dev: false file:projects/workbench.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-Et3ux6GBUUjekSU8T9jXBlgOVlR4j5KUaMWZ112uhmduZG/nLPKSSkbMxDHJBzXZeuYoOqMb9BNlfV05SwkRww==, tarball: file:projects/workbench.tgz} + resolution: {integrity: sha512-dkqWvqJy82D6Ngv4klk9r4e6lOnlPOifehFM84k5koM38UQqzThbPdhPufzM5VQ5jKoFli7WMJ++18C/1TyJOw==, tarball: file:projects/workbench.tgz} id: file:projects/workbench.tgz name: '@rush-temp/workbench' version: 0.0.0 diff --git a/dev/prod/.env-prod b/dev/prod/.env-prod index e9652c7bfa..5b576584eb 100644 --- a/dev/prod/.env-prod +++ b/dev/prod/.env-prod @@ -1,3 +1,3 @@ -APP_ACCOUNTS_URL=https://ftwm71rwag.execute-api.us-west-2.amazonaws.com/stage/ +ACCOUNTS_URL=https://ftwm71rwag.execute-api.us-west-2.amazonaws.com/stage/ diff --git a/dev/prod/package.json b/dev/prod/package.json index 06884cbc0c..e3c000cd97 100644 --- a/dev/prod/package.json +++ b/dev/prod/package.json @@ -63,6 +63,7 @@ "@anticrm/recruit-assets": "~0.6.0", "@anticrm/recruit-resources": "~0.6.0", "@anticrm/server-chunter": "~0.6.0", - "@anticrm/dev-server-chunter-resources": "~0.6.0" + "@anticrm/dev-server-chunter-resources": "~0.6.0", + "@anticrm/client-resources": "~0.6.0" } } diff --git a/dev/prod/src/platform.ts b/dev/prod/src/platform.ts index d96058f9e9..ebb4345ea2 100644 --- a/dev/prod/src/platform.ts +++ b/dev/prod/src/platform.ts @@ -36,15 +36,12 @@ import { setMetadata } from '@anticrm/platform' export function configurePlatform() { - console.log(process.env.APP_ACCOUNTS_URL) + setMetadata(login.metadata.AccountsUrl, process.env.ACCOUNTS_URL) + setMetadata(login.metadata.OverrideLoginToken, process.env.LOGIN_TOKEN) + setMetadata(login.metadata.OverrideEndpoint, process.env.LOGIN_ENDPOINT) - // setMetadata(login.metadata.AccountsUrl, 'https://ftwm71rwag.execute-api.us-west-2.amazonaws.com/stage/') - setMetadata(login.metadata.AccountsUrl, process.env.APP_ACCOUNTS_URL) - - // if (process.env.CLIENT === 'dev') - addLocation(clientId, () => import(/* webpackChunkName: "client-dev" */ '@anticrm/dev-client-resources')) - // else - // addLocation(core, () => import(/* webpackChunkName: "plugin-core" */ '@anticrm/plugin-core-impl')) +// addLocation(clientId, () => import(/* webpackChunkName: "client-dev" */ '@anticrm/dev-client-resources')) + addLocation(clientId, () => import(/* webpackChunkName: "client-dev" */ '@anticrm/client-resources')) addLocation(loginId, () => import(/* webpackChunkName: "login" */ '@anticrm/login-resources')) addLocation(workbenchId, () => import(/* webpackChunkName: "workbench" */ '@anticrm/workbench-resources')) diff --git a/dev/server/package.json b/dev/server/package.json index f0d1f4aa60..6d731643a6 100644 --- a/dev/server/package.json +++ b/dev/server/package.json @@ -23,6 +23,9 @@ "@anticrm/dev-storage": "~0.6.3", "@anticrm/server-ws": "~0.6.4", "@anticrm/core": "~0.6.7", - "@anticrm/platform": "~0.6.5" + "@anticrm/platform": "~0.6.5", + "jwt-simple": "~0.5.6", + "@anticrm/server-chunter": "~0.6.0", + "@anticrm/dev-server-chunter-resources": "~0.6.3" } } diff --git a/dev/server/src/__start.ts b/dev/server/src/__start.ts index 53319cb68f..66b8f8edb0 100644 --- a/dev/server/src/__start.ts +++ b/dev/server/src/__start.ts @@ -16,5 +16,10 @@ import { start } from '.' +import { encode } from 'jwt-simple' + +const token = encode({ email: 'rosamund@hc.engineering', workspace: 'ws1' }, 'secret') +console.log(token) + // eslint-disable-next-line @typescript-eslint/no-floating-promises start(3333) diff --git a/dev/server/src/server.ts b/dev/server/src/server.ts index 0caf1456fc..b343093861 100644 --- a/dev/server/src/server.ts +++ b/dev/server/src/server.ts @@ -18,10 +18,15 @@ import { start as startJsonRpc } from '@anticrm/server-ws' import { createStorage } from '@anticrm/dev-storage' import { DevSession } from './session' +import { addLocation } from '@anticrm/platform' +import { serverChunterId } from '@anticrm/server-chunter' + /** * @public */ export async function start (port: number, host?: string): Promise { + addLocation(serverChunterId, () => import('@anticrm/dev-server-chunter-resources')) + const storage = await createStorage() startJsonRpc(server => new DevSession(server, storage), port, host) } diff --git a/models/workbench/package.json b/models/workbench/package.json index 761f5e01c2..d822c79a54 100644 --- a/models/workbench/package.json +++ b/models/workbench/package.json @@ -21,6 +21,7 @@ "@anticrm/model": "~0.6.0", "@anticrm/platform": "~0.6.5", "@anticrm/model-core": "~0.6.0", - "@anticrm/workbench": "~0.6.0" + "@anticrm/workbench": "~0.6.0", + "@anticrm/ui": "~0.6.0" } } diff --git a/models/workbench/src/plugin.ts b/models/workbench/src/plugin.ts index cd68a45a73..4acbd2eb7d 100644 --- a/models/workbench/src/plugin.ts +++ b/models/workbench/src/plugin.ts @@ -14,6 +14,7 @@ // import { mergeIds } from '@anticrm/platform' +import {} from '@anticrm/ui' import workbench, { workbenchId } from '@anticrm/workbench' export default mergeIds(workbenchId, workbench, { diff --git a/plugins/client-resources/src/index.ts b/plugins/client-resources/src/index.ts index b918ace91a..6252a165be 100644 --- a/plugins/client-resources/src/index.ts +++ b/plugins/client-resources/src/index.ts @@ -14,8 +14,6 @@ // import { createClient, Client, TxHander } from '@anticrm/core' -import { getMetadata } from '@anticrm/platform' -import clientPlugin from '@anticrm/client' import { connect } from './connection' @@ -30,13 +28,11 @@ export default async () => { return { function: { - GetClient: async (): Promise => { + GetClient: async (token: string, endpoint: string): Promise => { if (client === undefined) { - const url = getMetadata(clientPlugin.metadata.ClientUrl) - if (url === undefined) { - throw new Error('no app server url provided.') - } return await createClient((handler: TxHander) => { + const url = `ws://${endpoint}:3333/${token}` + console.log('connecting to', url) return connect(url, handler) }) } diff --git a/plugins/client/src/index.ts b/plugins/client/src/index.ts index 1f77472ca1..5107b4cb2d 100644 --- a/plugins/client/src/index.ts +++ b/plugins/client/src/index.ts @@ -14,7 +14,7 @@ // import { plugin } from '@anticrm/platform' -import type { Metadata, Plugin, Resource } from '@anticrm/platform' +import type { Plugin, Resource } from '@anticrm/platform' import type { Client } from '@anticrm/core' // import type { LiveQuery } from '@anticrm/query' @@ -28,10 +28,7 @@ export const clientId = 'client' as Plugin export default plugin(clientId, { function: { - GetClient: '' as Resource<() => Promise> - }, - metadata: { - ClientUrl: '' as Metadata + GetClient: '' as Resource<(token: string, endpoint: string) => Promise> } } ) diff --git a/plugins/login-resources/package.json b/plugins/login-resources/package.json index 66d4d83bb4..0019c79234 100644 --- a/plugins/login-resources/package.json +++ b/plugins/login-resources/package.json @@ -22,6 +22,7 @@ "@anticrm/platform": "~0.6.5", "svelte": "^3.37.0", "@anticrm/login": "~0.6.0", - "@anticrm/ui": "~0.6.0" + "@anticrm/ui": "~0.6.0", + "@anticrm/workbench": "~0.6.0" } } diff --git a/plugins/login-resources/src/components/LoginForm.svelte b/plugins/login-resources/src/components/LoginForm.svelte index a713aa3dfa..445eade40e 100644 --- a/plugins/login-resources/src/components/LoginForm.svelte +++ b/plugins/login-resources/src/components/LoginForm.svelte @@ -15,12 +15,14 @@ - - - - - -
-
- - -
- Profile +{#if client} + + + + + +
+
+ + +
+ Profile +
+
+ {#if navigator} + -
- {#if navigator} - - {/if} -
- - {#if currentView && currentSpace} - {/if} +
+ + {#if currentView && currentSpace} + + {/if} +
+
- -
- + +{:else} + No client +{/if}