From 0aba0954e449e24c168f3f1fb9f2815c265e9b75 Mon Sep 17 00:00:00 2001
From: Valentin Kaelin <kalanehd@gmail.com>
Date: Mon, 9 Sep 2019 18:14:15 +0200
Subject: [PATCH] Fix the region changes with the new Jax wrapper

---
 client/src/store/modules/summoner.js | 1 +
 client/src/views/Summoner.vue        | 1 -
 server/src/Jax/Jax.js                | 7 +++++++
 server/src/server.js                 | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/src/store/modules/summoner.js b/client/src/store/modules/summoner.js
index d67a085..aaf2722 100644
--- a/client/src/store/modules/summoner.js
+++ b/client/src/store/modules/summoner.js
@@ -29,6 +29,7 @@ export const mutations = {
 export const actions = {
   async summonerRequest({ commit, dispatch, rootState }, { summoner, region }) {
     console.log(summoner, region)
+    region = rootState.regionsList[region]
     commit('SUMMONER_REQUEST')
     try {
       const resp = await axios(({ url: 'api', data: { summoner, region }, method: 'POST' }))
diff --git a/client/src/views/Summoner.vue b/client/src/views/Summoner.vue
index 71d0365..b2ac268 100644
--- a/client/src/views/Summoner.vue
+++ b/client/src/views/Summoner.vue
@@ -76,7 +76,6 @@ export default {
       return this.$route.params.region
     },
     ...mapState({
-      regionsList: state => state.regionsList,
       localInfos: state => state.summoner.infos,
       summonerFound: state => state.summoner.summonerFound,
       loading: state => state.summoner.loading
diff --git a/server/src/Jax/Jax.js b/server/src/Jax/Jax.js
index ae03dd6..baa9d95 100644
--- a/server/src/Jax/Jax.js
+++ b/server/src/Jax/Jax.js
@@ -39,6 +39,13 @@ class Jax {
 
   set regionName(regionName) {
     this.region = regionName
+    const blacklistedProperties = ['key', 'limiter', 'region', 'version', 'DDragon']
+
+    for (const key of Object.getOwnPropertyNames(this)) {
+      if(blacklistedProperties.includes(key)) continue
+
+      this[key].region = regionName
+    }
   }
 }
 
diff --git a/server/src/server.js b/server/src/server.js
index 2899c0c..3540d8d 100644
--- a/server/src/server.js
+++ b/server/src/server.js
@@ -7,7 +7,7 @@ const app = express()
 import { Jax } from "./Jax"
 
 /* Set Port */
-app.set('port', (process.env.PORT || 5000))
+app.set('port', (process.env.PORT || 3333))
 
 /* Setup Cors */
 app.use(cors({