Porównaj commity

...

2 Commity

Autor SHA1 Wiadomość Data
Manuel Kasper b19f9d5ecc Use user ID of currently logged in user 2023-09-28 11:29:36 +02:00
Manuel Kasper 53bff389c3 Switch those requests to api-db2 that have already required authentication before
(to maintain public/not-logged-in access to the list of activations for activator details pages)
2023-09-28 11:22:20 +02:00
1 zmienionych plików z 5 dodań i 4 usunięć

Wyświetl plik

@ -1,8 +1,9 @@
import axios from 'axios' import axios from 'axios'
import ssoauth from './ssoauth.js' import ssoauth from './ssoauth.js'
import utils from './utils.js'
export default { export default {
mixins: [ssoauth], mixins: [ssoauth, utils],
methods: { methods: {
loadActivations (callsign) { loadActivations (callsign) {
return axios.get(process.env.VUE_APP_API_URL + '/activations/' + callsign) return axios.get(process.env.VUE_APP_API_URL + '/activations/' + callsign)
@ -11,13 +12,13 @@ export default {
}) })
}, },
loadActivationDetails (activationId) { loadActivationDetails (activationId) {
return this.axiosAuth.get('https://api-db.sota.org.uk/admin/secure/my_activator_log_detailed', { params: { id: this.activationId } }) return this.axiosAuth.get('https://api-db2.sota.org.uk/logs/activation/detailed/' + this.activationId)
.then(response => { .then(response => {
return response.data[0] return response.data[0]
}) })
}, },
loadS2SLog (userId, year) { loadS2SLog (userId, year) {
return this.axiosAuth.get('https://api-db.sota.org.uk/admin/secure/s2s_log_by_id', { params: { id: userId, year } }) return this.axiosAuth.get('https://api-db2.sota.org.uk/logs/s2s/' + userId + '/' + year + '/1')
.then(response => { .then(response => {
return response.data return response.data
}) })
@ -56,7 +57,7 @@ export default {
if (this.$store.state.myActivatedSummitsThisYear) { if (this.$store.state.myActivatedSummitsThisYear) {
return Promise.resolve(this.$store.state.myActivatedSummitsThisYear) return Promise.resolve(this.$store.state.myActivatedSummitsThisYear)
} else { } else {
return this.axiosAuth.get('https://api-db.sota.org.uk/admin/secure/my_activator_log', { params: { year: new Date().getUTCFullYear() } }) return this.axiosAuth.get('https://api-db2.sota.org.uk/logs/activator/' + this.myUserId + '/' + new Date().getUTCFullYear() + '/1')
.then(response => { .then(response => {
let myActivatedSummitsThisYear = new Set() let myActivatedSummitsThisYear = new Set()
response.data.forEach(ent => { response.data.forEach(ent => {