diff --git a/services/idp/package.json b/services/idp/package.json index 21da935a91..797bbf38be 100644 --- a/services/idp/package.json +++ b/services/idp/package.json @@ -7,7 +7,7 @@ "analyze": "source-map-explorer 'build/static/js/*.js'", "build": "node --openssl-legacy-provider scripts/build.js && rm -f build/service-worker.js", "licenses": "NODE_PATH=./node_modules node ../scripts/js-license-ranger.js", - "licenses:check": "license-checker-rseidelsohn --summary --relativeLicensePath --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL;ODC-By-1.0;BlueOak-1.0.0;OFL-1.1' --excludePackages 'identifier;kpop;unicoderegexp' --clarificationsFile license-checker-clarifications.json", + "licenses:check": "license-checker-rseidelsohn --summary --relativeLicensePath --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL;ODC-By-1.0;BlueOak-1.0.0;OFL-1.1' --excludePackages 'identifier;unicoderegexp' --clarificationsFile license-checker-clarifications.json", "licenses:csv": "license-checker-rseidelsohn --relativeLicensePath --csv --out ../../third-party-licenses/node/idp/third-party-licenses.csv", "licenses:save": "license-checker-rseidelsohn --relativeLicensePath --out /dev/null --files ../../third-party-licenses/node/idp/third-party-licenses", "lint": "eslint ./**/*.{tsx,ts,jsx,js}", @@ -89,7 +89,6 @@ "i18next-browser-languagedetector": "^8.1.0", "i18next-http-backend": "^3.0.2", "i18next-resources-to-backend": "^1.2.1", - "kpop": "https://download.kopano.io/community/kapp:/kpop-2.7.2.tgz", "query-string": "^9.2.0", "react": "^17.0.2", "react-app-polyfill": "^3.0.0", @@ -154,10 +153,5 @@ "webpack-manifest-plugin": "5.0.0", "workbox-webpack-plugin": "7.1.0" }, - "packageManager": "pnpm@9.15.4", - "pnpm": { - "overrides": { - "kpop>cldr": "" - } - } + "packageManager": "pnpm@9.15.4" } diff --git a/services/idp/pnpm-lock.yaml b/services/idp/pnpm-lock.yaml index fae3ee999c..62e9c9372a 100644 --- a/services/idp/pnpm-lock.yaml +++ b/services/idp/pnpm-lock.yaml @@ -4,9 +4,6 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false -overrides: - kpop>cldr: '' - importers: .: @@ -65,9 +62,6 @@ importers: i18next-resources-to-backend: specifier: ^1.2.1 version: 1.2.1 - kpop: - specifier: https://download.kopano.io/community/kapp:/kpop-2.7.2.tgz - version: https://download.kopano.io/community/kapp:/kpop-2.7.2.tgz(@gluejs/glue@0.3.0)(@material-ui/core@4.12.4(@types/react@17.0.80)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(@material-ui/icons@4.11.3(@material-ui/core@4.12.4(@types/react@17.0.80)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(@types/react@17.0.80)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(notistack@0.8.9(@material-ui/core@4.12.4(@types/react@17.0.80)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(oidc-client@1.11.5)(react-dom@17.0.2(react@17.0.2))(react-intl@2.9.0(prop-types@15.8.1)(react@17.0.2))(react@17.0.2) query-string: specifier: ^9.2.0 version: 9.2.0 @@ -1516,9 +1510,6 @@ packages: '@fontsource/roboto@5.2.5': resolution: {integrity: sha512-70r2UZ0raqLn5W+sPeKhqlf8wGvUXFWlofaDlcbt/S3d06+17gXKr3VNqDODB0I1ASme3dGT5OJj9NABt7OTZQ==} - '@gluejs/glue@0.3.0': - resolution: {integrity: sha512-byvFoZCbZW+A3Pg8JUU+8FjoPuF5l1v7mDeLJQP/YSeEcEDiD/YdUKLBUapPrcuyxclrtS8+peX4cxkh6awwTw==} - '@gulpjs/to-absolute-glob@4.0.0': resolution: {integrity: sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==} engines: {node: '>=10.13.0'} @@ -2724,9 +2715,6 @@ packages: core-js@3.40.0: resolution: {integrity: sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==} - core-js@3.43.0: - resolution: {integrity: sha512-N6wEbTTZSYOY2rYAn85CuvWWkCK6QweMn7/4Nr3w+gDBeBhk/x4EJeY6FPo4QzDoJZxVTv8U7CMvgWk6pOHHqA==} - core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} @@ -2738,11 +2726,6 @@ packages: resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==} engines: {node: '>=10'} - crc32@0.2.2: - resolution: {integrity: sha512-PFZEGbDUeoNbL2GHIEpJRQGheXReDody/9axKTxhXtQqIL443wnNigtVZO9iuCIMPApKZRv7k2xr8euXHqNxQQ==} - engines: {node: '>= 0.4.0'} - hasBin: true - cross-fetch@4.0.0: resolution: {integrity: sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==} @@ -2754,9 +2737,6 @@ packages: resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} - crypto-js@4.2.0: - resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==} - crypto-random-string@2.0.0: resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==} engines: {node: '>=8'} @@ -3718,9 +3698,6 @@ packages: resolution: {integrity: sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - hsv-rgb@1.0.0: - resolution: {integrity: sha512-Azd6IP11LZm0cEczEnJw5B6zIgWdGlE4TSoM2eh+RPRbXSQCy/0JS2POEq0wOtbAZtxTJhEMGm3GUYGbnTIJGw==} - html-escaper@2.0.2: resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} @@ -3850,23 +3827,6 @@ packages: resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==} engines: {node: '>= 0.4'} - intl-format-cache@2.2.9: - resolution: {integrity: sha512-Zv/u8wRpekckv0cLkwpVdABYST4hZNTDaX7reFetrYTJwxExR2VyTqQm+l0WmL0Qo8Mjb9Tf33qnfj0T7pjxdQ==} - - intl-messageformat-parser@1.4.0: - resolution: {integrity: sha512-/XkqFHKezO6UcF4Av2/Lzfrez18R0jyw7kRFhSeB/YRakdrgSc9QfFZUwNJI9swMwMoNPygK1ArC5wdFSjPw+A==} - deprecated: We've written a new parser that's 6x faster and is backwards compatible. Please use @formatjs/icu-messageformat-parser - - intl-messageformat@2.2.0: - resolution: {integrity: sha512-I+tSvHnXqJYjDfNmY95tpFMj30yoakC6OXAo+wu/wTMy6tA/4Fd4mvV7Uzs4cqK/Ap29sHhwjcY+78a8eifcXw==} - - intl-relativeformat@2.2.0: - resolution: {integrity: sha512-4bV/7kSKaPEmu6ArxXf9xjv1ny74Zkwuey8Pm01NH4zggPP7JHwg2STk8Y3JdspCKRDriwIyLRfEXnj2ZLr4Bw==} - deprecated: This package has been deprecated, please see migration guide at 'https://github.com/formatjs/formatjs/tree/master/packages/intl-relativeformat#migration-guide' - - invariant@2.2.4: - resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==} - is-arguments@1.2.0: resolution: {integrity: sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==} engines: {node: '>= 0.4'} @@ -4045,10 +4005,6 @@ packages: isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - iso-639-1@2.1.15: - resolution: {integrity: sha512-7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg==} - engines: {node: '>=6.0'} - istanbul-lib-coverage@3.2.2: resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==} engines: {node: '>=8'} @@ -4346,20 +4302,6 @@ packages: resolution: {integrity: sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==} engines: {node: '>= 8'} - kpop@https://download.kopano.io/community/kapp:/kpop-2.7.2.tgz: - resolution: {tarball: https://download.kopano.io/community/kapp:/kpop-2.7.2.tgz} - version: 2.7.1 - engines: {node: '>=6.11.0'} - peerDependencies: - '@gluejs/glue': ^0.3.0 - '@material-ui/core': ^4.11.0 - '@material-ui/icons': ^4.9.1 - notistack: ^0.8.8 - oidc-client: ^1.11.0 - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - react-intl: ^2.6.0 - language-subtag-registry@0.3.23: resolution: {integrity: sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==} @@ -4636,13 +4578,6 @@ packages: resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==} engines: {node: '>=0.10.0'} - notistack@0.8.9: - resolution: {integrity: sha512-nRHQVWUfgHnvnKrjRbRX9f+YAnbyh96yRyO5bEP/FCLVLuTZcJOwUr0GZ7Xr/8wK3+hXa9JYpXUkUhSxj1K8NQ==} - peerDependencies: - '@material-ui/core': ^3.2.0 || ^4.0.0 - react: ^16.8.0 - react-dom: ^16.8.0 - now-and-later@3.0.0: resolution: {integrity: sha512-pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==} engines: {node: '>= 10.13.0'} @@ -4698,9 +4633,6 @@ packages: resolution: {integrity: sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==} engines: {node: '>= 0.4'} - oidc-client@1.11.5: - resolution: {integrity: sha512-LcKrKC8Av0m/KD/4EFmo9Sg8fSQ+WFJWBrmtWd+tZkNn3WT/sQG3REmPANE9tzzhbjW6VkTNy4xhAXCfPApAOg==} - once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} @@ -5364,12 +5296,6 @@ packages: typescript: optional: true - react-intl@2.9.0: - resolution: {integrity: sha512-27jnDlb/d2A7mSJwrbOBnUgD+rPep+abmoJE511Tf8BnoONIAUehy/U1zZCHGO17mnOwMWxqN4qC0nW11cD6rA==} - peerDependencies: - prop-types: ^15.5.4 - react: ^0.14.9 || ^15.0.0 || ^16.0.0 - react-is@16.13.1: resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} @@ -5698,9 +5624,6 @@ packages: seq@0.3.5: resolution: {integrity: sha512-sisY2Ln1fj43KBkRtXkesnRHYNdswIkIibvNe/0UKm2GZxjMbqmccpiatoKr/k2qX5VKiLU8xm+tz/74LAho4g==} - serialize-javascript@4.0.0: - resolution: {integrity: sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==} - serialize-javascript@6.0.2: resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} @@ -7918,8 +7841,6 @@ snapshots: '@fontsource/roboto@5.2.5': {} - '@gluejs/glue@0.3.0': {} - '@gulpjs/to-absolute-glob@4.0.0': dependencies: is-negated-glob: 1.0.0 @@ -9403,8 +9324,6 @@ snapshots: core-js@3.40.0: {} - core-js@3.43.0: {} - core-util-is@1.0.3: {} cosmiconfig@6.0.0: @@ -9423,8 +9342,6 @@ snapshots: path-type: 4.0.0 yaml: 1.10.2 - crc32@0.2.2: {} - cross-fetch@4.0.0(encoding@0.1.13): dependencies: node-fetch: 2.7.0(encoding@0.1.13) @@ -9443,8 +9360,6 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 - crypto-js@4.2.0: {} - crypto-random-string@2.0.0: {} css-blank-pseudo@7.0.1(postcss@8.5.4): @@ -10683,8 +10598,6 @@ snapshots: dependencies: lru-cache: 7.18.3 - hsv-rgb@1.0.0: {} - html-escaper@2.0.2: {} html-minifier-terser@6.1.0: @@ -10833,22 +10746,6 @@ snapshots: hasown: 2.0.2 side-channel: 1.1.0 - intl-format-cache@2.2.9: {} - - intl-messageformat-parser@1.4.0: {} - - intl-messageformat@2.2.0: - dependencies: - intl-messageformat-parser: 1.4.0 - - intl-relativeformat@2.2.0: - dependencies: - intl-messageformat: 2.2.0 - - invariant@2.2.4: - dependencies: - loose-envify: 1.4.0 - is-arguments@1.2.0: dependencies: call-bound: 1.0.4 @@ -11007,8 +10904,6 @@ snapshots: isexe@2.0.0: {} - iso-639-1@2.1.15: {} - istanbul-lib-coverage@3.2.2: {} istanbul-lib-instrument@6.0.3: @@ -11539,20 +11434,6 @@ snapshots: klona@2.0.6: {} - kpop@https://download.kopano.io/community/kapp:/kpop-2.7.2.tgz(@gluejs/glue@0.3.0)(@material-ui/core@4.12.4(@types/react@17.0.80)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(@material-ui/icons@4.11.3(@material-ui/core@4.12.4(@types/react@17.0.80)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(@types/react@17.0.80)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(notistack@0.8.9(@material-ui/core@4.12.4(@types/react@17.0.80)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(oidc-client@1.11.5)(react-dom@17.0.2(react@17.0.2))(react-intl@2.9.0(prop-types@15.8.1)(react@17.0.2))(react@17.0.2): - dependencies: - '@gluejs/glue': 0.3.0 - '@material-ui/core': 4.12.4(@types/react@17.0.80)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) - '@material-ui/icons': 4.11.3(@material-ui/core@4.12.4(@types/react@17.0.80)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(@types/react@17.0.80)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) - crc32: 0.2.2 - hsv-rgb: 1.0.0 - iso-639-1: 2.1.15 - notistack: 0.8.9(@material-ui/core@4.12.4(@types/react@17.0.80)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(react-dom@17.0.2(react@17.0.2))(react@17.0.2) - oidc-client: 1.11.5 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) - react-intl: 2.9.0(prop-types@15.8.1)(react@17.0.2) - language-subtag-registry@0.3.23: {} language-tags@1.0.9: @@ -11787,16 +11668,6 @@ snapshots: normalize-range@0.1.2: {} - notistack@0.8.9(@material-ui/core@4.12.4(@types/react@17.0.80)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(react-dom@17.0.2(react@17.0.2))(react@17.0.2): - dependencies: - '@material-ui/core': 4.12.4(@types/react@17.0.80)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) - classnames: 2.5.1 - hoist-non-react-statics: 3.3.2 - prop-types: 15.8.1 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) - react-is: 16.13.1 - now-and-later@3.0.0: dependencies: once: 1.4.0 @@ -11860,14 +11731,6 @@ snapshots: define-properties: 1.2.1 es-object-atoms: 1.1.1 - oidc-client@1.11.5: - dependencies: - acorn: 7.4.1 - base64-js: 1.5.1 - core-js: 3.43.0 - crypto-js: 4.2.0 - serialize-javascript: 4.0.0 - once@1.4.0: dependencies: wrappy: 1.0.2 @@ -12599,16 +12462,6 @@ snapshots: react-dom: 17.0.2(react@17.0.2) typescript: 5.8.3 - react-intl@2.9.0(prop-types@15.8.1)(react@17.0.2): - dependencies: - hoist-non-react-statics: 3.3.2 - intl-format-cache: 2.2.9 - intl-messageformat: 2.2.0 - intl-relativeformat: 2.2.0 - invariant: 2.2.4 - prop-types: 15.8.1 - react: 17.0.2 - react-is@16.13.1: {} react-is@17.0.2: {} @@ -12975,10 +12828,6 @@ snapshots: chainsaw: 0.0.9 hashish: 0.0.4 - serialize-javascript@4.0.0: - dependencies: - randombytes: 2.1.0 - serialize-javascript@6.0.2: dependencies: randombytes: 2.1.0 diff --git a/services/idp/src/App.jsx b/services/idp/src/App.jsx index 228781534d..315a5876eb 100644 --- a/services/idp/src/App.jsx +++ b/services/idp/src/App.jsx @@ -2,10 +2,7 @@ import React, {ReactElement, Suspense, lazy, useState, useEffect} from 'react'; import PropTypes from 'prop-types'; import {MuiThemeProvider} from '@material-ui/core/styles'; -import {defaultTheme} from 'kpop/es/theme'; - -import 'kpop/static/css/base.css'; -import 'kpop/static/css/scrollbar.css'; +import muiTheme from './theme'; import Spinner from './components/Spinner'; import * as version from './version'; @@ -52,7 +49,7 @@ const App = ({ bgImg }): ReactElement => { className={`oc-login-bg ${bgImg ? 'oc-login-bg-image' : ''}`} style={{backgroundImage: bgImg ? `url(${bgImg})` : undefined}} > - + }> diff --git a/services/idp/src/app.css b/services/idp/src/app.css index 9818ad17d4..f6fd9319f8 100644 --- a/services/idp/src/app.css +++ b/services/idp/src/app.css @@ -1,4 +1,3 @@ -/* additional css on top of kpop */ @font-face { font-family: OpenCloud; src: url('./fonts/OpenCloud500-Regular.woff2') format('woff2'); @@ -17,16 +16,25 @@ html { font-feature-settings: "cv11"; color: #20434f !important; + height: 100%; } body { font-family: OpenCloud, sans-serif; + height: 100%; + margin: 0; + padding: 0; } strong { font-weight: 600; } +#root { + height: 100%; + display: flex; +} + .oc-font-weight-light { font-weight: 300; }