Verify lockfile before installation

Merge pull request 'Update dependency python-dotenv to v1' (!116 ) from renovate/python-dotenv-1.x into main
Reviewed-on: #116
2024-09-10 14:52:44 +02:00 · 2024-09-10 14:30:41 +02:00 · 2024-09-10 14:27:54 +02:00 · 2024-09-10 11:36:39 +00:00 · 2024-09-10 13:07:34 +02:00 · 2024-09-10 13:02:19 +02:00
12 changed files with 87 additions and 261 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -15,17 +15,28 @@ trigger:

 steps:
  - name: install-lint-test
-    image: python:3.8.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea
+    image: python:3.8.19-alpine@sha256:c2f31d16113f2c1152934d321855c9f0169143dff96d716dada19e0047d6ddee
    env:
      PYROOT: '/pyroot'
      PYTHONUSERBASE: '/pyroot'
    commands:
      - apk add --no-cache gcc g++ musl-dev python3-dev
      - pip3 install pipenv
+      - pipenv verify
      - pipenv install --dev
      - pipenv run flake8
      - pipenv run reuse lint
      - pipenv run python -m unittest discover ki
+  - name: docker-dry-run
+    image: plugins/docker:20.18.4@sha256:a8d3d86853c721492213264815f1d00d3ed13f42f5c1855a02f47fa4d5f1e042
+    settings:
+      registry: git.wtf-eg.de
+      repo: git.wtf-eg.de/kompetenzinventar/backend
+      target: ki-backend
+      dry_run: true
+    when:
+      event:
+        - pull_request

 ---
 kind: pipeline
@ -93,7 +104,7 @@ trigger:

 steps:
  - name: install-lint-test
-    image: python:3.8.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea
+    image: python:3.8.19-alpine@sha256:c2f31d16113f2c1152934d321855c9f0169143dff96d716dada19e0047d6ddee
    env:
      PYROOT: '/pyroot'
      PYTHONUSERBASE: '/pyroot'
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -27,5 +27,5 @@ repos:
      name: reuse
      entry: reuse lint
      language: system
-      exclude: ^(venv).*$
+      exclude: .*
      always_run: true
--- a/4
+++ b/4
@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later

-FROM python:3.8.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea AS builder
+FROM python:3.8.19-alpine@sha256:c2f31d16113f2c1152934d321855c9f0169143dff96d716dada19e0047d6ddee AS builder

 ENV PYROOT=/pyroot
 ENV PYTHONUSERBASE=$PYROOT
@ -20,7 +20,7 @@ RUN PIP_USER=1 PIP_IGNORE_INSTALLED=1 pipenv install --system --deploy --ignore-
 RUN pip3 uninstall --yes pipenv


-FROM python:3.8.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea AS ki-backend
+FROM python:3.8.19-alpine@sha256:c2f31d16113f2c1152934d321855c9f0169143dff96d716dada19e0047d6ddee AS ki-backend

 ENV PYROOT=/pyroot
 ENV PYTHONUSERBASE=$PYROOT
--- a/8
+++ b/8
@ -9,21 +9,21 @@ name = "pypi"

 [packages]
 flask = "==2.3.3"
-python-dotenv = "==0.21.1"
+python-dotenv = "==1.0.1"
 flask-migrate = "==3.0.1"
 flask-sqlalchemy  = "==2.5.1"
 sqlalchemy = "==1.4.53"
 waitress = "==2.1.2"
 pyyaml = "==6.0.2"
-flask-cors = "==3.0.10"
+flask-cors = "==5.0.0"
 ldap3 = "==2.9.1"
 pymysql = "==1.1.1"
 werkzeug = "==2.3.8"

 [dev-packages]
-flake8 = "==6.1.0"
+flake8 = "==7.1.1"
 yapf = "==0.40.2"
-pre-commit = "==2.13.0"
+pre-commit = "==2.21.0"
 reuse = "==0.14.0"

 [requires]
