Merge pull request #320 from LerianStudio/develop

merge: develop to main

.github/workflows/release-notification.yml

@@ -18,4 +18,4 @@ jobs:
           username: "Release Changelog"
           content: "||@everyone||"
           footer_title: "Changelog"
-          footer_timestamp: true
+          footer_timestamp: true

CHANGELOG.md

@@ -1,3 +1,21 @@
+## [1.30.0-beta.4](https://github.com/LerianStudio/midaz/compare/v1.30.0-beta.3...v1.30.0-beta.4) (2024-11-28)
+
+
+### Bug Fixes
+
+* remove slack release notification :bug: ([de07047](https://github.com/LerianStudio/midaz/commit/de0704713e601d8c5a06198bc46a66f433ebc711))
+
+## [1.30.0-beta.3](https://github.com/LerianStudio/midaz/compare/v1.30.0-beta.2...v1.30.0-beta.3) (2024-11-28)
+
+## [1.30.0-beta.2](https://github.com/LerianStudio/midaz/compare/v1.30.0-beta.1...v1.30.0-beta.2) (2024-11-27)
+
+## [1.30.0-beta.1](https://github.com/LerianStudio/midaz/compare/v1.29.0...v1.30.0-beta.1) (2024-11-27)
+
+
+### Features
+
+* format output colors and set flag global no-color :sparkles: ([7fae4c0](https://github.com/LerianStudio/midaz/commit/7fae4c044e1f060cbafbc751c2fa9c00fd60f308))
+
 ## [1.29.0](https://github.com/LerianStudio/midaz/compare/v1.28.0...v1.29.0) (2024-11-26)
 
 

components/auth/.env.example

@@ -5,18 +5,18 @@ CASDOOR_PORT=8080
 RUNNING_IN_DOCKER=true
 
 # CADOOR DB
-DB_HOST=casdoor-db
+DB_HOST=midaz-casdoor-db
 CASDOOR_DB_USER=midaz
 CASDOOR_DB_NAME=casdoor
-CASDOOR_DB_PASSWORD=leriand
+CASDOOR_DB_PASSWORD=lerian
 CASDOOR_DB_PORT=5700
 USER_EXECUTE_COMMAND=postgres
 
 # LOG
 LOG_LEVEL=debug
 
 # CASDOOR CONFIG
-appname=casdoor
+appname=midaz-casdoor
 httpport=${CASDOOR_PORT}
 runmode=dev
 driverName=postgres

components/auth/docker-compose.yml

@@ -1,31 +1,28 @@
-x-postgres-common:
-  &postgres-common
-  image: postgres:16-alpine
-  restart: always
-  env_file:
-    - .env
-  networks:
-    - auth_network
-
 services:
-  casdoor:
-    container_name: casdoor
+  midaz-casdoor:
+    container_name: midaz-casdoor
     image: casbin/casdoor:latest
+    restart: always
     env_file:
       - .env
     ports:
       - ${CASDOOR_PORT}:${CASDOOR_PORT}
     volumes:
       - ./setup/init_data.json:/init_data.json
     depends_on:
-      casdoor-db:
+      midaz-casdoor-db:
         condition: service_healthy
     networks:
       - auth_network
 
-  casdoor-db:
-    <<: *postgres-common
-    container_name: casdoor-db
+  midaz-casdoor-db:
+    container_name: midaz-casdoor-db
+    image: postgres:latest
+    restart: always
+    env_file:
+      - .env
+    networks:
+      - auth_network
     ports:
       - ${CASDOOR_DB_PORT}:${CASDOOR_DB_PORT}
     environment:
@@ -45,4 +42,4 @@ services:
 networks:
   auth_network:
     name: auth_network
-    driver: bridge
+    driver: bridge

components/auth/setup/00_init.sql

@@ -1,9 +1,9 @@
 -- Create the sequence used for the primary key
-CREATE SEQUENCE IF NOT EXISTS "casbin_lerian_rule_id_seq";
+CREATE SEQUENCE IF NOT EXISTS "casbin_lerian_enforcer_rule_id_seq";
 
 -- Create the table used by casbin to enforce permissions
-CREATE TABLE IF NOT EXISTS "casbin_lerian_rule" (
-    "id" BIGINT PRIMARY KEY DEFAULT nextval('casbin_lerian_rule_id_seq'),
+CREATE TABLE IF NOT EXISTS "casbin_lerian_enforcer_rule" (
+    "id" BIGINT PRIMARY KEY DEFAULT nextval('casbin_lerian_enforcer_rule_id_seq'),
     "ptype" CHARACTER VARYING(100),
     "v0" CHARACTER VARYING(100),
     "v1" CHARACTER VARYING(100),
@@ -14,29 +14,57 @@ CREATE TABLE IF NOT EXISTS "casbin_lerian_rule" (
 );
 
 -- Create indexes for the table
-CREATE INDEX IF NOT EXISTS idx_ptype ON "casbin_lerian_rule" ("ptype");
-CREATE INDEX IF NOT EXISTS idx_v0 ON "casbin_lerian_rule" ("v0");
-CREATE INDEX IF NOT EXISTS idx_v1 ON "casbin_lerian_rule" ("v1");
-CREATE INDEX IF NOT EXISTS idx_v2 ON "casbin_lerian_rule" ("v2");
-CREATE INDEX IF NOT EXISTS idx_v3 ON "casbin_lerian_rule" ("v3");
-CREATE INDEX IF NOT EXISTS idx_v4 ON "casbin_lerian_rule" ("v4");
-CREATE INDEX IF NOT EXISTS idx_v5 ON "casbin_lerian_rule" ("v5");
+CREATE INDEX IF NOT EXISTS idx_ptype ON "casbin_lerian_enforcer_rule" ("ptype");
+CREATE INDEX IF NOT EXISTS idx_v0 ON "casbin_lerian_enforcer_rule" ("v0");
+CREATE INDEX IF NOT EXISTS idx_v1 ON "casbin_lerian_enforcer_rule" ("v1");
+CREATE INDEX IF NOT EXISTS idx_v2 ON "casbin_lerian_enforcer_rule" ("v2");
+CREATE INDEX IF NOT EXISTS idx_v3 ON "casbin_lerian_enforcer_rule" ("v3");
+CREATE INDEX IF NOT EXISTS idx_v4 ON "casbin_lerian_enforcer_rule" ("v4");
+CREATE INDEX IF NOT EXISTS idx_v5 ON "casbin_lerian_enforcer_rule" ("v5");
 
 -- Insert the default group and policy
-INSERT INTO "casbin_lerian_rule" ("ptype", "v0", "v1", "v2", "v3", "v4", "v5") VALUES
+INSERT INTO "casbin_lerian_enforcer_rule" ("ptype", "v0", "v1", "v2", "v3", "v4", "v5") VALUES
 ('g',	'user_john',	'admin_role',	'',	'',	'',	''),
-('g',	'user_kate',	'admin_role',	'',	'',	'',	''),
-('g',	'user_lisa',	'admin_role',	'',	'',	'',	''),
-('g',	'user_john',	'developer_role',	'',	'',	'',	''),
-('g',	'user_john',	'grpc_role',	'',	'',	'',	''),
-('g',	'user_kate',	'developer_role',	'',	'',	'',	''),
-('g',	'user_bob',	'developer_role',	'',	'',	'',	''),
+('g',	'user_lisa',	'developer_role',	'',	'',	'',	''),
+('g',	'user_lisa',	'grpc_role',	'',	'',	'',	''),
 ('g',	'user_bob',	'grpc_role',	'',	'',	'',	''),
 ('g',	'user_mike',	'user_role',	'',	'',	'',	''),
+('g',	'user_kate',	'user_role',	'',	'',	'',	''),
 ('p',	'admin_role',	'*',	'*',	'',	'',	''),
-('p',	'developer_role',	'*',	'POST',	'',	'',	''),
-('p',	'developer_role',	'*',	'GET',	'',	'',	''),
-('p',	'developer_role',	'*',	'PUT',	'',	'',	''),
-('p',	'developer_role',	'*',	'PATCH',	'',	'',	''),
-('p',	'user_role',	'*',	'GET',	'',	'',	''),
+('p',	'developer_role',	'organization',	'post',	'',	'',	''),
+('p',	'developer_role',	'organization',	'get',	'',	'',	''),
+('p',	'developer_role',	'organization',	'patch',	'',	'',	''),
+('p',	'developer_role',	'ledger',	'post',	'',	'',	''),
+('p',	'developer_role',	'ledger',	'get',	'',	'',	''),
+('p',	'developer_role',	'ledger',	'patch',	'',	'',	''),
+('p',	'developer_role',	'asset',	'post',	'',	'',	''),
+('p',	'developer_role',	'asset',	'get',	'',	'',	''),
+('p',	'developer_role',	'asset',	'patch',	'',	'',	''),
+('p',	'developer_role',	'portfolio',	'post',	'',	'',	''),
+('p',	'developer_role',	'portfolio',	'get',	'',	'',	''),
+('p',	'developer_role',	'portfolio',	'patch',	'',	'',	''),
+('p',	'developer_role',	'product',	'post',	'',	'',	''),
+('p',	'developer_role',	'product',	'get',	'',	'',	''),
+('p',	'developer_role',	'product',	'patch',	'',	'',	''),
+('p',	'developer_role',	'account',	'post',	'',	'',	''),
+('p',	'developer_role',	'account',	'get',	'',	'',	''),
+('p',	'developer_role',	'account',	'patch',	'',	'',	''),
+('p',	'developer_role',	'transaction',	'post',	'',	'',	''),
+('p',	'developer_role',	'transaction',	'get',	'',	'',	''),
+('p',	'developer_role',	'transaction',	'patch',	'',	'',	''),
+('p',	'developer_role',	'operation',	'post',	'',	'',	''),
+('p',	'developer_role',	'operation',	'get',	'',	'',	''),
+('p',	'developer_role',	'operation',	'patch',	'',	'',	''),
+('p',	'developer_role',	'asset-rate',	'post',	'',	'',	''),
+('p',	'developer_role',	'asset-rate',	'get',	'',	'',	''),
+('p',	'developer_role',	'asset-rate',	'patch',	'',	'',	''),
+('p',	'user_role',	'organization',	'get',	'',	'',	''),
+('p',	'user_role',	'ledger',	'get',	'',	'',	''),
+('p',	'user_role',	'asset',	'get',	'',	'',	''),
+('p',	'user_role',	'portfolio',	'get',	'',	'',	''),
+('p',	'user_role',	'product',	'get',	'',	'',	''),
+('p',	'user_role',	'account',	'get',	'',	'',	''),
+('p',	'user_role',	'transaction',	'get',	'',	'',	''),
+('p',	'user_role',	'operation',	'get',	'',	'',	''),
+('p',	'user_role',	'asset-rate',	'get',	'',	'',	''),
 ('p',	'grpc_role',	'account.AccountProto',	'*',	'',	'',	'');

components/auth/setup/init_data.json

@@ -574,8 +574,7 @@
       "signupApplication": "app-midaz",
       "createdIp": "",
       "groups": [
-        "lerian/group_admin",
-        "lerian/group_developer"
+        "lerian/group_admin"
       ]
     },
     {
@@ -599,8 +598,7 @@
       "signupApplication": "app-midaz",
       "createdIp": "",
       "groups": [
-        "lerian/group_admin",
-        "lerian/group_developer"
+        "lerian/group_user"
       ]
     },
     {
@@ -624,7 +622,7 @@
       "signupApplication": "app-midaz",
       "createdIp": "",
       "groups": [
-        "lerian/group_admin"
+        "lerian/group_developer"
       ]
     },
     {
@@ -752,14 +750,12 @@
       "name": "admin-api-permission",
       "displayName": "Admin API Permission",
       "isEnabled": true,
-      "model": "lerian/api-model",
+      "model": "api-model",
       "roles": [
         "lerian/admin_role"
       ],
       "users": [
-        "lerian/user_john",
-        "lerian/user_kate",
-        "lerian/user_lisa"
+        "lerian/user_john"
       ],
       "resourceType": "Custom",
       "resources": [
@@ -780,24 +776,29 @@
       "name": "developer-api-permission",
       "displayName": "Developer API Permission",
       "isEnabled": true,
-      "model": "lerian/api-model",
+      "model": "api-model",
       "roles": [
         "lerian/developer_role"
       ],
       "users": [
-        "lerian/user_john",
-        "lerian/user_kate",
-        "lerian/user_bob"
+        "lerian/user_lisa"
       ],
       "resourceType": "Custom",
       "resources": [
-        "*"
+        "account",
+        "asset",
+        "ledger",
+        "organization",
+        "portfolio",
+        "product",
+        "transaction",
+        "operation",
+        "asset-rate"
       ],
       "actions": [
-        "GET",
-        "POST",
-        "PATCH",
-        "PUT"
+        "get",
+        "post",
+        "patch"
       ],
       "domains": [],
       "effect": "Allow",
@@ -811,13 +812,13 @@
       "name": "grpc-api-permission",
       "displayName": "GRPC API Permission",
       "isEnabled": true,
-      "model": "lerian/api-model",
+      "model": "api-model",
       "roles": [
         "lerian/grpc_role"
       ],
       "users": [
-        "lerian/user_john",
-        "lerian/user_bob"
+        "lerian/user_bob",
+        "lerian/user_lisa"
       ],
       "resourceType": "Custom",
       "resources": [
@@ -838,19 +839,28 @@
       "name": "user-api-permission",
       "displayName": "User API Permission",
       "isEnabled": true,
-      "model": "lerian/api-model",
+      "model": "api-model",
       "roles": [
         "lerian/user_role"
       ],
       "users": [
-        "lerian/user_mike"
+        "lerian/user_mike",
+        "lerian/user_kate"
       ],
       "resourceType": "Custom",
       "resources": [
-        "*"
+        "account",
+        "asset",
+        "ledger",
+        "organization",
+        "portfolio",
+        "product",
+        "transaction",
+        "operation",
+        "asset-rate"
       ],
       "actions": [
-        "GET"
+        "get"
       ],
       "domains": [],
       "effect": "Allow",
@@ -869,9 +879,7 @@
       "owner": "lerian",
       "roles": [],
       "users": [
-        "lerian/user_john",
-        "lerian/user_kate",
-        "lerian/user_lisa"
+        "lerian/user_john"
       ]
     },
     {
@@ -881,9 +889,7 @@
       "owner": "lerian",
       "roles": [],
       "users": [
-        "lerian/user_john",
-        "lerian/user_kate",
-        "lerian/user_bob"
+        "lerian/user_lisa"
       ]
     },
     {
@@ -893,8 +899,8 @@
       "owner": "lerian",
       "roles": [],
       "users": [
-        "lerian/user_john",
-        "lerian/user_bob"
+        "lerian/user_bob",
+        "lerian/user_lisa"
       ]
     },
     {
@@ -904,7 +910,8 @@
       "owner": "lerian",
       "roles": [],
       "users": [
-        "lerian/user_mike"
+        "lerian/user_mike",
+        "lerian/user_kate"
       ]
     }
   ],
@@ -958,7 +965,7 @@
     {
       "owner": "lerian",
       "name": "lerian-adapter",
-      "table": "casbin_lerian_rule",
+      "table": "casbin_lerian_enforcer_rule",
       "useSameDb": true
     }
   ],