@nitra/vite-boot 3.5.0 → 3.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +8 -8
- package/src/login.js +2 -1
- package/src/token.js +3 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nitra/vite-boot",
|
|
3
|
-
"version": "3.5.
|
|
3
|
+
"version": "3.5.1",
|
|
4
4
|
"description": "Vite boot",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -27,12 +27,12 @@
|
|
|
27
27
|
"src"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@apollo/client": "^3.
|
|
31
|
-
"@nitra/jwt-decode": "^1.
|
|
32
|
-
"@sentry/tracing": "^
|
|
33
|
-
"@sentry/vue": "^7.
|
|
34
|
-
"graphql-ws": "^5.
|
|
35
|
-
"pinia": "^2.
|
|
36
|
-
"pinia-plugin-persistedstate": "^3.0
|
|
30
|
+
"@apollo/client": "^3.8.7",
|
|
31
|
+
"@nitra/jwt-decode": "^1.2.0",
|
|
32
|
+
"@sentry/tracing": "^7.81.1",
|
|
33
|
+
"@sentry/vue": "^7.81.1",
|
|
34
|
+
"graphql-ws": "^5.14.2",
|
|
35
|
+
"pinia": "^2.1.7",
|
|
36
|
+
"pinia-plugin-persistedstate": "^3.2.0"
|
|
37
37
|
}
|
|
38
38
|
}
|
package/src/login.js
CHANGED
|
@@ -22,7 +22,7 @@ export async function autoLogin() {
|
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
/**
|
|
25
|
-
* Вхід
|
|
25
|
+
* Вхід або на попередню або на кореневу сторінку
|
|
26
26
|
*
|
|
27
27
|
* @param {Object} decoded
|
|
28
28
|
* @param {String} raw? - необов'язково, але потрібно якщо використовується localStorage
|
|
@@ -32,6 +32,7 @@ export async function defaultLogin(decoded, raw) {
|
|
|
32
32
|
localStorage.setItem('__session', raw)
|
|
33
33
|
|
|
34
34
|
setUser(decoded)
|
|
35
|
+
// @ts-ignore
|
|
35
36
|
const route = sessionStorage.getItem('url-before-logout') || import.meta.env.BASE_URL
|
|
36
37
|
window.location.href = route // router.push(route)
|
|
37
38
|
}
|
package/src/token.js
CHANGED
|
@@ -3,6 +3,7 @@ import { unsetUser, setUser } from './user.js'
|
|
|
3
3
|
import { defaultLogin } from './login.js'
|
|
4
4
|
import { wsClient, apolloClient } from './apollo.js'
|
|
5
5
|
|
|
6
|
+
// @ts-ignore
|
|
6
7
|
const allowedRoles = import.meta.env.VITE_HASURA_ROLE.split(',')
|
|
7
8
|
|
|
8
9
|
/**
|
|
@@ -15,7 +16,7 @@ const allowedRoles = import.meta.env.VITE_HASURA_ROLE.split(',')
|
|
|
15
16
|
export function checkToken(token) {
|
|
16
17
|
const decoded = jwtDecode(token)
|
|
17
18
|
|
|
18
|
-
if (!decoded) {
|
|
19
|
+
if (!decoded || !decoded['https://hasura.io/jwt/claims']) {
|
|
19
20
|
cleanToken()
|
|
20
21
|
return { result: 'cleaned' }
|
|
21
22
|
}
|
|
@@ -58,6 +59,7 @@ export function cleanToken() {
|
|
|
58
59
|
// видаляємо з localStorage
|
|
59
60
|
localStorage.removeItem('__session')
|
|
60
61
|
|
|
62
|
+
// @ts-ignore
|
|
61
63
|
document.cookie = `__session=; Max-Age=0; path=/; domain=${import.meta.env.VITE_DOMAIN}` // eslint-disable-line
|
|
62
64
|
}
|
|
63
65
|
|