New: Included new EntityIds (coscine/issues#1278)

package.json

@@ -11,7 +11,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@coscine/api-connection": "^1.24.2",
+    "@coscine/api-connection": "^1.25.0",
     "@coscine/component-library": "^1.5.0",
     "@itcenter-layout/bootstrap": "^1.5.5",
     "@itcenter-layout/masterpage": "^1.3.0",

src/LoginApp.vue

@@ -38,6 +38,8 @@
                         :is="(logoutState) ? logoutComponent : currentInputCard"
                         :returnUrl="this.returnUrl"
                         :shibbolethReturnUrl="this.shibbolethReturnUrl"
+                        :testShibbolethReturnUrl="this.testShibbolethReturnUrl"
+                        :fhShibbolethReturnUrl="this.fhShibbolethReturnUrl"
                         :idpUrl="this.idpUrl"
                         :loggedInWithShibboleth="this.loggedInWithShibboleth"
                         :mergeReturnUrl="mergeReturnUrl"
@@ -125,11 +127,12 @@ function getReturnUrlParam() {
   return returnUrlParameters;
 }
 
-function getReturnUrl(method: string) {
-  const returnUrl = encodeURI(
-    '/coscine/api/Coscine.Api.STS/' + method + '/login?returnUrl=' + getReturnUrlParam(),
-  );
-  return returnUrl;
+function getReturnUrl(method: string, entityId: string = '') {
+  let returnUrl = '/coscine/api/Coscine.Api.STS/' + method + '/login?returnUrl=' + getReturnUrlParam();
+  if (entityId !== '') {
+    returnUrl += '&entityId=' + entityId;
+  }
+  return encodeURI(returnUrl);
 }
 
 function getMergeReturnUrl() {
@@ -145,7 +148,7 @@ function getAccountReturnUrl() {
 }
 
 function getShibbolethReturnUrl() {
-  return getReturnUrl('Shibboleth');
+  return getReturnUrl('Shibboleth', 'https://login-test.rz.rwth-aachen.de/shibboleth');
 }
 
 function getIdpUrl() {
@@ -204,7 +207,9 @@ export default Vue.extend({
       rwthImage: rootUrl + rwthImagePath,
       imageEnabled,
       returnUrl: getAccountReturnUrl(),
-      shibbolethReturnUrl: getShibbolethReturnUrl(),
+      shibbolethReturnUrl: getReturnUrl('Shibboleth', 'https://login.rz.rwth-aachen.de/shibboleth'),
+      testShibbolethReturnUrl: getReturnUrl('Shibboleth', 'https://login-test.rz.rwth-aachen.de/shibboleth'),
+      fhShibbolethReturnUrl: getReturnUrl('Shibboleth', 'https://login.fh-aachen.de/idp/shibboleth'),
       tosReturnUrl: getTOSReturnUrl(),
       mergeReturnUrl: getMergeReturnUrl(),
       idpUrl: getIdpUrl(),

src/components/LoginMain.vue

@@ -9,9 +9,15 @@
         <span>  {{ $t('login_button_orcid') }}</span>
       </button>
     </div>
-    <form class="w-100" :action="shibbolethReturnUrl" method="post">
+    <form class="w-100" :action="devMachine === true ? testShibbolethReturnUrl : shibbolethReturnUrl" method="post">
       <div class="row">
-          <input class="btn btn-primary w-100" type="Submit" :value="$t('login_shibboleth')" />
+          <input class="btn btn-primary w-100" type="Submit" :value="$t('login_rwth')" />
+          <input type="hidden" name="wa" value="wsignin1.0" />
+      </div>
+    </form>
+    <form class="w-100" :action="fhShibbolethReturnUrl" method="post">
+      <div class="row">
+          <input class="btn btn-primary w-100" type="Submit" :value="$t('login_fh')" />
           <input type="hidden" name="wa" value="wsignin1.0" />
       </div>
     </form>
@@ -23,15 +29,23 @@ import Vue from 'vue';
 
 export default Vue.extend({
   name: 'LoginMain',
+  data: {
+    devMachine: false,
+  },
   props: {
     returnUrl: String,
     shibbolethReturnUrl: String,
+    testShibbolethReturnUrl: String,
+    fhShibbolethReturnUrl: String,
   },
   methods: {
     clickGetORCiDForm() {
       this.$emit('clickGetORCiDForm');
     },
   },
+  created() {
+    this.devMachine = window.location.href.toString().indexOf('d-sp') !== -1;
+  }
 });
 </script>
 

src/locale/de.ts

@@ -10,7 +10,8 @@ export default {
     login_button_with_account: 'Login-Zugang',
     login_button_orcid: 'Anmelden mit ORCID',
     login_button_form: 'Anmelden mit User ID',
-    login_shibboleth: 'Anmelden mit Shibboleth',
+    login_rwth: 'Anmelden mit RWTH Aachen University',
+    login_fh: 'Anmelden mit University of Applied Sciences Aachen',
     login_button_without_account: 'Weiter ohne Login',
     logout_button_orcid: 'Logout von ORCID',
     logout_shibboleth: 'Logout von Shibboleth',

src/locale/en.ts

@@ -10,7 +10,8 @@ export default {
     login_button_with_account: 'Login Access',
     login_button_orcid: 'Sign in with ORCID',
     login_button_form: 'Sign in with a User ID',
-    login_shibboleth: 'Sign in with Shibboleth',
+    login_rwth: 'Sign in with RWTH Aachen University',
+    login_fh: 'Sign in with University of Applied Sciences Aachen',
     login_button_without_account: 'Continue without Login',
     logout_button_orcid: 'Logout from ORCID',
     logout_shibboleth: 'Logout from Shibboleth',

yarn.lock-workspace

@@ -32,14 +32,14 @@ __metadata:
   languageName: node
   linkType: hard
-"@coscine/api-connection@npm:^1.24.2":
-  version: 1.24.2
-  resolution: "@coscine/api-connection@npm:1.24.2"
+"@coscine/api-connection@npm:^1.25.0":
+  version: 1.25.0
+  resolution: "@coscine/api-connection@npm:1.25.0"
   dependencies:
     "@types/file-saver": ^2.0.1
     axios: ^0.21.1
     file-saver: ^2.0.5
-  checksum: 7e43305aeb98f6b9ec573c61715f6ca293d4922fec345dea20380776e4a683844f1f16a6dce5fae5bf69bcb97205a41cc400f3dfa0558476d9758126cbfd6aca
+  checksum: 61e7230228b059f4f593b45e02e1d9378a6540204ea9ad88dc09e3984bb892c567de066506d42b7d492ef0e46b06094ad7f50b7eb8c8213802dcd3520094abc4
   languageName: node
   linkType: hard
@@ -64,7 +64,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@coscine/login@workspace:."
   dependencies:
-    "@coscine/api-connection": ^1.24.2
+    "@coscine/api-connection": ^1.25.0
     "@coscine/component-library": ^1.5.0
     "@hutson/semantic-delivery-gitlab": ^9.1.0
     "@itcenter-layout/bootstrap": ^1.5.5
@@ -287,17 +287,17 @@ __metadata:
   linkType: hard
 "@octokit/auth-token@npm:^2.4.4":
-  version: 2.4.4
-  resolution: "@octokit/auth-token@npm:2.4.4"
+  version: 2.4.5
+  resolution: "@octokit/auth-token@npm:2.4.5"
   dependencies:
-    "@octokit/types": ^6.0.0
-  checksum: a2911a58bdcee7c996dc02ac152c3d6318401c41c3899ad4286b379da273700680c97561ed9cf87ee792abf2cf2b439f63d43b33778ca991dfc751994e4d5544
+    "@octokit/types": ^6.0.3
+  checksum: 4cd8ef3bc0b10b54c6547adfd33caefc59982d9948e1f2aaa5e7ae3909a5446f08f5db055932976fe7070005d5db4f5c82b0ae0288a25d410d4998eaa42f5edc
   languageName: node
   linkType: hard
 "@octokit/core@npm:^3.2.3":
-  version: 3.2.4
-  resolution: "@octokit/core@npm:3.2.4"
+  version: 3.2.5
+  resolution: "@octokit/core@npm:3.2.5"
   dependencies:
     "@octokit/auth-token": ^2.4.4
     "@octokit/graphql": ^4.5.8
@@ -305,85 +305,85 @@ __metadata:
     "@octokit/types": ^6.0.3
     before-after-hook: ^2.1.0
     universal-user-agent: ^6.0.0
-  checksum: fb76c14bfdd934daa00f2d015a2d7af41ead2c50fe7359fa8283a140f833a28a6a23d2b3c541dc92d06aa69aea34d4c3d3aeea2eb8628bdaf899b19693f235c9
+  checksum: 509d224696a48c92b6182bcc03c0d7d4ba26eac30598300323411d2f8037de427930311244f1b9c446fc9916545db28b17d0812c1af5cf616fc5d2249416855e
   languageName: node
   linkType: hard
 "@octokit/endpoint@npm:^6.0.1":
-  version: 6.0.10
-  resolution: "@octokit/endpoint@npm:6.0.10"
+  version: 6.0.11
+  resolution: "@octokit/endpoint@npm:6.0.11"
   dependencies:
-    "@octokit/types": ^6.0.0
+    "@octokit/types": ^6.0.3
     is-plain-object: ^5.0.0
     universal-user-agent: ^6.0.0
-  checksum: e73ddbed6b02344924b101c47f2b7589e2ec0812623cc80be748d31a3308c2fcb2736d7696de64095b4f49da454160146bbb92322d1d62d66b064ce8ce213d99
+  checksum: b2b0f6bb1d10490985dd3070c4fabc7eb7068dabb9242d6009e9be16795a9f0635c6e177a1eb93816efad27f926c0fa9e8ad839b09bcd59f8fb61ebd76d00b0e
   languageName: node
   linkType: hard
 "@octokit/graphql@npm:^4.5.8":
-  version: 4.5.8
-  resolution: "@octokit/graphql@npm:4.5.8"
+  version: 4.5.9
+  resolution: "@octokit/graphql@npm:4.5.9"
   dependencies:
     "@octokit/request": ^5.3.0
-    "@octokit/types": ^6.0.0
+    "@octokit/types": ^6.0.3
     universal-user-agent: ^6.0.0
-  checksum: d29ec8a5ec51238b2f149ede5c760106e549def000fd0a42fadc23297c5b762732153957507a63a84cdbaaffd481951e530ffca384bc5a5c0fea01d2fa735171
+  checksum: 935d38128bcca75e1c4cd96edf6ebe4182e126da6da2b9e3ee57e58a300096e1f23d36a42ab52b677bba38e288d3823702a4b73a3ddfa4d9eac98eb1ba85b32c
   languageName: node
   linkType: hard
-"@octokit/openapi-types@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "@octokit/openapi-types@npm:2.3.0"
-  checksum: 6994eb327f56cc17eff44d4907fac46dce188190bc718b6bff42cb674dc8f77e7f39df4e645965aa07558b8f4581a024d67fa2cd9a15bf73679bcc94462acf10
+"@octokit/openapi-types@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "@octokit/openapi-types@npm:3.3.0"
+  checksum: d787ef625f71951f6553da62afe06ee59a2c7e77d43feec687d580fa19963b2804707ec751419cf3ca8fe41d1c739a43344dd84275aec06501a17e9b7e731829
   languageName: node
   linkType: hard
 "@octokit/plugin-paginate-rest@npm:^2.6.2":
-  version: 2.7.1
-  resolution: "@octokit/plugin-paginate-rest@npm:2.7.1"
+  version: 2.9.0
+  resolution: "@octokit/plugin-paginate-rest@npm:2.9.0"
   dependencies:
-    "@octokit/types": ^6.3.1
+    "@octokit/types": ^6.6.0
   peerDependencies:
     "@octokit/core": ">=2"
-  checksum: 6ee312d4b73a9f00c209a097c5afff869770bc8772c9cefd88c549e56ac9b1cea1933a5155c1b08422a2f362ba3e31a09a7b1c2630f9c60c70c3311d1bbb5eeb
+  checksum: 8a8387506a44b13dddd3c81a39b1aedc08a66eaa10d7e5a3d7baf371799075fbc18d93c3da162547b335c687b13ace2591b68b9fdb0e50d5cc7f50f6c300584e
   languageName: node
   linkType: hard
 "@octokit/plugin-request-log@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "@octokit/plugin-request-log@npm:1.0.2"
+  version: 1.0.3
+  resolution: "@octokit/plugin-request-log@npm:1.0.3"
   peerDependencies:
     "@octokit/core": ">=3"
-  checksum: c587973f425491fb6b9bf74dd9e3f4bbcf6d814d7a4833d262eed554c0764db1461d7b6719159eb3176edd60e9fc54bf31d5e4fad9c0af6f81fb742e59c1d394
+  checksum: f858361b36046c9b59a98898db3ae07e07fb1ca314c64155b8ccae306f01aa702216cbb74586e84c5c1ddcbc49bdf1d9819301f3acd5c7bc60057bb424cd3eb8
   languageName: node
   linkType: hard
-"@octokit/plugin-rest-endpoint-methods@npm:4.4.1":
-  version: 4.4.1
-  resolution: "@octokit/plugin-rest-endpoint-methods@npm:4.4.1"
+"@octokit/plugin-rest-endpoint-methods@npm:4.8.0":
+  version: 4.8.0
+  resolution: "@octokit/plugin-rest-endpoint-methods@npm:4.8.0"
   dependencies:
-    "@octokit/types": ^6.1.0
+    "@octokit/types": ^6.5.0
     deprecation: ^2.3.1
   peerDependencies:
     "@octokit/core": ">=3"
-  checksum: a19bca83c674aa217cd57063b9b39f140dcc0c55698bf7bae33618098909d32a6ea7cb20729436467e8d0b6b80cc5a98930f984366bd9b05ac1c0eb53b2e13a8
+  checksum: f8932a5cd0086505b19b6a8dbb5b538867b1e83e6308093a299cde29c3a8453227190761355ae0dfaa7cc09a50c5c79da4ce74eaf3ebf783ec6d1f080af74548
   languageName: node
   linkType: hard
 "@octokit/request-error@npm:^2.0.0":
-  version: 2.0.4
-  resolution: "@octokit/request-error@npm:2.0.4"
+  version: 2.0.5
+  resolution: "@octokit/request-error@npm:2.0.5"
   dependencies:
-    "@octokit/types": ^6.0.0
+    "@octokit/types": ^6.0.3
     deprecation: ^2.0.0
     once: ^1.4.0
-  checksum: 5761659a66aba76a238f97d8e1a995e0745fe3aa7cf86daa42c07d339cc6353e3818c74e5a58c923f72a77f490d137cb20398532c263919d922b02477dd3ee03
+  checksum: 0d3a3103a55188ddc533100de5654928610ee44a83a5043ca94374d10cce2e9c2069b4d9fba9384a8f12ad5c9770d58dccd6292f65b3f0403726e1de9fd849c1
   languageName: node
   linkType: hard
 "@octokit/request@npm:^5.3.0, @octokit/request@npm:^5.4.12":
-  version: 5.4.12
-  resolution: "@octokit/request@npm:5.4.12"
+  version: 5.4.13
+  resolution: "@octokit/request@npm:5.4.13"
   dependencies:
     "@octokit/endpoint": ^6.0.1
     "@octokit/request-error": ^2.0.0
@@ -393,29 +393,29 @@ __metadata:
     node-fetch: ^2.6.1
     once: ^1.4.0
     universal-user-agent: ^6.0.0
-  checksum: 7a98c8c7f91671f25f9211e071e881d31e8a4e7f1078954b71374b1b5923001eb979f4c511bc25dde1632143c09586c85de67ba1ab1268ee663db5dfa4d48ef5
+  checksum: d7136aed4e90a047b05b385826e99cc6386f63f0b1d4f60f515e25705ff639aa8fda1d89c23e902a71418efc55445c260131a31b61f7e701264f3e20d71d6b5c
   languageName: node
   linkType: hard
 "@octokit/rest@npm:^18.0.0":
-  version: 18.0.12
-  resolution: "@octokit/rest@npm:18.0.12"
+  version: 18.0.15
+  resolution: "@octokit/rest@npm:18.0.15"
   dependencies:
     "@octokit/core": ^3.2.3
     "@octokit/plugin-paginate-rest": ^2.6.2
     "@octokit/plugin-request-log": ^1.0.2
-    "@octokit/plugin-rest-endpoint-methods": 4.4.1
-  checksum: 79219bff3e21a216cab5c883ed843e99d9ff1d5b12992e11feb6650a13763c6b1651580e05ce40d1ab52f4c5ae91895081688f39ec7d67979077aeaad401f546
+    "@octokit/plugin-rest-endpoint-methods": 4.8.0
+  checksum: cda786af3e8440168d5f0d3a1b5ffa2027081d7bf7f6a7f68b69edf3131fd91b6114f29c93dbfaf61a6711aaef7188d9446e30d5bcbf28dcd11620aa012b50d8
   languageName: node
   linkType: hard
-"@octokit/types@npm:^6.0.0, @octokit/types@npm:^6.0.3, @octokit/types@npm:^6.1.0, @octokit/types@npm:^6.3.1":
-  version: 6.3.1
-  resolution: "@octokit/types@npm:6.3.1"
+"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.5.0, @octokit/types@npm:^6.6.0":
+  version: 6.6.0
+  resolution: "@octokit/types@npm:6.6.0"
   dependencies:
-    "@octokit/openapi-types": ^2.3.0
+    "@octokit/openapi-types": ^3.3.0
     "@types/node": ">= 8"
-  checksum: ea2fbb183decfda0b75912b8a143b02ce84645976a236bd44bbbea03aec8bb898e404a4ae66fd25492dc584ff082731390a37de6ce3c6cae242bde5ea4da6f1c
+  checksum: c7d1464ab5aaeeba4b75fac382930dd94188f589247b69a8ace3b8c18cf85f0fd3cb30bec3d1f52a4df4abc7074617d5b8b372f91a537e7e99590a11aa7092c2
   languageName: node
   linkType: hard
@@ -488,8 +488,8 @@ __metadata:
   linkType: hard
 "@semantic-release/gitlab@npm:^6.0.5":
-  version: 6.0.8
-  resolution: "@semantic-release/gitlab@npm:6.0.8"
+  version: 6.0.9
+  resolution: "@semantic-release/gitlab@npm:6.0.9"
   dependencies:
     "@semantic-release/error": ^2.2.0
     aggregate-error: ^3.0.0
@@ -505,7 +505,7 @@ __metadata:
     url-join: ^4.0.0
   peerDependencies:
     semantic-release: ">=15.8.0 <18.0.0"
-  checksum: 322e4e094aaadbaa20280697961227546f91375ed2a37f36c6c15c2307628c130e62e7277352f13760d990759f31a5a6ea690840cc36d4fa05dd8ed3cd197b6c
+  checksum: 91387709a83e20119c49b0da2b0b0f9752795c3ac15cafa3e079afb01d62b48ac2fa8be63f1317c068cba295c66d59e102826156d50d0d80ea43864bd6460b33
   languageName: node
   linkType: hard
@@ -737,9 +737,9 @@ __metadata:
   linkType: hard
 "@types/json-schema@npm:^7.0.3, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5":
-  version: 7.0.6
-  resolution: "@types/json-schema@npm:7.0.6"
-  checksum: 820cabe35ac915b93e38b0c01957e5c49d7d9f69251dddfbf39af0ff4fe24f6e08b39e55603e0d212dea7bcaa383b1218b58a738d1c02013dc22df06547ff238
+  version: 7.0.7
+  resolution: "@types/json-schema@npm:7.0.7"
+  checksum: b9d2c509fa4e0b82f58e73f5e6ab76c60ff1884ba41bb82f37fb1cece226d4a3e5a62fedf78a43da0005373a6713d9abe61c1e592906402c41c08ad6ab26d52b
   languageName: node
   linkType: hard
@@ -759,10 +759,10 @@ __metadata:
   languageName: node
   linkType: hard
-"@types/mime@npm:*":
-  version: 2.0.3
-  resolution: "@types/mime@npm:2.0.3"
-  checksum: 6df548a912494f8579d548cd883be0425f30eaa2922283335c405e270600f49045a06d766460c0f0edabb41dff570c614d174d3c52215de3bddd11f190ec9ae9
+"@types/mime@npm:^1":
+  version: 1.3.2
+  resolution: "@types/mime@npm:1.3.2"
+  checksum: c354bc135628c2f4ab64801ca3867c3acbd4050611579c4c9f5bdfecfb70db71bb8540bf8611b4319f5ef44139c5f7c5af81254369add5ed59e7e02ce929b96f
   languageName: node
   linkType: hard
@@ -781,9 +781,9 @@ __metadata:
   linkType: hard
 "@types/node@npm:*, @types/node@npm:>= 8, @types/node@npm:^14.14.20":
-  version: 14.14.21
-  resolution: "@types/node@npm:14.14.21"
-  checksum: b659823ffa01684ff2cb4edf0b70ea76d7eae6cd86af43de62ae6b460c174161850fb75a1be50ab60c4519c14babd4ec430ddbbe6689e341073ba10ff106311c
+  version: 14.14.22
+  resolution: "@types/node@npm:14.14.22"
+  checksum: e46e32685b4d0261779c13c10ba3ff220cfa714b5c12f8f571fd52cc309546bdbc8ffc86cbad20559ad88e7b17e66fc51c98b067d8c3766597092c05df157b9b
   languageName: node
   linkType: hard
@@ -839,12 +839,12 @@ __metadata:
   linkType: hard
 "@types/serve-static@npm:*":
-  version: 1.13.8
-  resolution: "@types/serve-static@npm:1.13.8"
+  version: 1.13.9
+  resolution: "@types/serve-static@npm:1.13.9"
   dependencies:
-    "@types/mime": "*"
+    "@types/mime": ^1
     "@types/node": "*"
-  checksum: 39db4c0f0f1c459588609496f92c2cb084b7feca8b9f96ac5032e371f8a0f4923c32dc9b7fd005b8bb6d10aad5d9118238da4869647672441571ff20bcbe4ea4
+  checksum: f261127514057b5c038d76259128d7b765dd92bfeaf769d05b8ddf5f254d066ce6142a935e2fc707bb3009d6544a979591852f0d135d0ed4d0c56db08738df6b
   languageName: node
   linkType: hard
@@ -933,11 +933,11 @@ __metadata:
   linkType: hard
 "@typescript-eslint/eslint-plugin@npm:^4.12.0":
-  version: 4.13.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:4.13.0"
+  version: 4.14.1
+  resolution: "@typescript-eslint/eslint-plugin@npm:4.14.1"
   dependencies:
-    "@typescript-eslint/experimental-utils": 4.13.0
-    "@typescript-eslint/scope-manager": 4.13.0
+    "@typescript-eslint/experimental-utils": 4.14.1
+    "@typescript-eslint/scope-manager": 4.14.1
     debug: ^4.1.1
     functional-red-black-tree: ^1.0.1
     lodash: ^4.17.15
@@ -950,66 +950,66 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 98f6ab92683965a75dfc966c3aa68d8b620b6fa5ff43048b7e249848c09c2a8bf7aaf7c4fa32b8c1203d8bc083279269ca291b12b5775d444806f9e22a4f21a1
+  checksum: 8e37fbd8fbaa7306fbc4f96f8e4cbc5d1be8eba35eefc0f14993d372c719d1e22e723e6bad09e3be0f6f37ce1b0f67b3d6401e27f074e14efa98fa29c3128e73
   languageName: node
   linkType: hard
-"@typescript-eslint/experimental-utils@npm:4.13.0":
-  version: 4.13.0
-  resolution: "@typescript-eslint/experimental-utils@npm:4.13.0"
+"@typescript-eslint/experimental-utils@npm:4.14.1":
+  version: 4.14.1
+  resolution: "@typescript-eslint/experimental-utils@npm:4.14.1"
   dependencies:
     "@types/json-schema": ^7.0.3
-    "@typescript-eslint/scope-manager": 4.13.0
-    "@typescript-eslint/types": 4.13.0
-    "@typescript-eslint/typescript-estree": 4.13.0
+    "@typescript-eslint/scope-manager": 4.14.1
+    "@typescript-eslint/types": 4.14.1
+    "@typescript-eslint/typescript-estree": 4.14.1
     eslint-scope: ^5.0.0
     eslint-utils: ^2.0.0
   peerDependencies:
     eslint: "*"
-  checksum: 63eee348ddc77bca7547be8a3b8759e4bcff30cf8a04e27a224bf8221d68ad8e4e1634fdd0aebdff7dc29d32a82dfa6ee70ec03d7d69d3c7128ae221f2711d1a
+  checksum: 0d9de633cbdab76a25dabec29759a21d110879d301cb7ccec230ef2d406b8502d18e1a65016113a1f747d618e38431352520c65687d84694a69ff25fd973c0e9
   languageName: node
   linkType: hard
 "@typescript-eslint/parser@npm:^4.12.0":
-  version: 4.13.0
-  resolution: "@typescript-eslint/parser@npm:4.13.0"
+  version: 4.14.1
+  resolution: "@typescript-eslint/parser@npm:4.14.1"
   dependencies:
-    "@typescript-eslint/scope-manager": 4.13.0
-    "@typescript-eslint/types": 4.13.0
-    "@typescript-eslint/typescript-estree": 4.13.0
+    "@typescript-eslint/scope-manager": 4.14.1
+    "@typescript-eslint/types": 4.14.1
+    "@typescript-eslint/typescript-estree": 4.14.1
     debug: ^4.1.1
   peerDependencies:
     eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 7eec410392d618eddfa421fd6d1449bba1312abc90bd81dcbea33d3083788616c50e97e98ac11fbce1600f827fc7d04e50296f56366fcdd37a54b08558812319
+  checksum: 069976e6dc4d74b23c556a0597b97088e55e04e2a3ddc1b705655bb95f36b6d74778c552f65dd9b7f4432a3a36254b108ae5ce971d5bea75d12e839e5bc10971
   languageName: node
   linkType: hard
-"@typescript-eslint/scope-manager@npm:4.13.0":
-  version: 4.13.0
-  resolution: "@typescript-eslint/scope-manager@npm:4.13.0"
+"@typescript-eslint/scope-manager@npm:4.14.1":
+  version: 4.14.1
+  resolution: "@typescript-eslint/scope-manager@npm:4.14.1"
   dependencies:
-    "@typescript-eslint/types": 4.13.0
-    "@typescript-eslint/visitor-keys": 4.13.0
-  checksum: 878302870ee46f5b311bcee7984514eb4f81caea618010983abd75f5395faf9b6ca2c76f82d43b221946672494fac593c697b5b8644d7a3ae70fc03b9c166d12
+    "@typescript-eslint/types": 4.14.1
+    "@typescript-eslint/visitor-keys": 4.14.1
+  checksum: fa8ae677b9bf03b380c006451aa4b8c158abf99371cc2dfacee82883dbf9f9ffe4784a1724ac2db2976e2d2f892c2c970480296ca629b5ba5d9703034bf38f52
   languageName: node
   linkType: hard
-"@typescript-eslint/types@npm:4.13.0":
-  version: 4.13.0
-  resolution: "@typescript-eslint/types@npm:4.13.0"
-  checksum: ed2e27ad1f7d0db28d13d3a5fe900b7638981689fea1b5556de4fcd87729f73cfe2e3792005cf4e05ba4c405f2abe9bc55c076354d4ac3f9576ded65c1b4ddf5
+"@typescript-eslint/types@npm:4.14.1":
+  version: 4.14.1
+  resolution: "@typescript-eslint/types@npm:4.14.1"
+  checksum: c994b59f5ef607a133a52ff61b70b934c3932859a3ac1d6886ca4efca6012d819fd21f49ba3170330fc84dff1ccae05063704ca6a1ddd7f80ae24610fe8a9390
   languageName: node
   linkType: hard
-"@typescript-eslint/typescript-estree@npm:4.13.0":
-  version: 4.13.0
-  resolution: "@typescript-eslint/typescript-estree@npm:4.13.0"
+"@typescript-eslint/typescript-estree@npm:4.14.1":
+  version: 4.14.1
+  resolution: "@typescript-eslint/typescript-estree@npm:4.14.1"
   dependencies:
-    "@typescript-eslint/types": 4.13.0
-    "@typescript-eslint/visitor-keys": 4.13.0
+    "@typescript-eslint/types": 4.14.1
+    "@typescript-eslint/visitor-keys": 4.14.1
     debug: ^4.1.1
     globby: ^11.0.1
     is-glob: ^4.0.1
@@ -1019,44 +1019,44 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 8b7485f192f247d659779f1bc95d927612e53b23801981acc462c2fd76219a61ac1094348bf7ac46034b58c1751793053128d11264268e378241eb6e686f5e8e
+  checksum: 17a3e00fa6cbc12d25705318a3c65a692d58195658444140741fa473814287678ec87e14fc54426bbbe00bc4a8f1f298c0fc4fb4624fc0dfda270b8bd50e9dc6
   languageName: node
   linkType: hard
-"@typescript-eslint/visitor-keys@npm:4.13.0":
-  version: 4.13.0
-  resolution: "@typescript-eslint/visitor-keys@npm:4.13.0"
+"@typescript-eslint/visitor-keys@npm:4.14.1":
+  version: 4.14.1
+  resolution: "@typescript-eslint/visitor-keys@npm:4.14.1"
   dependencies:
-    "@typescript-eslint/types": 4.13.0
+    "@typescript-eslint/types": 4.14.1
     eslint-visitor-keys: ^2.0.0
-  checksum: 35f20062885da380ef9d6e07f058ea9629a36b3d264dcf7e776e81da7c8f544373a287d6f49c88fd4fc546bb4afea27efdcd4e5be972c4202746b46cf1682a2d
+  checksum: 3fad9e451a85a9aa70a22f08fd6e9cfc68f1953dfb14efa8e5815adebd1d337914bed9fbc7b7da1b99e017edb001c7057f03953647e88bd7ba2666deadc44bdd
   languageName: node
   linkType: hard
-"@vue/cli-overlay@npm:^4.5.10":
-  version: 4.5.10
-  resolution: "@vue/cli-overlay@npm:4.5.10"
-  checksum: 5a16078d3cc486d53c70db3804baa45d7874117e4767f036bfc86afe13cba703abfa7e1318253600823e6b54177aaed24d973ae941934e816e5b3ae9570bf700
+"@vue/cli-overlay@npm:^4.5.11":
+  version: 4.5.11
+  resolution: "@vue/cli-overlay@npm:4.5.11"
+  checksum: ca042e2d27edce44de83dd546b5121bc048b3cee50788a9f9f5d864d9b3ef05f56f19a446cbd91c04ee0a59bead90f365b40a71cc88b73fd3b810a2a569ef15b
   languageName: node
   linkType: hard
-"@vue/cli-plugin-router@npm:^4.5.10":
-  version: 4.5.10
-  resolution: "@vue/cli-plugin-router@npm:4.5.10"
+"@vue/cli-plugin-router@npm:^4.5.11":
+  version: 4.5.11
+  resolution: "@vue/cli-plugin-router@npm:4.5.11"
   dependencies:
-    "@vue/cli-shared-utils": ^4.5.10
+    "@vue/cli-shared-utils": ^4.5.11
   peerDependencies:
     "@vue/cli-service": ^3.0.0 || ^4.0.0-0
-  checksum: 95f0d885d5b0ab3b3e2731866d1b7f461a20ad2fd2069f1f9c812e74f74e8bde8a65a014fe3a434f7457ce9df2a22ccdbec5457b962e2c2acdc2a14b4e8ac645
+  checksum: 792fd539ff5ce8e40373ec493cb1808791dba5b4613530682aca5246dd4ccc04c0afb116662c23412bb53ca0d39aab1dc4b8961ae1f53d9b8e5e0ddf21d7e398
   languageName: node
   linkType: hard
 "@vue/cli-plugin-typescript@npm:^4.5.7":
-  version: 4.5.10
-  resolution: "@vue/cli-plugin-typescript@npm:4.5.10"
+  version: 4.5.11
+  resolution: "@vue/cli-plugin-typescript@npm:4.5.11"
   dependencies:
     "@types/webpack-env": ^1.15.2
-    "@vue/cli-shared-utils": ^4.5.10
+    "@vue/cli-shared-utils": ^4.5.11
     cache-loader: ^4.1.0
     fork-ts-checker-webpack-plugin: ^3.1.1
     fork-ts-checker-webpack-plugin-v5: "npm:fork-ts-checker-webpack-plugin@^5.0.11"
@@ -1076,22 +1076,22 @@ __metadata:
   peerDependenciesMeta:
     "@vue/compiler-sfc":
       optional: true
-  checksum: b25a638aa5e4df6690e7d39ee2d9e585a555d0b5cc82fbd66bde62abbfde462dd94e2ff656fbe90d7c51f9b7a0a0cb385d81406ed5ecbfdc15d924da1cffbd5b
+  checksum: 232d367e6f9d055f64337d117645e3070c6d4f571fef2d8bbf2d22498f08555c7871b4064f23f33fea361cb3580431d8ae6777f8e9f2f0528bf0859f2d18f0ca
   languageName: node
   linkType: hard
-"@vue/cli-plugin-vuex@npm:^4.5.10":
-  version: 4.5.10
-  resolution: "@vue/cli-plugin-vuex@npm:4.5.10"
+"@vue/cli-plugin-vuex@npm:^4.5.11":
+  version: 4.5.11
+  resolution: "@vue/cli-plugin-vuex@npm:4.5.11"
   peerDependencies:
     "@vue/cli-service": ^3.0.0 || ^4.0.0-0
-  checksum: ba857b94f5e61cb6ee5ca4ca127915e9cc165ce5222d12905656e284983f1ca262f6d58c2ddd0e2cf12ebdd0dc457ca3b7627e8e4fb324b9d6bbb9881359a6b3
+  checksum: 532a123e283ca98b48f02a906080e2b833babff27d338001ae1a0773fb01e8654b1dbc347c35cb6662eb3ef6e5220b18921be89c7dec749c5cedb8187e94e06b
   languageName: node
   linkType: hard
 "@vue/cli-service@npm:^4.5.7":
-  version: 4.5.10
-  resolution: "@vue/cli-service@npm:4.5.10"
+  version: 4.5.11
+  resolution: "@vue/cli-service@npm:4.5.11"
   dependencies:
     "@intervolga/optimize-cssnano-plugin": ^1.0.5
     "@soda/friendly-errors-webpack-plugin": ^1.7.1
@@ -1099,10 +1099,10 @@ __metadata:
     "@types/minimist": ^1.2.0
     "@types/webpack": ^4.0.0
     "@types/webpack-dev-server": ^3.11.0
-    "@vue/cli-overlay": ^4.5.10
-    "@vue/cli-plugin-router": ^4.5.10
-    "@vue/cli-plugin-vuex": ^4.5.10
-    "@vue/cli-shared-utils": ^4.5.10
+    "@vue/cli-overlay": ^4.5.11
+    "@vue/cli-plugin-router": ^4.5.11
+    "@vue/cli-plugin-vuex": ^4.5.11
+    "@vue/cli-shared-utils": ^4.5.11
     "@vue/component-compiler-utils": ^3.1.2
     "@vue/preload-webpack-plugin": ^1.1.0
     "@vue/web-component-wrapper": ^1.2.0
@@ -1172,13 +1172,13 @@ __metadata:
       optional: true
   bin:
     vue-cli-service: bin/vue-cli-service.js
-  checksum: 5d04cee1a8dfc4e06b5855742df8dbb739b1ed5117a61c8fae58d2c56ba5888528e7442a42aa9eea44c10cc6fa3997b4df30cb6d54571c382723076910054627
+  checksum: 4c37f39c8a727564e4ebe8ab218faf482ce0dcd6cfa55fddd0cf55f88c933f30df64285be9642b5233f51cc4aebb520a04b75a086fc22fda2a21da6de7b88efa
   languageName: node
   linkType: hard
-"@vue/cli-shared-utils@npm:^4.5.10":
-  version: 4.5.10
-  resolution: "@vue/cli-shared-utils@npm:4.5.10"
+"@vue/cli-shared-utils@npm:^4.5.11":
+  version: 4.5.11
+  resolution: "@vue/cli-shared-utils@npm:4.5.11"
   dependencies:
     "@hapi/joi": ^15.0.1
     chalk: ^2.4.2
@@ -1192,7 +1192,7 @@ __metadata:
     request: ^2.88.2
     semver: ^6.1.0
     strip-ansi: ^6.0.0
-  checksum: ca1b6272ea3a09a3df8717d932815389eb8dda0f3d92758096a7037ea328c4e691c3c7433df173e783dda0c6d728033784e8b4c7e1ab42329a49070d12377de7
+  checksum: 7aca35cd67b5d38dab899d726f845875f7e0a6b7a8e8cddd309d3a9c28910614c86a5d4fa2843f65a00ac25b063279d1cb6078ee55147438bbf7d236507da25e
   languageName: node
   linkType: hard
@@ -2230,12 +2230,12 @@ __metadata:
   linkType: hard
 "bootstrap@npm:>=4.5.3 <5.0.0":
-  version: 4.5.3
-  resolution: "bootstrap@npm:4.5.3"