Skip to content

Commit

Permalink
Merge pull request #2413 from sumesh-aot/FWF-4071
Browse files Browse the repository at this point in the history
Adding new permission for BPMN and DMN access
  • Loading branch information
arun-s-aot authored Dec 11, 2024
2 parents 887dca3 + 692f0dd commit 30f3edb
Show file tree
Hide file tree
Showing 10 changed files with 238 additions and 127 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/forms-flow-data-analysis-api-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

strategy:
matrix:
python-version: [3.12.6]
python-version: [3.12.7]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:

strategy:
matrix:
python-version: [3.12.6]
python-version: [3.12.7]

services:
postgres:
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:

strategy:
matrix:
python-version: [3.12.6]
python-version: [3.12.7]

steps:
- uses: actions/checkout@v2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,17 @@
MANAGE_USERS = "manage_users"
MANAGE_ROLES = "manage_roles"
ADMIN= "admin"
CREATE_BPMN_FLOWS = "create_bpmn_flows"
MANAGE_SUBFLOWS = "manage_subflows"
MANAGE_DECISION_TABLES = "manage_decision_tables"


PERMISSION_DETAILS = [
{"name": CREATE_DESIGNS , "description": "Create Form, workflow designs", "depends_on": [ VIEW_DESIGNS ]},
{"name": VIEW_DESIGNS , "description": "Access to design", "depends_on": []},
{"name": CREATE_BPMN_FLOWS , "description": "Access to BPMN worflows", "depends_on": [CREATE_DESIGNS]},
{"name": MANAGE_SUBFLOWS , "description": "Access to Subflows", "depends_on": [CREATE_DESIGNS]},
{"name": MANAGE_DECISION_TABLES , "description": "Access to Decision Tables", "depends_on": [CREATE_DESIGNS]},
{"name": CREATE_SUBMISSIONS , "description": "Create submissions", "depends_on": []},
{"name": VIEW_SUBMISSIONS , "description": "Access to submissions", "depends_on": []},
{"name": VIEW_DASHBOARDS , "description": "Access to dashboards", "depends_on": []},
Expand Down
46 changes: 21 additions & 25 deletions forms-flow-api/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,71 +5,67 @@ Flask-Moment==1.0.6
Flask-SQLAlchemy==3.1.1
Flask==2.3.3
Jinja2==3.1.4
Mako==1.3.5
MarkupSafe==3.0.1
PyJWT==2.9.0
Mako==1.3.8
MarkupSafe==3.0.2
PyJWT==2.10.1
PySocks==1.7.1
SQLAlchemy-Utils==0.41.2
SQLAlchemy==2.0.35
Werkzeug==3.0.4
alembic==1.13.3
SQLAlchemy==2.0.36
Werkzeug==3.1.3
alembic==1.14.0
aniso8601==9.0.1
async-timeout==4.0.3
attrs==24.2.0
blinker==1.8.2
blinker==1.9.0
cachelib==0.13.0
certifi==2024.8.30
cffi==1.17.1
charset-normalizer==3.3.2
charset-normalizer==3.4.0
click==8.1.7
cryptography==43.0.1
cryptography==44.0.0
ecdsa==0.19.0
exceptiongroup==1.2.2
flask-jwt-oidc==0.7.0
flask-marshmallow==1.2.1
flask-restx==1.3.0
formsflow_api_utils @ git+https://github.com/AOT-Technologies/forms-flow-ai.git@develop#subdirectory=forms-flow-api-utils
formsflow_api_utils @ git+https://github.com/AOT-Technologies/forms-flow-ai.git@develop#subdirectory=forms-flow-api-utils
gunicorn==23.0.0
h11==0.14.0
h2==4.1.0
hpack==4.0.0
hyperframe==6.0.1
idna==3.10
importlib_metadata==8.5.0
importlib_resources==6.4.5
itsdangerous==2.2.0
jsonschema-specifications==2024.10.1
jsonschema==4.23.0
kaitaistruct==0.10
lxml==5.3.0
marshmallow-sqlalchemy==1.1.0
marshmallow==3.22.0
marshmallow==3.23.1
outcome==1.3.0.post0
packaging==24.1
psycopg2-binary==2.9.9
pyOpenSSL==24.2.1
packaging==24.2
psycopg2-binary==2.9.10
pyOpenSSL==24.3.0
pyasn1==0.6.1
pycparser==2.22
pyparsing==3.1.4
pyparsing==3.2.0
python-dotenv==1.0.1
python-jose==3.3.0
pytz==2024.2
redis==5.1.1
redis==5.2.1
referencing==0.35.1
requests==2.32.3
rpds-py==0.20.0
rpds-py==0.22.3
rsa==4.9
selenium-wire==5.1.0
selenium==4.25.0
sentry-sdk==2.16.0
six==1.16.0
selenium==4.27.1
sentry-sdk==2.19.2
six==1.17.0
sniffio==1.3.1
sortedcontainers==2.4.0
trio-websocket==0.11.1
trio==0.26.2
trio==0.27.0
typing_extensions==4.12.2
urllib3==2.2.3
websocket-client==1.8.0
wsproto==1.2.0
zipp==3.20.2
zstandard==0.23.0
21 changes: 21 additions & 0 deletions forms-flow-api/tests/docker/realms/forms-flow-ai-realm.json
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,27 @@
"composite": false,
"clientRole": true,
"attributes": {}
},
{
"name": "create_bpmn_flows",
"description": "Access to BPMN worflows",
"composite": false,
"clientRole": true,
"attributes": {}
},
{
"name": "manage_subflows",
"description": "Access to Subflows",
"composite": false,
"clientRole": true,
"attributes": {}
},
{
"name": "manage_decision_tables",
"description": "Access to Decision Tables",
"composite": false,
"clientRole": true,
"attributes": {}
}
],
"security-admin-console": [],
Expand Down
72 changes: 35 additions & 37 deletions forms-flow-data-analysis-api/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,87 +1,85 @@
Flask-Migrate==4.0.7
Flask-SQLAlchemy==3.1.1
Flask==3.0.3
Flask==3.1.0
Jinja2==3.1.4
Mako==1.3.5
MarkupSafe==3.0.1
Mako==1.3.8
MarkupSafe==3.0.2
PyYAML==6.0.2
Pygments==2.18.0
SQLAlchemy-Utils==0.41.2
SQLAlchemy==2.0.35
Werkzeug==3.0.4
alembic==1.13.3
SQLAlchemy==2.0.36
Werkzeug==3.1.3
alembic==1.14.0
aniso8601==9.0.1
annotated-types==0.7.0
attrs==24.2.0
blinker==1.8.2
blis==1.0.1
blinker==1.9.0
blis==1.0.2
cachelib==0.13.0
catalogue==2.0.10
certifi==2024.8.30
charset-normalizer==3.3.2
charset-normalizer==3.4.0
click==8.1.7
cloudpathlib==0.19.0
cloudpathlib==0.20.0
confection==0.1.5
cymem==2.0.8
cymem==2.0.10
ecdsa==0.19.0
filelock==3.16.1
flask-jwt-oidc==0.7.0
flask-restx==1.3.0
fsspec==2024.9.0
fsspec==2024.10.0
gunicorn==23.0.0
huggingface-hub==0.25.1
huggingface-hub==0.26.5
idna==3.10
importlib_metadata==8.5.0
importlib_resources==6.4.5
itsdangerous==2.2.0
joblib==1.4.2
jsonschema-specifications==2024.10.1
jsonschema==4.23.0
langcodes==3.4.1
language_data==1.2.0
marisa-trie==1.2.0
langcodes==3.5.0
language_data==1.3.0
marisa-trie==1.2.1
markdown-it-py==3.0.0
mdurl==0.1.2
mpmath==1.3.0
murmurhash==1.0.10
networkx==3.2.1
murmurhash==1.0.11
networkx==3.4.2
nltk==3.9.1
numpy==2.0.2
packaging==24.1
packaging==24.2
preshed==3.0.9
protobuf==5.28.2
psycopg2-binary==2.9.9
protobuf==5.29.1
psycopg2-binary==2.9.10
pyasn1==0.6.1
pydantic==2.9.2
pydantic_core==2.23.4
pydantic==2.10.3
pydantic_core==2.27.1
python-dotenv==1.0.1
python-jose==3.3.0
pytz==2024.2
referencing==0.35.1
regex==2024.9.11
regex==2024.11.6
requests==2.32.3
rich==13.9.2
rpds-py==0.20.0
rich==13.9.4
rpds-py==0.22.3
rsa==4.9
safetensors==0.4.5
sentencepiece==0.2.0
shellingham==1.5.4
six==1.16.0
six==1.17.0
smart-open==7.0.5
spacy-legacy==3.0.12
spacy-loggers==1.0.5
spacy==3.8.2
srsly==2.4.8
sympy==1.13.3
srsly==2.5.0
sympy==1.13.1
thinc==8.3.2
tokenizers==0.20.0
torch==2.4.1
tqdm==4.66.5
transformers==4.45.2
typer==0.12.5
tokenizers==0.21.0
torch==2.5.1
tqdm==4.67.1
transformers==4.47.0
typer==0.15.1
typing_extensions==4.12.2
urllib3==2.2.3
wasabi==1.1.3
weasel==0.4.1
wrapt==1.16.0
zipp==3.20.2
wrapt==1.17.0
43 changes: 19 additions & 24 deletions forms-flow-documents/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,24 @@ Flask-Moment==1.0.6
Flask-SQLAlchemy==3.1.1
Flask==2.3.3
Jinja2==3.1.4
Mako==1.3.5
MarkupSafe==3.0.1
PyJWT==2.9.0
Mako==1.3.8
MarkupSafe==3.0.2
PyJWT==2.10.1
PySocks==1.7.1
SQLAlchemy-Utils==0.41.2
SQLAlchemy==2.0.35
Werkzeug==3.0.4
alembic==1.13.3
SQLAlchemy==2.0.36
Werkzeug==3.1.3
alembic==1.14.0
aniso8601==9.0.1
async-timeout==4.0.3
attrs==24.2.0
blinker==1.7.0
cachelib==0.13.0
certifi==2024.8.30
cffi==1.17.1
charset-normalizer==3.3.2
charset-normalizer==3.4.0
click==8.1.7
cryptography==43.0.1
cryptography==44.0.0
ecdsa==0.19.0
exceptiongroup==1.2.2
flask-jwt-oidc==0.7.0
flask-marshmallow==1.2.1
flask-restx==1.3.0
Expand All @@ -35,42 +33,39 @@ h2==4.1.0
hpack==4.0.0
hyperframe==6.0.1
idna==3.10
importlib_metadata==8.5.0
importlib_resources==6.4.5
itsdangerous==2.2.0
jsonschema-specifications==2024.10.1
jsonschema==4.23.0
kaitaistruct==0.10
marshmallow-sqlalchemy==1.1.0
marshmallow==3.22.0
marshmallow==3.23.1
nested-lookup==0.2.25
outcome==1.3.0.post0
packaging==24.1
psycopg2-binary==2.9.9
pyOpenSSL==24.2.1
packaging==24.2
psycopg2-binary==2.9.10
pyOpenSSL==24.3.0
pyasn1==0.6.1
pycparser==2.22
pyparsing==3.1.4
pyparsing==3.2.0
python-dotenv==1.0.1
python-jose==3.3.0
pytz==2024.2
redis==5.1.1
redis==5.2.1
referencing==0.35.1
requests==2.32.3
rpds-py==0.20.0
rpds-py==0.22.3
rsa==4.9
selenium-wire==5.1.0
selenium==4.25.0
sentry-sdk==2.16.0
six==1.16.0
selenium==4.27.1
sentry-sdk==2.19.2
six==1.17.0
sniffio==1.3.1
sortedcontainers==2.4.0
trio-websocket==0.11.1
trio==0.26.2
trio==0.27.0
typing_extensions==4.12.2
urllib3==2.2.3
websocket-client==1.8.0
wsproto==1.2.0
zipp==3.20.2
zstandard==0.23.0
setuptools==75.2.0
Loading

0 comments on commit 30f3edb

Please sign in to comment.