- addes @adonisjs/redis fo saving session into redis with redis.ts contract and config

- npm updated
- added createHashValues and dlete inside File.ts
- added dataset_count property inside Subject.ts
- corrected rotes.ts with correct permissions

start/inertia.ts

@@ -24,8 +24,9 @@ Inertia.share({
     },
 
     // params: ({ params }) => params,
-    authUser: ({ auth }: HttpContextContract) => {
+    authUser: async ({ auth }: HttpContextContract) => {
         if (auth.user) {
+            await auth.user.load('roles');
             return auth.user;
             // {
             //     'id': auth.user.id,

start/routes.ts

@@ -94,6 +94,8 @@ Route.post('/app/login', 'Auth/AuthController.login').as('login.store');
 // Route.post("/signup", "AuthController.signup");
 Route.post('/signout', 'Auth/AuthController.logout').as('logout');
 
+
+// administrator
 Route.group(() => {
     Route.get('/settings', async ({ inertia }) => {
         return inertia.render('Admin/Settings');
@@ -133,6 +135,10 @@ Route.group(() => {
     // .middleware(['auth', 'can:dataset-list,dataset-publish']);
     .middleware(['auth', 'is:administrator,moderator']);
 
+
+
+
+
 Route.get('/edit-account-info', 'UsersController.accountInfo')
     .as('admin.account.info')
     .namespace('App/Controllers/Http/Admin')
@@ -145,9 +151,10 @@ Route.post('/edit-account-info/store/:id', 'UsersController.accountInfoStore')
     .middleware(['auth']);
 // Route::post('change-password', 'UserController@changePasswordStore')->name('admin.account.password.store');
 
+// submitter:
 Route.group(() => {
     // Route.get('/user', 'UsersController.index').as('user.index');
-    Route.get('/dataset', 'DatasetController.index').as('dataset.list').middleware(['auth']); //.middleware(['can:dataset-list']);
+    Route.get('/dataset', 'DatasetController.index').as('dataset.list').middleware(['auth', 'can:dataset-list']);
     Route.get('/dataset/create', 'DatasetController.create').as('dataset.create').middleware(['auth', 'can:dataset-submit']);
     Route.post('/dataset/first/first-step', 'DatasetController.firstStep')
         .as('dataset.first.step')
@@ -158,25 +165,23 @@ Route.group(() => {
     Route.post('/dataset/second/third-step', 'DatasetController.thirdStep')
         .as('dataset.third.step')
         .middleware(['auth', 'can:dataset-submit']);
-
     Route.post('/dataset/submit', 'DatasetController.store').as('dataset.submit').middleware(['auth', 'can:dataset-submit']);
 
     Route.get('/dataset/:id/release', 'DatasetController.release')
         .as('dataset.release')
         .where('id', Route.matchers.number())
-        .middleware(['auth']); //, 'can:dataset-submit']);
+        .middleware(['auth', 'can:dataset-edit']);
     Route.put('/dataset/:id/releaseupdate', 'DatasetController.releaseUpdate')
         .as('dataset.releaseUpdate')
-        .middleware(['auth', 'can:dataset-submit']);
+        .middleware(['auth', 'can:dataset-edit']);
     Route.get('/dataset/:id/edit', 'DatasetController.edit')
         .as('dataset.edit')
         .where('id', Route.matchers.number())
-        .middleware(['auth', 'can:dataset-submit']);
-
+        .middleware(['auth', 'can:dataset-edit']);
     Route.put('/dataset/:id/update', 'DatasetController.update')
     .as('dataset.update')
         .where('id', Route.matchers.number())
-        .middleware(['auth', 'can:dataset-submit']);
+        .middleware(['auth', 'can:dataset-edit']);
     
     Route.get('/dataset/:id/delete', 'DatasetController.delete').as('dataset.delete').middleware(['auth', 'can:dataset-delete']);
     Route.put('/dataset/:id/deleteupdate', 'DatasetController.deleteUpdate')
@@ -195,7 +200,7 @@ Route.group(() => {
 // .middleware(['auth', 'is:submitter']);
 
 Route.group(() => {
-    Route.put('/dataset/:id/update', 'DatasetsController.update').as('editor.dataset.update').middleware(['auth', 'can:dataset-submit']);
+    Route.put('/dataset/:id/update', 'DatasetsController.update').as('editor.dataset.update').middleware(['auth', 'can:dataset-editor-edit']);
 })
     .namespace('App/Controllers/Http/Editor')
     .prefix('editor');