Aufgrund einer Wartung wird GitLab am 29.10. zwischen 9:00 und 10:00 Uhr kurzzeitig nicht zur Verfügung stehen. / Due to maintenance, GitLab will be temporarily unavailable on 29.10. between 9:00 and 10:00 am.

Commit 5be12011 authored by Marcel Nellesen's avatar Marcel Nellesen

Merge branch 'Sprint/2020-11' into 'master'

Sprint/2020 11

See merge request !30
parents a2cfcc4c c816130e
This diff is collapsed.
......@@ -12,7 +12,7 @@
"test:unit": "vue-cli-service test:unit"
},
"dependencies": {
"@coscine/api-connection": "^1.15.0",
"@coscine/api-connection": "^1.16.0",
"@itcenter-layout/bootstrap": "^1.5.5",
"@itcenter-layout/masterpage": "^1.2.9",
"@types/jquery": "^3.3.38",
......
......@@ -44,6 +44,7 @@
:shibbolethReturnUrl="this.shibbolethReturnUrl"
:idpUrl="this.idpUrl"
:loggedInWithShibboleth="this.loggedInWithShibboleth"
:mergeReturnUrl="mergeReturnUrl"
@back="loginBack"
@clickGetLoginForm="getLoginForm"
@clickGetORCiDForm="getORCiDForm"
......@@ -117,6 +118,10 @@ function getReturnUrl(method: string) {
return returnUrl;
}
function getMergeReturnUrl() {
return getReturnUrl('Merge');
}
function getTOSReturnUrl() {
return encodeURI('' + getReturnUrlParam());
}
......@@ -188,6 +193,7 @@ export default Vue.extend({
returnUrl: getAccountReturnUrl(),
shibbolethReturnUrl: getShibbolethReturnUrl(),
tosReturnUrl: getTOSReturnUrl(),
mergeReturnUrl: getMergeReturnUrl(),
idpUrl: getIdpUrl(),
orcidUrl: getORCiDUrl(),
logoutState: getIsLogout(),
......
......@@ -32,11 +32,16 @@ export default Vue.extend({
};
},
mounted() {
if (document.cookie.indexOf('coscine.mergetoken') !== -1) {
window.location.href = this.mergeReturnUrl;
return;
}
this.getOrcidState();
},
props: {
idpUrl: String,
loggedInWithShibboleth: Boolean,
mergeReturnUrl: String,
},
methods: {
clickLogoutOrcid() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment