lfk/mailer
3
0
Fork 0
Code Issues Pull Requests Actions Projects Releases 3 Wiki Activity

Merge branch 'dev' of https://git.odit.services/lfk/mailer into dev
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Philipp Dormann 2023-02-03 16:34:19 +01:00
commit 3fda05dc49
Signed by: philipp
GPG Key ID: 3BB9ADD52DCA4314
7 changed files with 193 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
.drone.yml
View File

@ -22,7 +22,7 @@ get:
--- ---
kind: pipeline kind: pipeline
type: kubernetes type: kubernetes
name: tests:node_latest name: tests:node
clone: clone:
disable: true disable: true
steps: steps:
@ -32,7 +32,7 @@ steps:
- git clone $DRONE_REMOTE_URL . - git clone $DRONE_REMOTE_URL .
- git checkout $DRONE_SOURCE_BRANCH - git checkout $DRONE_SOURCE_BRANCH
- name: run tests - name: run tests
image: node:latest image: registry.odit.services/hub/library/node:19.0.1-alpine3.16
commands: commands:
- yarn - yarn
- yarn test:ci - yarn test:ci
@ -54,53 +54,22 @@ steps:
- git clone $DRONE_REMOTE_URL . - git clone $DRONE_REMOTE_URL .
- git checkout dev - git checkout dev
- name: build dev - name: build dev
image: plugins/docker image: registry.odit.services/library/drone-kaniko
depends_on: [clone]
settings: settings:
username: username:
from_secret: docker_username from_secret: docker_username
password: password:
from_secret: docker_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: tags:
- dev - dev
cache: true
registry: registry.odit.services registry: registry.odit.services
mtu: 1000
- name: run changelog export
depends_on: ["clone"]
image: node:latest
commands:
- npx auto-changelog --commit-limit false -p -u --hide-credit
- name: push new changelog to repo
depends_on: ["run changelog export"]
image: appleboy/drone-git-push
settings:
branch: dev
commit: true
commit_message: 🧾New changelog file version [CI SKIP] [skip ci]
author_email: bot@odit.services
remote: git@git.odit.services:lfk/mailer.git
ssh_key:
from_secret: git_ssh
- name: run full license export
depends_on: ["clone"]
image: node:14.15.1-alpine3.12
commands:
- yarn
- yarn licenses:export
- name: push new licenses file to repo
depends_on: ["run full license export"]
image: appleboy/drone-git-push
settings:
branch: dev
commit: true
commit_message: 📖New license file version [CI SKIP] [skip ci]
author_email: bot@odit.services
remote: git@git.odit.services:lfk/mailer.git
skip_verify: true
ssh_key:
from_secret: git_ssh
trigger: trigger:
branch: branch:
- dev - dev
@ -123,28 +92,22 @@ steps:
- git merge main - git merge main
- git checkout main - git checkout main
- name: build latest - name: build latest
depends_on: ["clone"] image: registry.odit.services/library/drone-kaniko
image: plugins/docker
settings: settings:
username: username:
from_secret: docker_username from_secret: docker_username
password: password:
from_secret: docker_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: tags:
- latest - latest
cache: true
registry: registry.odit.services registry: registry.odit.services
mtu: 1000
- name: push merge to repo
depends_on: ["clone"]
image: appleboy/drone-git-push
settings:
branch: dev
commit: false
remote: git@git.odit.services:lfk/mailer.git
ssh_key:
from_secret: git_ssh
trigger: trigger:
branch: branch:
- main - main
@ -158,18 +121,22 @@ name: build:tags
steps: steps:
- name: build $DRONE_TAG - name: build $DRONE_TAG
image: plugins/docker image: registry.odit.services/library/drone-kaniko
depends_on: [clone]
settings: settings:
username: username:
from_secret: docker_username from_secret: docker_username
password: password:
from_secret: docker_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: tags:
- '${DRONE_TAG}' - "${DRONE_TAG}"
cache: true
registry: registry.odit.services registry: registry.odit.services
mtu: 1000
trigger: trigger:
event: event:
- tag - tag

1
.gitignore vendored
View File

