diff --git a/Dockerfile b/Dockerfile index 948f1dd5..7e2cdef0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -70,6 +70,7 @@ RUN mkdir /app/log /app/config /app/tmp # copy frontend build statics COPY --from=frontend-build /app/src/objects/static /app/src/objects/static +COPY --from=frontend-build /app/node_modules/@fortawesome/fontawesome-free/webfonts /app/node_modules/@fortawesome/fontawesome-free/webfonts # copy source code COPY ./src /app/src diff --git a/package-lock.json b/package-lock.json index 97607176..4c50172f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "3.3.0", "license": "UNLICENSED", "dependencies": { + "@fortawesome/fontawesome-free": "^7.0.0", "microscope-sass": "latest", "react": "^17.0.2", "react-dom": "^17.0.2", @@ -1605,6 +1606,14 @@ "node": ">=14.17.0" } }, + "node_modules/@fortawesome/fontawesome-free": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.0.1.tgz", + "integrity": "sha512-RLmb9U6H2rJDnGxEqXxzy7ANPrQz7WK2/eTjdZqyU9uRU5W+FkAec9uU5gTYzFBH7aoXIw2WTJSCJR4KPlReQw==", + "engines": { + "node": ">=6" + } + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", diff --git a/package.json b/package.json index cea69ba8..ce14fba5 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "homepage": "https://maykinmedia.nl", "dependencies": { "microscope-sass": "latest", + "@fortawesome/fontawesome-free": "^7.0.0", "react": "^17.0.2", "react-dom": "^17.0.2", "tough-cookie": "^4.1.4" @@ -58,4 +59,4 @@ "webpack-stream": "latest", "yargs": "latest" } -} \ No newline at end of file +} diff --git a/requirements/base.in b/requirements/base.in index 4f913c8d..734400cd 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -5,12 +5,17 @@ glom # data represenation based on spec jsonschema furl +# Django libraries +django-capture-tag + # Common ground libraries django-setup-configuration>=0.5.0 notifications-api-common[setup-configuration] zgw-consumers[setup-configuration] mozilla-django-oidc-db[setup-configuration] commonground-api-common[oas] +maykin-common[axes,mfa] + # celery dependencies # TODO this should be moved to open-api-framework once it is verified that this fixes # maykinmedia/objects-api#541 diff --git a/requirements/base.txt b/requirements/base.txt index 16d02b29..2e46a654 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -104,17 +104,24 @@ django==5.2.7 # drf-spectacular # drf-spectacular-sidecar # maykin-2fa + # maykin-common # mozilla-django-oidc # mozilla-django-oidc-db # notifications-api-common # open-api-framework # zgw-consumers django-admin-index==3.1.0 - # via open-api-framework + # via + # maykin-common + # open-api-framework django-appconf==1.0.6 # via django-log-outgoing-requests django-axes==6.5.1 - # via open-api-framework + # via + # maykin-common + # open-api-framework +django-capture-tag==1.0 + # via -r requirements/base.in django-cors-headers==4.4.0 # via open-api-framework django-csp==4.0 @@ -238,7 +245,11 @@ kombu==5.5.4 # -r requirements/base.in # celery maykin-2fa==1.0.1 - # via open-api-framework + # via + # maykin-common + # open-api-framework +maykin-common==0.11.0 + # via -r requirements/base.in mozilla-django-oidc==4.0.0 # via mozilla-django-oidc-db mozilla-django-oidc-db==0.22.0 diff --git a/requirements/ci.txt b/requirements/ci.txt index 1f40ab6b..d5400c9c 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -167,6 +167,7 @@ django==5.2.7 # drf-spectacular # drf-spectacular-sidecar # maykin-2fa + # maykin-common # mozilla-django-oidc # mozilla-django-oidc-db # notifications-api-common @@ -187,6 +188,10 @@ django-axes==6.5.1 # -c requirements/base.txt # -r requirements/base.txt # open-api-framework +django-capture-tag==1.0 + # via + # -c requirements/base.txt + # -r requirements/base.txt django-cors-headers==4.4.0 # via # -c requirements/base.txt @@ -446,6 +451,10 @@ maykin-2fa==1.0.1 # -c requirements/base.txt # -r requirements/base.txt # open-api-framework +maykin-common==0.11.0 + # via + # -c requirements/base.txt + # -r requirements/base.txt mozilla-django-oidc==4.0.0 # via # -c requirements/base.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index 12227b55..4d0286fe 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -207,6 +207,7 @@ django==5.2.7 # drf-spectacular # drf-spectacular-sidecar # maykin-2fa + # maykin-common # mozilla-django-oidc # mozilla-django-oidc-db # notifications-api-common @@ -227,6 +228,10 @@ django-axes==6.5.1 # -c requirements/ci.txt # -r requirements/ci.txt # open-api-framework +django-capture-tag==1.0 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt django-cors-headers==4.4.0 # via # -c requirements/ci.txt @@ -534,6 +539,10 @@ maykin-2fa==1.0.1 # -c requirements/ci.txt # -r requirements/ci.txt # open-api-framework +maykin-common==0.11.0 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt mdurl==0.1.2 # via markdown-it-py mozilla-django-oidc==4.0.0 diff --git a/src/objects/accounts/tests/keycloak_cassets/happy_flow.yaml b/src/objects/accounts/tests/files/vcr_cassettes/OIDCFLowTests/test_duplicate_email_unique_constraint_violated.yaml similarity index 78% rename from src/objects/accounts/tests/keycloak_cassets/happy_flow.yaml rename to src/objects/accounts/tests/files/vcr_cassettes/OIDCFLowTests/test_duplicate_email_unique_constraint_violated.yaml index d748a607..d01040c0 100644 --- a/src/objects/accounts/tests/keycloak_cassets/happy_flow.yaml +++ b/src/objects/accounts/tests/files/vcr_cassettes/OIDCFLowTests/test_duplicate_email_unique_constraint_violated.yaml @@ -9,7 +9,7 @@ interactions: Connection: - keep-alive User-Agent: - - python-requests/2.32.3 + - python-requests/2.32.4 method: GET uri: http://localhost:8080/realms/test/protocol/openid-connect/auth?response_type=code&scope=openid&client_id=testid&redirect_uri=http%3A%2F%2Ftestserver%2Foidc%2Fcallback%2F&state=not-a-random-string&nonce=not-a-random-string response: @@ -18,16 +18,16 @@ interactions: \ \n \n\n \n