Skip to content

Commit a794645

Browse files
orangecodingorangecoding
committed
fixing login route
1 parent fd7e228 commit a794645

File tree

3 files changed

+43
-47
lines changed

3 files changed

+43
-47
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"node-mailjet": "6.0.11",
8181
"p-throttle": "^8.1.0",
8282
"package-up": "^5.0.0",
83-
"puppeteer": "^24.37.3",
83+
"puppeteer": "^24.37.2",
8484
"puppeteer-extra": "^3.3.6",
8585
"puppeteer-extra-plugin-stealth": "^2.11.2",
8686
"query-string": "9.3.1",

‎ui/src/App.jsx‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import GeneralSettings from './views/generalSettings/GeneralSettings';
1111
import UserSettings from './views/userSettings/UserSettings';
1212
import JobMutation from './views/jobs/mutation/JobMutation';
1313
import UserMutator from './views/user/mutation/UserMutator';
14-
import { useActions, useSelector } from './services/state/store';
14+
import { useActions, useSelector, useFredyState } from './services/state/store';
1515
import { Routes, Route, Navigate } from 'react-router-dom';
1616
import Login from './views/login/Login';
1717
import Users from './views/user/Users';
@@ -41,21 +41,24 @@ export default function FredyApp() {
4141
useEffect(() => {
4242
async function init() {
4343
await actions.user.getCurrentUser();
44-
if (!needsLogin()) {
45-
await actions.provider.getProvider();
46-
await actions.jobsData.getJobs();
47-
await actions.jobsData.getSharableUserList();
48-
await actions.notificationAdapter.getAdapter();
49-
await actions.generalSettings.getGeneralSettings();
50-
await actions.userSettings.getUserSettings();
51-
await actions.versionUpdate.getVersionUpdate();
52-
await actions.tracking.getTrackingPois();
44+
const user = useFredyState.getState().user.currentUser;
45+
if (!user || Object.keys(user).length === 0) {
46+
setLoading(false);
47+
return;
5348
}
49+
await actions.provider.getProvider();
50+
await actions.jobsData.getJobs();
51+
await actions.jobsData.getSharableUserList();
52+
await actions.notificationAdapter.getAdapter();
53+
await actions.generalSettings.getGeneralSettings();
54+
await actions.userSettings.getUserSettings();
55+
await actions.versionUpdate.getVersionUpdate();
56+
await actions.tracking.getTrackingPois();
5457
setLoading(false);
5558
}
5659

5760
init();
58-
}, [currentUser?.userId]);
61+
}, []);
5962

6063
const needsLogin = () => {
6164
return currentUser == null || Object.keys(currentUser).length === 0;
@@ -65,10 +68,7 @@ export default function FredyApp() {
6568
const { Sider, Content } = Layout;
6669

6770
return loading ? null : needsLogin() ? (
68-
<Routes>
69-
<Route path="/login" element={<Login />} />
70-
<Route path="*" element={<Navigate to="/login" replace />} />
71-
</Routes>
71+
<Login />
7272
) : (
7373
<Layout className="app">
7474
<Sider>
@@ -137,6 +137,7 @@ export default function FredyApp() {
137137
}
138138
/>
139139

140+
{/* Authenticated fallbacks */}
140141
<Route path="/" element={<Navigate to="/dashboard" replace />} />
141142
</Routes>
142143
</Content>

‎yarn.lock‎

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,16 +1470,16 @@
14701470
resolved "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz"
14711471
integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
14721472

1473-
"@puppeteer/browsers@2.12.0":
1474-
version "2.12.0"
1475-
resolved "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.12.0.tgz"
1476-
integrity sha512-Xuq42yxcQJ54ti8ZHNzF5snFvtpgXzNToJ1bXUGQRaiO8t+B6UM8sTUJfvV+AJnqtkJU/7hdy6nbKyA12aHtRw==
1473+
"@puppeteer/browsers@2.12.1":
1474+
version "2.12.1"
1475+
resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-2.12.1.tgz#eea8d90bab08e709550f5bf987b5af92f3286f1e"
1476+
integrity sha512-fXa6uXLxfslBlus3MEpW8S6S9fe5RwmAE5Gd8u3krqOwnkZJV3/lQJiY3LaFdTctLLqJtyMgEUGkbDnRNf6vbQ==
14771477
dependencies:
14781478
debug "^4.4.3"
14791479
extract-zip "^2.0.1"
14801480
progress "^2.0.3"
14811481
proxy-agent "^6.5.0"
1482-
semver "^7.7.3"
1482+
semver "^7.7.4"
14831483
tar-fs "^3.1.1"
14841484
yargs "^17.7.2"
14851485

@@ -2617,10 +2617,10 @@ chownr@^1.1.1:
26172617
resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"
26182618
integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
26192619

2620-
chromium-bidi@13.1.1:
2621-
version "13.1.1"
2622-
resolved "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-13.1.1.tgz"
2623-
integrity sha512-zB9MpoPd7VJwjowQqiW3FKOvQwffFMjQ8Iejp5ZW+sJaKLRhZX1sTxzl3Zt22TDB4zP0OOqs8lRoY7eAW5geyQ==
2620+
chromium-bidi@14.0.0:
2621+
version "14.0.0"
2622+
resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-14.0.0.tgz#15a12ab083ae519a49a724e94994ca0a9ced9c8e"
2623+
integrity sha512-9gYlLtS6tStdRWzrtXaTMnqcM4dudNegMXJxkR0I/CXObHalYeYcAMPrL19eroNZHtJ8DQmu1E+ZNOYu/IXMXw==
26242624
dependencies:
26252625
mitt "^3.0.1"
26262626
zod "^3.24.1"
@@ -6223,17 +6223,17 @@ punycode@^2.1.0:
62236223
resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz"
62246224
integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
62256225

6226-
puppeteer-core@24.37.2:
6227-
version "24.37.2"
6228-
resolved "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-24.37.2.tgz"
6229-
integrity sha512-nN8qwE3TGF2vA/+xemPxbesntTuqD9vCGOiZL2uh8HES3pPzLX20MyQjB42dH2rhQ3W3TljZ4ZaKZ0yX/abQuw==
6226+
puppeteer-core@24.37.3:
6227+
version "24.37.3"
6228+
resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-24.37.3.tgz#56f65d743eb99fe86b246b6af9ea3e94b0e4a4f9"
6229+
integrity sha512-fokQ8gv+hNgsRWqVuP5rUjGp+wzV5aMTP3fcm8ekNabmLGlJdFHas1OdMscAH9Gzq4Qcf7cfI/Pe6wEcAqQhqg==
62306230
dependencies:
6231-
"@puppeteer/browsers" "2.12.0"
6232-
chromium-bidi "13.1.1"
6231+
"@puppeteer/browsers" "2.12.1"
6232+
chromium-bidi "14.0.0"
62336233
debug "^4.4.3"
62346234
devtools-protocol "0.0.1566079"
62356235
typed-query-selector "^2.12.0"
6236-
webdriver-bidi-protocol "0.4.0"
6236+
webdriver-bidi-protocol "0.4.1"
62376237
ws "^8.19.0"
62386238

62396239
puppeteer-extra-plugin-stealth@^2.11.2:
@@ -6284,15 +6284,15 @@ puppeteer-extra@^3.3.6:
62846284
deepmerge "^4.2.2"
62856285

62866286
puppeteer@^24.37.2:
6287-
version "24.37.2"
6288-
resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-24.37.2.tgz#059a486d1db6d16ea58c4456eba896b27946656f"
6289-
integrity sha512-FV1W/919ve0y0oiS/3Rp5XY4MUNUokpZOH/5M4MMDfrrvh6T9VbdKvAHrAFHBuCxvluDxhjra20W7Iz6HJUcIQ==
6287+
version "24.37.3"
6288+
resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-24.37.3.tgz#68327e1f571887ed1ba7916d770e6028975a21db"
6289+
integrity sha512-AUGGWq0BhPM+IOS2U9A+ZREH3HDFkV1Y5HERYGDg5cbGXjoGsTCT7/A6VZRfNU0UJJdCclyEimZICkZW6pqJyw==
62906290
dependencies:
6291-
"@puppeteer/browsers" "2.12.0"
6292-
chromium-bidi "13.1.1"
6291+
"@puppeteer/browsers" "2.12.1"
6292+
chromium-bidi "14.0.0"
62936293
cosmiconfig "^9.0.0"
62946294
devtools-protocol "0.0.1566079"
6295-
puppeteer-core "24.37.2"
6295+
puppeteer-core "24.37.3"
62966296
typed-query-selector "^2.12.0"
62976297

62986298
qs@^6.14.1:
@@ -6787,11 +6787,6 @@ semver@^7.3.5, semver@^7.5.3:
67876787
resolved "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz"
67886788
integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
67896789

6790-
semver@^7.7.3:
6791-
version "7.7.3"
6792-
resolved "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz"
6793-
integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
6794-
67956790
semver@^7.7.4:
67966791
version "7.7.4"
67976792
resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.4.tgz#28464e36060e991fa7a11d0279d2d3f3b57a7e8a"
@@ -7643,10 +7638,10 @@ web-streams-polyfill@^3.0.3:
76437638
resolved "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz"
76447639
integrity sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==
76457640

7646-
webdriver-bidi-protocol@0.4.0:
7647-
version "0.4.0"
7648-
resolved "https://registry.npmjs.org/webdriver-bidi-protocol/-/webdriver-bidi-protocol-0.4.0.tgz"
7649-
integrity sha512-U9VIlNRrq94d1xxR9JrCEAx5Gv/2W7ERSv8oWRoNe/QYbfccS0V3h/H6qeNeCRJxXGMhhnkqvwNrvPAYeuP9VA==
7641+
webdriver-bidi-protocol@0.4.1:
7642+
version "0.4.1"
7643+
resolved "https://registry.yarnpkg.com/webdriver-bidi-protocol/-/webdriver-bidi-protocol-0.4.1.tgz#d411e7b8e158408d83bb166b0b4f1054fa3f077e"
7644+
integrity sha512-ARrjNjtWRRs2w4Tk7nqrf2gBI0QXWuOmMCx2hU+1jUt6d00MjMxURrhxhGbrsoiZKJrhTSTzbIrc554iKI10qw==
76507645

76517646
whatwg-encoding@^3.1.1:
76527647
version "3.1.1"

0 commit comments

Comments
 (0)