From 99c479ade20abd71fb8373be1432a2cf104aaed5 Mon Sep 17 00:00:00 2001 From: Khairul Hidayat Date: Sat, 16 Mar 2024 10:24:34 +0700 Subject: [PATCH] fix: ws baseurl not working on prod build --- ...c9d9bdeef.js => entry-a989ba6dbc16efcaea6aa0b62000b62c.js} | 2 +- backend/public/index.html | 2 +- src/lib/constants.ts | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) rename backend/public/_expo/static/js/web/{entry-17370bd88e3ea74f7539767c9d9bdeef.js => entry-a989ba6dbc16efcaea6aa0b62000b62c.js} (99%) diff --git a/backend/public/_expo/static/js/web/entry-17370bd88e3ea74f7539767c9d9bdeef.js b/backend/public/_expo/static/js/web/entry-a989ba6dbc16efcaea6aa0b62000b62c.js similarity index 99% rename from backend/public/_expo/static/js/web/entry-17370bd88e3ea74f7539767c9d9bdeef.js rename to backend/public/_expo/static/js/web/entry-a989ba6dbc16efcaea6aa0b62000b62c.js index 4db54cf..9991e49 100644 --- a/backend/public/_expo/static/js/web/entry-17370bd88e3ea74f7539767c9d9bdeef.js +++ b/backend/public/_expo/static/js/web/entry-a989ba6dbc16efcaea6aa0b62000b62c.js @@ -734,7 +734,7 @@ __d((function(g,r,i,a,m,e,d){var t=r(d[0]);Object.defineProperty(e,"__esModule", __d((function(g,r,i,a,m,e,d){Object.defineProperty(e,"__esModule",{value:!0}),e.toastStore=e.showToast=void 0;var t=r(d[0]),o=e.toastStore=(0,t.createStore)((function(){return null}));e.showToast=function(t,n){var s=o.getState();s&&s.show(t,n)}}),655,[642]); __d((function(g,r,i,a,m,e,d){var t=r(d[0]);Object.defineProperty(e,"__esModule",{value:!0}),e.wakePcUp=void 0;var n=t(r(d[1])),o=t(r(d[2])),p=r(d[3]);e.wakePcUp=(function(){var t=(0,n.default)((function*(){try{yield o.default.apps.wakepc.$post(),(0,p.showToast)("Waking up PC...")}catch(t){(0,p.showToast)("Cannot wake up the PC!",{type:"danger"})}}));return function(){return t.apply(this,arguments)}})()}),656,[34,6,657,655]); __d((function(g,_r,_i,_a,m,_e,d){var e=_r(d[0]);Object.defineProperty(_e,"__esModule",{value:!0}),_e.default=_e.ApiError=void 0;var t=e(_r(d[1])),r=e(_r(d[2])),n=e(_r(d[3])),o=e(_r(d[4])),a=e(_r(d[5])),u=e(_r(d[6])),f=e(_r(d[7])),i=_r(d[8]),l=_r(d[9]),c=(function(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!=typeof e&&"function"!=typeof e)return{default:e};var r=s(t);if(r&&r.has(e))return r.get(e);var n={__proto__:null},o=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var a in e)if("default"!==a&&Object.prototype.hasOwnProperty.call(e,a)){var u=o?Object.getOwnPropertyDescriptor(e,a):null;u&&(u.get||u.set)?Object.defineProperty(n,a,u):n[a]=e[a]}return n.default=e,r&&r.set(e,n),n})(_r(d[10]));function s(e){if("function"!=typeof WeakMap)return null;var t=new WeakMap,r=new WeakMap;return(s=function(e){return e?r:t})(e)}function p(){try{var e=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){})))}catch(e){}return(p=function(){return!!e})()}var y=(0,l.hc)(i.API_BASEURL,{fetch:function(e,t){return v.apply(this,arguments)}}),h=_e.ApiError=(function(e){function t(e,r){var u;(0,n.default)(this,t);var f,i,l,c="string"==typeof r?r:"object"==typeof r?null==r?void 0:r.message:e.statusText;return f=this,i=t,l=[c],i=(0,a.default)(i),(u=(0,o.default)(f,p()?Reflect.construct(i,l||[],(0,a.default)(f).constructor):i.apply(f,l))).code=400,u.name="ApiError",u.code=e.status,u}return(0,u.default)(t,e),(0,r.default)(t)})((0,f.default)(Error));function v(){return(v=(0,t.default)((function*(e,t){var r=c.default.getState().token;t&&(t.headers=new Headers(t.headers),r&&t.headers.set("Authorization",`Bearer ${r}`)),"object"==typeof e&&(e.headers=new Headers(t.headers),r&&e.headers.set("Authorization",`Bearer ${r}`));var n=yield fetch(e,t);return yield j(n),n}))).apply(this,arguments)}function j(e){return _.apply(this,arguments)}function _(){return(_=(0,t.default)((function*(e){if(!e.ok){var t=null;try{var r;t=(null==(r=e.headers.get("Content-Type"))?void 0:r.includes("application/json"))?yield e.json():yield e.text()}catch(e){}throw 401===e.status&&(0,c.logout)(),new h(e,t)}}))).apply(this,arguments)}_e.default=y}),657,[34,6,10,14,15,17,18,20,658,659,648]); -__d((function(g,r,i,a,m,e,d){Object.defineProperty(e,"__esModule",{value:!0}),e.API_BASEURL=void 0;e.API_BASEURL=""}),658,[]); +__d((function(g,r,i,a,m,e,d){Object.defineProperty(e,"__esModule",{value:!0}),e.API_BASEURL=void 0;e.API_BASEURL=location.protocol+"//"+location.host}),658,[]); __d((function(g,r,i,a,m,e,d){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"hc",{enumerable:!0,get:function(){return n.hc}});var n=r(d[0])}),659,[660]); __d((function(g,_r,i,a,m,_e,d){var r=_r(d[0]);Object.defineProperty(_e,"__esModule",{value:!0}),_e.hc=void 0;var e=r(_r(d[1])),t=r(_r(d[2])),n=r(_r(d[3])),o=r(_r(d[4])),s=r(_r(d[5])),u=_r(d[6]),f=_r(d[7]);function c(r,e){var t=Object.keys(r);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(r);e&&(n=n.filter((function(e){return Object.getOwnPropertyDescriptor(r,e).enumerable}))),t.push.apply(t,n)}return t}function p(r){for(var t=1;t2&&void 0!==arguments[2]?arguments[2]:{},i=`${e}=${t}`;if(e.startsWith("__Secure-")&&!n.secure)throw new Error("__Secure- Cookie must have Secure attributes");if(e.startsWith("__Host-")){if(!n.secure)throw new Error("__Host- Cookie must have Secure attributes");if("/"!==n.path)throw new Error('__Host- Cookie must have Path attributes with "/"');if(n.domain)throw new Error("__Host- Cookie must not have Domain attributes")}if(n&&"number"==typeof n.maxAge&&n.maxAge>=0){if(n.maxAge>3456e4)throw new Error("Cookies Max-Age SHOULD NOT be greater than 400 days (34560000 seconds) in duration.");i+=`; Max-Age=${Math.floor(n.maxAge)}`}if(n.domain&&"host"!==n.prefix&&(i+=`; Domain=${n.domain}`),n.path&&(i+=`; Path=${n.path}`),n.expires){if(n.expires.getTime()-Date.now()>3456e7)throw new Error("Cookies Expires SHOULD NOT be greater than 400 days (34560000 seconds) in the future.");i+=`; Expires=${n.expires.toUTCString()}`}if(n.httpOnly&&(i+="; HttpOnly"),n.secure&&(i+="; Secure"),n.sameSite&&(i+=`; SameSite=${n.sameSite}`),n.partitioned){if(!n.secure)throw new Error("Partitioned Cookie must have Secure attributes");i+="; Partitioned"}return i});_e.serialize=function(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return t=encodeURIComponent(t),v(e,t,n)},_e.serializeSigned=(function(){var e=(0,i.default)((function*(e,t,n){var i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{};return t=`${t}.${yield f(t,n)}`,t=encodeURIComponent(t),v(e,t,i)}));return function(t,n,i){return e.apply(this,arguments)}})()}),661,[34,35,61,6,662]); diff --git a/backend/public/index.html b/backend/public/index.html index d6408f9..8a42345 100644 --- a/backend/public/index.html +++ b/backend/public/index.html @@ -32,6 +32,6 @@
- + diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 675085d..2c5cf7e 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -1 +1,3 @@ -export const API_BASEURL = __DEV__ ? "http://localhost:3000" : ""; +export const API_BASEURL = __DEV__ + ? "http://localhost:3000" + : location.protocol + "//" + location.host;