@oniti/quasar-app-extension-vlank-auth 3.2.26 → 4.1.0
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/README.md +91 -23
- package/package.json +16 -5
- package/src/boot/index.js +51 -51
- package/src/components/pages/Login.vue +13 -12
- package/src/components/pages/PasswordLost.vue +9 -7
- package/src/components/pages/PasswordReset.vue +17 -17
- package/src/index.js +2 -2
- package/src/install.js +1 -5
- package/src/stores/auth.js +165 -0
- package/src/components/store/actions.js +0 -80
- package/src/components/store/getters.js +0 -78
- package/src/components/store/index.js +0 -12
- package/src/components/store/mutations.js +0 -32
- package/src/components/store/state.js +0 -14
package/README.md
CHANGED
|
@@ -7,6 +7,12 @@ Provides :
|
|
|
7
7
|
- login page
|
|
8
8
|
- helpers (get user, rights, disconnect, …)
|
|
9
9
|
|
|
10
|
+
### Prérequis
|
|
11
|
+
|
|
12
|
+
- Node.js >= 18.0.0
|
|
13
|
+
- Quasar 2 avec `@quasar/app-vite` ^2.0.0
|
|
14
|
+
- Pinia installé et enregistré dans l'app consommatrice (via un boot file chargé **avant** celui de vlank-auth)
|
|
15
|
+
- L'extension `@oniti/vlank-starter` installée au préalable
|
|
10
16
|
|
|
11
17
|
### Install
|
|
12
18
|
```bash
|
|
@@ -23,6 +29,67 @@ quasar ext remove @oniti/vlank-auth
|
|
|
23
29
|
yarn upgrade @oniti/vlank-auth
|
|
24
30
|
```
|
|
25
31
|
|
|
32
|
+
### Nouveautés 4.1.0
|
|
33
|
+
|
|
34
|
+
Sans rupture : une application en 4.0.0 passe en 4.1.0 sans rien changer.
|
|
35
|
+
|
|
36
|
+
- **Pinia 4 et vue-router 5 acceptés**, en plus de Pinia 3 et vue-router 4.
|
|
37
|
+
Pinia 4 demande à l'application d'installer elle-même `@vue/devtools-api`.
|
|
38
|
+
- **Vue >= 3.5.11 déclaré** : c'est déjà ce qu'exige Pinia 3.
|
|
39
|
+
- **Garde de navigation sans `next()`**, déprécié par vue-router 5 : même
|
|
40
|
+
logique de droits et mêmes redirections, sans avertissement en console.
|
|
41
|
+
- **Plus d'exception non gérée en console** quand la connexion, le mot de
|
|
42
|
+
passe perdu ou la réinitialisation échouent. `$auth.login()` et les autres
|
|
43
|
+
helpers rejettent toujours leur promesse en cas d'erreur : un `.catch()`
|
|
44
|
+
dans votre application continue de fonctionner.
|
|
45
|
+
- **Paquet allégé** : seuls `src/`, le README et le `package.json` sont
|
|
46
|
+
publiés.
|
|
47
|
+
|
|
48
|
+
### Migration v3 → v4
|
|
49
|
+
|
|
50
|
+
**Breaking changes :**
|
|
51
|
+
|
|
52
|
+
- **Pinia obligatoire** : le composant utilise Pinia au lieu de Vuex. Votre application doit avoir Pinia installé et enregistré via un boot file **précédant** celui de vlank-auth dans `quasar.config.js > boot`.
|
|
53
|
+
- **`@quasar/app-vite` ^2.0.0 requis** : les projets encore sur `@quasar/app-webpack` doivent rester sur vlank-auth 3.2.x.
|
|
54
|
+
- **Alias webpack → alias Vite** : remplacer `chainWebpack` par `build.extendViteConf` (voir Configuration ci-dessous).
|
|
55
|
+
- **Node 18+** requis.
|
|
56
|
+
- **État accédé via Pinia** : si votre app accédait directement à l'état (déconseillé), utiliser `useAuthStore` à la place de `store.state.auth`. Le champ `has_check` est renommé `hasCheck`.
|
|
57
|
+
|
|
58
|
+
### Maintenance des versions 3.x et 4.x
|
|
59
|
+
|
|
60
|
+
Les deux lignées de versions sont maintenues en parallèle :
|
|
61
|
+
|
|
62
|
+
| Lignée | Branche Git | Dist-tag NPM | Contenu |
|
|
63
|
+
| ------ | ----------- | ------------ | ------- |
|
|
64
|
+
| 4.x | `master` | `latest` | nouvelles fonctionnalités + correctifs |
|
|
65
|
+
| 3.x | `3.x` | `legacy-v3` | **correctifs uniquement** |
|
|
66
|
+
|
|
67
|
+
Règles de travail :
|
|
68
|
+
|
|
69
|
+
- **Bug présent uniquement en v3** : merge request vers la branche `3.x`, puis publication d'un patch 3.1.x.
|
|
70
|
+
- **Bug présent dans les deux versions** : corriger sur `master` d'abord, puis reporter sur `3.x` avec `git cherry-pick <sha>` (ou correctif distinct si le code a trop divergé).
|
|
71
|
+
- **Nouvelles fonctionnalités** : uniquement sur `master`. La branche `3.x` ne reçoit que des correctifs.
|
|
72
|
+
|
|
73
|
+
Les projets restés en v3 n'ont rien à changer : un `package.json` avec `"^3.1.0"` continue de résoudre automatiquement les nouvelles versions 3.1.x publiées.
|
|
74
|
+
|
|
75
|
+
#### Publication d'un correctif 3.x (depuis la branche `3.x`)
|
|
76
|
+
|
|
77
|
+
> ⚠️ **CRITIQUE : ne jamais publier une 3.x sans le dist-tag `legacy-v3`.**
|
|
78
|
+
> Un `yarn publish` classique déplacerait le tag NPM `latest` vers la 3.x : tous les
|
|
79
|
+
> nouveaux `npm install` / `yarn add` récupéreraient alors l'ancienne version au lieu
|
|
80
|
+
> de la 4.x.
|
|
81
|
+
|
|
82
|
+
A la racine du projet, sur la branche `3.x` :
|
|
83
|
+
1. commit
|
|
84
|
+
2. `yarn publish --tag legacy-v3` (penser à changer la version)
|
|
85
|
+
3. `git push origin 3.x --tags`
|
|
86
|
+
|
|
87
|
+
En cas d'oubli du `--tag`, réparer immédiatement en repointant `latest` sur la dernière 4.x :
|
|
88
|
+
|
|
89
|
+
```bash
|
|
90
|
+
npm dist-tag add @oniti/vlank-input@<dernière version 4.x> latest
|
|
91
|
+
```
|
|
92
|
+
|
|
26
93
|
### Live extension development
|
|
27
94
|
```bash
|
|
28
95
|
# in this extension root directory (once for all):
|
|
@@ -32,7 +99,10 @@ yarn link
|
|
|
32
99
|
# (delete node_modules + yarn install to get to the original state)
|
|
33
100
|
yarn link "@oniti/quasar-app-extension-vlank-auth"
|
|
34
101
|
```
|
|
35
|
-
|
|
102
|
+
|
|
103
|
+
Pendant la phase de migration v4, il faut également linker `@oniti/quasar-app-extension-vlank-input` en v4 en local dans le projet consommateur.
|
|
104
|
+
|
|
105
|
+
In quasar.config.js of host project:
|
|
36
106
|
```javascript
|
|
37
107
|
devServer: {
|
|
38
108
|
…
|
|
@@ -54,13 +124,12 @@ ln -s /home/xfennec/git/vlank-auth/src/ node_modules/@oniti/quasar-app-extension
|
|
|
54
124
|
That's it. The extension is already in devServer's watchFiles of laravel-vlank,
|
|
55
125
|
so it will be reloaded automatically when you change something in the extension.
|
|
56
126
|
|
|
57
|
-
edit: I was also able to make it work by modifying files in node_modules and
|
|
58
|
-
running `quasar clean` in the host project + restarting `./serve.sh` for quick tests.
|
|
59
|
-
|
|
60
127
|
### Publish
|
|
61
128
|
```bash
|
|
62
129
|
# only necessary step (asks for new version):
|
|
63
130
|
yarn publish
|
|
131
|
+
# … ou si vous avez un yarn trop vieux (vu les changements récents chez npm):
|
|
132
|
+
npm publish
|
|
64
133
|
```
|
|
65
134
|
|
|
66
135
|
### Settings
|
|
@@ -73,28 +142,28 @@ The default page use `email` and `password` as credentials.
|
|
|
73
142
|
|
|
74
143
|
### Configuration
|
|
75
144
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
});
|
|
145
|
+
Les alias (logos, layout de login) sont définis côté consommateur dans `quasar.config.js` :
|
|
146
|
+
|
|
147
|
+
```javascript
|
|
148
|
+
import { fileURLToPath } from 'node:url'
|
|
149
|
+
|
|
150
|
+
build: {
|
|
151
|
+
extendViteConf (viteConf) {
|
|
152
|
+
viteConf.resolve ??= {}
|
|
153
|
+
viteConf.resolve.alias ??= {}
|
|
154
|
+
Object.assign(viteConf.resolve.alias, {
|
|
155
|
+
'vlank-auth-logo': fileURLToPath(new URL('./src/assets/logo-app.png', import.meta.url)),
|
|
156
|
+
'vlank-auth-logo-text': fileURLToPath(new URL('./src/assets/logo-app-text.png', import.meta.url)),
|
|
157
|
+
'vlank-auth-layout': fileURLToPath(new URL('./src/layouts/EmptyLayout.vue', import.meta.url)),
|
|
158
|
+
})
|
|
159
|
+
}
|
|
92
160
|
}
|
|
93
161
|
```
|
|
162
|
+
|
|
94
163
|
### Custom route validation
|
|
95
164
|
You can define a custom function to check route access.
|
|
96
165
|
|
|
97
|
-
in `quasar.
|
|
166
|
+
in `quasar.config.js`
|
|
98
167
|
```javascript
|
|
99
168
|
boot: [...,'override-check-route-access'],
|
|
100
169
|
...,
|
|
@@ -160,8 +229,7 @@ Route example:
|
|
|
160
229
|
|
|
161
230
|
## Helpers
|
|
162
231
|
|
|
163
|
-
The authentication logic is performed inside a
|
|
164
|
-
Les helpers sont accessibles depuis le composant après avoir fait un inject :
|
|
232
|
+
The authentication logic is performed inside a Pinia store (`useAuthStore`, exporté depuis `@oniti/quasar-app-extension-vlank-auth/src/stores/auth`). Les helpers sont accessibles depuis le composant après avoir fait un inject :
|
|
165
233
|
```javascript
|
|
166
234
|
import { inject } from 'vue'
|
|
167
235
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oniti/quasar-app-extension-vlank-auth",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.1.0",
|
|
4
4
|
"description": "Authentification",
|
|
5
5
|
"author": "François BOUYER <francois@oniti.fr>",
|
|
6
6
|
"license": "MIT",
|
|
@@ -17,8 +17,19 @@
|
|
|
17
17
|
"access": "public"
|
|
18
18
|
},
|
|
19
19
|
"engines": {
|
|
20
|
-
"node": ">=
|
|
21
|
-
"npm": ">=
|
|
22
|
-
"yarn": ">= 1.
|
|
23
|
-
}
|
|
20
|
+
"node": ">= 18.0.0",
|
|
21
|
+
"npm": ">= 9.0.0",
|
|
22
|
+
"yarn": ">= 1.22.0"
|
|
23
|
+
},
|
|
24
|
+
"peerDependencies": {
|
|
25
|
+
"@quasar/app-vite": "^2.0.0",
|
|
26
|
+
"quasar": "^2.0.0",
|
|
27
|
+
"vue": "^3.5.11",
|
|
28
|
+
"pinia": "^3.0.0 || ^4.0.0",
|
|
29
|
+
"@oniti/quasar-app-extension-vlank-input": "^4.0.0",
|
|
30
|
+
"vue-router": "^4.0.0 || ^5.0.0"
|
|
31
|
+
},
|
|
32
|
+
"files": [
|
|
33
|
+
"src"
|
|
34
|
+
]
|
|
24
35
|
}
|
package/src/boot/index.js
CHANGED
|
@@ -1,39 +1,40 @@
|
|
|
1
|
-
import auth from "../components/store";
|
|
2
1
|
import { Notify } from "quasar";
|
|
3
2
|
import { boot } from 'quasar/wrappers'
|
|
3
|
+
import { useAuthStore } from "../stores/auth";
|
|
4
4
|
|
|
5
|
-
export default boot(({ app, router
|
|
6
|
-
|
|
7
|
-
store.registerModule("auth", auth);
|
|
5
|
+
export default boot(({ app, router }) => {
|
|
6
|
+
const authStore = useAuthStore();
|
|
8
7
|
|
|
9
8
|
const config = app.config.globalProperties.$q.config.onitiVlankAuth;
|
|
10
9
|
const configFramework = app.config.globalProperties.$q.config.onitiVlankAuthConfig ? app.config.globalProperties.$q.config.onitiVlankAuthConfig : {};
|
|
11
10
|
|
|
12
11
|
// Fonction permettant de gérer la redirection en cas de compte non loggué
|
|
13
|
-
|
|
12
|
+
// Garde sans next() : next() est déprécié depuis vue-router 5.0.3.
|
|
13
|
+
// Retourner une valeur fonctionne avec vue-router 4 et 5.
|
|
14
|
+
router.beforeEach((to, from) => {
|
|
14
15
|
/**
|
|
15
16
|
* Défini les routes de redirection et de login
|
|
16
17
|
*/
|
|
17
18
|
const routesToSet = {
|
|
18
|
-
loginRoute: { default: "defaultAuthRoute",
|
|
19
|
+
loginRoute: { default: "defaultAuthRoute", setter: authStore.setLoginRoute },
|
|
19
20
|
redirectRoute: {
|
|
20
21
|
default: "defaultRedirectRoute",
|
|
21
|
-
|
|
22
|
+
setter: authStore.setRedirectRoute,
|
|
22
23
|
},
|
|
23
24
|
passwordCreateRoute: {
|
|
24
25
|
default: "defaultPasswordCreateRoute",
|
|
25
|
-
|
|
26
|
+
setter: authStore.setCreatePasswordRoute,
|
|
26
27
|
},
|
|
27
28
|
passwordLostRoute: {
|
|
28
29
|
default: "defaultPasswordLostRoute",
|
|
29
|
-
|
|
30
|
+
setter: authStore.setLostPasswordRoute,
|
|
30
31
|
},
|
|
31
32
|
};
|
|
32
33
|
|
|
33
34
|
for (const [key, routeConfig] of Object.entries(routesToSet)) {
|
|
34
35
|
let routePath = to.matched.find((r) => r.meta[key]);
|
|
35
36
|
routePath = routePath ? routePath.meta[key] : config[routeConfig.default];
|
|
36
|
-
|
|
37
|
+
routeConfig.setter(routePath);
|
|
37
38
|
}
|
|
38
39
|
|
|
39
40
|
let rights = to.matched.find((r) => r.meta.rights);
|
|
@@ -42,7 +43,6 @@ export default boot(({ app, router, store }) => {
|
|
|
42
43
|
let typeRightCheck = to.matched.find((r) => r.meta.typeRightCheck);
|
|
43
44
|
typeRightCheck = typeRightCheck ? typeRightCheck.meta.typeRightCheck : "all";
|
|
44
45
|
|
|
45
|
-
const getter_right_check = typeRightCheck === "any" ? "auth/checkAny" : "auth/checkAll";
|
|
46
46
|
const check_route_access_overide_name = configFramework.check_route_access_overide_name;
|
|
47
47
|
const check_route_access_overide = app.config.globalProperties[check_route_access_overide_name];
|
|
48
48
|
|
|
@@ -54,33 +54,33 @@ export default boot(({ app, router, store }) => {
|
|
|
54
54
|
: false;
|
|
55
55
|
|
|
56
56
|
if (!helper.isFunctionalRoute(to.path)) {
|
|
57
|
-
|
|
57
|
+
authStore.setWantedRoute(to.path);
|
|
58
58
|
}
|
|
59
59
|
if (to.matched.some((routeRecord) => routeRecord.meta.requiresAuth)) {
|
|
60
60
|
// eslint-disable-next-line
|
|
61
|
-
if (
|
|
61
|
+
if (authStore.logged) {
|
|
62
|
+
const rightCheck = typeRightCheck === "any"
|
|
63
|
+
? authStore.checkAny(rights)
|
|
64
|
+
: authStore.checkAll(rights);
|
|
65
|
+
|
|
62
66
|
// Pas les droits nécéssaires
|
|
63
|
-
if ((check_route_access_overide && !check_route_access_overide(
|
|
64
|
-
if (logoutOnUnsufisantRights) {
|
|
65
|
-
store.dispatch("auth/logout");
|
|
66
|
-
next(helper.getLoginRoute());
|
|
67
|
-
} else {
|
|
68
|
-
next(from && from.path ? from.path : helper.getLoginRoute());
|
|
69
|
-
}
|
|
67
|
+
if ((check_route_access_overide && !check_route_access_overide(authStore.user, to)) || (!check_route_access_overide && !rightCheck)) {
|
|
70
68
|
Notify.create({
|
|
71
69
|
message: "Vous n'avez pas accès à cette zone.",
|
|
72
70
|
type: "negative",
|
|
73
71
|
});
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
72
|
+
if (logoutOnUnsufisantRights) {
|
|
73
|
+
authStore.logout();
|
|
74
|
+
return helper.getLoginRoute();
|
|
75
|
+
}
|
|
76
|
+
return from && from.path ? from.path : helper.getLoginRoute();
|
|
77
77
|
}
|
|
78
|
-
|
|
79
|
-
|
|
78
|
+
//Sinon on continue
|
|
79
|
+
return true;
|
|
80
80
|
}
|
|
81
|
-
|
|
82
|
-
next();
|
|
81
|
+
return helper.getLoginRoute();
|
|
83
82
|
}
|
|
83
|
+
return true;
|
|
84
84
|
});
|
|
85
85
|
|
|
86
86
|
let { routes } = router.options;
|
|
@@ -133,23 +133,23 @@ export default boot(({ app, router, store }) => {
|
|
|
133
133
|
let helper = {};
|
|
134
134
|
|
|
135
135
|
helper.getRedirectRoute = () => {
|
|
136
|
-
return
|
|
136
|
+
return authStore.routes.currentRedirect;
|
|
137
137
|
};
|
|
138
138
|
|
|
139
139
|
helper.getLoginRoute = () => {
|
|
140
|
-
return
|
|
140
|
+
return authStore.routes.currentLogin;
|
|
141
141
|
};
|
|
142
142
|
|
|
143
143
|
helper.getPasswordCreateRoute = () => {
|
|
144
|
-
return
|
|
144
|
+
return authStore.routes.currentPasswordCreateRoute;
|
|
145
145
|
};
|
|
146
146
|
|
|
147
147
|
helper.getPasswordLostRoute = () => {
|
|
148
|
-
return
|
|
148
|
+
return authStore.routes.currentPasswordLostRoute;
|
|
149
149
|
};
|
|
150
150
|
|
|
151
151
|
helper.getWantedRoute = () => {
|
|
152
|
-
return
|
|
152
|
+
return authStore.routes.currentWantedRoute;
|
|
153
153
|
};
|
|
154
154
|
|
|
155
155
|
helper.isFunctionalRoute = (routePath) => {
|
|
@@ -167,15 +167,15 @@ export default boot(({ app, router, store }) => {
|
|
|
167
167
|
*/
|
|
168
168
|
helper.fetch = () => {
|
|
169
169
|
return new Promise((resolve, reject) => {
|
|
170
|
-
|
|
171
|
-
.
|
|
170
|
+
authStore
|
|
171
|
+
.me()
|
|
172
172
|
.then(() => {
|
|
173
|
-
|
|
173
|
+
authStore.setHasCheck();
|
|
174
174
|
|
|
175
175
|
const wantedRoute = helper.getWantedRoute();
|
|
176
176
|
let route_to_go = null;
|
|
177
177
|
if (wantedRoute) {
|
|
178
|
-
|
|
178
|
+
authStore.setWantedRoute(null);
|
|
179
179
|
route_to_go = wantedRoute;
|
|
180
180
|
} else {
|
|
181
181
|
let redirectRoute = helper.getRedirectRoute()
|
|
@@ -192,7 +192,7 @@ export default boot(({ app, router, store }) => {
|
|
|
192
192
|
resolve();
|
|
193
193
|
})
|
|
194
194
|
.catch((err) => {
|
|
195
|
-
|
|
195
|
+
authStore.setHasCheck();
|
|
196
196
|
reject(err);
|
|
197
197
|
});
|
|
198
198
|
});
|
|
@@ -203,8 +203,8 @@ export default boot(({ app, router, store }) => {
|
|
|
203
203
|
*/
|
|
204
204
|
helper.login = (data) => {
|
|
205
205
|
return new Promise((resolve, reject) => {
|
|
206
|
-
|
|
207
|
-
.
|
|
206
|
+
authStore
|
|
207
|
+
.login(data)
|
|
208
208
|
.then(() => {
|
|
209
209
|
helper.fetch().then(resolve).catch(reject);
|
|
210
210
|
})
|
|
@@ -231,17 +231,17 @@ export default boot(({ app, router, store }) => {
|
|
|
231
231
|
*/
|
|
232
232
|
helper.logout = () => {
|
|
233
233
|
return new Promise((resolve, reject) => {
|
|
234
|
-
|
|
234
|
+
authStore.logout()
|
|
235
235
|
.then(() => {
|
|
236
236
|
let isPrivate = router.currentRoute._value.matched.some((match) => {
|
|
237
237
|
return match.meta.requiresAuth;
|
|
238
238
|
});
|
|
239
239
|
if (isPrivate) {
|
|
240
|
-
|
|
240
|
+
authStore.setWantedRoute(null);
|
|
241
241
|
router.push(helper.getLoginRoute());
|
|
242
242
|
}
|
|
243
|
-
|
|
244
|
-
|
|
243
|
+
authStore.setLogout();
|
|
244
|
+
authStore.setHasCheck();
|
|
245
245
|
resolve()
|
|
246
246
|
})
|
|
247
247
|
.catch(reject)
|
|
@@ -252,55 +252,55 @@ export default boot(({ app, router, store }) => {
|
|
|
252
252
|
* @param {*} data
|
|
253
253
|
*/
|
|
254
254
|
helper.updatePassword = (data) => {
|
|
255
|
-
return
|
|
255
|
+
return authStore.updatePassword(data);
|
|
256
256
|
};
|
|
257
257
|
/**
|
|
258
258
|
* reset le password
|
|
259
259
|
* @param {*} data
|
|
260
260
|
*/
|
|
261
261
|
helper.resetPassword = (data) => {
|
|
262
|
-
return
|
|
262
|
+
return authStore.resetPassword(data);
|
|
263
263
|
};
|
|
264
264
|
/**
|
|
265
265
|
* met à jour les informations de l'utilisateur
|
|
266
266
|
* @param {*} data
|
|
267
267
|
*/
|
|
268
268
|
helper.updateUser = (data) => {
|
|
269
|
-
return
|
|
269
|
+
return authStore.update(data);
|
|
270
270
|
};
|
|
271
271
|
/**
|
|
272
272
|
* Retourne l'utilisateur dans le store
|
|
273
273
|
*/
|
|
274
274
|
helper.user = () => {
|
|
275
|
-
return
|
|
275
|
+
return authStore.user;
|
|
276
276
|
};
|
|
277
277
|
/**
|
|
278
278
|
* Vérfie si un droit est présent
|
|
279
279
|
* @param {*} right
|
|
280
280
|
*/
|
|
281
281
|
helper.check = (right) => {
|
|
282
|
-
return
|
|
282
|
+
return authStore.checkSingle(right);
|
|
283
283
|
};
|
|
284
284
|
/**
|
|
285
285
|
* Vérfie si tous les droits sont validés
|
|
286
286
|
* @param {*} rights
|
|
287
287
|
*/
|
|
288
288
|
helper.checkAll = (rights) => {
|
|
289
|
-
return
|
|
289
|
+
return authStore.checkAll(rights);
|
|
290
290
|
};
|
|
291
291
|
/**
|
|
292
292
|
* Vérfie si un droit au moins est disponible.
|
|
293
293
|
* @param {*} rights
|
|
294
294
|
*/
|
|
295
295
|
helper.checkAny = (rights) => {
|
|
296
|
-
return
|
|
296
|
+
return authStore.checkAny(rights);
|
|
297
297
|
};
|
|
298
298
|
/**
|
|
299
299
|
* Envoi l'email de réinitialisation du password
|
|
300
300
|
* @param {*} data
|
|
301
301
|
*/
|
|
302
302
|
helper.passwordLost = (data) => {
|
|
303
|
-
return
|
|
303
|
+
return authStore.passwordLost(data);
|
|
304
304
|
};
|
|
305
305
|
|
|
306
306
|
app.config.globalProperties.$auth = helper;
|
|
@@ -68,10 +68,12 @@
|
|
|
68
68
|
|
|
69
69
|
<script setup>
|
|
70
70
|
import { ref, onMounted, computed, watch, inject } from 'vue'
|
|
71
|
-
import { useStore } from 'vuex'
|
|
72
71
|
import { useQuasar } from 'quasar'
|
|
72
|
+
import { useAuthStore } from '../../stores/auth'
|
|
73
|
+
import logoUrl from 'vlank-auth-logo'
|
|
74
|
+
import logoTextUrl from 'vlank-auth-logo-text'
|
|
73
75
|
|
|
74
|
-
const
|
|
76
|
+
const authStore = useAuthStore()
|
|
75
77
|
const $q = useQuasar()
|
|
76
78
|
const $auth = inject('vlank-auth')
|
|
77
79
|
|
|
@@ -79,7 +81,7 @@ const isPwd = ref(true)
|
|
|
79
81
|
const login = ref("")
|
|
80
82
|
const password = ref("")
|
|
81
83
|
|
|
82
|
-
const has_check = computed(() =>
|
|
84
|
+
const has_check = computed(() => authStore.hasCheck)
|
|
83
85
|
|
|
84
86
|
const getUrlPasswordLost = computed(() => {
|
|
85
87
|
return $q.config.onitiVlankAuth.defaultPasswordLostRoute
|
|
@@ -90,18 +92,17 @@ const submitConnexion = function () {
|
|
|
90
92
|
$auth.login({
|
|
91
93
|
email: login.value,
|
|
92
94
|
password: password.value,
|
|
95
|
+
}).catch(() => {
|
|
96
|
+
// erreur déjà affichée (notification ou message sous le champ) :
|
|
97
|
+
// on capte le rejet pour ne pas laisser d'exception non gérée en console
|
|
93
98
|
});
|
|
94
99
|
}
|
|
95
100
|
|
|
96
|
-
const getLogoImage =
|
|
97
|
-
return require('vlank-auth-logo')
|
|
98
|
-
}
|
|
99
|
-
|
|
101
|
+
const getLogoImage = () => logoUrl
|
|
100
102
|
|
|
101
|
-
const getLogoBottomImage =
|
|
102
|
-
if ($q.config.onitiVlankAuth.hideBottomTextLogo !== true)
|
|
103
|
-
|
|
104
|
-
return require('vlank-auth-logo-text')
|
|
103
|
+
const getLogoBottomImage = () => {
|
|
104
|
+
if ($q.config.onitiVlankAuth.hideBottomTextLogo !== true) {
|
|
105
|
+
return logoTextUrl
|
|
105
106
|
}
|
|
106
107
|
}
|
|
107
108
|
|
|
@@ -113,7 +114,7 @@ watch(has_check, (newValue, oldValue) => {
|
|
|
113
114
|
})
|
|
114
115
|
|
|
115
116
|
onMounted(() => {
|
|
116
|
-
if(!
|
|
117
|
+
if(!authStore.hasCheck){
|
|
117
118
|
$q.loading.show({
|
|
118
119
|
delay: 0, // ms
|
|
119
120
|
})
|
|
@@ -45,6 +45,8 @@
|
|
|
45
45
|
import { ref, inject } from 'vue'
|
|
46
46
|
import { useRouter } from 'vue-router'
|
|
47
47
|
import { useQuasar } from 'quasar'
|
|
48
|
+
import logoUrl from 'vlank-auth-logo'
|
|
49
|
+
import logoTextUrl from 'vlank-auth-logo-text'
|
|
48
50
|
|
|
49
51
|
const $auth = inject('vlank-auth')
|
|
50
52
|
const $router = useRouter()
|
|
@@ -57,17 +59,17 @@ const submitPasswordLost = function () {
|
|
|
57
59
|
email: email.value
|
|
58
60
|
}).then(() => {
|
|
59
61
|
$router.push($auth.getLoginRoute())
|
|
62
|
+
}).catch(() => {
|
|
63
|
+
// erreur déjà affichée (notification ou message sous le champ) :
|
|
64
|
+
// on capte le rejet pour ne pas laisser d'exception non gérée en console
|
|
60
65
|
})
|
|
61
66
|
}
|
|
62
67
|
|
|
63
|
-
const getLogoImage =
|
|
64
|
-
return require('vlank-auth-logo')
|
|
65
|
-
}
|
|
68
|
+
const getLogoImage = () => logoUrl
|
|
66
69
|
|
|
67
|
-
const getLogoBottomImage =
|
|
68
|
-
if ($q.config.onitiVlankAuth.hideBottomTextLogo !== true)
|
|
69
|
-
|
|
70
|
-
return require('vlank-auth-logo-text')
|
|
70
|
+
const getLogoBottomImage = () => {
|
|
71
|
+
if ($q.config.onitiVlankAuth.hideBottomTextLogo !== true) {
|
|
72
|
+
return logoTextUrl
|
|
71
73
|
}
|
|
72
74
|
}
|
|
73
75
|
|
|
@@ -65,12 +65,14 @@
|
|
|
65
65
|
<script setup>
|
|
66
66
|
import { ref, computed, watch, inject, onMounted } from 'vue'
|
|
67
67
|
import { useRoute, useRouter } from 'vue-router'
|
|
68
|
-
import { useStore } from 'vuex'
|
|
69
68
|
import { useQuasar } from 'quasar'
|
|
69
|
+
import { useAuthStore } from '../../stores/auth'
|
|
70
|
+
import logoUrl from 'vlank-auth-logo'
|
|
71
|
+
import logoTextUrl from 'vlank-auth-logo-text'
|
|
70
72
|
|
|
71
73
|
const $route = useRoute()
|
|
72
74
|
const $router = useRouter()
|
|
73
|
-
const
|
|
75
|
+
const authStore = useAuthStore()
|
|
74
76
|
const $q = useQuasar()
|
|
75
77
|
const $auth = inject('vlank-auth')
|
|
76
78
|
|
|
@@ -80,9 +82,7 @@ const token = ref($route.params.token)
|
|
|
80
82
|
const new_password = ref("")
|
|
81
83
|
const password_confirm = ref("")
|
|
82
84
|
|
|
83
|
-
const has_check = computed(() =>
|
|
84
|
-
return store.state.auth.has_check
|
|
85
|
-
})
|
|
85
|
+
const has_check = computed(() => authStore.hasCheck)
|
|
86
86
|
|
|
87
87
|
const submitPassword = function () {
|
|
88
88
|
$auth.resetPassword({
|
|
@@ -91,17 +91,17 @@ $auth.resetPassword({
|
|
|
91
91
|
token: token.value
|
|
92
92
|
}).then(()=> {
|
|
93
93
|
$router.push($auth.getLoginRoute())
|
|
94
|
+
}).catch(() => {
|
|
95
|
+
// erreur déjà affichée (notification ou message sous le champ) :
|
|
96
|
+
// on capte le rejet pour ne pas laisser d'exception non gérée en console
|
|
94
97
|
});
|
|
95
98
|
}
|
|
96
99
|
|
|
97
|
-
const getLogoImage =
|
|
98
|
-
return require('vlank-auth-logo')
|
|
99
|
-
}
|
|
100
|
+
const getLogoImage = () => logoUrl
|
|
100
101
|
|
|
101
|
-
const getLogoBottomImage =
|
|
102
|
-
if ($q.config.onitiVlankAuth.hideBottomTextLogo !== true)
|
|
103
|
-
|
|
104
|
-
return require('vlank-auth-logo-text')
|
|
102
|
+
const getLogoBottomImage = () => {
|
|
103
|
+
if ($q.config.onitiVlankAuth.hideBottomTextLogo !== true) {
|
|
104
|
+
return logoTextUrl
|
|
105
105
|
}
|
|
106
106
|
}
|
|
107
107
|
|
|
@@ -112,11 +112,11 @@ if(newValue) {
|
|
|
112
112
|
})
|
|
113
113
|
|
|
114
114
|
onMounted(() => {
|
|
115
|
-
if(!
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
}
|
|
115
|
+
if(!authStore.hasCheck){
|
|
116
|
+
$q.loading.show({
|
|
117
|
+
delay: 0, // ms
|
|
118
|
+
})
|
|
119
|
+
}
|
|
120
120
|
})
|
|
121
121
|
</script>
|
|
122
122
|
|
package/src/index.js
CHANGED
|
@@ -7,9 +7,9 @@
|
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
9
|
const extendWithComponent = (conf, api) => {
|
|
10
|
+
conf.boot = conf.boot || []
|
|
10
11
|
conf.boot.push('~@oniti/quasar-app-extension-vlank-auth/src/boot/index.js')
|
|
11
|
-
|
|
12
|
-
|
|
12
|
+
|
|
13
13
|
conf.framework.config.onitiVlankAuth = {
|
|
14
14
|
...api.prompts
|
|
15
15
|
}
|
package/src/install.js
CHANGED
|
@@ -6,11 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
module.exports = function (api) {
|
|
9
|
-
api.compatibleWith('@quasar/app', '^
|
|
10
|
-
|
|
11
|
-
if (!api.hasExtension('@oniti/vlank-starter')) {
|
|
12
|
-
throw new Error('Extention Vlank-starter nécéssaire avant d\'installer celle ci')
|
|
13
|
-
}
|
|
9
|
+
api.compatibleWith('@quasar/app-vite', '^2.0.0')
|
|
14
10
|
|
|
15
11
|
api.onExitLog('Vlank-Auth bien installé Merci :)')
|
|
16
12
|
}
|
|
@@ -0,0 +1,165 @@
|
|
|
1
|
+
import { defineStore } from "pinia";
|
|
2
|
+
import { ref } from "vue";
|
|
3
|
+
import { axiosClient } from "axios-oniti";
|
|
4
|
+
|
|
5
|
+
export const useAuthStore = defineStore("auth", () => {
|
|
6
|
+
const user = ref(null);
|
|
7
|
+
const logged = ref(false);
|
|
8
|
+
const hasCheck = ref(false);
|
|
9
|
+
const routes = ref({
|
|
10
|
+
currentRedirect: null,
|
|
11
|
+
currentLogin: null,
|
|
12
|
+
currentPasswordCreateRoute: null,
|
|
13
|
+
currentPasswordLostRoute: null,
|
|
14
|
+
currentWantedRoute: null,
|
|
15
|
+
});
|
|
16
|
+
|
|
17
|
+
// Mutateurs (remplacent les commits Vuex)
|
|
18
|
+
function setAuth(newUser) {
|
|
19
|
+
user.value = newUser;
|
|
20
|
+
logged.value = true;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
function setLogout() {
|
|
24
|
+
user.value = null;
|
|
25
|
+
logged.value = false;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
function setHasCheck() {
|
|
29
|
+
hasCheck.value = true;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
function setRedirectRoute(route) {
|
|
33
|
+
routes.value.currentRedirect = route;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
function setLoginRoute(route) {
|
|
37
|
+
routes.value.currentLogin = route;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
function setLostPasswordRoute(route) {
|
|
41
|
+
routes.value.currentPasswordLostRoute = route;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
function setCreatePasswordRoute(route) {
|
|
45
|
+
routes.value.currentPasswordCreateRoute = route;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
function setWantedRoute(route) {
|
|
49
|
+
routes.value.currentWantedRoute = route;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
// Actions API
|
|
53
|
+
function login(data) {
|
|
54
|
+
return axiosClient.post("/auth/login", data, {
|
|
55
|
+
disable_oniti_success_notification: true,
|
|
56
|
+
disable_oniti_error_notification: true,
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
function logout() {
|
|
61
|
+
return new Promise((resolve, reject) => {
|
|
62
|
+
axiosClient
|
|
63
|
+
.post("/auth/logout", null, { disable_oniti_success_notification: true })
|
|
64
|
+
.then((response) => {
|
|
65
|
+
setLogout();
|
|
66
|
+
resolve(response.data);
|
|
67
|
+
})
|
|
68
|
+
.catch(reject);
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
function me() {
|
|
73
|
+
return new Promise((resolve, reject) => {
|
|
74
|
+
axiosClient
|
|
75
|
+
.get("/auth/me", { disable_oniti_error_notification: true })
|
|
76
|
+
.then((response) => {
|
|
77
|
+
setAuth(response.data);
|
|
78
|
+
resolve();
|
|
79
|
+
})
|
|
80
|
+
.catch(reject);
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
function updatePassword(data) {
|
|
85
|
+
return axiosClient.post("/auth/password/change", data, {
|
|
86
|
+
oniti_success_notification_message: "Mot de passe mis à jour.",
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
function resetPassword(data) {
|
|
91
|
+
return axiosClient.post("/auth/password/reset", data, {
|
|
92
|
+
oniti_success_notification_message: "Mot de passe mis à jour.",
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
function update(data) {
|
|
97
|
+
return new Promise((resolve, reject) => {
|
|
98
|
+
axiosClient
|
|
99
|
+
.put("/auth/update", data)
|
|
100
|
+
.then((response) => {
|
|
101
|
+
setAuth(response.data);
|
|
102
|
+
resolve();
|
|
103
|
+
})
|
|
104
|
+
.catch(reject);
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
function passwordLost(data) {
|
|
109
|
+
return axiosClient.post("/auth/password/lost", data, {
|
|
110
|
+
oniti_success_notification_message:
|
|
111
|
+
"Email de réinitialisation de mot de passe envoyé.",
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
// Helpers de vérification des droits
|
|
116
|
+
function checkSingle(right) {
|
|
117
|
+
if (!user.value) return false;
|
|
118
|
+
return user.value.rights.includes(right);
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
function checkAll(rights) {
|
|
122
|
+
if (!user.value) return false;
|
|
123
|
+
for (const right of rights) {
|
|
124
|
+
if (!user.value.rights.includes(right)) return false;
|
|
125
|
+
}
|
|
126
|
+
return true;
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
function checkAny(rights) {
|
|
130
|
+
if (!user.value) return false;
|
|
131
|
+
for (const right of rights) {
|
|
132
|
+
if (user.value.rights.includes(right)) return true;
|
|
133
|
+
}
|
|
134
|
+
return false;
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
return {
|
|
138
|
+
// state
|
|
139
|
+
user,
|
|
140
|
+
logged,
|
|
141
|
+
hasCheck,
|
|
142
|
+
routes,
|
|
143
|
+
// mutateurs
|
|
144
|
+
setAuth,
|
|
145
|
+
setLogout,
|
|
146
|
+
setHasCheck,
|
|
147
|
+
setRedirectRoute,
|
|
148
|
+
setLoginRoute,
|
|
149
|
+
setLostPasswordRoute,
|
|
150
|
+
setCreatePasswordRoute,
|
|
151
|
+
setWantedRoute,
|
|
152
|
+
// actions
|
|
153
|
+
login,
|
|
154
|
+
logout,
|
|
155
|
+
me,
|
|
156
|
+
updatePassword,
|
|
157
|
+
resetPassword,
|
|
158
|
+
update,
|
|
159
|
+
passwordLost,
|
|
160
|
+
// helpers droits
|
|
161
|
+
checkSingle,
|
|
162
|
+
checkAll,
|
|
163
|
+
checkAny,
|
|
164
|
+
};
|
|
165
|
+
});
|
|
@@ -1,80 +0,0 @@
|
|
|
1
|
-
import {axiosClient} from 'axios-oniti'
|
|
2
|
-
|
|
3
|
-
/**
|
|
4
|
-
* Fonction de login
|
|
5
|
-
* @param { ActionContext } ctx
|
|
6
|
-
* @param { object } data
|
|
7
|
-
*/
|
|
8
|
-
export function login (ctx,data){
|
|
9
|
-
return axiosClient.post('/auth/login', data, { disable_oniti_success_notification: true, disable_oniti_error_notification: true })
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
/**
|
|
13
|
-
* Fonction de changement de mot de passe
|
|
14
|
-
* @param { ActionContext } ctx
|
|
15
|
-
* @param { object } data
|
|
16
|
-
*/
|
|
17
|
-
export function updatePassword (ctx, data) {
|
|
18
|
-
return axiosClient.post('/auth/password/change', data, { oniti_success_notification_message: 'Mot de passe mis à jour.'})
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
/**
|
|
22
|
-
* Fonction de reset de mot de passe
|
|
23
|
-
* @param { ActionContext } ctx
|
|
24
|
-
* @param { object } data
|
|
25
|
-
*/
|
|
26
|
-
export function resetPassword (ctx, data) {
|
|
27
|
-
return axiosClient.post('/auth/password/reset', data, { oniti_success_notification_message: 'Mot de passe mis à jour.' })
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
/**
|
|
31
|
-
* Fonction de update user
|
|
32
|
-
* @param { ActionContext } ctx
|
|
33
|
-
* @param { object } data
|
|
34
|
-
*/
|
|
35
|
-
export function update ({ commit },data){
|
|
36
|
-
return new Promise((resolve, reject) => {
|
|
37
|
-
axiosClient.put('/auth/update', data)
|
|
38
|
-
.then( response => {
|
|
39
|
-
commit('SET_AUTH', response.data)
|
|
40
|
-
resolve()
|
|
41
|
-
}).catch(reject)
|
|
42
|
-
})
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
/**
|
|
46
|
-
* Déconnection
|
|
47
|
-
*/
|
|
48
|
-
export function logout ({ commit }){
|
|
49
|
-
return new Promise((resolve,reject)=>{
|
|
50
|
-
axiosClient.post('/auth/logout', null, { disable_oniti_success_notification: true })
|
|
51
|
-
.then( response => {
|
|
52
|
-
commit('SET_LOGOUT')
|
|
53
|
-
resolve(response.data)
|
|
54
|
-
}).catch(reject)
|
|
55
|
-
})
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
/**
|
|
59
|
-
* Récupère l'utilisateur Courrant
|
|
60
|
-
* @param { ActionContext } state
|
|
61
|
-
*/
|
|
62
|
-
export function me ({ commit }){
|
|
63
|
-
return new Promise((resolve,reject)=>{
|
|
64
|
-
axiosClient.get('/auth/me',{ disable_oniti_error_notification: true })
|
|
65
|
-
.then( response => {
|
|
66
|
-
commit('SET_AUTH', response.data)
|
|
67
|
-
resolve()
|
|
68
|
-
}).catch(reject)
|
|
69
|
-
})
|
|
70
|
-
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
/**
|
|
74
|
-
* Fonction de mot de passe perdu
|
|
75
|
-
* @param { ActionContext } ctx
|
|
76
|
-
* @param { object } data
|
|
77
|
-
*/
|
|
78
|
-
export function passwordLost (ctx, data) {
|
|
79
|
-
return axiosClient.post('/auth/password/lost', data, { oniti_success_notification_message: 'Email de réinitialisation de mot de passe envoyé.' })
|
|
80
|
-
}
|
|
@@ -1,78 +0,0 @@
|
|
|
1
|
-
export function getRedirectRoute ( state ) {
|
|
2
|
-
return state.routes.currentRedirect
|
|
3
|
-
}
|
|
4
|
-
|
|
5
|
-
export function getPasswordCreateRoute ( state ) {
|
|
6
|
-
return state.routes.currentPasswordCreateRoute
|
|
7
|
-
}
|
|
8
|
-
|
|
9
|
-
export function getPasswordLostRoute ( state ) {
|
|
10
|
-
return state.routes.currentPasswordLostRoute
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
export function getLoginRoute ( state ) {
|
|
14
|
-
return state.routes.currentLogin
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
export function getWantedRoute ( state ) {
|
|
18
|
-
return state.routes.currentWantedRoute
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
export function getRights ( state ){
|
|
22
|
-
return state.user ? state.user.rights : []
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
export function isAuthenticated ( state ) {
|
|
26
|
-
return state.logged
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
export function hasCheckAuth ( state ) {
|
|
30
|
-
return state.has_check
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
export function user ( state ) {
|
|
34
|
-
return state.user
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
/**
|
|
38
|
-
* Vérifie la présence d'un droit spécifique
|
|
39
|
-
* @param {*} state
|
|
40
|
-
* @param {*} right
|
|
41
|
-
*/
|
|
42
|
-
export const checkSingle = ( state ) => ( right ) => {
|
|
43
|
-
const user = state.user
|
|
44
|
-
if(!user) return false
|
|
45
|
-
|
|
46
|
-
return user.rights.includes(right)
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
/**
|
|
50
|
-
* Vérifie si tous les droits sont vérfiés
|
|
51
|
-
* @param {*} state
|
|
52
|
-
* @param {*} rights
|
|
53
|
-
*/
|
|
54
|
-
export const checkAll = ( state ) => ( rights ) =>{
|
|
55
|
-
const user = state.user
|
|
56
|
-
if(!user) return false
|
|
57
|
-
|
|
58
|
-
for(const right of rights){
|
|
59
|
-
if(!user.rights.includes(right)) return false
|
|
60
|
-
}
|
|
61
|
-
return true
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
/**
|
|
65
|
-
* Vérifie si au moins un des droits est présent.
|
|
66
|
-
* @param {*} state
|
|
67
|
-
* @param {*} rights
|
|
68
|
-
*/
|
|
69
|
-
export const checkAny = ( state ) => ( rights ) => {
|
|
70
|
-
const user = state.user
|
|
71
|
-
if(!user) return false
|
|
72
|
-
|
|
73
|
-
for(const right of rights){
|
|
74
|
-
if(user.rights.includes(right)) return true
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
return false
|
|
78
|
-
}
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
export function SET_AUTH(state,user){
|
|
2
|
-
state.user = user
|
|
3
|
-
state.logged = true
|
|
4
|
-
}
|
|
5
|
-
export function SET_LOGOUT(state){
|
|
6
|
-
state.user = null
|
|
7
|
-
state.logged = false
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
export function HAS_CHECK_AUTH ( state ) {
|
|
11
|
-
state.has_check = true
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
export function SET_REDIRECT_ROUTE ( state, redirectRoute ) {
|
|
15
|
-
state.routes.currentRedirect = redirectRoute
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
export function SET_LOGIN_ROUTE ( state, loginRoute ) {
|
|
19
|
-
state.routes.currentLogin = loginRoute
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
export function SET_LOST_PASSWORD_ROUTE ( state, PasswordLostRoute ) {
|
|
23
|
-
state.routes.currentPasswordLostRoute = PasswordLostRoute
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
export function SET_CREATE_PASSWORD_ROUTE ( state, PasswordCreateRoute ) {
|
|
27
|
-
state.routes.currentPasswordCreateRoute = PasswordCreateRoute
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
export function SET_WANTED_ROUTE ( state, wantedRoute ) {
|
|
31
|
-
state.routes.currentWantedRoute = wantedRoute
|
|
32
|
-
}
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
export default function () {
|
|
2
|
-
return {
|
|
3
|
-
user: null,
|
|
4
|
-
logged: false,
|
|
5
|
-
has_check: false,
|
|
6
|
-
routes: {
|
|
7
|
-
currentRedirect: null,
|
|
8
|
-
currentLogin: null,
|
|
9
|
-
currentPasswordCreateRoute: null,
|
|
10
|
-
currentPasswordLostRoute: null,
|
|
11
|
-
currentWantedRoute: null
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
|
-
}
|