touchstudy-core 0.1.98 → 0.1.99

package/dist/index.js

@@ -252,6 +252,14 @@ var getAccessToken = (function () {
   }
 });
 
+var getLanguage = (function () {
+  try {
+    return localStorage.getItem(LANGUAGE);
+  } catch (err) {
+    return null;
+  }
+});
+
 var api = axios.create({
   baseURL: BASE_URL,
   timeout: 0,
@@ -276,13 +284,15 @@ var apiUpload = axios.create({
     var paramDomain = searchParams.get('domain');
     var paramLang = searchParams.get('lang');
     var academyDomainStorage = getAcademyDomain();
+    var langStorage = getLanguage();
     var academyDomain = paramDomain || academyDomainStorage;
+    var language = paramLang || langStorage;
     if (token) {
       config.headers.Authorization = "Bearer " + token;
       localStorage.setItem("LAST_TIME_REQUEST", moment().utc().format("YYYY-MM-DD HH:mm:ss"));
     }
     if (academyDomain && !config.headers[AcademyHeaders]) config.headers[AcademyHeaders] = "" + academyDomain;
-    if (paramLang) config.headers[LanguageHeaders] = "" + paramLang;
+    if (language) config.headers[LanguageHeaders] = "" + language;
     return config;
   }, function (error) {
     return Promise.reject(error);
@@ -1189,14 +1199,6 @@ var LANGUAGES = [{
 var DEFAULT_LANGUAGE = LANGUAGES[0];
 var LOGIN_URL = "/login";
 
-var getLanguage = (function () {
-  try {
-    return localStorage.getItem(LANGUAGE);
-  } catch (err) {
-    return null;
-  }
-});
-
 var useLanguage = function useLanguage(history) {
   var dispatch = reactRedux.useDispatch();
   var _useTranslation = reactI18next.useTranslation(),