--- a/Pipfile.lock
+++ b/Pipfile.lock
@ -1,7 +1,7 @@
 {
    "_meta": {
        "hash": {
-            "sha256": "701ece99277177da8e5adf857508e3b83e00e1f75bd20509b370bbe0bd8c008f"
+            "sha256": "85cdc18e964ebc18c00497b89fe743b28f2c5d2d66d64e0ef49be8bd56cac134"
        },
        "pipfile-spec": 6,
        "requires": {
@ -51,11 +51,11 @@
        },
        "flask-cors": {
            "hashes": [
-                "sha256:74efc975af1194fc7891ff5cd85b0f7478be4f7f59fe158102e91abb72bb4438",
-                "sha256:b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de"
+                "sha256:5aadb4b950c4e93745034594d9f3ea6591f734bb3662e16e255ffbf5e89c88ef",
+                "sha256:b9e307d082a9261c100d8fb0ba909eec6a228ed1b60a8315fd85f783d61910bc"
            ],
            "index": "pypi",
-            "version": "==3.0.10"
+            "version": "==5.0.0"
        },
        "flask-migrate": {
            "hashes": [
@ -74,70 +74,6 @@
            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
            "version": "==2.5.1"
        },
-        "greenlet": {
-            "hashes": [
-                "sha256:01bc7ea167cf943b4c802068e178bbf70ae2e8c080467070d01bfa02f337ee67",
-                "sha256:0448abc479fab28b00cb472d278828b3ccca164531daab4e970a0458786055d6",
-                "sha256:086152f8fbc5955df88382e8a75984e2bb1c892ad2e3c80a2508954e52295257",
-                "sha256:098d86f528c855ead3479afe84b49242e174ed262456c342d70fc7f972bc13c4",
-                "sha256:149e94a2dd82d19838fe4b2259f1b6b9957d5ba1b25640d2380bea9c5df37676",
-                "sha256:1551a8195c0d4a68fac7a4325efac0d541b48def35feb49d803674ac32582f61",
-                "sha256:15d79dd26056573940fcb8c7413d84118086f2ec1a8acdfa854631084393efcc",
-                "sha256:1996cb9306c8595335bb157d133daf5cf9f693ef413e7673cb07e3e5871379ca",
-                "sha256:1a7191e42732df52cb5f39d3527217e7ab73cae2cb3694d241e18f53d84ea9a7",
-                "sha256:1ea188d4f49089fc6fb283845ab18a2518d279c7cd9da1065d7a84e991748728",
-                "sha256:1f672519db1796ca0d8753f9e78ec02355e862d0998193038c7073045899f305",
-                "sha256:2516a9957eed41dd8f1ec0c604f1cdc86758b587d964668b5b196a9db5bfcde6",
-                "sha256:2797aa5aedac23af156bbb5a6aa2cd3427ada2972c828244eb7d1b9255846379",
-                "sha256:2dd6e660effd852586b6a8478a1d244b8dc90ab5b1321751d2ea15deb49ed414",
-                "sha256:3ddc0f794e6ad661e321caa8d2f0a55ce01213c74722587256fb6566049a8b04",
-                "sha256:3ed7fb269f15dc662787f4119ec300ad0702fa1b19d2135a37c2c4de6fadfd4a",
-                "sha256:419b386f84949bf0e7c73e6032e3457b82a787c1ab4a0e43732898a761cc9dbf",
-                "sha256:43374442353259554ce33599da8b692d5aa96f8976d567d4badf263371fbe491",
-                "sha256:52f59dd9c96ad2fc0d5724107444f76eb20aaccb675bf825df6435acb7703559",
-                "sha256:57e8974f23e47dac22b83436bdcf23080ade568ce77df33159e019d161ce1d1e",
-                "sha256:5b51e85cb5ceda94e79d019ed36b35386e8c37d22f07d6a751cb659b180d5274",
-                "sha256:649dde7de1a5eceb258f9cb00bdf50e978c9db1b996964cd80703614c86495eb",
-                "sha256:64d7675ad83578e3fc149b617a444fab8efdafc9385471f868eb5ff83e446b8b",
-                "sha256:68834da854554926fbedd38c76e60c4a2e3198c6fbed520b106a8986445caaf9",
-                "sha256:6b66c9c1e7ccabad3a7d037b2bcb740122a7b17a53734b7d72a344ce39882a1b",
-                "sha256:70fb482fdf2c707765ab5f0b6655e9cfcf3780d8d87355a063547b41177599be",
-                "sha256:7170375bcc99f1a2fbd9c306f5be8764eaf3ac6b5cb968862cad4c7057756506",
-                "sha256:73a411ef564e0e097dbe7e866bb2dda0f027e072b04da387282b02c308807405",
-                "sha256:77457465d89b8263bca14759d7c1684df840b6811b2499838cc5b040a8b5b113",
-                "sha256:7f362975f2d179f9e26928c5b517524e89dd48530a0202570d55ad6ca5d8a56f",
-                "sha256:81bb9c6d52e8321f09c3d165b2a78c680506d9af285bfccbad9fb7ad5a5da3e5",
-                "sha256:881b7db1ebff4ba09aaaeae6aa491daeb226c8150fc20e836ad00041bcb11230",
-                "sha256:894393ce10ceac937e56ec00bb71c4c2f8209ad516e96033e4b3b1de270e200d",
-                "sha256:99bf650dc5d69546e076f413a87481ee1d2d09aaaaaca058c9251b6d8c14783f",
-                "sha256:9da2bd29ed9e4f15955dd1595ad7bc9320308a3b766ef7f837e23ad4b4aac31a",
-                "sha256:afaff6cf5200befd5cec055b07d1c0a5a06c040fe5ad148abcd11ba6ab9b114e",
-                "sha256:b1b5667cced97081bf57b8fa1d6bfca67814b0afd38208d52538316e9422fc61",
-                "sha256:b37eef18ea55f2ffd8f00ff8fe7c8d3818abd3e25fb73fae2ca3b672e333a7a6",
-                "sha256:b542be2440edc2d48547b5923c408cbe0fc94afb9f18741faa6ae970dbcb9b6d",
-                "sha256:b7dcbe92cc99f08c8dd11f930de4d99ef756c3591a5377d1d9cd7dd5e896da71",
-                "sha256:b7f009caad047246ed379e1c4dbcb8b020f0a390667ea74d2387be2998f58a22",
-                "sha256:bba5387a6975598857d86de9eac14210a49d554a77eb8261cc68b7d082f78ce2",
-                "sha256:c5e1536de2aad7bf62e27baf79225d0d64360d4168cf2e6becb91baf1ed074f3",
-                "sha256:c5ee858cfe08f34712f548c3c363e807e7186f03ad7a5039ebadb29e8c6be067",
-                "sha256:c9db1c18f0eaad2f804728c67d6c610778456e3e1cc4ab4bbd5eeb8e6053c6fc",
-                "sha256:d353cadd6083fdb056bb46ed07e4340b0869c305c8ca54ef9da3421acbdf6881",
-                "sha256:d46677c85c5ba00a9cb6f7a00b2bfa6f812192d2c9f7d9c4f6a55b60216712f3",
-                "sha256:d4d1ac74f5c0c0524e4a24335350edad7e5f03b9532da7ea4d3c54d527784f2e",
-                "sha256:d73a9fe764d77f87f8ec26a0c85144d6a951a6c438dfe50487df5595c6373eac",
-                "sha256:da70d4d51c8b306bb7a031d5cff6cc25ad253affe89b70352af5f1cb68e74b53",
-                "sha256:daf3cb43b7cf2ba96d614252ce1684c1bccee6b2183a01328c98d36fcd7d5cb0",
-                "sha256:dca1e2f3ca00b84a396bc1bce13dd21f680f035314d2379c4160c98153b2059b",
-                "sha256:dd4f49ae60e10adbc94b45c0b5e6a179acc1736cf7a90160b404076ee283cf83",
-                "sha256:e1f145462f1fa6e4a4ae3c0f782e580ce44d57c8f2c7aae1b6fa88c0b2efdb41",
-                "sha256:e3391d1e16e2a5a1507d83e4a8b100f4ee626e8eca43cf2cadb543de69827c4c",
-                "sha256:fcd2469d6a2cf298f198f0487e0a5b1a47a42ca0fa4dfd1b6862c999f018ebbf",
-                "sha256:fd096eb7ffef17c456cfa587523c5f92321ae02427ff955bebe9e3c63bc9f0da",
-                "sha256:fe754d231288e1e64323cfad462fcee8f0288654c10bdf4f603a39ed923bef33"
-            ],
-            "markers": "python_version >= '3' and platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32')))))",
-            "version": "==3.0.3"
-        },
        "importlib-metadata": {
            "hashes": [
                "sha256:66f342cc6ac9818fc6ff340576acd24d65ba0b3efabb2b4ac08b598965a4a2f1",
@ -148,11 +84,11 @@
        },
        "importlib-resources": {
            "hashes": [
-                "sha256:20600c8b7361938dc0bb2d5ec0297802e575df486f5a544fa414da65e13721f7",
-                "sha256:dda242603d1c9cd836c3368b1174ed74cb4049ecd209e7a1a0104620c18c5c11"
+                "sha256:980862a1d16c9e147a59603677fa2aa5fd82b87f223b6cb870695bcfce830065",
+                "sha256:ac29d5f956f01d5e4bb63102a5a19957f1b9175e45649977264a1416783bb717"
            ],
            "markers": "python_version < '3.9'",
-            "version": "==6.4.4"
+            "version": "==6.4.5"
        },
        "itsdangerous": {
            "hashes": [
@ -274,12 +210,12 @@
        },
        "python-dotenv": {
            "hashes": [
-                "sha256:1c93de8f636cde3ce377292818d0e440b6e45a82f215c3744979151fa8151c49",
-                "sha256:41e12e0318bebc859fcc4d97d4db8d20ad21721a6aa5047dd59f090391cb549a"
+                "sha256:e324ee90a023d808f1959c46bcbc04446a10ced277783dc6ee09987c37ec10ca",
+                "sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a"
            ],
            "index": "pypi",
-            "markers": "python_version >= '3.7'",
-            "version": "==0.21.1"
+            "markers": "python_version >= '3.8'",
+            "version": "==1.0.1"
        },
        "pyyaml": {
            "hashes": [
@ -341,14 +277,6 @@
            "markers": "python_version >= '3.8'",
            "version": "==6.0.2"
        },
-        "six": {
-            "hashes": [
-                "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
-                "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==1.16.0"
-        },
        "sqlalchemy": {
            "hashes": [
                "sha256:0465b8a68f8f4de754c1966c45b187ac784ad97bc9747736f913130f0e1adea0",
@ -452,11 +380,11 @@
        },
        "certifi": {
            "hashes": [
-                "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b",
-                "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"
+                "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8",
+                "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"
            ],
            "markers": "python_version >= '3.6'",
-            "version": "==2024.7.4"
+            "version": "==2024.8.30"
        },
        "cfgv": {
            "hashes": [
@ -579,20 +507,20 @@
        },
        "filelock": {
            "hashes": [
-                "sha256:2207938cbc1844345cb01a5a95524dae30f0ce089eba5b00378295a17e3e90cb",
-                "sha256:6ca1fffae96225dab4c6eaf1c4f4f28cd2568d3ec2a44e15a08520504de468e7"
+                "sha256:81de9eb8453c769b63369f87f11131a7ab04e367f8d97ad39dc230daa07e3bec",
+                "sha256:f6ed4c963184f4c84dd5557ce8fece759a3724b37b80c6c4f20a2f63a4dc6609"
            ],
            "markers": "python_version >= '3.8'",
-            "version": "==3.15.4"
+            "version": "==3.16.0"
        },
        "flake8": {
            "hashes": [
-                "sha256:d5b3857f07c030bdb5bf41c7f53799571d75c4491748a3adcd47de929e34cd23",
-                "sha256:ffdfce58ea94c6580c77888a86506937f9a1a227dfcd15f245d694ae20a6b6e5"
+                "sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38",
+                "sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213"
            ],
            "index": "pypi",
            "markers": "python_full_version >= '3.8.1'",
-            "version": "==6.1.0"
+            "version": "==7.1.1"
        },
        "identify": {
            "hashes": [
@ -718,36 +646,36 @@
        },
        "platformdirs": {
            "hashes": [
-                "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee",
-                "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3"
+                "sha256:9e5e27a08aa095dd127b9f2e764d74254f482fef22b0970773bfba79d091ab8c",
+                "sha256:eb1c8582560b34ed4ba105009a4badf7f6f85768b30126f351328507b2beb617"
            ],
            "markers": "python_version >= '3.8'",
-            "version": "==4.2.2"
+            "version": "==4.3.2"
        },
        "pre-commit": {
            "hashes": [
-                "sha256:764972c60693dc668ba8e86eb29654ec3144501310f7198742a767bec385a378",
-                "sha256:b679d0fddd5b9d6d98783ae5f10fd0c4c59954f375b70a58cbe1ce9bcf9809a4"
+                "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658",
+                "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"
            ],
            "index": "pypi",
-            "markers": "python_full_version >= '3.6.1'",
-            "version": "==2.13.0"
+            "markers": "python_version >= '3.7'",
+            "version": "==2.21.0"
        },
        "pycodestyle": {
            "hashes": [
-                "sha256:41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f",
-                "sha256:44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67"
+                "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3",
+                "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521"
            ],
            "markers": "python_version >= '3.8'",
-            "version": "==2.11.1"
+            "version": "==2.12.1"
        },
        "pyflakes": {
            "hashes": [
-                "sha256:4132f6d49cb4dae6819e5379898f2b8cce3c5f23994194c24b77d5da2e36f774",
-                "sha256:a0aae034c444db0071aa077972ba4768d40c830d9539fd45bf4cd3f8f6992efc"
+                "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f",
+                "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a"
            ],
            "markers": "python_version >= '3.8'",
-            "version": "==3.1.0"
+            "version": "==3.2.0"
        },
        "python-debian": {
            "hashes": [
@ -837,19 +765,11 @@
        },
        "setuptools": {
            "hashes": [
-                "sha256:0274581a0037b638b9fc1c6883cc71c0210865aaa76073f7882376b641b84e8f",
-                "sha256:a85e96b8be2b906f3e3e789adec6a9323abf79758ecfa3065bd740d81158b11e"
+                "sha256:5f4c08aa4d3ebcb57a50c33b1b07e94315d7fc7230f7115e47fc99776c8ce308",
+                "sha256:95b40ed940a1c67eb70fc099094bd6e99c6ee7c23aa2306f4d2697ba7916f9c6"
            ],
            "markers": "python_version >= '3.8'",
-            "version": "==74.0.0"
-        },
-        "toml": {
-            "hashes": [
-                "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b",
-                "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"
-            ],
-            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==0.10.2"
+            "version": "==74.1.2"
        },
        "tomli": {
            "hashes": [
@ -869,11 +789,11 @@
        },
        "virtualenv": {
            "hashes": [
-                "sha256:4c43a2a236279d9ea36a0d76f98d84bd6ca94ac4e0f4a3b9d46d05e10fea542a",
-                "sha256:8cc4a31139e796e9a7de2cd5cf2489de1217193116a8fd42328f1bd65f434589"
+                "sha256:48f2695d9809277003f30776d155615ffc11328e6a0a8c1f0ec80188d7874a55",
+                "sha256:c17f4e0f3e6036e9f26700446f85c76ab11df65ff6d8a9cbfad9f71aabfcf23c"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==20.26.3"
+            "version": "==20.26.4"
        },
        "yapf": {
            "hashes": [
--- a/app.py
+++ b/app.py
@ -42,8 +42,5 @@ db = SQLAlchemy(app)
 migrate = Migrate(app, db, compare_type=True)

 app.logger.info("Hello from KI")
+
 from ki import module  # noqa
-from ki import resume
-
-
-app.register_blueprint(resume.bp_resume, url_prefix='/resume')
--- a/ki/models.py
+++ b/ki/models.py
@ -33,7 +33,7 @@ class Profile(db.Model):
    volunteerwork = Column(String(4000), default="")
    freetext = Column(String(4000), default="")

-    availability_status = Column(Boolean, default=False, nullable=False)
+    availability_status = Column(Boolean, default=False)
    availability_text = Column(String(4000), default="")
    availability_hours_per_week = Column(Integer, default=0)

--- a/ki/resume.py
+++ b/ki/resume.py
@ -1,32 +0,0 @@
-# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-from flask import Blueprint
-from ki.token_auth import token_auth
-from ki.resume_models import Resume
-
-bp_resume = Blueprint('resume', __name__,
-                      template_folder='templates')
-
-
-@bp_resume.route('/')
-@token_auth
-def show(page):
-    """
-    return the list of resumes as object with data array inside
-    """
-    pass
-
-
-@bp_resume.route("/<resume_id>")
-@token_auth
-def get_resume(resume_id):
-    """
-    lookup for resume with resume_id, check if its from this user
-    and provide its contents in the appropriate format
-    shall support 'format' parameter with values of 'html', 'pdf'
-    if no parameter is given, json is returned
-    """
-    r = Resume()
-    return r.to_dict()
--- a/ki/resume_models.py
+++ b/ki/resume_models.py
@ -1,28 +0,0 @@
-# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-
-from sqlalchemy import Column, Integer, String, ForeignKey, JSON
-from sqlalchemy.orm import relationship
-from app import db
-
-
-class Resume(db.Model):
-    __tablename__ = 'resume'
-
-    id = Column(Integer, primary_key=True)
-
-    user_id = Column(Integer, ForeignKey("user.id", ondelete='CASCADE'))
-    label = Column("label", String(50), nullable=True)
-    data = Column('data', JSON)
-
-    user = relationship("User", backref='user', passive_deletes=True)
-
-    def to_dict(self):
-        return {
-            "id": self.id,
-            'user_id': self.user_id,
-            "label": self.label,
-            "data": self.data
-        }
--- a/ki/routes.py
+++ b/ki/routes.py
@ -4,18 +4,42 @@

 import os
 from flask import g, make_response, request, send_file
+from functools import wraps

 from ki.auth import auth
 from ki.handlers import find_profiles as find_profiles_handler
 from ki.handlers import update_profile as update_profile_handler
-from ki.models import ContactType, Language, Skill, User
+from ki.models import ContactType, Language, Skill, Token, User
 from app import app
-from ki.token_auth import token_auth

 content_type_svg = "image/svg+xml"
 content_type_png = "image/png"


+def token_auth(func):
+
+    @wraps(func)
+    def _token_auth(*args, **kwargs):
+        auth_header = request.headers.get("Authorization")
+
+        if (auth_header is None):
+            return make_response({}, 401)
+
+        if not auth_header.startswith("Bearer"):
+            return make_response({}, 401)
+
+        token = Token.query.filter(Token.token == auth_header[7:]).first()
+
+        if token is None:
+            return make_response({}, 403)
+
+        g.user = token.user
+
+        return func(*args, **kwargs)
+
+    return _token_auth
+
+
 def models_to_list(models):
    models_list = []

--- a/ki/token_auth.py
+++ b/ki/token_auth.py
@ -1,31 +0,0 @@
-# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-from flask import g, make_response, request
-from functools import wraps
-
-from ki.models import Token
-
-
-def token_auth(func):
-    @wraps(func)
-    def _token_auth(*args, **kwargs):
-        auth_header = request.headers.get("Authorization")
-
-        if (auth_header is None):
-            return make_response({}, 401)
-
-        if not auth_header.startswith("Bearer"):
-            return make_response({}, 401)
-
-        token = Token.query.filter(Token.token == auth_header[7:]).first()
-
-        if token is None:
-            return make_response({}, 403)
-
-        g.user = token.user
-
-        return func(*args, **kwargs)
-
-    return _token_auth
--- a/migrations/versions/6be5073423b4_add_resume.py
+++ b/migrations/versions/6be5073423b4_add_resume.py
@ -1,35 +0,0 @@
-"""add resume
-
-Revision ID: 6be5073423b4
-Revises: b5023977cbda
-Create Date: 2024-08-30 18:18:14.555874
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '6be5073423b4'
-down_revision = 'b5023977cbda'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('resume',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=True),
-    sa.Column('label', sa.String(length=50), nullable=True),
-    sa.Column('data', sa.JSON(), nullable=True),
-    sa.ForeignKeyConstraint(['user_id'], ['user.id'], ondelete='CASCADE'),
-    sa.PrimaryKeyConstraint('id')
-    )
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table('resume')
-    # ### end Alembic commands ###
Author	SHA1	Message	Date
Brain	4064a65e63	Verify lockfile before installation All checks were successful continuous-integration/drone/pr Build is passing Details	2024-09-10 14:52:44 +02:00
Brain	afe22e13c1	Merge pull request 'Update dependency python-dotenv to v1' (!116 ) from renovate/python-dotenv-1.x into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #116	2024-09-10 14:30:41 +02:00
Brain	e4d0a89053	Update lock file All checks were successful continuous-integration/drone/pr Build is passing Details	2024-09-10 14:27:54 +02:00
Renovate Bot	78bdd796e0	Update dependency python-dotenv to v1 Some checks failed renovate/artifacts Artifact file update failure continuous-integration/drone/pr Build is passing Details	2024-09-10 11:36:39 +00:00
Brain	5369de67d8	Merge pull request 'Update dependency pre-commit to v2.21.0' (!89 ) from renovate/pre-commit-2.x into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #89	2024-09-10 13:07:34 +02:00
Brain	54c5246f0a	Merge pull request 'Add dry-run Docker build to Pull Request CI run' (!117 ) from docker-dry-run into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #117	2024-09-10 13:02:19 +02:00
Brain	9a95baf106	Add dry-run Docker build to Pull Request CI run All checks were successful continuous-integration/drone/pr Build is passing Details	2024-09-10 12:56:04 +02:00
Renovate Bot	338380ed93	Update dependency pre-commit to v2.21.0 All checks were successful continuous-integration/drone/pr Build is passing Details	2024-09-05 09:36:44 +00:00
Brain	3d128d771c	Merge pull request 'Update dependency flask-cors to v5' (!114 ) from renovate/flask-cors-5.x into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #114	2024-09-05 11:26:34 +02:00
Renovate Bot	6b7517fc7a	Update dependency flask-cors to v5 All checks were successful continuous-integration/drone/pr Build is passing Details	2024-09-04 21:36:04 +00:00
Brain	5ceb361da3	Merge pull request 'Update python:3.8.19-alpine Docker digest to c2f31d1' (!113 ) from renovate/python into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #113	2024-09-04 23:03:32 +02:00
Renovate Bot	4379a06f26	Update python:3.8.19-alpine Docker digest to c2f31d1 All checks were successful continuous-integration/drone/pr Build is passing Details	2024-09-04 19:36:16 +00:00
Brain	c43f375e4b	Merge pull request 'Update dependency flake8 to v7' (!108 ) from renovate/flake8-7.x into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #108	2024-09-04 20:44:01 +02:00
Renovate Bot	621a90b8ab	Update dependency flake8 to v7 All checks were successful continuous-integration/drone/pr Build is passing Details	2024-08-28 14:36:12 +00:00