Commit 9e48a9ac authored by Marcel Nellesen's avatar Marcel Nellesen

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

Sprint/2020 13

See merge request !36
parents 4bf62ab4 51e73fc6
{
"name": "@coscine/login",
"version": "1.6.0",
"version": "1.7.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......
......@@ -8,7 +8,7 @@
<p class="card-text">{{ $t('ppBodyStart') }}<a href="https://git.rwth-aachen.de/coscine/terms/-/blob/master/PrivacyPolicy.md">Link</a>{{ $t('ppBodyEnd') }}</p>
<b-form-checkbox id="checkboxPP" v-model="checkedPP">{{ $t('ppBodyCheckBox') }}</b-form-checkbox>
<button
class="btn btn-secondary w-100"
class="btn btn-primary w-100"
name="tosppContinue"
@click.prevent="accept()"
:disabled="!checkedTOS || !checkedPP"
......@@ -40,12 +40,14 @@ export default Vue.extend({
},
methods: {
accept() {
if (this.checkedTOS && this.checkedPP) {
TOSApi.acceptCurrentTOSVersion(this.getJWT(), (response: any) => {
location.href = this.tosReturnUrl;
});
}
},
cancel() {
location.href = 'https://www.rwth-aachen.de/';
window.location.href = '/coscine/api/Coscine.Api.STS/account/logout';
},
getJWT() {
const urlParams = new URLSearchParams(window.location.search);
......
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