Merge remote-tracking branch 'upstream/master'

Author: rudivanhierden

.github/ISSUE_TEMPLATE/bugs.md

@@ -3,6 +3,8 @@
 name: Build and Publish Version Tags
 on:
   push:
+    branches:
+      - '**'
     tags:
       - "v*"
 jobs:
@@ -11,17 +13,23 @@ jobs:
     name: Build Docker image and push to repositories
     # run only when code is compiling and tests are passing
     runs-on: ubuntu-latest
+    env:
+      IMAGE: ${{ secrets.DOCKER_IMAGE || 'openstad/api' }}
     # steps to perform in job
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Get the version
-        id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
-
-   #   - name: tag number
-#        run : echo ${{ github.event.release.tag_name }}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.IMAGE }}
+          tags: |
+            # branch event
+            type=ref,event=branch,suffix=-{{sha}}
+            # tag event
+            type=ref,event=tag
 
       # setup Docker buld action
       - name: Set up Docker Buildx
@@ -35,16 +43,27 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build image and push to Docker Hub and GitHub Container Registry
+        id: docker_build
         uses: docker/build-push-action@v2
         with:
           context: .
           push: true
-          # Note: tags has to be all lower-case
-          tags: |
-            openstad/api:${{ steps.get_version.outputs.VERSION }}
-          # build on feature branches, push only on main branch
-          ##push: ${{ github.ref == 'refs/heads/main' }}
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+          tags: ${{ steps.meta.outputs.tags }}
+
+      # Comment build info in commit
+      - uses: actions/github-script@0.9.0
+        env:
+          STDOUT: "Published new image: `${{ fromJson(steps.docker_build.outputs.metadata)['image.name'] }}`"
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            github.repos.createCommitComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              commit_sha: context.sha,
+              body: process.env.STDOUT
+            })
 
+      - name: Image digest
+        run: echo "${{ steps.docker_build.outputs.metadata }}"
 

.github/ISSUE_TEMPLATE/config.yml

@@ -3,19 +3,33 @@
 ## UNRELEASED
 * Change mongoDB S3 backup to read the database dump in chunks and upload it to the S3 bucket using a MultiPart upload setup.
 * Allow s3 backups to be disabled from the cronjobs, but instead be run through a different entrypoint (backup.js) to allow kubernetes cronjobs to be used.
+* Add input, textarea and multiple-choice question types to the choices guide
+
+## 1.0.0
+* Anonymize site users 
+* Save idea as concept
+* Bugfix: no-sentiment in arguments-block
+* Bugfix: edit idea after first like or argument
+* Add env MYSQL_CA_CERT for MySQL SSL connection
+* Update/cleanup access rights for moderators and editors
+* Bugfix: add constraint to users table, to prevent double users
+* Remove all remaining code related to sessions; the API is stateless
+* Remove old image code
+* Bugfix: users in vote export
+* Bugfix: site.config.ideas.automaticallyUpdateStatus
+* Upgrade to node 16
+* Add virtual end date to idea
 
 ## v0.40.0
 Update version number
-
-## v0.21.0
+* Remove sessions and cookies - the API is stateless
 * Update Action cron to once every minute
 * Add linter/prettier
 * Unknown fixed-auth-token is no longer an error but is now a not-logged-in
 * Better handling of database connections
 * New template distribution system
 * Do not wait for cms when updating site config
 * Move docker builds from travis to github actions
-
 ## v0.20.0 (2021-12-20)
 * Fix responding to not existing routes with to much information
 * Make submissions listable & viewable, and allow them to be filtered by formId

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,5 +1,5 @@
 # Nodejs 8.0.0 alpine 3.6.0
-FROM node:13.14.0-alpine
+FROM node:16.16.0-alpine
 
 # Label for tracking
 LABEL nl.openstad.container="api_container" nl.openstad.version="0.0.1-beta" nl.openstad.release-date="2020-05-07"
@@ -19,15 +19,13 @@ ENV API_MAIL_TRANSPORT_SMTP_REQUIRESSL=""
 ENV API_MAIL_TRANSPORT_SMTP_AUTH_USER=""
 ENV API_MAIL_TRANSPORT_SMTP_AUTH_PASS=""
 ENV API_NOTIFICATIONS_ADMIN_EMAILADDRESS=""
-ENV API_SECURITY_SESSIONS_COOKIENAME=""
-ENV API_SECURITY_SESSIONS_ONLYSECURE=""
 ENV API_AUTHORIZATION_JWTSECRET=""
 ENV API_AUTHORIZATION_FIXEDAUTHTOKENS=""
 ENV AUTH_API_URL=""
 
 
 # Install all base dependencies.# add perl for shell scripts
-RUN apk add --no-cache --update g++ make python musl-dev bash perl perl-dbd-mysql perl-posix-strftime-compiler
+RUN apk add --no-cache --update g++ make python3 musl-dev bash perl perl-dbd-mysql perl-posix-strftime-compiler
 
 RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.6/main' >> /etc/apk/repositories
 RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.6/community' >> /etc/apk/repositories
@@ -47,7 +45,7 @@ RUN npm install
 RUN npm install -g nodemon
 
 # Remove unused packages only used for building.
-RUN apk del g++ make python && rm -rf /var/cache/apk/*
+RUN apk del g++ make python3 && rm -rf /var/cache/apk/*
 
 # Set node ownership to /home/app
 RUN chown -R node:node /home/app

.github/pull_request_template.md

@@ -44,10 +44,6 @@ module.exports = {
   },
 
   "security": {
-    "sessions": {
-      "secret": "COOKIE_SECRET",
-      "onlySecure": true
-    }
   },
 
   "authorization": {
@@ -93,7 +89,10 @@ Then run following command:
 ```
 env ... node reset.js
 ```
-
+If you are using an existing database and only want to migrate run the following command:
+```
+node -r dotenv/config migrate.js
+```
 
 ### 4. Start de server
 ```
@@ -128,7 +127,10 @@ If you want to enable gitops flow in the ci pipeline of travis you need to confi
 - GITOPS_ACC_VALUES_FILE=k8s/openstad/environments/acc.values.yaml
 - GITOPS_PROD_VALUES_FILE=k8s/openstad/environments/prod.values.yaml
 
+## MySQL with SSL
+
+When you want to connect to a MySQL server using SSL, a Certificate Authority certificate is required. The contents of this CA certificate can be passed into the `MYSQL_CA_CERT` environment variable.
+
 ## Documentatie
 
 Meer informatie staat in de [docs directory](doc/index.md).
-