Merge branch 'deploy/base' into 'github-release'

Deploy/base

See merge request igrp-3_0/igrp-platform-access-management!242

Author: marcelomonteironosi

.env.example

@@ -18,15 +18,25 @@ IGRP_KEYCLOAK_CLIENT_ID=access-management
 IGRP_KEYCLOAK_CLIENT_SECRET=************
 IGRP_KEYCLOAK_GRANT_TYPE=client_credentials
 
-# File Storage configuration (Amazon AWS S3)
+# M2M Sync Token (used to authenticate requests from other modules/microservices to iGRP Access Management)
+IGRP_ACCESS_M2M_SYNC_TOKEN=my-m2m-sync-token
+
+# File Storage configuration (Choose between 'minio' and 's3')
 IGRP_STORAGE_PROVIDER=s3
-S3_ENDPOINT=http://localhost:9000
-S3_SECURITY=false
-S3_ACCESS_KEY=admin
-S3_SECRET_KEY=admin12345678
-S3_BUCKET_NAME=igrp
-S3_PATH_STYLE_ACCESS=true
-S3_REGION=praia
+IGRP_STORAGE_SECURITY=false
+IGRP_STORAGE_ACCESS_KEY=admin
+IGRP_STORAGE_SECRET_KEY=admin12345678
+IGRP_STORAGE_BUCKET_NAME=igrp
+IGRP_STORAGE_PATH_STYLE_ACCESS=true
+IGRP_STORAGE_REGION=praia
+
+# For AWS S3, override AWS endpoint (provide full URL including protocol, e.g., http://localhost:9000)
+# If not provided it will map from IGRP_STORAGE_ENDPOINT and IGRP_STORAGE_PORT, resulting in http://IGRP_STORAGE_ENDPOINT:IGRP_STORAGE_PORT
+IGRP_S3_AWS_ENDPOINT=http://localhost:9000
+
+# For minIO, the endpoint and port should be provided separetely
+IGRP_STORAGE_ENDPOINT=localhost
+IGRP_STORAGE_PORT=9000
 
 # Cache configuration (Redis)
 REDIS_HOST=redis

.igrpstudio/m2m/controllers/M2MController.json

@@ -0,0 +1,106 @@
+{
+  "type": "controller",
+  "name": "M2M",
+  "module": "m2m",
+  "description": "Machine-to-Machine",
+  "basePath": "api",
+  "actions": [
+    {
+      "actionName": "syncPermissions",
+      "path": "m2m/sync/permissions",
+      "method": "POST",
+      "requestBody": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "PermissionDTO",
+              "collectionType": "list",
+              "name": "data",
+              "objectType": "dto",
+              "module": "shared"
+            }
+          }
+        }
+      },
+      "responses": {
+        "204": {
+          "name": "OK",
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string",
+                "name": "data",
+                "collectionType": "none"
+              }
+            }
+          }
+        }
+      }
+    },
+    {
+      "actionName": "syncResources",
+      "path": "m2m/sync/resources",
+      "method": "POST",
+      "requestBody": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "ResourceDTO",
+              "collectionType": "none",
+              "name": "data",
+              "objectType": "dto",
+              "module": "shared"
+            }
+          }
+        }
+      },
+      "responses": {
+        "204": {
+          "name": "OK",
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string",
+                "name": "data",
+                "collectionType": "none"
+              }
+            }
+          }
+        }
+      }
+    },
+    {
+      "actionName": "syncApplications",
+      "path": "m2m/sync/applications",
+      "method": "POST",
+      "requestBody": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "ApplicationDTO",
+              "collectionType": "none",
+              "name": "data",
+              "objectType": "dto",
+              "module": "shared"
+            }
+          }
+        }
+      },
+      "responses": {
+        "204": {
+          "name": "OK",
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string",
+                "name": "data",
+                "collectionType": "none"
+              }
+            }
+          }
+        }
+      }
+    }
+  ],
+  "id": "jws7h4f2af"
+}

.igrpstudio/m2m/dto/.gitkeep

@@ -0,0 +1 @@
+This file is used to let Git track empty directories.

.igrpstudio/m2m/models/.gitkeep

@@ -0,0 +1 @@
+This file is used to let Git track empty directories.

.igrpstudio/m2m/module.json

@@ -0,0 +1,4 @@
+{
+  "type": "module",
+  "name": "m2m"
+}

.igrpstudio/shared/dto/PermissionDTO.json

@@ -29,7 +29,7 @@
       "isEmail": false,
       "isUrl": false,
       "primaryKey": false,
-      "regex": "^[A-Za-z0-9_-]+$"
+      "regex": "^[A-Za-z0-9._-]+$"
     },
     {
       "name": "description",
@@ -61,7 +61,7 @@
       "name": "departmentCode",
       "objectType": "java",
       "type": "string",
-      "required": true,
+      "required": false,
       "before": false,
       "after": false,
       "positive": false,