🚀Bumped version to v0.2.0

Reviewed-on: #18

.drone.yml

@@ -22,7 +22,7 @@ get:
 ---
 kind: pipeline
 type: kubernetes
-name: tests:node_latest
+name: tests:node
 clone:
   disable: true
 steps:
@@ -32,7 +32,7 @@ steps:
       - git clone $DRONE_REMOTE_URL .
       - git checkout $DRONE_SOURCE_BRANCH
   - name: run tests
-    image: node:latest
+    image: registry.odit.services/hub/library/node:19.0.1-alpine3.16
     commands:
       - yarn
       - yarn test:ci
@@ -54,21 +54,25 @@ steps:
       - git clone $DRONE_REMOTE_URL .
       - git checkout dev
   - name: build dev
-    image: plugins/docker
-    depends_on: [clone]
+    image: registry.odit.services/library/drone-kaniko
     settings:
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
-      repo: registry.odit.services/lfk/mailer
+      build_args:
+        - NPM_REGISTRY_DOMAIN:
+          from_secret: npmjs_domain
+        - NPM_REGISTRY_TOKEN:
+          from_secret: npmjs_token
+      repo: lfk/mailer
       tags:
         - dev
+      cache: true
       registry: registry.odit.services
-      mtu: 1000
   - name: run changelog export
     depends_on: ["clone"]
-    image: node:latest
+    image: registry.odit.services/hub/library/node:19.0.1-alpine3.16
     commands:
       - npx auto-changelog --commit-limit false -p -u --hide-credit
   - name: push new changelog to repo
@@ -84,7 +88,7 @@ steps:
         from_secret: git_ssh
   - name: run full license export
     depends_on: ["clone"]
-    image: node:14.15.1-alpine3.12
+    image: registry.odit.services/hub/library/node:19.0.1-alpine3.16
     commands:
       - yarn
       - yarn licenses:export
@@ -100,7 +104,6 @@ steps:
       skip_verify: true
       ssh_key:
         from_secret: git_ssh
-
 trigger:
   branch:
     - dev
@@ -123,18 +126,22 @@ steps:
       - git merge main
       - git checkout main
   - name: build latest
-    depends_on: ["clone"]
-    image: plugins/docker
+    image: registry.odit.services/library/drone-kaniko
     settings:
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
-      repo: registry.odit.services/lfk/mailer
+      build_args:
+        - NPM_REGISTRY_DOMAIN:
+          from_secret: npmjs_domain
+        - NPM_REGISTRY_TOKEN:
+          from_secret: npmjs_token
+      repo: lfk/mailer
       tags:
         - latest
+      cache: true
       registry: registry.odit.services
-      mtu: 1000
   - name: push merge to repo
     depends_on: ["clone"]
     image: appleboy/drone-git-push
@@ -144,7 +151,6 @@ steps:
       remote: git@git.odit.services:lfk/mailer.git
       ssh_key:
         from_secret: git_ssh
-
 trigger:
   branch:
     - main
@@ -158,18 +164,22 @@ name: build:tags
 
 steps:
   - name: build $DRONE_TAG
-    image: plugins/docker
-    depends_on: [clone]
+    image: registry.odit.services/library/drone-kaniko
     settings:
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
-      repo: registry.odit.services/lfk/mailer
+      build_args:
+        - NPM_REGISTRY_DOMAIN:
+          from_secret: npmjs_domain
+        - NPM_REGISTRY_TOKEN:
+          from_secret: npmjs_token
+      repo: lfk/mailer
       tags:
-        - '${DRONE_TAG}'
+        - "${DRONE_TAG}"
+      cache: true
       registry: registry.odit.services
-      mtu: 1000
 trigger:
   event:
-  - tag
+    - tag

.npmrc

@@ -0,0 +1 @@
+strict-peer-dependencies=false

CHANGELOG.md

