Fixing application dependencies (#325)

composer.json

@@ -38,6 +38,7 @@
     "contributte/cache": "^0.6",
     "contributte/console": "^0.9",
     "contributte/monolog": "^0.5",
+    "contributte/translation": "^2.0",
     "contributte/vite": "^0.2",
     "cweagans/composer-patches": "^1.7",
     "doctrine/orm": "2.15.*",
@@ -50,6 +51,8 @@
     "nette/caching": "^3.3",
     "nette/di": "^3.2",
     "nette/utils": "^4.0",
+    "nettrine/dbal": "^0.8",
+    "nettrine/orm": "^0.8",
     "orisai/nette-object-mapper": "^0.1",
     "orisai/object-mapper": "^0.2",
     "psr/event-dispatcher": "^1.0",

tests/common.neon

@@ -21,20 +21,13 @@ extensions:
     nettrineOrmAttributes               : Nettrine\ORM\DI\OrmAttributesExtension
     nettrineOrmConsole                  : Nettrine\ORM\DI\OrmConsoleExtension
     nettrineOrmCache                    : Nettrine\ORM\DI\OrmCacheExtension
-    ipubDoctrineCrud                    : IPub\DoctrineCrud\DI\DoctrineCrudExtension
-    ipubDoctrineTimestampable           : IPub\DoctrineTimestampable\DI\DoctrineTimestampableExtension
     fbDateTimeFactory                   : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension
-    fbJsonApi                           : FastyBird\JsonApi\DI\JsonApiExtension
     fbSimpleAuth                        : FastyBird\SimpleAuth\DI\SimpleAuthExtension
-    fbTools                             : FastyBird\Core\Tools\DI\ToolsExtension
-    fbExchange                          : FastyBird\Core\Exchange\DI\ExchangeExtension
 
 services:
     - {factory: IPub\SlimRouter\Http\ResponseFactory}
     -
         factory: IPub\SlimRouter\Routing\Router
-        setup:
-            - addMiddleware(@fbJsonApi.middlewares.jsonapi)
 
     cache.storage: Nette\Caching\Storages\DevNullStorage
 
@@ -47,7 +40,6 @@ contributteTranslation:
     localeResolvers: []
     dirs:
         - %appDir%/../src/Translations
-        - %vendorDir%/fastybird/json-api/src/Translations
 
 nettrineDbal:
     connection:
@@ -87,18 +79,10 @@ fbSimpleAuth:
     token:
         issuer: com.fastybird.auth-module
         signature: 'g3xHbkELpMD9LRqW4WmJkHL7kz2bdNYAQJyEuFVzR3k='
-    enable:
-        middleware: true
-        doctrine:
-            mapping: true
-        casbin:
-            database: true
     services:
         identity: true
-
-fbJsonApi:
-    meta:
-        copyright: FastyBird s.r.o
+    casbin:
+        policy: %appDir%/policy.csv
 
 fbDateTimeFactory:
     frozen: DateTimeImmutable('2020-04-01T12:00:00+00:00')

tests/policy.csv

@@ -0,0 +1,6 @@
+p, administrator'
+p, manager
+p, user
+p, visitor
+g, 5e79efbf-bd0d-5b7c-46ef-bfbdefbfbd34, administrator
+g, efbfbdef-bfbd-68ef-bfbd-770b40efbfbd, user