Skip to content

Commit

Permalink
fix(popout): authorize / socket on load (#3707)
Browse files Browse the repository at this point in the history
Fixes #3701

[skip-tests]
  • Loading branch information
sogehige committed May 10, 2020
1 parent 41dd4f5 commit 271ed37
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion src/panel/popout.ts
Expand Up @@ -37,7 +37,7 @@ import { isUserLoggedIn } from 'src/panel/helpers/isUserLoggedIn';
import translate from 'src/panel/helpers/translate';
import urlParam from 'src/panel/helpers/urlParam';
import { getListOf } from 'src/panel/helpers/getListOf';
import { getConfiguration, getTranslations } from 'src/panel/helpers/socket';
import { getConfiguration, getTranslations, redirectLogin, waitForAuthorizationSocket } from 'src/panel/helpers/socket';

library.add(faVolumeOff, faGripVertical, faImage, faUpload, faCircle2, faCaretRight, faTasks, faCaretDown, faSlash, faFilter, faToggleOn, faToggleOff, faBell, faShareSquare, faExclamationCircle, faQuestion, faVial, faEquals, faGreaterThanEqual, faLongArrowAltLeft, faBan, faPlusSquare, faMusic, faList, faPlay, faPause, faForward, faSpotify, faMoneyBillAlt, faPlus, faSpinner, faGift, faHeadphones, faTh, faDollarSign, faSignInAlt, faSignOutAlt, faUsers, faMusic, faCalendar, faTwitter, faCheck, faMusic, faMusic, faVolumeUp, faVolumeDown, faUsers, faGift, faTrophy, faCog, faExternalLinkAlt, faTrash, faPlus, faSync, faComments, faTwitch, faCircle, faCheckCircle, faLock, faUsers, faUser, faCheck, faTimes, faHeart, faStar, faLockOpen, faHandPointer, faRandom, faEyeSlash, faSignOutAlt, faSignInAlt, faBoxOpen, faEye, faCog, faExternalLinkAlt, faHeart, faTv, faRandom, faGem, faStar, faGift, faDollarSign, faStarHalf, faLongArrowAltRight, faCircleNotch, faCalendar, faDollarSign, faCog, faCode, faAngleUp, faTrashAlt, faAngleDown, faFont, faPlus, faMinus, faDownload, faDollarSign, faTerminal, faCog, faCommentAlt, faUsers, faExternalLinkAlt, faSyncAlt, faClock, faCog, faInfinity, faTrophy, faClone, faGem, faCoins, faExclamation, faStop, faBan, faSpinner, faCheck, faAngleRight, faPlus, faEdit, faEraser, faLink, faTrash, faPlus, faCaretLeft, faExternalLinkAlt, faLink, faSave, faThLarge, faThList, faSearch, faCircleNotch, faCheck, faEllipsisH, faEllipsisV, faPowerOff);
Vue.component('fa', FontAwesomeIcon);
Expand Down Expand Up @@ -94,6 +94,14 @@ const main = async () => {
Vue.prototype.translate = (v) => translate(v);
Vue.prototype.urlParam = (v) => urlParam(v);

/* force first authorize */
try {
await waitForAuthorizationSocket('/');
} catch (e) {
console.error(e);
redirectLogin();
return;
}
Vue.prototype.$loggedUser = await isUserLoggedIn();
if (Vue.prototype.$loggedUser !== false) {
await getTranslations();
Expand Down

0 comments on commit 271ed37

Please sign in to comment.