@ -138,3 +138,4 @@ build
lib lib
/oss-attribution /oss-attribution
*.tmp *.tmp
pnpm-lock.yaml

1
.npmrc Normal file
View File

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

15
CHANGELOG.md
View File

@ -2,9 +2,22 @@
All notable changes to this project will be documented in this file. Dates are displayed in UTC. 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) #### [v0.2.1](https://git.odit.services/lfk/mailer/compare/v0.1.2...v0.2.1)
- update runner-welcome mail template [`#15`](https://git.odit.services/lfk/mailer/issues/15) - update runner-welcome mail template [`#15`](https://git.odit.services/lfk/mailer/issues/15)
- Moved Release management to releaseit [`68bd293`](https://git.odit.services/lfk/mailer/commit/68bd293acb474fe8f201423ffd442d0ee186a482)
- 🚀Bumped version to v0.2.0 [`84e3778`](https://git.odit.services/lfk/mailer/commit/84e3778b8962834b57ee92ba01a0b02505bbc7e7)
- Merge pull request 'feature/kaniko' (#18) from feature/kaniko into dev [`4ca5f9d`](https://git.odit.services/lfk/mailer/commit/4ca5f9d38dc3300d0bcbf8448283b53b484a827d)
- Fresh licenses 4 yall [`c48a2ed`](https://git.odit.services/lfk/mailer/commit/c48a2ed01e65dc20c562d80099ca7448a8725446)
- Version pinning [`22470d6`](https://git.odit.services/lfk/mailer/commit/22470d6160b450515966e7e38c37c45085f8ceb2)
- Now building w/ kaniko [`f422f98`](https://git.odit.services/lfk/mailer/commit/f422f989c7d5c2fead70e37fc314b734034916f7)
- 📖New license file version [CI SKIP] [skip ci] [`247d4b6`](https://git.odit.services/lfk/mailer/commit/247d4b617678655845b5baf6ae5deba01e953a39)
- Bumped used ci node images [`0692b72`](https://git.odit.services/lfk/mailer/commit/0692b72955974c2fdee6441d4e7838d41dde8ed6)
- 🧾New changelog file version [CI SKIP] [skip ci] [`00bb40d`](https://git.odit.services/lfk/mailer/commit/00bb40ddf999245d9fa0b005f000e670f4daf60c)
- Bumped docker node [`af173dc`](https://git.odit.services/lfk/mailer/commit/af173dcec822f12d8233b717304ad82b7fac14db)
- 🧾New changelog file version [CI SKIP] [skip ci] [`e155454`](https://git.odit.services/lfk/mailer/commit/e155454013aa32e31db6afe5d6cb476c21d38aba)
- Shut up pnpm warnings [`acb013e`](https://git.odit.services/lfk/mailer/commit/acb013e8ae86f868aced40dbc2a68f8165627145)
- Merge pull request 'update runner-welcome mail template' (#17) from dev into main [`07306be`](https://git.odit.services/lfk/mailer/commit/07306be49722877dcce04660e452acedc6f77663)
- 🧾New changelog file version [CI SKIP] [skip ci] [`e713ef5`](https://git.odit.services/lfk/mailer/commit/e713ef54ef39d4759832ada073cea825b4ef26dc) - 🧾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) #### [v0.1.2](https://git.odit.services/lfk/mailer/compare/v0.1.1...v0.1.2)

4
Dockerfile
View File

@ -1,5 +1,5 @@
# Typescript Build # 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 WORKDIR /app
COPY package.json ./ COPY package.json ./
RUN npm i -g pnpm RUN npm i -g pnpm
@ -8,7 +8,7 @@ COPY tsconfig.json ./
COPY src ./src COPY src ./src
RUN pnpm run build RUN pnpm run build
# final image # 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 ./ COPY package.json ./
RUN npm i -g pnpm RUN npm i -g pnpm
RUN pnpm i --prod RUN pnpm i --prod

88
licenses.md
View File

@ -244,7 +244,7 @@ SOFTWARE.
# i18next-fs-backend # i18next-fs-backend
**Author**: undefined **Author**: undefined
**Repo**: git@github.com:i18next/i18next-fs-backend.git **Repo**: git@github.com:i18next/i18next-fs-backend.git
**License**: MIT **License**: undefined
**Description**: i18next-fs-backend is a backend layer for i18next using in Node.js and for Deno to load translations from the filesystem. **Description**: i18next-fs-backend is a backend layer for i18next using in Node.js and for Deno to load translations from the filesystem.
## License Text ## License Text
@ -492,27 +492,56 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**License**: MIT **License**: MIT
**Description**: TypeScript definitions for Nodemailer **Description**: TypeScript definitions for Nodemailer
## License Text ## License Text
MIT License 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
Copyright (c) Microsoft Corporation. # auto-changelog
**Author**: Pete Cook <pete@cookpete.com> (https://github.com/cookpete)
**Repo**: https://github.com/CookPete/auto-changelog.git
**License**: MIT
**Description**: Command line tool for generating a changelog from git tags and commit history
## License Text
The MIT License
Permission is hereby granted, free of charge, to any person obtaining a copy Copyright (c) 2017 Pete Cook https://cookpete.com
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 Permission is hereby granted, free of charge, to any person obtaining a copy
copies or substantial portions of the Software. 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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR The above copyright notice and this permission notice shall be included in
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, all copies or substantial portions of the Software.
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
SOFTWARE 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 # axios
@ -604,7 +633,7 @@ SOFTWARE.
**Author**: [object Object] **Author**: [object Object]
**Repo**: https://github.com/remy/nodemon.git **Repo**: https://github.com/remy/nodemon.git
**License**: MIT **License**: MIT
**Description**: Simple monitor script for use during development of a Node.js app. **Description**: Simple monitor script for use during development of a node.js app.
## License Text ## License Text
MIT License MIT License
@ -687,27 +716,6 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**License**: MIT **License**: MIT
**Description**: Starts server, waits for URL, then runs test command; when the tests end, shuts down server **Description**: Starts server, waits for URL, then runs test command; when the tests end, shuts down server
## License Text ## License Text
MIT License
Copyright (c) 2022 bahmutov
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.
# ts-jest # ts-jest

191
package.json
View File

@ -1,92 +1,99 @@
{ {
"name": "@odit/lfk-mailer", "name": "@odit/lfk-mailer",
"version": "0.1.2", "version": "0.2.1",
"description": "The document mailer for the LfK! runner system. This generates and sends mails (password reset, welcome, ...)", "description": "The document mailer for the LfK! runner system. This generates and sends mails (password reset, welcome, ...)",
"main": "src/app.ts", "main": "src/app.ts",
"scripts": { "scripts": {
"dev": "nodemon src/app.ts", "dev": "nodemon src/app.ts",
"build": "rimraf ./dist && tsc && cp-cli ./src/templates ./dist/templates && cp-cli ./src/locales ./dist/locales", "build": "rimraf ./dist && tsc && cp-cli ./src/templates ./dist/templates && cp-cli ./src/locales ./dist/locales",
"licenses:export": "license-exporter --markdown", "licenses:export": "license-exporter --markdown",
"release": "release-it --only-version", "changelog:export": "auto-changelog --commit-limit false -p -u --hide-credit",
"translations:sort": "node ./scripts/sort_translations.js", "release": "release-it --only-version",
"test": "jest", "translations:sort": "node ./scripts/sort_translations.js",
"test:watch": "jest --watchAll", "test": "jest",
"test:generate_env": "ts-node ./scripts/create_testenv.ts", "test:watch": "jest --watchAll",
"test:ci": "npm run test:generate_env && npm run test:ci:run", "test:generate_env": "ts-node ./scripts/create_testenv.ts",
"test:ci:run": "start-server-and-test dev http://localhost:4010/docs/openapi.json test" "test:ci": "npm run test:generate_env && npm run test:ci:run",
}, "test:ci:run": "start-server-and-test dev http://localhost:4010/docs/openapi.json test"
"repository": { },
"type": "git", "repository": {
"url": "git@git.odit.services:lfk/mailer.git" "type": "git",
}, "url": "git@git.odit.services:lfk/mailer.git"
"keywords": [ },
"odit", "keywords": [
"lfk", "odit",
"mail", "lfk",
"node" "mail",
], "node"
"author": { ],
"name": "ODIT.Services", "author": {
"email": "info@odit.services", "name": "ODIT.Services",
"url": "https://odit.services" "email": "info@odit.services",
}, "url": "https://odit.services"
"contributors": [ },
{ "contributors": [
"name": "Philipp Dormann", {
"email": "philipp@philippdormann.de", "name": "Philipp Dormann",
"url": "https://philippdormann.de" "email": "philipp@philippdormann.de",
}, "url": "https://philippdormann.de"
{ },
"name": "Nicolai Ort", {
"email": "info@nicolai-ort.com", "name": "Nicolai Ort",
"url": "https://nicolai-ort.com" "email": "info@nicolai-ort.com",
} "url": "https://nicolai-ort.com"
], }
"license": "CC-BY-NC-SA-4.0", ],
"dependencies": { "license": "CC-BY-NC-SA-4.0",
"@odit/class-validator-jsonschema": "^2.1.1", "dependencies": {
"class-transformer": "0.3.1", "@odit/class-validator-jsonschema": "2.1.1",
"class-validator": "^0.13.1", "class-transformer": "0.3.1",
"consola": "^2.15.3", "class-validator": "0.13.1",
"cors": "^2.8.5", "consola": "2.15.3",
"dotenv": "^8.2.0", "cors": "2.8.5",
"express": "^4.17.1", "dotenv": "8.2.0",
"handlebars": "^4.7.6", "express": "4.17.1",
"i18next": "^19.8.7", "handlebars": "4.7.6",
"i18next-fs-backend": "^1.0.8", "i18next": "19.8.7",
"nodemailer": "^6.5.0", "i18next-fs-backend": "1.0.8",
"reflect-metadata": "^0.1.13", "nodemailer": "6.5.0",
"routing-controllers": "0.9.0-alpha.6", "reflect-metadata": "0.1.13",
"routing-controllers-openapi": "2.2.0" "routing-controllers": "0.9.0-alpha.6",
}, "routing-controllers-openapi": "2.2.0"
"devDependencies": { },
"@odit/license-exporter": "^0.0.10", "devDependencies": {
"@types/express": "^4.17.11", "@odit/license-exporter": "0.0.10",
"@types/jest": "^26.0.20", "@types/express": "4.17.11",
"@types/node": "^14.14.22", "@types/jest": "26.0.20",
"@types/nodemailer": "^6.4.0", "@types/node": "14.14.22",
"axios": "^0.21.1", "@types/nodemailer": "6.4.0",
"cp-cli": "^2.0.0", "auto-changelog": "^2.4.0",
"jest": "^26.6.3", "axios": "0.21.1",
"nodemon": "^2.0.7", "cp-cli": "2.0.0",
"release-it": "^14.2.2", "jest": "26.6.3",
"rimraf": "^3.0.2", "nodemon": "2.0.7",
"start-server-and-test": "^1.12.0", "release-it": "14.2.2",
"ts-jest": "^26.5.2", "rimraf": "3.0.2",
"ts-node": "^9.1.1", "start-server-and-test": "1.12.0",
"typescript": "^4.1.3" "ts-jest": "26.5.2",
}, "ts-node": "9.1.1",
"release-it": { "typescript": "4.1.3"
"git": { },
"commit": true, "release-it": {
"requireCleanWorkingDir": false, "git": {
"commitMessage": "🚀Bumped version to v${version}", "commit": true,
"requireBranch": "dev", "requireCleanWorkingDir": false,
"push": false, "commitMessage": "🚀Bumped version to v${version}",
"tag": false "requireBranch": "dev",
}, "push": true,
"npm": { "tag": true,
"publish": false "tagName": "v${version}",
} "tagAnnotation": "v${version}"
} },
} "npm": {
"publish": false
},
"hooks": {
"after:bump": "npm run changelog:export && npm run licenses:export && git add CHANGELOG.md && git add licenses.md"
}
}
}