@@ -2,12 +2,30 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [v0.1.2](https://git.odit.services/lfk/mailer/compare/v0.1.2...v0.1.2)
+
+- update runner-welcome mail template [`#15`](https://git.odit.services/lfk/mailer/issues/15)
+- Merge pull request 'update runner-welcome mail template' (#17) from dev into main [`07306be`](https://git.odit.services/lfk/mailer/commit/07306be49722877dcce04660e452acedc6f77663)
+- 📖New license file version [CI SKIP] [skip ci] [`247d4b6`](https://git.odit.services/lfk/mailer/commit/247d4b617678655845b5baf6ae5deba01e953a39)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`00bb40d`](https://git.odit.services/lfk/mailer/commit/00bb40ddf999245d9fa0b005f000e670f4daf60c)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`e713ef5`](https://git.odit.services/lfk/mailer/commit/e713ef54ef39d4759832ada073cea825b4ef26dc)
+
+#### [v0.1.2](https://git.odit.services/lfk/mailer/compare/v0.1.1...v0.1.2)
+
+> 15 April 2021
+
+- Merge pull request 'Release 0.1.2' (#14) from dev into main [`15b98e8`](https://git.odit.services/lfk/mailer/commit/15b98e83098906005e0f3f0b24313f9cab6ec1af)
+- Fixed typos and added missing translations🌎 [`8099d2f`](https://git.odit.services/lfk/mailer/commit/8099d2fdbaa8fea6e4fd6a993ac1cfb09e01d14d)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`c8378b6`](https://git.odit.services/lfk/mailer/commit/c8378b66ba512a90ca4386d5a3570f4bb8bea049)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`fbc95be`](https://git.odit.services/lfk/mailer/commit/fbc95be3455eed0d97a124f7df277d0f902e76c9)
+- 🚀Bumped version to v0.1.2 [`d550059`](https://git.odit.services/lfk/mailer/commit/d5500594945b99e428ac1651afd1fe8a8eeba192)
+
 #### [v0.1.1](https://git.odit.services/lfk/mailer/compare/v0.1.0...v0.1.1)
 
+> 31 March 2021
+
+- Merge pull request 'Release 0.1.1' (#13) from dev into main [`b47660a`](https://git.odit.services/lfk/mailer/commit/b47660af65362d773911e99fa9ebf99340d1a368)
 - Added mail templates for forgotten selfservice links [`56c3dec`](https://git.odit.services/lfk/mailer/commit/56c3deca574fc4501cc9b51128b4f3b0467d24c9)
-- 🧾New changelog file version [CI SKIP] [skip ci] [`8996aef`](https://git.odit.services/lfk/mailer/commit/8996aef1523e079aec83b63df99c44173f3a43cc)
-- 🚀Bumped version to v0.1.1 [`34e0c72`](https://git.odit.services/lfk/mailer/commit/34e0c729b542b026b997f25a33165383ff879222)
-- Merge pull request 'Now base64-encoding the selfservice tokens👀' (#12) from bugfix/11-selfservice_profile_link into dev [`5ff6f77`](https://git.odit.services/lfk/mailer/commit/5ff6f77dafa6a3a67615fae6d228c31cb8eac6b9)
 - Applied Docker MTU fix 🛠 [`f6c03c7`](https://git.odit.services/lfk/mailer/commit/f6c03c7ae218faf8bcdc4108e809ef121b87ef92)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`00e7837`](https://git.odit.services/lfk/mailer/commit/00e78371f3d875460596c24f3544d4e94a896f3c)
 - Added tests [`91f9a8c`](https://git.odit.services/lfk/mailer/commit/91f9a8cbdecf74a74e68b80f3aec675de59e46d4)
@@ -24,11 +42,15 @@ All notable changes to this project will be documented in this file. Dates are d
 - 🧾New changelog file version [CI SKIP] [skip ci] [`07aeaf6`](https://git.odit.services/lfk/mailer/commit/07aeaf6d6ba46d0bde62141a7ab0f47c9afde565)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`416be79`](https://git.odit.services/lfk/mailer/commit/416be7920cc551bfd2da2ddfc2fdc25367cafc99)
 - Added translation keys to txt [`44972e4`](https://git.odit.services/lfk/mailer/commit/44972e4a93204aa9f6acbbf29f3012aa8213af77)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`d996d2e`](https://git.odit.services/lfk/mailer/commit/d996d2e85f24c9e3723913bafc8078a13732fc04)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`8996aef`](https://git.odit.services/lfk/mailer/commit/8996aef1523e079aec83b63df99c44173f3a43cc)
+- 🚀Bumped version to v0.1.1 [`34e0c72`](https://git.odit.services/lfk/mailer/commit/34e0c729b542b026b997f25a33165383ff879222)
+- Merge pull request 'Now base64-encoding the selfservice tokens👀' (#12) from bugfix/11-selfservice_profile_link into dev [`5ff6f77`](https://git.odit.services/lfk/mailer/commit/5ff6f77dafa6a3a67615fae6d228c31cb8eac6b9)
 - Changed ci pipeline type to kubernetes [`18c8600`](https://git.odit.services/lfk/mailer/commit/18c8600563c4369321a0e9ba51a09a2fa95198b5)
-- Added new mailtype enum [`015b25a`](https://git.odit.services/lfk/mailer/commit/015b25a2056fe3537fb8e88539c25c2c9e6ba618)
 - Dockerfile with cached images 🔥 [`f554718`](https://git.odit.services/lfk/mailer/commit/f55471825ef6833600780cb229148d7b7d122150)
 - Now base64-encoding the selfservice tokens👀 [`1f58165`](https://git.odit.services/lfk/mailer/commit/1f581650c5164b6b6d6a6fce5e86e64074c1bdf9)
 - Merge pull request 'Selfservice link forgotten mails feature/5-registration_forgot_mails' (#10) from feature/5-registration_forgot_mails into dev [`f011659`](https://git.odit.services/lfk/mailer/commit/f011659469bd62dffc17e440a6ed42d1fbe7956e)
+- Added new mailtype enum [`015b25a`](https://git.odit.services/lfk/mailer/commit/015b25a2056fe3537fb8e88539c25c2c9e6ba618)
 - Fixed typo [`577f321`](https://git.odit.services/lfk/mailer/commit/577f321b3ffcea666eaaa529e86e532702432635)
 - Renamed templates [`34e30d6`](https://git.odit.services/lfk/mailer/commit/34e30d64929ca7555cee62c4da86d07050b94ff5)
 

Dockerfile

@@ -1,5 +1,5 @@
 # Typescript Build
-FROM registry.odit.services/hub/library/node:14.15.1-alpine3.12
+FROM registry.odit.services/hub/library/node:19.0.1-alpine3.16
 WORKDIR /app
 COPY package.json ./
 RUN npm i -g pnpm
@@ -8,7 +8,7 @@ COPY tsconfig.json ./
 COPY src ./src
 RUN pnpm run build
 # final image
-FROM registry.odit.services/hub/library/node:14.15.1-alpine3.12
+FROM registry.odit.services/hub/library/node:19.0.1-alpine3.16
 COPY package.json ./
 RUN npm i -g pnpm
 RUN pnpm i --prod

licenses.md

@@ -492,27 +492,27 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **License**: MIT
 **Description**: TypeScript definitions for Nodemailer
 ## License Text
-    MIT License
-
-    Copyright (c) Microsoft Corporation.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE
+    MIT License
+
+    Copyright (c) Microsoft Corporation. All rights reserved.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE
  
 
 # axios

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odit/lfk-mailer",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "The document mailer for the LfK! runner system. This generates and sends mails (password reset, welcome, ...)",
   "main": "src/app.ts",
   "scripts": {
@@ -44,37 +44,37 @@
   ],
   "license": "CC-BY-NC-SA-4.0",
   "dependencies": {
-    "@odit/class-validator-jsonschema": "^2.1.1",
+    "@odit/class-validator-jsonschema": "2.1.1",
     "class-transformer": "0.3.1",
-    "class-validator": "^0.13.1",
-    "consola": "^2.15.3",
-    "cors": "^2.8.5",
-    "dotenv": "^8.2.0",
-    "express": "^4.17.1",
-    "handlebars": "^4.7.6",
-    "i18next": "^19.8.7",
-    "i18next-fs-backend": "^1.0.8",
-    "nodemailer": "^6.5.0",
-    "reflect-metadata": "^0.1.13",
+    "class-validator": "0.13.1",
+    "consola": "2.15.3",
+    "cors": "2.8.5",
+    "dotenv": "8.2.0",
+    "express": "4.17.1",
+    "handlebars": "4.7.6",
+    "i18next": "19.8.7",
+    "i18next-fs-backend": "1.0.8",
+    "nodemailer": "6.5.0",
+    "reflect-metadata": "0.1.13",
     "routing-controllers": "0.9.0-alpha.6",
     "routing-controllers-openapi": "2.2.0"
   },
   "devDependencies": {
-    "@odit/license-exporter": "^0.0.10",
-    "@types/express": "^4.17.11",
-    "@types/jest": "^26.0.20",
-    "@types/node": "^14.14.22",
-    "@types/nodemailer": "^6.4.0",
-    "axios": "^0.21.1",
-    "cp-cli": "^2.0.0",
-    "jest": "^26.6.3",
-    "nodemon": "^2.0.7",
-    "release-it": "^14.2.2",
-    "rimraf": "^3.0.2",
-    "start-server-and-test": "^1.12.0",
-    "ts-jest": "^26.5.2",
-    "ts-node": "^9.1.1",
-    "typescript": "^4.1.3"
+    "@odit/license-exporter": "0.0.10",
+    "@types/express": "4.17.11",
+    "@types/jest": "26.0.20",
+    "@types/node": "14.14.22",
+    "@types/nodemailer": "6.4.0",
+    "axios": "0.21.1",
+    "cp-cli": "2.0.0",
+    "jest": "26.6.3",
+    "nodemon": "2.0.7",
+    "release-it": "14.2.2",
+    "rimraf": "3.0.2",
+    "start-server-and-test": "1.12.0",
+    "ts-jest": "26.5.2",
+    "ts-node": "9.1.1",
+    "typescript": "4.1.3"
   },
   "release-it": {
     "git": {

src/Mailer.ts

@@ -134,7 +134,7 @@ export class Mailer {
             link_imprint: `${config.app_url}/imprint`,
             link_privacy: `${config.app_url}/privacy`,
             selfservice_link: `${config.app_url}/selfservice/profile/${token}`,
-            forgot_link: `${config.app_url}/selfservice`,
+            forgot_link: `${config.app_url}/selfservice/`,
             contact_mail: config.contact_mail,
             event_name: config.event_name
         }
@@ -168,7 +168,7 @@ export class Mailer {
             link_imprint: `${config.app_url}/imprint`,
             link_privacy: `${config.app_url}/privacy`,
             selfservice_link: `${config.app_url}/selfservice/profile/${token}`,
-            forgot_link: `${config.app_url}/selfservice`,
+            forgot_link: `${config.app_url}/selfservice/`,
             contact_mail: config.contact_mail,
             event_name: config.event_name
         }

src/locales/de.json

@@ -12,15 +12,20 @@
     "privacy": "Datenschutz",
     "reset-password": "Passwort zurücksetzen",
     "test-mail": "Test mail",
+    "thank-you-for-requesting-a-new-link-to-your-event_name-runner-profile": "Danke, dass du einen neuen Profillink für das {{event_name}} Läuferstem beantragt hast.",
     "thanks-for-registering-and-welcome-to-the-event_name": "Vielen Dank für die Registrierung und willkommen beim {{event_name}}!",
     "the-only-thing-you-have-to-do-now-is-to-bring-your-registration-code-with-you": "Du must nichts weiter machen, außer deinen Registrierungscode zum Lauf mitzubringen.",
     "this-is-a-test-mail-triggered-by-an-admin-in-the-lfk-backend": "Das ist eine Testmail, die von einem Admin im LfK! Backend erzeugt wurde.",
     "this-mail-was-sent-to-recipient_mail-because-someone-request-a-mail-test-for-this-mail-address": "Du bekommst diese Mail, weil jemand eine Testmail für deine Mail-Adresse angefragt hat.",
     "this-mail-was-sent-to-you-because-someone-request-a-password-reset-for-a-account-linked-to-the-mail-address": "Du bekommst diese E-Mail, weil jemand einen Passwort-Reset für deinen Account beantragt hat.",
+    "this-mail-was-sent-to-you-because-someone-requested-a-new-link-to-access-your-profile-for-the-event_name": "Diese E-Mail wurde an dich gesendet, weil jemand einen neuen Link angefordert hat, um auf dein {{event_name}} Profil zuzugreifen.",
     "this-mail-was-sent-to-you-because-someone-used-your-mail-address-to-register-themselfes-for-the-event_name": "Du bekommst diese Mail, weil jemand deine E-Mail-Adresse verwendet hat, um sich beim {{event_name}} zu registrieren.",
+    "to-prevent-spam-you-can-only-request-a-new-link-every-24hrs": "Um Spam zu vermeiden, kannst du nur alle 24 Stunden einen neuen Link anfordern.",
     "view-my-data": "Meine Daten",
     "we-successfully-processed-your-registration": "Wir haben deine Registrierung erfolgreich verarbeitet.",
     "welcome": "Willkommen",
-    "you-can-view-your-registration-code-lap-times-and-much-more-by-visiting-our-selfservice": "Du kannst deinen Registrierungscode, deine Rundenzeiten unv vieles mehr im Selfservice einsehen:",
-    "your-password-wont-be-changed-until-you-click-the-reset-link-below-and-set-a-new-one": "Dein Passwort wird erst zurückgesetzt, wenn du den Reset-Link öffnest und ein neues Passwort setzt."
+    "you-can-view-your-registration-code-lap-times-and-much-more-by-visiting-our-selfservice": "Du kannst deinen Registrierungscode, deine Rundenzeiten und vieles mehr im Selfservice einsehen:",
+    "your-event_name-profile": "Dein {{event_name}} Profil",
+    "your-password-wont-be-changed-until-you-click-the-reset-link-below-and-set-a-new-one": "Dein Passwort wird erst zurückgesetzt, wenn du den Reset-Link öffnest und ein neues Passwort setzt.",
+    "your-profile": "Dein Profil"
 }

src/locales/en.json

@@ -27,5 +27,5 @@
     "you-can-view-your-registration-code-lap-times-and-much-more-by-visiting-our-selfservice": "You can view your registration code, lap times and much more by visiting our selfservice:",
     "your-event_name-profile": "Your {{event_name}} profile",
     "your-password-wont-be-changed-until-you-click-the-reset-link-below-and-set-a-new-one": "Your password won't be changed until you click the reset link below and set a new one.",
-    "your-profile": "Your Profile"
+    "your-profile": "Your profile"
 }