We are a Data Controller of your information.
+We (Modrinth) are a Data Controller of your information.
Rinth, Inc. legal basis for collecting and using the personal @@ -54,7 +54,7 @@
- Google is a third-party vendor on our site. It also uses cookies, known - as DART cookies, to serve ads to our site visitors based upon their - visit to www.website.com and other sites on the internet. However, - visitors may choose to decline the use of DART cookies by visiting the - Google ad and content network Privacy Policy at the following URL – - https://policies.google.com/technologies/ads -
-it.data) @@ -253,7 +253,7 @@ export default { : null, status: this.currentProject.newStatus, }, - this.$auth.headers + this.$defaultHeaders() ) this.projects.splice( @@ -278,7 +278,7 @@ export default { try { await this.$axios.delete( `report/${this.reports[index].id}`, - this.$auth.headers + this.$defaultHeaders() ) this.reports.splice(index, 1) diff --git a/pages/notifications.vue b/pages/notifications.vue index 07346f2d4..75b35c025 100644 --- a/pages/notifications.vue +++ b/pages/notifications.vue @@ -127,7 +127,7 @@ export default { await this.$axios.delete( `notifications?ids=${JSON.stringify(ids)}`, - this.$auth.headers + this.$defaultHeaders() ) ids.forEach((x) => this.$store.dispatch('user/deleteNotification', x)) @@ -145,7 +145,7 @@ export default { try { await this.$axios.delete( `notification/${notification.id}`, - this.$auth.headers + this.$defaultHeaders() ) await this.$store.dispatch('user/deleteNotification', notification.id) diff --git a/pages/search.vue b/pages/search.vue index ee734d378..55d48710d 100644 --- a/pages/search.vue +++ b/pages/search.vue @@ -570,7 +570,7 @@ export default { } } - const res = await this.$axios.get(url) + const res = await this.$axios.get(url, this.$defaultHeaders()) this.results = res.data.hits const pageAmount = Math.ceil(res.data.total_hits / res.data.limit) diff --git a/pages/settings/index.vue b/pages/settings/index.vue index 87a8187c7..e5d32b341 100644 --- a/pages/settings/index.vue +++ b/pages/settings/index.vue @@ -220,7 +220,7 @@ export default { this.icon.type.split('/')[this.icon.type.split('/').length - 1] }`, this.icon, - this.$auth.headers + this.$defaultHeaders() ) } @@ -235,7 +235,7 @@ export default { await this.$axios.patch( `user/${this.$auth.user.id}`, data, - this.$auth.headers + this.$defaultHeaders() ) await this.$store.dispatch('auth/fetchUser', { diff --git a/pages/settings/security.vue b/pages/settings/security.vue index d08b667f2..b5be5d975 100644 --- a/pages/settings/security.vue +++ b/pages/settings/security.vue @@ -90,7 +90,7 @@ export default { try { await this.$axios.delete( `user/${this.$auth.user.id}`, - this.$auth.headers + this.$defaultHeaders() ) } catch (err) { this.$notify({ diff --git a/pages/user/_id.vue b/pages/user/_id.vue index fa5496a84..05b823860 100644 --- a/pages/user/_id.vue +++ b/pages/user/_id.vue @@ -164,10 +164,10 @@ export default { try { const [user, projects] = ( await Promise.all([ - data.$axios.get(`user/${data.params.id}`, data.$auth.headers), + data.$axios.get(`user/${data.params.id}`, data.$defaultHeaders()), data.$axios.get( `user/${data.params.id}/projects`, - data.$auth.headers + data.$defaultHeaders() ), ]) ).map((it) => it.data) diff --git a/plugins/shorthands.js b/plugins/shorthands.js index 613034821..2f945496c 100644 --- a/plugins/shorthands.js +++ b/plugins/shorthands.js @@ -2,6 +2,19 @@ export default ({ store }, inject) => { inject('user', store.state.user) inject('tag', store.state.tag) inject('auth', store.state.auth) + inject('defaultHeaders', () => { + const obj = { headers: {} } + + if (process.server && process.env.RATE_LIMIT_IGNORE_KEY) { + obj.headers['x-ratelimit-key'] = process.env.RATE_LIMIT_IGNORE_KEY + } + + if (store.state.auth.user) { + obj.headers.Authorization = store.state.auth.token + } + + return obj + }) inject('formatNumber', formatNumber) inject('formatVersion', (versionArray) => { const allVersions = store.state.tag.gameVersions.slice().reverse() diff --git a/store/auth.js b/store/auth.js index ae39487e4..1515eab3f 100644 --- a/store/auth.js +++ b/store/auth.js @@ -17,12 +17,15 @@ export const mutations = { } export const actions = { - async fetchUser({ commit }, { token }) { + async fetchUser({ commit, state }, { token }) { try { const user = ( await this.$axios.get(`user`, { headers: { Authorization: token, + 'x-ratelimit-key': process.server + ? process.env.RATE_LIMIT_IGNORE_KEY + : '', }, }) ).data diff --git a/store/tag.js b/store/tag.js index 16a84b868..8aa6c54c3 100644 --- a/store/tag.js +++ b/store/tag.js @@ -26,13 +26,21 @@ export const mutations = { export const actions = { async fetchAllTags({ commit }) { + const headers = { + headers: { + 'x-ratelimit-key': process.server + ? process.env.RATE_LIMIT_IGNORE_KEY + : '', + }, + } + const [categories, loaders, gameVersions, licenses, donationPlatforms] = ( await Promise.all([ - this.$axios.get(`tag/category`), - this.$axios.get(`tag/loader`), - this.$axios.get(`tag/game_version`), - this.$axios.get(`tag/license`), - this.$axios.get(`tag/donation_platform`), + this.$axios.get(`tag/category`, headers), + this.$axios.get(`tag/loader`, headers), + this.$axios.get(`tag/game_version`, headers), + this.$axios.get(`tag/license`, headers), + this.$axios.get(`tag/donation_platform`, headers), ]) ).map((it) => it.data)