Galimybe priskirti administratorius perziurai

database/migrations/20240114212233_addAssigneeToForm.js

@@ -0,0 +1,11 @@
+exports.up = async function (knex) {
+  await knex.schema.alterTable('forms', (table) => {
+    table.integer('assigneeId').unsigned();
+  });
+};
+
+exports.down = async function (knex) {
+  await knex.schema.alterTable('forms', (table) => {
+    table.dropColumn('assigneeId');
+  });
+};

mixins/database.mixin.ts

@@ -1,11 +1,11 @@
 'use strict';
 
 import _ from 'lodash';
-const DbService = require('@moleculer/database').Service;
-import { config } from '../knexfile';
-import filtersMixin from 'moleculer-knex-filters';
 import { Context } from 'moleculer';
+import filtersMixin from 'moleculer-knex-filters';
+import { config } from '../knexfile';
 import { parseToJsonIfNeeded } from '../utils';
+const DbService = require('@moleculer/database').Service;
 
 export default function (opts: any = {}) {
   const adapter: any = {

services/api.service.ts

@@ -1,12 +1,16 @@
+import { Handlers } from '@sentry/node';
 import pick from 'lodash/pick';
 import moleculer, { Context, Errors } from 'moleculer';
 import { Action, Method, Service } from 'moleculer-decorators';
 import ApiGateway from 'moleculer-web';
-import { COMMON_DELETED_SCOPES, EndpointType, RequestMessage } from '../types';
+import {
+  COMMON_DELETED_SCOPES,
+  EndpointType,
+  RequestMessage,
+  throwUnauthorizedError,
+} from '../types';
 import { Tenant } from './tenants.service';
-import { User } from './users.service';
-import { throwUnauthorizedError } from '../types';
-import { Handlers } from '@sentry/node';
+import { User, UserType } from './users.service';
 export interface UserAuthMeta {
   user: User;
   profile?: Tenant;
@@ -265,7 +269,19 @@ export default class ApiService extends moleculer.Service {
           const app: any = await ctx.call('auth.apps.resolveToken');
 
           if (user && user.id) {
-            ctx.meta.authUser = authUser;
+            const authUserWithGroups: any = await ctx.call('auth.users.get', {
+              id: authUser.id,
+              populate: 'groups',
+            });
+
+            const adminOfGroups = authUserWithGroups.groups
+              .filter(
+                (group: any) =>
+                  group.apps.includes(app.id) && group.role === UserType.ADMIN
+              )
+              .map((group: any) => group.id);
+
+            ctx.meta.authUser = { ...authUser, adminOfGroups };
             ctx.meta.authToken = token;
             ctx.meta.app = app;
 

services/auth.service.ts

@@ -4,14 +4,14 @@ import moleculer, { Context } from 'moleculer';
 import { Action, Event, Method, Service } from 'moleculer-decorators';
 
 import authMixin from 'biip-auth-nodejs/mixin';
-import { UserAuthMeta } from './api.service';
-import { User, UserType } from './users.service';
 import {
   AUTH_FREELANCERS_GROUP_ID,
   EndpointType,
   throwNotFoundError,
 } from '../types';
+import { UserAuthMeta } from './api.service';
 import { TenantUserRole } from './tenantUsers.service';
+import { User, UserType } from './users.service';
 
 @Service({
   name: 'auth',
@@ -67,12 +67,6 @@ export default class AuthService extends moleculer.Service {
       };
     }
 
-    if (user.type === UserType.ADMIN) {
-      data.tasks = await ctx.call('users.getTasksCounts', {
-        userId: user.id,
-      });
-    }
-
     return data;
   }