From f77c6ac74e3309139c3f9b17a85f560a265a19a5 Mon Sep 17 00:00:00 2001 From: jschaul Date: Fri, 22 Sep 2017 13:43:57 +0200 Subject: [PATCH 01/10] Fix compilation for api-bot and api-client --- libs/api-bot/src/Network/Wire/Bot/Cache.hs | 1 + libs/api-bot/src/Network/Wire/Bot/Monad.hs | 2 ++ libs/api-bot/stack.yaml | 1 + libs/api-client/stack.yaml | 1 + 4 files changed, 5 insertions(+) diff --git a/libs/api-bot/src/Network/Wire/Bot/Cache.hs b/libs/api-bot/src/Network/Wire/Bot/Cache.hs index ad3277191e7..f37321b25c6 100644 --- a/libs/api-bot/src/Network/Wire/Bot/Cache.hs +++ b/libs/api-bot/src/Network/Wire/Bot/Cache.hs @@ -16,6 +16,7 @@ import Data.ByteString.Conversion import Data.IORef import Data.LanguageCodes import Data.Maybe (fromMaybe) +import Data.Misc import Data.Monoid import Data.Text.Encoding import Data.Text.Lazy hiding (length, map) diff --git a/libs/api-bot/src/Network/Wire/Bot/Monad.hs b/libs/api-bot/src/Network/Wire/Bot/Monad.hs index bf64e046743..b85910957c0 100644 --- a/libs/api-bot/src/Network/Wire/Bot/Monad.hs +++ b/libs/api-bot/src/Network/Wire/Bot/Monad.hs @@ -84,6 +84,7 @@ import Data.Id import Data.IORef import Data.List (foldl', partition) import Data.Maybe (fromMaybe, isNothing) +import Data.Misc import Data.Metrics (Metrics) import Data.Monoid ((<>)) import Data.String (IsString) @@ -861,6 +862,7 @@ randUser (Email loc dom) (BotTag tag) = do , newUserInvitationCode = Nothing , newUserLabel = Nothing , newUserLocale = Nothing + , newUserTeam = Nothing }, passw) randMailbox :: BotNet Mailbox diff --git a/libs/api-bot/stack.yaml b/libs/api-bot/stack.yaml index 1a83851049e..7b1390718bf 100644 --- a/libs/api-bot/stack.yaml +++ b/libs/api-bot/stack.yaml @@ -20,3 +20,4 @@ extra-deps: flags: types-common: protobuf: True + arbitrary: True diff --git a/libs/api-client/stack.yaml b/libs/api-client/stack.yaml index 1be86de7533..1ac57bc8023 100644 --- a/libs/api-client/stack.yaml +++ b/libs/api-client/stack.yaml @@ -18,3 +18,4 @@ extra-deps: flags: types-common: protobuf: True + arbitrary: True From e76b4323dcfd423fc0d98f06416da7b627ca1205 Mon Sep 17 00:00:00 2001 From: Jon Elverkilde Date: Wed, 4 Oct 2017 09:10:08 +0200 Subject: [PATCH 02/10] Fix alpine builder path --- build/alpine/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/alpine/Dockerfile b/build/alpine/Dockerfile index 110586b3822..c08e0718811 100644 --- a/build/alpine/Dockerfile +++ b/build/alpine/Dockerfile @@ -8,15 +8,15 @@ FROM wire-server-builder:alpine as builder ARG service -COPY . /src +COPY . /src/wire-server/ -RUN cd /src/services/${service} && make install +RUN cd /src/wire-server/services/${service} && make install #--- Minified stage --- FROM wire-server-deps:alpine ARG service -COPY --from=builder /src/services/${service}/dist/${service} /usr/local/bin/${service} +COPY --from=builder /src/wire-server/services/${service}/dist/${service} /usr/local/bin/${service} # ARGs are not available at runtime, create symlink at build time # more info: https://stackoverflow.com/questions/40902445/using-variable-interpolation-in-string-in-docker From 9233663a3797a51ca8beefcfd9d488663b756842 Mon Sep 17 00:00:00 2001 From: jschaul Date: Thu, 5 Oct 2017 14:24:43 +0200 Subject: [PATCH 03/10] Containers for integration,schema,etc executables --- build/alpine/Dockerfile | 7 ++++--- services/brig/Makefile | 10 +++++++++- services/cannon/Makefile | 9 ++++++++- services/cargohold/Makefile | 9 ++++++++- services/galley/Makefile | 10 +++++++++- services/gundeck/Makefile | 10 +++++++++- services/proxy/Makefile | 9 ++++++++- 7 files changed, 55 insertions(+), 9 deletions(-) diff --git a/build/alpine/Dockerfile b/build/alpine/Dockerfile index c08e0718811..f903fa2afa3 100644 --- a/build/alpine/Dockerfile +++ b/build/alpine/Dockerfile @@ -16,9 +16,10 @@ RUN cd /src/wire-server/services/${service} && make install FROM wire-server-deps:alpine ARG service -COPY --from=builder /src/wire-server/services/${service}/dist/${service} /usr/local/bin/${service} +ARG executable +COPY --from=builder /src/wire-server/services/${service}/dist/${executable} /usr/bin/${exectuable} # ARGs are not available at runtime, create symlink at build time # more info: https://stackoverflow.com/questions/40902445/using-variable-interpolation-in-string-in-docker -RUN ln -s /usr/local/bin/${service} /usr/local/bin/service -ENTRYPOINT ["/usr/local/bin/service"] +RUN ln -s /usr/bin/${executable} /usr/bin/service +ENTRYPOINT ["/usr/bin/service"] diff --git a/services/brig/Makefile b/services/brig/Makefile index a096446f021..e80ca8b8c49 100644 --- a/services/brig/Makefile +++ b/services/brig/Makefile @@ -12,6 +12,7 @@ DEB_IT := dist/$(NAME)-integration_$(VERSION)+$(BUILD)_amd64.deb DEB_SCHEMA := dist/$(NAME)-schema_$(VERSION)+$(BUILD)_amd64.deb DEB_INDEX := dist/$(NAME)-index_$(VERSION)+$(BUILD)_amd64.deb KEIRETSU_ENV ?= ../.env +EXECUTABLES := $(NAME) $(NAME)-integration $(NAME)-schema $(NAME)-index guard-%: @ if [ "${${*}}" = "" ]; then \ @@ -115,4 +116,11 @@ index-reset: install .PHONY: docker docker: - docker build -t $(NAME) -f ../../build/alpine/Dockerfile --build-arg service=$(NAME) ../.. + $(foreach executable,$(EXECUTABLES),\ + docker build -t $(executable) \ + -f ../../build/alpine/Dockerfile \ + --build-arg service=$(NAME) \ + --build-arg executable=$(executable) \ + ../.. \ + ;) + diff --git a/services/cannon/Makefile b/services/cannon/Makefile index 95075003219..47a66d676c0 100644 --- a/services/cannon/Makefile +++ b/services/cannon/Makefile @@ -5,6 +5,7 @@ BUILD_NUMBER ?= 0 BUILD_LABEL ?= local BUILD := $(BUILD_NUMBER)$(shell [ "${BUILD_LABEL}" == "" ] && echo "" || echo ".${BUILD_LABEL}") DEB := $(NAME)_$(VERSION)+$(BUILD)_amd64.deb +EXECUTABLES := $(NAME) guard-%: @ if [ "${${*}}" = "" ]; then \ @@ -59,4 +60,10 @@ integration-%: .PHONY: docker docker: - docker build -t $(NAME) -f ../../build/alpine/Dockerfile --build-arg service=$(NAME) ../.. + $(foreach executable,$(EXECUTABLES),\ + docker build -t $(executable) \ + -f ../../build/alpine/Dockerfile \ + --build-arg service=$(NAME) \ + --build-arg executable=$(executable) \ + ../.. \ + ;) diff --git a/services/cargohold/Makefile b/services/cargohold/Makefile index eb8875b88f0..d86d28ae21f 100644 --- a/services/cargohold/Makefile +++ b/services/cargohold/Makefile @@ -9,6 +9,7 @@ DEB := dist/$(NAME)_$(VERSION)+$(BUILD)_amd64.deb DEB_IT := dist/$(NAME)-integration_$(VERSION)+$(BUILD)_amd64.deb SDIST := dist/$(NAME)-$(VERSION).tar.gz KEIRETSU_ENV ?= ../.env +EXECUTABLES := $(NAME) $(NAME)-integration guard-%: @ if [ "${${*}}" = "" ]; then \ @@ -66,4 +67,10 @@ integration: install .PHONY: docker docker: - docker build -t $(NAME) -f ../../build/alpine/Dockerfile --build-arg service=$(NAME) ../.. + $(foreach executable,$(EXECUTABLES),\ + docker build -t $(executable) \ + -f ../../build/alpine/Dockerfile \ + --build-arg service=$(NAME) \ + --build-arg executable=$(executable) \ + ../.. \ + ;) diff --git a/services/galley/Makefile b/services/galley/Makefile index cbdcace2f62..a329dac4a49 100644 --- a/services/galley/Makefile +++ b/services/galley/Makefile @@ -11,6 +11,7 @@ DEB_IT := $(NAME)-integration_$(VERSION)+$(BUILD)_amd64.deb DEB_SCHEMA := $(NAME)-schema_$(VERSION)+$(BUILD)_amd64.deb DEB_JOURNALER := $(NAME)-journaler_$(VERSION)+$(BUILD)_amd64.deb KEIRETSU_ENV ?= ../.env +EXECUTABLES := $(NAME) $(NAME)-integration $(NAME)-schema $(NAME)-journaler guard-%: @ if [ "${${*}}" = "" ]; then \ @@ -101,4 +102,11 @@ db-migrate: install .PHONY: docker docker: - docker build -t $(NAME) -f ../../build/alpine/Dockerfile --build-arg service=$(NAME) ../.. + $(foreach executable,$(EXECUTABLES),\ + docker build -t $(executable) \ + -f ../../build/alpine/Dockerfile \ + --build-arg service=$(NAME) \ + --build-arg executable=$(executable) \ + ../.. \ + ;) + diff --git a/services/gundeck/Makefile b/services/gundeck/Makefile index befef43ae2d..b597212d755 100644 --- a/services/gundeck/Makefile +++ b/services/gundeck/Makefile @@ -13,6 +13,7 @@ DEB_IT := $(NAME)-integration_$(VERSION)+$(BUILD)_amd64.deb DEB_SCHEMA := $(NAME)-schema_$(VERSION)+$(BUILD)_amd64.deb SDIST := dist/$(NAME)-$(VERSION).tar.gz KEIRETSU_ENV ?= ../.env +EXECUTABLES := $(NAME) $(NAME)-integration $(NAME)-schema guard-%: @ if [ "${${*}}" = "" ]; then \ @@ -106,4 +107,11 @@ db-migrate: install .PHONY: docker docker: - docker build -t $(NAME) -f ../../build/alpine/Dockerfile --build-arg service=$(NAME) ../.. + $(foreach executable,$(EXECUTABLES),\ + docker build -t $(executable) \ + -f ../../build/alpine/Dockerfile \ + --build-arg service=$(NAME) \ + --build-arg executable=$(executable) \ + ../.. \ + ;) + diff --git a/services/proxy/Makefile b/services/proxy/Makefile index b97c96482c4..de883e3fb05 100644 --- a/services/proxy/Makefile +++ b/services/proxy/Makefile @@ -5,6 +5,7 @@ BUILD_NUMBER ?= 0 BUILD_LABEL ?= local BUILD := $(BUILD_NUMBER)$(shell [ "${BUILD_LABEL}" == "" ] && echo "" || echo ".${BUILD_LABEL}") DEB := $(NAME)_$(VERSION)+$(BUILD)_amd64.deb +EXECUTABLES := proxy guard-%: @ if [ "${${*}}" = "" ]; then \ @@ -49,4 +50,10 @@ $(DEB): .PHONY: docker docker: - docker build -t $(NAME) -f ../../build/alpine/Dockerfile --build-arg service=$(NAME) ../.. + $(foreach executable,$(EXECUTABLES),\ + docker build -t $(executable) \ + -f ../../build/alpine/Dockerfile \ + --build-arg service=$(NAME) \ + --build-arg executable=$(executable) \ + ../.. \ + ;) From 2a4b35bd056a76bee95e510e9e7c134e80d6ec59 Mon Sep 17 00:00:00 2001 From: Tiago Loureiro Date: Mon, 2 Oct 2017 15:02:16 +0200 Subject: [PATCH 04/10] Use a different email template when a user creates a team --- services/brig/Procfile | 2 +- services/brig/deb/etc/sv/brig/run | 1 + .../user/ar/email/team-activation-subject.txt | 1 + .../user/ar/email/team-activation.html | 1 + .../user/ar/email/team-activation.txt | 1 + .../user/de/email/team-activation-subject.txt | 1 + .../user/de/email/team-activation.html | 118 +++++++++++++++++ .../user/de/email/team-activation.txt | 24 ++++ .../templates/user/en/email/activation.html | 1 + .../user/en/email/team-activation-subject.txt | 1 + .../user/en/email/team-activation.html | 121 ++++++++++++++++++ .../user/en/email/team-activation.txt | 22 ++++ .../es-ES/email/team-activation-subject.txt | 1 + .../user/es-ES/email/team-activation.html | 1 + .../user/es-ES/email/team-activation.txt | 1 + .../user/et/email/team-activation-subject.txt | 1 + .../user/et/email/team-activation.html | 1 + .../user/et/email/team-activation.txt | 1 + .../user/fa/email/team-activation-subject.txt | 1 + .../user/fa/email/team-activation.html | 1 + .../user/fa/email/team-activation.txt | 1 + .../user/fr/email/team-activation-subject.txt | 1 + .../user/fr/email/team-activation.html | 1 + .../user/fr/email/team-activation.txt | 1 + .../user/it/email/team-activation-subject.txt | 1 + .../user/it/email/team-activation.html | 1 + .../user/it/email/team-activation.txt | 1 + .../pt-BR/email/team-activation-subject.txt | 1 + .../user/pt-BR/email/team-activation.html | 1 + .../user/pt-BR/email/team-activation.txt | 1 + .../user/ru/email/team-activation-subject.txt | 1 + .../user/ru/email/team-activation.html | 1 + .../user/ru/email/team-activation.txt | 1 + .../sv-SE/email/team-activation-subject.txt | 1 + .../user/sv-SE/email/team-activation.html | 1 + .../user/sv-SE/email/team-activation.txt | 1 + .../user/tr/email/team-activation-subject.txt | 1 + .../user/tr/email/team-activation.html | 1 + .../user/tr/email/team-activation.txt | 1 + .../user/uk/email/team-activation-subject.txt | 1 + .../user/uk/email/team-activation.html | 1 + .../user/uk/email/team-activation.txt | 1 + .../zh-TW/email/team-activation-subject.txt | 1 + .../user/zh-TW/email/team-activation.html | 1 + .../user/zh-TW/email/team-activation.txt | 1 + services/brig/src/Brig/API.hs | 8 +- services/brig/src/Brig/Options.hs | 6 + services/brig/src/Brig/User/Email.hs | 44 +++++++ services/brig/src/Brig/User/Template.hs | 28 +++- 49 files changed, 406 insertions(+), 7 deletions(-) create mode 120000 services/brig/deb/opt/brig/templates/user/ar/email/team-activation-subject.txt create mode 120000 services/brig/deb/opt/brig/templates/user/ar/email/team-activation.html create mode 120000 services/brig/deb/opt/brig/templates/user/ar/email/team-activation.txt create mode 100644 services/brig/deb/opt/brig/templates/user/de/email/team-activation-subject.txt create mode 100644 services/brig/deb/opt/brig/templates/user/de/email/team-activation.html create mode 100644 services/brig/deb/opt/brig/templates/user/de/email/team-activation.txt create mode 100644 services/brig/deb/opt/brig/templates/user/en/email/team-activation-subject.txt create mode 100644 services/brig/deb/opt/brig/templates/user/en/email/team-activation.html create mode 100644 services/brig/deb/opt/brig/templates/user/en/email/team-activation.txt create mode 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/team-activation-subject.txt create mode 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/team-activation.html create mode 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/team-activation.txt create mode 120000 services/brig/deb/opt/brig/templates/user/et/email/team-activation-subject.txt create mode 120000 services/brig/deb/opt/brig/templates/user/et/email/team-activation.html create mode 120000 services/brig/deb/opt/brig/templates/user/et/email/team-activation.txt create mode 120000 services/brig/deb/opt/brig/templates/user/fa/email/team-activation-subject.txt create mode 120000 services/brig/deb/opt/brig/templates/user/fa/email/team-activation.html create mode 120000 services/brig/deb/opt/brig/templates/user/fa/email/team-activation.txt create mode 120000 services/brig/deb/opt/brig/templates/user/fr/email/team-activation-subject.txt create mode 120000 services/brig/deb/opt/brig/templates/user/fr/email/team-activation.html create mode 120000 services/brig/deb/opt/brig/templates/user/fr/email/team-activation.txt create mode 120000 services/brig/deb/opt/brig/templates/user/it/email/team-activation-subject.txt create mode 120000 services/brig/deb/opt/brig/templates/user/it/email/team-activation.html create mode 120000 services/brig/deb/opt/brig/templates/user/it/email/team-activation.txt create mode 120000 services/brig/deb/opt/brig/templates/user/pt-BR/email/team-activation-subject.txt create mode 120000 services/brig/deb/opt/brig/templates/user/pt-BR/email/team-activation.html create mode 120000 services/brig/deb/opt/brig/templates/user/pt-BR/email/team-activation.txt create mode 120000 services/brig/deb/opt/brig/templates/user/ru/email/team-activation-subject.txt create mode 120000 services/brig/deb/opt/brig/templates/user/ru/email/team-activation.html create mode 120000 services/brig/deb/opt/brig/templates/user/ru/email/team-activation.txt create mode 120000 services/brig/deb/opt/brig/templates/user/sv-SE/email/team-activation-subject.txt create mode 120000 services/brig/deb/opt/brig/templates/user/sv-SE/email/team-activation.html create mode 120000 services/brig/deb/opt/brig/templates/user/sv-SE/email/team-activation.txt create mode 120000 services/brig/deb/opt/brig/templates/user/tr/email/team-activation-subject.txt create mode 120000 services/brig/deb/opt/brig/templates/user/tr/email/team-activation.html create mode 120000 services/brig/deb/opt/brig/templates/user/tr/email/team-activation.txt create mode 120000 services/brig/deb/opt/brig/templates/user/uk/email/team-activation-subject.txt create mode 120000 services/brig/deb/opt/brig/templates/user/uk/email/team-activation.html create mode 120000 services/brig/deb/opt/brig/templates/user/uk/email/team-activation.txt create mode 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/team-activation-subject.txt create mode 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/team-activation.html create mode 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/team-activation.txt diff --git a/services/brig/Procfile b/services/brig/Procfile index d6b29710c26..411b68e50d6 100644 --- a/services/brig/Procfile +++ b/services/brig/Procfile @@ -1 +1 @@ -web: LOG_LEVEL=Warn ./dist/brig --host=$BRIG_WEB_HOST --port=$PORT --cassandra-host=$BRIG_CASSANDRA_HOST --cassandra-port=$BRIG_CASSANDRA_PORT --cassandra-keyspace=$BRIG_CASSANDRA_KEYSPACE --galley-host=$GALLEY_WEB_HOST --galley-port=$GALLEY_WEB_PORT --gundeck-host=$GUNDECK_WEB_HOST --gundeck-port=$GUNDECK_WEB_PORT --aws-ses-queue=$AWS_USER_SES_QUEUE --aws-internal-queue=$AWS_USER_INTERNAL_QUEUE --aws-dynamo-blacklist=$AWS_USER_BLACKLIST_TABLE --aws-dynamo-prekeys=$AWS_USER_PREKEYS_TABLE --aws-account-id=$AWS_ACCOUNT --aws-access-key-id=$AWS_ACCESS_KEY_ID --aws-secret-access-key=$AWS_SECRET_ACCESS_KEY --twilio-sid=$TWILIO_SID --twilio-token=$TWILIO_TOKEN --twilio-sender=$TWILIO_SENDER --nexmo-key=$NEXMO_KEY --nexmo-secret=$NEXMO_SECRET --nexmo-endpoint=$NEXMO_ENDPOINT --activation-url=http://$BRIG_WEB_HOST:$PORT/activate?key=\${key}\&code=\${code} --sms-activation-url=http://$BRIG_WEB_HOST:$PORT/v/\${code} --password-reset-url=http://$BRIG_WEB_HOST:$PORT/password-reset/\${key}?code=\${code} --invitation-url=http://$BRIG_WEB_HOST:$PORT/register?invitation_code=\${code} --deletion-url=http://$BRIG_WEB_HOST:$PORT/users/delete?key=\${key}\&code=\${code} --provider-activation-url=http://$BRIG_WEB_HOST:$PORT/provider/activate?key=\${key}\&code=\${code} --provider-approval-url=http://$BRIG_WEB_HOST:$PORT/provider/approve?key=\${key}\&code=\${code} --team-invitation-url=http://$BRIG_WEB_HOST:$PORT/register?team=\${team}\&team_code=\${code} --template-dir=deb/opt/brig/templates --email-sender=$EMAIL_SENDER --activation-timeout=$USER_ACTIVATION_TIMEOUT --user-connection-limit=$USER_CONNECTION_LIMIT --cookie-domain=$COOKIE_DOMAIN --provider-approval-to=$PROVIDER_APPROVAL_TO --provider-home-url=$PROVIDER_HOME_URL --zauth-provider-token-timeout=$ZAUTH_PROVIDER_TOKEN_TIMEOUT --zauth-private-keys=$ZAUTH_PRIVKEYS --zauth-public-keys=$ZAUTH_PUBKEYS --zauth-key-index=$ZAUTH_KEY_INDEX --zauth-user-token-timeout=$ZAUTH_USER_TOKEN_TIMEOUT --user-cookie-renew-age=$USER_COOKIE_RENEW_AGE --zauth-access-token-timeout=$ZAUTH_ACCESS_TOKEN_TIMEOUT --zauth-session-token-timeout=$ZAUTH_SESSION_TOKEN_TIMEOUT --cookie-insecure --user-cookie-retry-after=$USER_COOKIE_RETRY_AFTER --user-cookie-min-deviation=$USER_COOKIE_MIN_DEVIATION --user-cookie-limit=$USER_COOKIE_LIMIT --turn-servers=$TURN_SERVERS --turn-secret=$TURN_SECRET --elasticsearch-url=$BRIG_ELASTICSEARCH_URL --elasticsearch-user-index=$BRIG_ELASTICSEARCH_USER_INDEX +web: LOG_LEVEL=Warn ./dist/brig --host=$BRIG_WEB_HOST --port=$PORT --cassandra-host=$BRIG_CASSANDRA_HOST --cassandra-port=$BRIG_CASSANDRA_PORT --cassandra-keyspace=$BRIG_CASSANDRA_KEYSPACE --galley-host=$GALLEY_WEB_HOST --galley-port=$GALLEY_WEB_PORT --gundeck-host=$GUNDECK_WEB_HOST --gundeck-port=$GUNDECK_WEB_PORT --aws-ses-queue=$AWS_USER_SES_QUEUE --aws-internal-queue=$AWS_USER_INTERNAL_QUEUE --aws-dynamo-blacklist=$AWS_USER_BLACKLIST_TABLE --aws-dynamo-prekeys=$AWS_USER_PREKEYS_TABLE --aws-account-id=$AWS_ACCOUNT --aws-access-key-id=$AWS_ACCESS_KEY_ID --aws-secret-access-key=$AWS_SECRET_ACCESS_KEY --twilio-sid=$TWILIO_SID --twilio-token=$TWILIO_TOKEN --twilio-sender=$TWILIO_SENDER --nexmo-key=$NEXMO_KEY --nexmo-secret=$NEXMO_SECRET --nexmo-endpoint=$NEXMO_ENDPOINT --activation-url=http://$BRIG_WEB_HOST:$PORT/activate?key=\${key}\&code=\${code} --team-activation-url=http://$BRIG_WEB_HOST:$PORT/activate?key=\${key}\&code=\${code} --sms-activation-url=http://$BRIG_WEB_HOST:$PORT/v/\${code} --password-reset-url=http://$BRIG_WEB_HOST:$PORT/password-reset/\${key}?code=\${code} --invitation-url=http://$BRIG_WEB_HOST:$PORT/register?invitation_code=\${code} --deletion-url=http://$BRIG_WEB_HOST:$PORT/users/delete?key=\${key}\&code=\${code} --provider-activation-url=http://$BRIG_WEB_HOST:$PORT/provider/activate?key=\${key}\&code=\${code} --provider-approval-url=http://$BRIG_WEB_HOST:$PORT/provider/approve?key=\${key}\&code=\${code} --team-invitation-url=http://$BRIG_WEB_HOST:$PORT/register?team=\${team}\&team_code=\${code} --template-dir=deb/opt/brig/templates --email-sender=$EMAIL_SENDER --activation-timeout=$USER_ACTIVATION_TIMEOUT --user-connection-limit=$USER_CONNECTION_LIMIT --cookie-domain=$COOKIE_DOMAIN --provider-approval-to=$PROVIDER_APPROVAL_TO --provider-home-url=$PROVIDER_HOME_URL --zauth-provider-token-timeout=$ZAUTH_PROVIDER_TOKEN_TIMEOUT --zauth-private-keys=$ZAUTH_PRIVKEYS --zauth-public-keys=$ZAUTH_PUBKEYS --zauth-key-index=$ZAUTH_KEY_INDEX --zauth-user-token-timeout=$ZAUTH_USER_TOKEN_TIMEOUT --user-cookie-renew-age=$USER_COOKIE_RENEW_AGE --zauth-access-token-timeout=$ZAUTH_ACCESS_TOKEN_TIMEOUT --zauth-session-token-timeout=$ZAUTH_SESSION_TOKEN_TIMEOUT --cookie-insecure --user-cookie-retry-after=$USER_COOKIE_RETRY_AFTER --user-cookie-min-deviation=$USER_COOKIE_MIN_DEVIATION --user-cookie-limit=$USER_COOKIE_LIMIT --turn-servers=$TURN_SERVERS --turn-secret=$TURN_SECRET --elasticsearch-url=$BRIG_ELASTICSEARCH_URL --elasticsearch-user-index=$BRIG_ELASTICSEARCH_USER_INDEX diff --git a/services/brig/deb/etc/sv/brig/run b/services/brig/deb/etc/sv/brig/run index 9558bddba0a..b9d6d4cffc3 100755 --- a/services/brig/deb/etc/sv/brig/run +++ b/services/brig/deb/etc/sv/brig/run @@ -62,6 +62,7 @@ exec chpst -u $USER \ --cassandra-port=${BRIG_CASSANDRA_PORT?'unset'} \ --cassandra-keyspace=${BRIG_CASSANDRA_KEYSPACE?'unset'} \ --activation-url=${BRIG_ACTIVATION_URL?'unset'} \ + --team-activation-url=${BRIG_TEAM_ACTIVATION_URL?'unset'} \ --activation-timeout=${BRIG_ACTIVATION_TIMEOUT?'unset'} \ --sms-activation-url=${BRIG_SMS_ACTIVATION_URL?'unset'} \ --password-reset-url=${BRIG_PASSWORD_RESET_URL?'unset'} \ diff --git a/services/brig/deb/opt/brig/templates/user/ar/email/team-activation-subject.txt b/services/brig/deb/opt/brig/templates/user/ar/email/team-activation-subject.txt new file mode 120000 index 00000000000..784e3a04e39 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/ar/email/team-activation-subject.txt @@ -0,0 +1 @@ +../../en/email/team-activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/ar/email/team-activation.html b/services/brig/deb/opt/brig/templates/user/ar/email/team-activation.html new file mode 120000 index 00000000000..39707d4f014 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/ar/email/team-activation.html @@ -0,0 +1 @@ +../../en/email/team-activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/ar/email/team-activation.txt b/services/brig/deb/opt/brig/templates/user/ar/email/team-activation.txt new file mode 120000 index 00000000000..731780a7a2d --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/ar/email/team-activation.txt @@ -0,0 +1 @@ +../../en/email/team-activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/de/email/team-activation-subject.txt b/services/brig/deb/opt/brig/templates/user/de/email/team-activation-subject.txt new file mode 100644 index 00000000000..78e3e141b80 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/de/email/team-activation-subject.txt @@ -0,0 +1 @@ +Dein Wire-Benutzerkonto diff --git a/services/brig/deb/opt/brig/templates/user/de/email/team-activation.html b/services/brig/deb/opt/brig/templates/user/de/email/team-activation.html new file mode 100644 index 00000000000..562d8c5a4df --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/de/email/team-activation.html @@ -0,0 +1,118 @@ + + + + + + + +
+ + + + +
+
+ + + + + + + + + + + + + + + + + +
+ Wire + + wire.com +
+

+ Dein neues Wire-Benutzerkonto im '${team}' Team +

+
+

Ein Wire Benutzerkonto in einem neuen Wire Team namens '${team}' wurde mit der E-Mail-Adresse ${email} erstellt. Wir möchten gerne sicherstellen, dass du ${name} bist. +

+ + VERIFIZIEREN + +

+

+ Bitte klicke open auf "Verifizieren", um deine Identität zu bestätigen. Erst danach kannst du Wire nutzen. +

+

+ Wenn du nicht auf den "Verifizieren"-Button klicken kannst, benutze stattdessen bitte folgenden Link:
+

+

+ ${url} +

+

+ Wenn du kein Wire-Benutzerkonto mit dieser E-Mail-Adresse erstellt hast, klicke bitte hier. +

+

+
+ Datenschutzrichtlinie· + Missbrauch melden
Wire Swiss GmbH. Alle Rechte vorbehalten. +
+
+
+ + + diff --git a/services/brig/deb/opt/brig/templates/user/de/email/team-activation.txt b/services/brig/deb/opt/brig/templates/user/de/email/team-activation.txt new file mode 100644 index 00000000000..2e96043c88a --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/de/email/team-activation.txt @@ -0,0 +1,24 @@ +Wire + + +Hallo, + + +Ein Wire Benutzerkonto in einem neuen Wire Team namens '${team}' wurde mit der E-Mail-Adresse ${email} erstellt. Wir möchten gerne sicherstellen, dass du ${name} bist. + +Bitte klicke auf den folgenden Link, um deine Identität zu bestätigen. Erst danach kannst du Wire nutzen. + + +${url} + +Bitte antworte nicht auf diese E-Mail. + +Wenn du kein Wire-Benutzerkonto mit dieser E-Mail-Adresse erstellt hast, gehe bitte auf https://support.wire.com + + + + +(c) Wire Swiss GmbH + +Datenschutzrichtlinie | Missbrauch melden + diff --git a/services/brig/deb/opt/brig/templates/user/en/email/activation.html b/services/brig/deb/opt/brig/templates/user/en/email/activation.html index 687e6b5ce72..743b5d3083d 100644 --- a/services/brig/deb/opt/brig/templates/user/en/email/activation.html +++ b/services/brig/deb/opt/brig/templates/user/en/email/activation.html @@ -77,6 +77,7 @@ display: inline-block; margin: 20px 0; line-height: 3; + text-align: center; ">VERIFY + VERIFY + +

+

+ Click the button above to verify your address. You won’t be able to use Wire until you do. +

+

+ If you can’t click on the button, use this link:
+

+

+ ${url} +

+

+ If you didn’t create a Wire account using this email address, please + + contact us + . +

+ + + + + + + Privacy· + Report Misuse
Wire Swiss GmbH. All Rights Reserved. + + + + + + + + + + diff --git a/services/brig/deb/opt/brig/templates/user/en/email/team-activation.txt b/services/brig/deb/opt/brig/templates/user/en/email/team-activation.txt new file mode 100644 index 00000000000..66d5fe5afd3 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/en/email/team-activation.txt @@ -0,0 +1,22 @@ +Wire + + +Hello, + +A new Wire team called ${team} was created with ${email}. We want to verify that you are indeed ${name}. + +Follow the link below to verify your address. You won't be able to use Wire until you do. + + +${url} + +Please don't reply to this message. + +If you didn't create a Wire account using this email address, please visit https://support.wire.com + + + + +(c) Wire Swiss GmbH + +Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/team-activation-subject.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/team-activation-subject.txt new file mode 120000 index 00000000000..784e3a04e39 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/team-activation-subject.txt @@ -0,0 +1 @@ +../../en/email/team-activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/team-activation.html b/services/brig/deb/opt/brig/templates/user/es-ES/email/team-activation.html new file mode 120000 index 00000000000..39707d4f014 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/team-activation.html @@ -0,0 +1 @@ +../../en/email/team-activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/team-activation.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/team-activation.txt new file mode 120000 index 00000000000..731780a7a2d --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/team-activation.txt @@ -0,0 +1 @@ +../../en/email/team-activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/team-activation-subject.txt b/services/brig/deb/opt/brig/templates/user/et/email/team-activation-subject.txt new file mode 120000 index 00000000000..784e3a04e39 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/team-activation-subject.txt @@ -0,0 +1 @@ +../../en/email/team-activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/team-activation.html b/services/brig/deb/opt/brig/templates/user/et/email/team-activation.html new file mode 120000 index 00000000000..39707d4f014 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/team-activation.html @@ -0,0 +1 @@ +../../en/email/team-activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/team-activation.txt b/services/brig/deb/opt/brig/templates/user/et/email/team-activation.txt new file mode 120000 index 00000000000..731780a7a2d --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/team-activation.txt @@ -0,0 +1 @@ +../../en/email/team-activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/team-activation-subject.txt b/services/brig/deb/opt/brig/templates/user/fa/email/team-activation-subject.txt new file mode 120000 index 00000000000..784e3a04e39 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/team-activation-subject.txt @@ -0,0 +1 @@ +../../en/email/team-activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/team-activation.html b/services/brig/deb/opt/brig/templates/user/fa/email/team-activation.html new file mode 120000 index 00000000000..39707d4f014 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/team-activation.html @@ -0,0 +1 @@ +../../en/email/team-activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/team-activation.txt b/services/brig/deb/opt/brig/templates/user/fa/email/team-activation.txt new file mode 120000 index 00000000000..731780a7a2d --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/team-activation.txt @@ -0,0 +1 @@ +../../en/email/team-activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fr/email/team-activation-subject.txt b/services/brig/deb/opt/brig/templates/user/fr/email/team-activation-subject.txt new file mode 120000 index 00000000000..784e3a04e39 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fr/email/team-activation-subject.txt @@ -0,0 +1 @@ +../../en/email/team-activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fr/email/team-activation.html b/services/brig/deb/opt/brig/templates/user/fr/email/team-activation.html new file mode 120000 index 00000000000..39707d4f014 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fr/email/team-activation.html @@ -0,0 +1 @@ +../../en/email/team-activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fr/email/team-activation.txt b/services/brig/deb/opt/brig/templates/user/fr/email/team-activation.txt new file mode 120000 index 00000000000..731780a7a2d --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fr/email/team-activation.txt @@ -0,0 +1 @@ +../../en/email/team-activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/team-activation-subject.txt b/services/brig/deb/opt/brig/templates/user/it/email/team-activation-subject.txt new file mode 120000 index 00000000000..784e3a04e39 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/team-activation-subject.txt @@ -0,0 +1 @@ +../../en/email/team-activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/team-activation.html b/services/brig/deb/opt/brig/templates/user/it/email/team-activation.html new file mode 120000 index 00000000000..39707d4f014 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/team-activation.html @@ -0,0 +1 @@ +../../en/email/team-activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/team-activation.txt b/services/brig/deb/opt/brig/templates/user/it/email/team-activation.txt new file mode 120000 index 00000000000..731780a7a2d --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/team-activation.txt @@ -0,0 +1 @@ +../../en/email/team-activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/pt-BR/email/team-activation-subject.txt b/services/brig/deb/opt/brig/templates/user/pt-BR/email/team-activation-subject.txt new file mode 120000 index 00000000000..784e3a04e39 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/pt-BR/email/team-activation-subject.txt @@ -0,0 +1 @@ +../../en/email/team-activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/pt-BR/email/team-activation.html b/services/brig/deb/opt/brig/templates/user/pt-BR/email/team-activation.html new file mode 120000 index 00000000000..39707d4f014 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/pt-BR/email/team-activation.html @@ -0,0 +1 @@ +../../en/email/team-activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/pt-BR/email/team-activation.txt b/services/brig/deb/opt/brig/templates/user/pt-BR/email/team-activation.txt new file mode 120000 index 00000000000..731780a7a2d --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/pt-BR/email/team-activation.txt @@ -0,0 +1 @@ +../../en/email/team-activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/ru/email/team-activation-subject.txt b/services/brig/deb/opt/brig/templates/user/ru/email/team-activation-subject.txt new file mode 120000 index 00000000000..784e3a04e39 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/ru/email/team-activation-subject.txt @@ -0,0 +1 @@ +../../en/email/team-activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/ru/email/team-activation.html b/services/brig/deb/opt/brig/templates/user/ru/email/team-activation.html new file mode 120000 index 00000000000..39707d4f014 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/ru/email/team-activation.html @@ -0,0 +1 @@ +../../en/email/team-activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/ru/email/team-activation.txt b/services/brig/deb/opt/brig/templates/user/ru/email/team-activation.txt new file mode 120000 index 00000000000..731780a7a2d --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/ru/email/team-activation.txt @@ -0,0 +1 @@ +../../en/email/team-activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/sv-SE/email/team-activation-subject.txt b/services/brig/deb/opt/brig/templates/user/sv-SE/email/team-activation-subject.txt new file mode 120000 index 00000000000..784e3a04e39 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/sv-SE/email/team-activation-subject.txt @@ -0,0 +1 @@ +../../en/email/team-activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/sv-SE/email/team-activation.html b/services/brig/deb/opt/brig/templates/user/sv-SE/email/team-activation.html new file mode 120000 index 00000000000..39707d4f014 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/sv-SE/email/team-activation.html @@ -0,0 +1 @@ +../../en/email/team-activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/sv-SE/email/team-activation.txt b/services/brig/deb/opt/brig/templates/user/sv-SE/email/team-activation.txt new file mode 120000 index 00000000000..731780a7a2d --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/sv-SE/email/team-activation.txt @@ -0,0 +1 @@ +../../en/email/team-activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/team-activation-subject.txt b/services/brig/deb/opt/brig/templates/user/tr/email/team-activation-subject.txt new file mode 120000 index 00000000000..784e3a04e39 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/team-activation-subject.txt @@ -0,0 +1 @@ +../../en/email/team-activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/team-activation.html b/services/brig/deb/opt/brig/templates/user/tr/email/team-activation.html new file mode 120000 index 00000000000..39707d4f014 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/team-activation.html @@ -0,0 +1 @@ +../../en/email/team-activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/team-activation.txt b/services/brig/deb/opt/brig/templates/user/tr/email/team-activation.txt new file mode 120000 index 00000000000..731780a7a2d --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/team-activation.txt @@ -0,0 +1 @@ +../../en/email/team-activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/uk/email/team-activation-subject.txt b/services/brig/deb/opt/brig/templates/user/uk/email/team-activation-subject.txt new file mode 120000 index 00000000000..784e3a04e39 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/uk/email/team-activation-subject.txt @@ -0,0 +1 @@ +../../en/email/team-activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/uk/email/team-activation.html b/services/brig/deb/opt/brig/templates/user/uk/email/team-activation.html new file mode 120000 index 00000000000..39707d4f014 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/uk/email/team-activation.html @@ -0,0 +1 @@ +../../en/email/team-activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/uk/email/team-activation.txt b/services/brig/deb/opt/brig/templates/user/uk/email/team-activation.txt new file mode 120000 index 00000000000..731780a7a2d --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/uk/email/team-activation.txt @@ -0,0 +1 @@ +../../en/email/team-activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/team-activation-subject.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/team-activation-subject.txt new file mode 120000 index 00000000000..784e3a04e39 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/team-activation-subject.txt @@ -0,0 +1 @@ +../../en/email/team-activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/team-activation.html b/services/brig/deb/opt/brig/templates/user/zh-TW/email/team-activation.html new file mode 120000 index 00000000000..39707d4f014 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/team-activation.html @@ -0,0 +1 @@ +../../en/email/team-activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/team-activation.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/team-activation.txt new file mode 120000 index 00000000000..731780a7a2d --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/team-activation.txt @@ -0,0 +1 @@ +../../en/email/team-activation.txt \ No newline at end of file diff --git a/services/brig/src/Brig/API.hs b/services/brig/src/Brig/API.hs index 826a93c8e5d..4bb99e45626 100644 --- a/services/brig/src/Brig/API.hs +++ b/services/brig/src/Brig/API.hs @@ -62,6 +62,7 @@ import qualified Brig.Types.Swagger as Doc import qualified Network.Wai.Utilities.Swagger as Doc import qualified Data.Swagger.Build.Api as Doc import qualified Galley.Types.Swagger as Doc +import qualified Galley.Types.Teams as Team import qualified Network.Wai.Middleware.Gzip as GZip import qualified Network.Wai.Middleware.Gunzip as GZip import qualified Data.ByteString.Lazy as Lazy @@ -1104,7 +1105,7 @@ createUser (_ ::: _ ::: req) = do let lang = userLocale usr lift $ do for_ (liftM2 (,) (userEmail usr) epair) $ \(e, p) -> - sendActivationMail e (userName usr) p (Just lang) Nothing + sendActivationEmail e (userName usr) p (Just lang) (newUserTeam new) for_ (liftM2 (,) (userPhone usr) ppair) $ \(p, c) -> sendActivationSms p c (Just lang) cok <- lift $ Auth.newCookie (userId usr) PersistentCookie (newUserLabel new) @@ -1112,6 +1113,11 @@ createUser (_ ::: _ ::: req) = do $ setStatus status201 . addHeader "Location" (toByteString' (userId usr)) $ json (SelfProfile usr) + where + sendActivationEmail e u p l (Just (NewUserTeam (Right (Team.BindingNewTeam t)))) = + sendTeamActivationMail e u p l (fromRange $ t^.Team.newTeamName) + sendActivationEmail e u p l _ = + sendActivationMail e u p l Nothing createUserNoVerify :: JSON ::: JSON ::: Request -> Handler Response createUserNoVerify (_ ::: _ ::: req) = do diff --git a/services/brig/src/Brig/Options.hs b/services/brig/src/Brig/Options.hs index 63ccc52e475..8b23de6dc8a 100644 --- a/services/brig/src/Brig/Options.hs +++ b/services/brig/src/Brig/Options.hs @@ -75,6 +75,7 @@ data Opts = Opts -- Email & SMS (User) , optUserActivationUrl :: !ByteString + , optUserTeamActivationUrl :: !ByteString , optUserSmsActivationUrl :: !ByteString , optUserPasswordResetUrl :: !ByteString , optUserInvitationUrl :: !ByteString @@ -247,6 +248,11 @@ parseOptions = execParser (info (helper <*> optsParser) desc) <> metavar "URL" <> help "Activation URL template") + <*> (bytesOption $ + long "team-activation-url" + <> metavar "URL" + <> help "Team Activation URL template") + <*> (bytesOption $ long "sms-activation-url" <> metavar "URL" diff --git a/services/brig/src/Brig/User/Email.hs b/services/brig/src/Brig/User/Email.hs index 47f4295e9a6..33a842c1437 100644 --- a/services/brig/src/Brig/User/Email.hs +++ b/services/brig/src/Brig/User/Email.hs @@ -5,6 +5,8 @@ module Brig.User.Email ( ActivationEmail (..) , sendActivationMail + , sendTeamActivationMail + , PasswordResetEmail (..) , sendPasswordResetMail @@ -68,6 +70,12 @@ sendNewClientEmail name email client locale = do tpl <- newClientEmail . snd <$> userTemplates (Just locale) Aws.sendMail $ renderNewClientEmail tpl (NewClientEmail locale email name client) +sendTeamActivationMail :: Email -> Name -> ActivationPair -> Maybe Locale -> Text -> AppIO () +sendTeamActivationMail to name pair loc team = do + tpl <- teamActivationEmail . snd <$> userTemplates loc + let mail = TeamActivationEmail to name team pair + Aws.sendMail $ renderTeamActivationMail mail tpl + ------------------------------------------------------------------------------- -- New Client Email @@ -185,6 +193,42 @@ renderActivationUrl t (ActivationKey k, ActivationCode c) = replace "code" = Ascii.toText c replace x = x +------------------------------------------------------------------------------- +-- Team Activation Email + +data TeamActivationEmail = TeamActivationEmail + { tacmTo :: !Email + , tacmName :: !Name + , tacmTeamName :: !Text + , tacmPair :: !ActivationPair + } + +renderTeamActivationMail :: TeamActivationEmail -> TeamActivationEmailTemplate -> Mail +renderTeamActivationMail TeamActivationEmail{..} TeamActivationEmailTemplate{..} = + (emptyMail from) + { mailTo = [ to ] + , mailHeaders = [ ("Subject", toStrict subj) + , ("X-Zeta-Purpose", "Activation") + , ("X-Zeta-Key", Ascii.toText key) + , ("X-Zeta-Code", Ascii.toText code) + ] + , mailParts = [ [ plainPart txt, htmlPart html ] ] + } + where + (ActivationKey key, ActivationCode code) = tacmPair + + from = Address (Just teamActivationEmailSenderName) (fromEmail teamActivationEmailSender) + to = mkMimeAddress tacmName tacmTo + txt = renderText teamActivationEmailBodyText replace + html = renderHtml teamActivationEmailBodyHtml replace + subj = renderText teamActivationEmailSubject replace + + replace "url" = renderActivationUrl teamActivationEmailUrl tacmPair + replace "email" = fromEmail tacmTo + replace "name" = fromName tacmName + replace "team" = tacmTeamName + replace x = x + ------------------------------------------------------------------------------- -- Password Reset Email diff --git a/services/brig/src/Brig/User/Template.hs b/services/brig/src/Brig/User/Template.hs index 4d7fb9e4de0..148f7e0d36f 100644 --- a/services/brig/src/Brig/User/Template.hs +++ b/services/brig/src/Brig/User/Template.hs @@ -5,6 +5,7 @@ module Brig.User.Template ( UserTemplates (..) , ActivationSmsTemplate (..) , ActivationEmailTemplate (..) + , TeamActivationEmailTemplate(..) , ActivationCallTemplate (..) , PasswordResetSmsTemplate (..) , PasswordResetEmailTemplate (..) @@ -36,6 +37,7 @@ data UserTemplates = UserTemplates , activationCall :: !ActivationCallTemplate , activationEmail :: !ActivationEmailTemplate , activationEmailUpdate :: !ActivationEmailTemplate + , teamActivationEmail :: !TeamActivationEmailTemplate , passwordResetSms :: !PasswordResetSmsTemplate , passwordResetEmail :: !PasswordResetEmailTemplate , invitationEmail :: !InvitationEmailTemplate @@ -66,6 +68,15 @@ data ActivationEmailTemplate = ActivationEmailTemplate , activationEmailSenderName :: !Text } +data TeamActivationEmailTemplate = TeamActivationEmailTemplate + { teamActivationEmailUrl :: !Template + , teamActivationEmailSubject :: !Template + , teamActivationEmailBodyText :: !Template + , teamActivationEmailBodyHtml :: !Template + , teamActivationEmailSender :: !Email + , teamActivationEmailSenderName :: !Text + } + data DeletionEmailTemplate = DeletionEmailTemplate { deletionEmailUrl :: !Template , deletionEmailSubject :: !Template @@ -148,6 +159,12 @@ loadUserTemplates o = readLocalesDir defLocale templateDir $ \fp -> <*> readTemplate (fp <> "/email/update.html") <*> pure (optEmailSender o) <*> readText (fp <> "/email/sender.txt")) + <*> (TeamActivationEmailTemplate teamActivationUrl + <$> readTemplate (fp <> "/email/team-activation-subject.txt") + <*> readTemplate (fp <> "/email/team-activation.txt") + <*> readTemplate (fp <> "/email/team-activation.html") + <*> pure (optEmailSender o) + <*> readText (fp <> "/email/sender.txt")) <*> (PasswordResetSmsTemplate <$> readTemplate (fp <> "/sms/password-reset.txt") <*> pure (optTwilioSender o)) @@ -187,11 +204,12 @@ loadUserTemplates o = readLocalesDir defLocale templateDir $ \fp -> <*> pure (optEmailSender o) <*> readText (fp <> "/email/sender.txt")) where - smsActivationUrl = template . Text.decodeLatin1 $ optUserSmsActivationUrl o - activationUrl = template . Text.decodeLatin1 $ optUserActivationUrl o - passwordResetUrl = template . Text.decodeLatin1 $ optUserPasswordResetUrl o - invitationUrl = template . Text.decodeLatin1 $ optUserInvitationUrl o - deletionUserUrl = template . Text.decodeLatin1 $ optUserDeletionUserUrl o + smsActivationUrl = template . Text.decodeLatin1 $ optUserSmsActivationUrl o + activationUrl = template . Text.decodeLatin1 $ optUserActivationUrl o + teamActivationUrl = template . Text.decodeLatin1 $ optUserTeamActivationUrl o + passwordResetUrl = template . Text.decodeLatin1 $ optUserPasswordResetUrl o + invitationUrl = template . Text.decodeLatin1 $ optUserInvitationUrl o + deletionUserUrl = template . Text.decodeLatin1 $ optUserDeletionUserUrl o defLocale = setDefaultLocale (optSettings o) templateDir = optTemplateDir o <> "/user" From fd5bac99068d2c8314ee445a6200f7b26ca9d811 Mon Sep 17 00:00:00 2001 From: Tiago Loureiro Date: Thu, 5 Oct 2017 18:17:11 +0200 Subject: [PATCH 05/10] Prefer symlinks to the default language instead --- .../user/ar/email/update-subject.txt | 2 +- .../brig/templates/user/ar/email/update.html | 127 +----------------- .../brig/templates/user/ar/email/update.txt | 23 +--- .../user/es-ES/email/activation-subject.txt | 2 +- .../user/es-ES/email/activation.html | 127 +----------------- .../templates/user/es-ES/email/activation.txt | 23 +--- .../user/es-ES/email/deletion-subject.txt | 2 +- .../templates/user/es-ES/email/deletion.html | 127 +----------------- .../templates/user/es-ES/email/deletion.txt | 18 +-- .../user/es-ES/email/invitation-subject.txt | 2 +- .../user/es-ES/email/invitation.html | 103 +------------- .../templates/user/es-ES/email/invitation.txt | 18 +-- .../user/es-ES/email/new-client-subject.txt | 2 +- .../user/es-ES/email/new-client.html | 103 +------------- .../templates/user/es-ES/email/new-client.txt | 19 +-- .../es-ES/email/password-reset-subject.txt | 2 +- .../user/es-ES/email/password-reset.html | 120 +---------------- .../user/es-ES/email/password-reset.txt | 22 +-- .../user/es-ES/email/update-subject.txt | 2 +- .../templates/user/es-ES/email/update.html | 127 +----------------- .../templates/user/es-ES/email/update.txt | 23 +--- .../user/et/email/activation-subject.txt | 2 +- .../templates/user/et/email/activation.html | 127 +----------------- .../templates/user/et/email/activation.txt | 23 +--- .../user/et/email/deletion-subject.txt | 2 +- .../templates/user/et/email/deletion.html | 127 +----------------- .../brig/templates/user/et/email/deletion.txt | 18 +-- .../user/et/email/invitation-subject.txt | 2 +- .../templates/user/et/email/invitation.html | 103 +------------- .../templates/user/et/email/invitation.txt | 18 +-- .../user/et/email/new-client-subject.txt | 2 +- .../templates/user/et/email/new-client.html | 103 +------------- .../templates/user/et/email/new-client.txt | 19 +-- .../user/et/email/password-reset-subject.txt | 2 +- .../user/et/email/password-reset.html | 120 +---------------- .../user/et/email/password-reset.txt | 22 +-- .../user/et/email/update-subject.txt | 2 +- .../brig/templates/user/et/email/update.html | 127 +----------------- .../brig/templates/user/et/email/update.txt | 23 +--- .../user/fa/email/activation-subject.txt | 2 +- .../templates/user/fa/email/activation.html | 127 +----------------- .../templates/user/fa/email/activation.txt | 23 +--- .../user/fa/email/deletion-subject.txt | 2 +- .../templates/user/fa/email/deletion.html | 127 +----------------- .../brig/templates/user/fa/email/deletion.txt | 18 +-- .../user/fa/email/invitation-subject.txt | 2 +- .../templates/user/fa/email/invitation.html | 103 +------------- .../templates/user/fa/email/invitation.txt | 18 +-- .../user/fa/email/new-client-subject.txt | 2 +- .../templates/user/fa/email/new-client.html | 103 +------------- .../templates/user/fa/email/new-client.txt | 19 +-- .../user/fa/email/password-reset-subject.txt | 2 +- .../user/fa/email/password-reset.html | 120 +---------------- .../user/fa/email/password-reset.txt | 22 +-- .../user/fa/email/update-subject.txt | 2 +- .../brig/templates/user/fa/email/update.html | 127 +----------------- .../brig/templates/user/fa/email/update.txt | 23 +--- .../user/fr/email/update-subject.txt | 2 +- .../brig/templates/user/fr/email/update.html | 127 +----------------- .../brig/templates/user/fr/email/update.txt | 23 +--- .../user/it/email/activation-subject.txt | 2 +- .../templates/user/it/email/activation.html | 127 +----------------- .../templates/user/it/email/activation.txt | 23 +--- .../user/it/email/deletion-subject.txt | 2 +- .../templates/user/it/email/deletion.html | 127 +----------------- .../brig/templates/user/it/email/deletion.txt | 18 +-- .../user/it/email/invitation-subject.txt | 2 +- .../templates/user/it/email/invitation.html | 103 +------------- .../templates/user/it/email/invitation.txt | 18 +-- .../user/it/email/new-client-subject.txt | 2 +- .../templates/user/it/email/new-client.html | 103 +------------- .../templates/user/it/email/new-client.txt | 19 +-- .../user/it/email/password-reset-subject.txt | 2 +- .../user/it/email/password-reset.html | 120 +---------------- .../user/it/email/password-reset.txt | 22 +-- .../user/it/email/update-subject.txt | 2 +- .../brig/templates/user/it/email/update.html | 127 +----------------- .../brig/templates/user/it/email/update.txt | 23 +--- .../user/pt-BR/email/update-subject.txt | 2 +- .../templates/user/pt-BR/email/update.html | 127 +----------------- .../templates/user/pt-BR/email/update.txt | 23 +--- .../user/ru/email/update-subject.txt | 2 +- .../brig/templates/user/ru/email/update.html | 127 +----------------- .../brig/templates/user/ru/email/update.txt | 23 +--- .../user/sv-SE/email/update-subject.txt | 2 +- .../templates/user/sv-SE/email/update.html | 127 +----------------- .../templates/user/sv-SE/email/update.txt | 23 +--- .../user/tr/email/activation-subject.txt | 2 +- .../templates/user/tr/email/activation.html | 127 +----------------- .../templates/user/tr/email/activation.txt | 23 +--- .../user/tr/email/deletion-subject.txt | 2 +- .../templates/user/tr/email/deletion.html | 127 +----------------- .../brig/templates/user/tr/email/deletion.txt | 18 +-- .../user/tr/email/invitation-subject.txt | 2 +- .../templates/user/tr/email/invitation.html | 103 +------------- .../templates/user/tr/email/invitation.txt | 18 +-- .../user/tr/email/new-client-subject.txt | 2 +- .../templates/user/tr/email/new-client.html | 103 +------------- .../templates/user/tr/email/new-client.txt | 19 +-- .../user/tr/email/password-reset-subject.txt | 2 +- .../user/tr/email/password-reset.html | 120 +---------------- .../user/tr/email/password-reset.txt | 22 +-- .../user/tr/email/update-subject.txt | 2 +- .../brig/templates/user/tr/email/update.html | 127 +----------------- .../brig/templates/user/tr/email/update.txt | 23 +--- .../user/uk/email/update-subject.txt | 2 +- .../brig/templates/user/uk/email/update.html | 127 +----------------- .../brig/templates/user/uk/email/update.txt | 23 +--- .../user/zh-TW/email/activation-subject.txt | 2 +- .../user/zh-TW/email/activation.html | 127 +----------------- .../templates/user/zh-TW/email/activation.txt | 23 +--- .../user/zh-TW/email/deletion-subject.txt | 2 +- .../templates/user/zh-TW/email/deletion.html | 127 +----------------- .../templates/user/zh-TW/email/deletion.txt | 18 +-- .../user/zh-TW/email/invitation-subject.txt | 2 +- .../user/zh-TW/email/invitation.html | 103 +------------- .../templates/user/zh-TW/email/invitation.txt | 18 +-- .../user/zh-TW/email/new-client-subject.txt | 2 +- .../user/zh-TW/email/new-client.html | 103 +------------- .../templates/user/zh-TW/email/new-client.txt | 19 +-- .../zh-TW/email/password-reset-subject.txt | 2 +- .../user/zh-TW/email/password-reset.html | 120 +---------------- .../user/zh-TW/email/password-reset.txt | 22 +-- .../user/zh-TW/email/update-subject.txt | 2 +- .../templates/user/zh-TW/email/update.html | 127 +----------------- .../templates/user/zh-TW/email/update.txt | 23 +--- 126 files changed, 126 insertions(+), 5838 deletions(-) mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/ar/email/update-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/ar/email/update.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/ar/email/update.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/activation-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/activation.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/activation.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/deletion-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/deletion.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/deletion.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/invitation-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/invitation.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/invitation.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/new-client-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/new-client.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/new-client.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/update-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/update.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/es-ES/email/update.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/activation-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/activation.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/activation.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/deletion-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/deletion.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/deletion.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/invitation-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/invitation.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/invitation.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/new-client-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/new-client.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/new-client.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/password-reset-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/password-reset.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/password-reset.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/update-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/update.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/et/email/update.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/activation-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/activation.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/activation.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/deletion-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/deletion.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/deletion.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/invitation-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/invitation.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/invitation.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/new-client-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/new-client.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/new-client.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/password-reset-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/password-reset.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/password-reset.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/update-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/update.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fa/email/update.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fr/email/update-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fr/email/update.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/fr/email/update.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/activation-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/activation.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/activation.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/deletion-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/deletion.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/deletion.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/invitation-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/invitation.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/invitation.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/new-client-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/new-client.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/new-client.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/password-reset-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/password-reset.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/password-reset.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/update-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/update.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/it/email/update.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/pt-BR/email/update-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/pt-BR/email/update.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/pt-BR/email/update.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/ru/email/update-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/ru/email/update.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/ru/email/update.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/sv-SE/email/update-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/sv-SE/email/update.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/sv-SE/email/update.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/activation-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/activation.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/activation.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/deletion-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/deletion.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/deletion.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/invitation-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/invitation.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/invitation.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/new-client-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/new-client.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/new-client.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/password-reset-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/password-reset.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/password-reset.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/update-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/update.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/tr/email/update.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/uk/email/update-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/uk/email/update.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/uk/email/update.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/activation-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/activation.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/activation.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/update-subject.txt mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/update.html mode change 100644 => 120000 services/brig/deb/opt/brig/templates/user/zh-TW/email/update.txt diff --git a/services/brig/deb/opt/brig/templates/user/ar/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/ar/email/update-subject.txt deleted file mode 100644 index 97b5791f48e..00000000000 --- a/services/brig/deb/opt/brig/templates/user/ar/email/update-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your new email address on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/ar/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/ar/email/update-subject.txt new file mode 120000 index 00000000000..52adaf74932 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/ar/email/update-subject.txt @@ -0,0 +1 @@ +../../en/email/update-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/ar/email/update.html b/services/brig/deb/opt/brig/templates/user/ar/email/update.html deleted file mode 100644 index 0bcf986aa4b..00000000000 --- a/services/brig/deb/opt/brig/templates/user/ar/email/update.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your new address. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this change, you can ignore this email or - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/ar/email/update.html b/services/brig/deb/opt/brig/templates/user/ar/email/update.html new file mode 120000 index 00000000000..37d6464a1f9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/ar/email/update.html @@ -0,0 +1 @@ +../../en/email/update.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/ar/email/update.txt b/services/brig/deb/opt/brig/templates/user/ar/email/update.txt deleted file mode 100644 index b230828d559..00000000000 --- a/services/brig/deb/opt/brig/templates/user/ar/email/update.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. - -Follow the link below to verify your new address. - - -${url} - -Please don't reply to this message. - -If you didn't request this change, you can ignore this email or visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/ar/email/update.txt b/services/brig/deb/opt/brig/templates/user/ar/email/update.txt new file mode 120000 index 00000000000..b056c56f546 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/ar/email/update.txt @@ -0,0 +1 @@ +../../en/email/update.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/activation-subject.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/activation-subject.txt deleted file mode 100644 index 7566d46a576..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/activation-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your Wire Account \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/activation-subject.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/activation-subject.txt new file mode 120000 index 00000000000..da6935bfa64 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/activation-subject.txt @@ -0,0 +1 @@ +../../en/email/activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/activation.html b/services/brig/deb/opt/brig/templates/user/es-ES/email/activation.html deleted file mode 100644 index 9e9e6f7f3d9..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/activation.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was used to create a Wire account. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your address. You won’t be able to use Wire until you do. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t create a Wire account using this email address, please - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/activation.html b/services/brig/deb/opt/brig/templates/user/es-ES/email/activation.html new file mode 120000 index 00000000000..349321f857c --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/activation.html @@ -0,0 +1 @@ +../../en/email/activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/activation.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/activation.txt deleted file mode 100644 index 682451dda69..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/activation.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -Your email address ${email} was used to create a Wire account. We want to verify that you are indeed ${name}. - -Follow the link below to verify your address. You won't be able to use Wire until you do. - - -${url} - -Please don't reply to this message. - -If you didn't create a Wire account using this email address, please visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/activation.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/activation.txt new file mode 120000 index 00000000000..3302d12c5bb --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/activation.txt @@ -0,0 +1 @@ +../../en/email/activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion-subject.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion-subject.txt deleted file mode 100644 index 8a92b9f9a36..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Delete account? \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion-subject.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion-subject.txt new file mode 120000 index 00000000000..28f2b222a88 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion-subject.txt @@ -0,0 +1 @@ +../../en/email/deletion-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion.html b/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion.html deleted file mode 100644 index 57991954819..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hi ${name}, -

- -

- We’ve received a request to delete your Wire account. Click the button below within 10 minutes to delete all your conversations, content and connections.
 -

-

- - DELETE ACCOUNT - -

-

- If you can’t click the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this, reset your password. -

-

- The Wire team -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion.html b/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion.html new file mode 120000 index 00000000000..81cade358d2 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion.html @@ -0,0 +1 @@ +../../en/email/deletion.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion.txt deleted file mode 100644 index ac781ddb43a..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion.txt +++ /dev/null @@ -1,17 +0,0 @@ -Wire - - -Hi ${name}, - -We’ve received a request to delete your Wire account. Visit the link below within 10 minutes to delete all your conversations, content and connections.
 - -${url} - -If you didn’t request this, reset your password. - -The Wire team - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion.txt new file mode 120000 index 00000000000..e80fd1061b9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/deletion.txt @@ -0,0 +1 @@ +../../en/email/deletion.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation-subject.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation-subject.txt deleted file mode 100644 index ce512e8f4e8..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation-subject.txt +++ /dev/null @@ -1 +0,0 @@ -${inviter} wants to connect on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation-subject.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation-subject.txt new file mode 120000 index 00000000000..85829cb4b42 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation-subject.txt @@ -0,0 +1 @@ +../../en/email/invitation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation.html b/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation.html deleted file mode 100644 index cc7b6347910..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - -
- -
-

- Hello ${invitee},
- ${inviter} wants to connect on Wire. -

-

- - ACCEPT INVITATION - -

-

- Wire is an app for calling, messaging, and sharing pics, music, videos and more in personal and group conversations. Learn more
-

-

- If you can’t click on the button, use this link: ${url}
-

-
- Please do not reply to this email.
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation.html b/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation.html new file mode 120000 index 00000000000..37456503673 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation.html @@ -0,0 +1 @@ +../../en/email/invitation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation.txt deleted file mode 100644 index 19c147333e0..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation.txt +++ /dev/null @@ -1,17 +0,0 @@ -Wire - - -Hi ${name}, - -${inviter} has invited you to join Wire. Accept this invitation to join the conversation by following the link: - -${url} - -Please don't reply to this message. - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation.txt new file mode 120000 index 00000000000..d3d40de079c --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/invitation.txt @@ -0,0 +1 @@ +../../en/email/invitation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client-subject.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client-subject.txt deleted file mode 100644 index 7c90a198403..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client-subject.txt +++ /dev/null @@ -1 +0,0 @@ -New device \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client-subject.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client-subject.txt new file mode 120000 index 00000000000..6778711c1a5 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client-subject.txt @@ -0,0 +1 @@ +../../en/email/new-client-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client.html b/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client.html deleted file mode 100644 index ba1a69c6223..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hi ${name}, -

- -

- Your Wire account was used on: -

- -

- ${date} -

-

- ${model} -

- -

- You may have installed Wire on a new device or installed it again on an existing one. If that was not the case, go to Wire Settings, remove the device and reset your password. -

- -

- The Wire team -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client.html b/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client.html new file mode 120000 index 00000000000..ea3647ea481 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client.html @@ -0,0 +1 @@ +../../en/email/new-client.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client.txt deleted file mode 100644 index 7bfdf6242c2..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client.txt +++ /dev/null @@ -1,18 +0,0 @@ -Wire - - -Hi ${name}, - -Your Wire account was used on: - - ${date} - ${model} - -You may have installed Wire on a new device or installed it again on an existing one. If that was not the case, go to Wire Settings, remove the device and reset your password. - -The Wire team - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client.txt new file mode 120000 index 00000000000..43680a08a51 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/new-client.txt @@ -0,0 +1 @@ +../../en/email/new-client.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset-subject.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset-subject.txt deleted file mode 100644 index dfba835fc9a..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Password Change at Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset-subject.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset-subject.txt new file mode 120000 index 00000000000..609f0965b59 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset-subject.txt @@ -0,0 +1 @@ +../../en/email/password-reset-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset.html b/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset.html deleted file mode 100644 index 602666c1672..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset.html +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

-

- We’ve received a request to change the password for your Wire account. - To change your password, click on the button below. -

-

- - CHANGE PASSWORD - -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- This is an automated message and no one will see your response. -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset.html b/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset.html new file mode 120000 index 00000000000..f28f353893f --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset.html @@ -0,0 +1 @@ +../../en/email/password-reset.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset.txt deleted file mode 100644 index 6f8e36a7212..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset.txt +++ /dev/null @@ -1,21 +0,0 @@ -Wire - - -Hello, - -We've received a request to change the password for your Wire account. - -To change your password, follow the link below. - -${url} - -Please don't reply to this message. - -This is an automated message and no one will see your response. -If you need more help, please visit https://support.wire.com - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset.txt new file mode 120000 index 00000000000..cbd03c4ff08 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/password-reset.txt @@ -0,0 +1 @@ +../../en/email/password-reset.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/update-subject.txt deleted file mode 100644 index 97b5791f48e..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/update-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your new email address on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/update-subject.txt new file mode 120000 index 00000000000..52adaf74932 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/update-subject.txt @@ -0,0 +1 @@ +../../en/email/update-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/update.html b/services/brig/deb/opt/brig/templates/user/es-ES/email/update.html deleted file mode 100644 index 0bcf986aa4b..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/update.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your new address. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this change, you can ignore this email or - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/update.html b/services/brig/deb/opt/brig/templates/user/es-ES/email/update.html new file mode 120000 index 00000000000..37d6464a1f9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/update.html @@ -0,0 +1 @@ +../../en/email/update.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/update.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/update.txt deleted file mode 100644 index b230828d559..00000000000 --- a/services/brig/deb/opt/brig/templates/user/es-ES/email/update.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. - -Follow the link below to verify your new address. - - -${url} - -Please don't reply to this message. - -If you didn't request this change, you can ignore this email or visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/es-ES/email/update.txt b/services/brig/deb/opt/brig/templates/user/es-ES/email/update.txt new file mode 120000 index 00000000000..b056c56f546 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/es-ES/email/update.txt @@ -0,0 +1 @@ +../../en/email/update.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/activation-subject.txt b/services/brig/deb/opt/brig/templates/user/et/email/activation-subject.txt deleted file mode 100644 index 7566d46a576..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/activation-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your Wire Account \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/activation-subject.txt b/services/brig/deb/opt/brig/templates/user/et/email/activation-subject.txt new file mode 120000 index 00000000000..da6935bfa64 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/activation-subject.txt @@ -0,0 +1 @@ +../../en/email/activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/activation.html b/services/brig/deb/opt/brig/templates/user/et/email/activation.html deleted file mode 100644 index 9e9e6f7f3d9..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/activation.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was used to create a Wire account. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your address. You won’t be able to use Wire until you do. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t create a Wire account using this email address, please - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/et/email/activation.html b/services/brig/deb/opt/brig/templates/user/et/email/activation.html new file mode 120000 index 00000000000..349321f857c --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/activation.html @@ -0,0 +1 @@ +../../en/email/activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/activation.txt b/services/brig/deb/opt/brig/templates/user/et/email/activation.txt deleted file mode 100644 index 682451dda69..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/activation.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -Your email address ${email} was used to create a Wire account. We want to verify that you are indeed ${name}. - -Follow the link below to verify your address. You won't be able to use Wire until you do. - - -${url} - -Please don't reply to this message. - -If you didn't create a Wire account using this email address, please visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/et/email/activation.txt b/services/brig/deb/opt/brig/templates/user/et/email/activation.txt new file mode 120000 index 00000000000..3302d12c5bb --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/activation.txt @@ -0,0 +1 @@ +../../en/email/activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/deletion-subject.txt b/services/brig/deb/opt/brig/templates/user/et/email/deletion-subject.txt deleted file mode 100644 index 8a92b9f9a36..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/deletion-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Delete account? \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/deletion-subject.txt b/services/brig/deb/opt/brig/templates/user/et/email/deletion-subject.txt new file mode 120000 index 00000000000..28f2b222a88 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/deletion-subject.txt @@ -0,0 +1 @@ +../../en/email/deletion-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/deletion.html b/services/brig/deb/opt/brig/templates/user/et/email/deletion.html deleted file mode 100644 index 57991954819..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/deletion.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hi ${name}, -

- -

- We’ve received a request to delete your Wire account. Click the button below within 10 minutes to delete all your conversations, content and connections.
 -

-

- - DELETE ACCOUNT - -

-

- If you can’t click the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this, reset your password. -

-

- The Wire team -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/et/email/deletion.html b/services/brig/deb/opt/brig/templates/user/et/email/deletion.html new file mode 120000 index 00000000000..81cade358d2 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/deletion.html @@ -0,0 +1 @@ +../../en/email/deletion.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/deletion.txt b/services/brig/deb/opt/brig/templates/user/et/email/deletion.txt deleted file mode 100644 index ac781ddb43a..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/deletion.txt +++ /dev/null @@ -1,17 +0,0 @@ -Wire - - -Hi ${name}, - -We’ve received a request to delete your Wire account. Visit the link below within 10 minutes to delete all your conversations, content and connections.
 - -${url} - -If you didn’t request this, reset your password. - -The Wire team - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/et/email/deletion.txt b/services/brig/deb/opt/brig/templates/user/et/email/deletion.txt new file mode 120000 index 00000000000..e80fd1061b9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/deletion.txt @@ -0,0 +1 @@ +../../en/email/deletion.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/invitation-subject.txt b/services/brig/deb/opt/brig/templates/user/et/email/invitation-subject.txt deleted file mode 100644 index ce512e8f4e8..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/invitation-subject.txt +++ /dev/null @@ -1 +0,0 @@ -${inviter} wants to connect on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/invitation-subject.txt b/services/brig/deb/opt/brig/templates/user/et/email/invitation-subject.txt new file mode 120000 index 00000000000..85829cb4b42 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/invitation-subject.txt @@ -0,0 +1 @@ +../../en/email/invitation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/invitation.html b/services/brig/deb/opt/brig/templates/user/et/email/invitation.html deleted file mode 100644 index cc7b6347910..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/invitation.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - -
- -
-

- Hello ${invitee},
- ${inviter} wants to connect on Wire. -

-

- - ACCEPT INVITATION - -

-

- Wire is an app for calling, messaging, and sharing pics, music, videos and more in personal and group conversations. Learn more
-

-

- If you can’t click on the button, use this link: ${url}
-

-
- Please do not reply to this email.
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/et/email/invitation.html b/services/brig/deb/opt/brig/templates/user/et/email/invitation.html new file mode 120000 index 00000000000..37456503673 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/invitation.html @@ -0,0 +1 @@ +../../en/email/invitation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/invitation.txt b/services/brig/deb/opt/brig/templates/user/et/email/invitation.txt deleted file mode 100644 index 19c147333e0..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/invitation.txt +++ /dev/null @@ -1,17 +0,0 @@ -Wire - - -Hi ${name}, - -${inviter} has invited you to join Wire. Accept this invitation to join the conversation by following the link: - -${url} - -Please don't reply to this message. - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/et/email/invitation.txt b/services/brig/deb/opt/brig/templates/user/et/email/invitation.txt new file mode 120000 index 00000000000..d3d40de079c --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/invitation.txt @@ -0,0 +1 @@ +../../en/email/invitation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/new-client-subject.txt b/services/brig/deb/opt/brig/templates/user/et/email/new-client-subject.txt deleted file mode 100644 index 7c90a198403..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/new-client-subject.txt +++ /dev/null @@ -1 +0,0 @@ -New device \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/new-client-subject.txt b/services/brig/deb/opt/brig/templates/user/et/email/new-client-subject.txt new file mode 120000 index 00000000000..6778711c1a5 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/new-client-subject.txt @@ -0,0 +1 @@ +../../en/email/new-client-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/new-client.html b/services/brig/deb/opt/brig/templates/user/et/email/new-client.html deleted file mode 100644 index ba1a69c6223..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/new-client.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hi ${name}, -

- -

- Your Wire account was used on: -

- -

- ${date} -

-

- ${model} -

- -

- You may have installed Wire on a new device or installed it again on an existing one. If that was not the case, go to Wire Settings, remove the device and reset your password. -

- -

- The Wire team -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/et/email/new-client.html b/services/brig/deb/opt/brig/templates/user/et/email/new-client.html new file mode 120000 index 00000000000..ea3647ea481 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/new-client.html @@ -0,0 +1 @@ +../../en/email/new-client.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/new-client.txt b/services/brig/deb/opt/brig/templates/user/et/email/new-client.txt deleted file mode 100644 index 7bfdf6242c2..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/new-client.txt +++ /dev/null @@ -1,18 +0,0 @@ -Wire - - -Hi ${name}, - -Your Wire account was used on: - - ${date} - ${model} - -You may have installed Wire on a new device or installed it again on an existing one. If that was not the case, go to Wire Settings, remove the device and reset your password. - -The Wire team - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/et/email/new-client.txt b/services/brig/deb/opt/brig/templates/user/et/email/new-client.txt new file mode 120000 index 00000000000..43680a08a51 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/new-client.txt @@ -0,0 +1 @@ +../../en/email/new-client.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/password-reset-subject.txt b/services/brig/deb/opt/brig/templates/user/et/email/password-reset-subject.txt deleted file mode 100644 index dfba835fc9a..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/password-reset-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Password Change at Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/password-reset-subject.txt b/services/brig/deb/opt/brig/templates/user/et/email/password-reset-subject.txt new file mode 120000 index 00000000000..609f0965b59 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/password-reset-subject.txt @@ -0,0 +1 @@ +../../en/email/password-reset-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/password-reset.html b/services/brig/deb/opt/brig/templates/user/et/email/password-reset.html deleted file mode 100644 index 602666c1672..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/password-reset.html +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

-

- We’ve received a request to change the password for your Wire account. - To change your password, click on the button below. -

-

- - CHANGE PASSWORD - -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- This is an automated message and no one will see your response. -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/et/email/password-reset.html b/services/brig/deb/opt/brig/templates/user/et/email/password-reset.html new file mode 120000 index 00000000000..f28f353893f --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/password-reset.html @@ -0,0 +1 @@ +../../en/email/password-reset.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/password-reset.txt b/services/brig/deb/opt/brig/templates/user/et/email/password-reset.txt deleted file mode 100644 index 6f8e36a7212..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/password-reset.txt +++ /dev/null @@ -1,21 +0,0 @@ -Wire - - -Hello, - -We've received a request to change the password for your Wire account. - -To change your password, follow the link below. - -${url} - -Please don't reply to this message. - -This is an automated message and no one will see your response. -If you need more help, please visit https://support.wire.com - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/et/email/password-reset.txt b/services/brig/deb/opt/brig/templates/user/et/email/password-reset.txt new file mode 120000 index 00000000000..cbd03c4ff08 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/password-reset.txt @@ -0,0 +1 @@ +../../en/email/password-reset.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/et/email/update-subject.txt deleted file mode 100644 index 97b5791f48e..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/update-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your new email address on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/et/email/update-subject.txt new file mode 120000 index 00000000000..52adaf74932 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/update-subject.txt @@ -0,0 +1 @@ +../../en/email/update-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/update.html b/services/brig/deb/opt/brig/templates/user/et/email/update.html deleted file mode 100644 index 0bcf986aa4b..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/update.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your new address. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this change, you can ignore this email or - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/et/email/update.html b/services/brig/deb/opt/brig/templates/user/et/email/update.html new file mode 120000 index 00000000000..37d6464a1f9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/update.html @@ -0,0 +1 @@ +../../en/email/update.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/et/email/update.txt b/services/brig/deb/opt/brig/templates/user/et/email/update.txt deleted file mode 100644 index b230828d559..00000000000 --- a/services/brig/deb/opt/brig/templates/user/et/email/update.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. - -Follow the link below to verify your new address. - - -${url} - -Please don't reply to this message. - -If you didn't request this change, you can ignore this email or visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/et/email/update.txt b/services/brig/deb/opt/brig/templates/user/et/email/update.txt new file mode 120000 index 00000000000..b056c56f546 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/et/email/update.txt @@ -0,0 +1 @@ +../../en/email/update.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/activation-subject.txt b/services/brig/deb/opt/brig/templates/user/fa/email/activation-subject.txt deleted file mode 100644 index 7566d46a576..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/activation-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your Wire Account \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/activation-subject.txt b/services/brig/deb/opt/brig/templates/user/fa/email/activation-subject.txt new file mode 120000 index 00000000000..da6935bfa64 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/activation-subject.txt @@ -0,0 +1 @@ +../../en/email/activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/activation.html b/services/brig/deb/opt/brig/templates/user/fa/email/activation.html deleted file mode 100644 index 9e9e6f7f3d9..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/activation.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was used to create a Wire account. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your address. You won’t be able to use Wire until you do. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t create a Wire account using this email address, please - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/activation.html b/services/brig/deb/opt/brig/templates/user/fa/email/activation.html new file mode 120000 index 00000000000..349321f857c --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/activation.html @@ -0,0 +1 @@ +../../en/email/activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/activation.txt b/services/brig/deb/opt/brig/templates/user/fa/email/activation.txt deleted file mode 100644 index 682451dda69..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/activation.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -Your email address ${email} was used to create a Wire account. We want to verify that you are indeed ${name}. - -Follow the link below to verify your address. You won't be able to use Wire until you do. - - -${url} - -Please don't reply to this message. - -If you didn't create a Wire account using this email address, please visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/activation.txt b/services/brig/deb/opt/brig/templates/user/fa/email/activation.txt new file mode 120000 index 00000000000..3302d12c5bb --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/activation.txt @@ -0,0 +1 @@ +../../en/email/activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/deletion-subject.txt b/services/brig/deb/opt/brig/templates/user/fa/email/deletion-subject.txt deleted file mode 100644 index 8a92b9f9a36..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/deletion-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Delete account? \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/deletion-subject.txt b/services/brig/deb/opt/brig/templates/user/fa/email/deletion-subject.txt new file mode 120000 index 00000000000..28f2b222a88 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/deletion-subject.txt @@ -0,0 +1 @@ +../../en/email/deletion-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/deletion.html b/services/brig/deb/opt/brig/templates/user/fa/email/deletion.html deleted file mode 100644 index 57991954819..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/deletion.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hi ${name}, -

- -

- We’ve received a request to delete your Wire account. Click the button below within 10 minutes to delete all your conversations, content and connections.
 -

-

- - DELETE ACCOUNT - -

-

- If you can’t click the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this, reset your password. -

-

- The Wire team -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/deletion.html b/services/brig/deb/opt/brig/templates/user/fa/email/deletion.html new file mode 120000 index 00000000000..81cade358d2 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/deletion.html @@ -0,0 +1 @@ +../../en/email/deletion.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/deletion.txt b/services/brig/deb/opt/brig/templates/user/fa/email/deletion.txt deleted file mode 100644 index ac781ddb43a..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/deletion.txt +++ /dev/null @@ -1,17 +0,0 @@ -Wire - - -Hi ${name}, - -We’ve received a request to delete your Wire account. Visit the link below within 10 minutes to delete all your conversations, content and connections.
 - -${url} - -If you didn’t request this, reset your password. - -The Wire team - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/deletion.txt b/services/brig/deb/opt/brig/templates/user/fa/email/deletion.txt new file mode 120000 index 00000000000..e80fd1061b9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/deletion.txt @@ -0,0 +1 @@ +../../en/email/deletion.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/invitation-subject.txt b/services/brig/deb/opt/brig/templates/user/fa/email/invitation-subject.txt deleted file mode 100644 index ce512e8f4e8..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/invitation-subject.txt +++ /dev/null @@ -1 +0,0 @@ -${inviter} wants to connect on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/invitation-subject.txt b/services/brig/deb/opt/brig/templates/user/fa/email/invitation-subject.txt new file mode 120000 index 00000000000..85829cb4b42 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/invitation-subject.txt @@ -0,0 +1 @@ +../../en/email/invitation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/invitation.html b/services/brig/deb/opt/brig/templates/user/fa/email/invitation.html deleted file mode 100644 index cc7b6347910..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/invitation.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - -
- -
-

- Hello ${invitee},
- ${inviter} wants to connect on Wire. -

-

- - ACCEPT INVITATION - -

-

- Wire is an app for calling, messaging, and sharing pics, music, videos and more in personal and group conversations. Learn more
-

-

- If you can’t click on the button, use this link: ${url}
-

-
- Please do not reply to this email.
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/invitation.html b/services/brig/deb/opt/brig/templates/user/fa/email/invitation.html new file mode 120000 index 00000000000..37456503673 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/invitation.html @@ -0,0 +1 @@ +../../en/email/invitation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/invitation.txt b/services/brig/deb/opt/brig/templates/user/fa/email/invitation.txt deleted file mode 100644 index 19c147333e0..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/invitation.txt +++ /dev/null @@ -1,17 +0,0 @@ -Wire - - -Hi ${name}, - -${inviter} has invited you to join Wire. Accept this invitation to join the conversation by following the link: - -${url} - -Please don't reply to this message. - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/invitation.txt b/services/brig/deb/opt/brig/templates/user/fa/email/invitation.txt new file mode 120000 index 00000000000..d3d40de079c --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/invitation.txt @@ -0,0 +1 @@ +../../en/email/invitation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/new-client-subject.txt b/services/brig/deb/opt/brig/templates/user/fa/email/new-client-subject.txt deleted file mode 100644 index 7c90a198403..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/new-client-subject.txt +++ /dev/null @@ -1 +0,0 @@ -New device \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/new-client-subject.txt b/services/brig/deb/opt/brig/templates/user/fa/email/new-client-subject.txt new file mode 120000 index 00000000000..6778711c1a5 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/new-client-subject.txt @@ -0,0 +1 @@ +../../en/email/new-client-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/new-client.html b/services/brig/deb/opt/brig/templates/user/fa/email/new-client.html deleted file mode 100644 index ba1a69c6223..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/new-client.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hi ${name}, -

- -

- Your Wire account was used on: -

- -

- ${date} -

-

- ${model} -

- -

- You may have installed Wire on a new device or installed it again on an existing one. If that was not the case, go to Wire Settings, remove the device and reset your password. -

- -

- The Wire team -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/new-client.html b/services/brig/deb/opt/brig/templates/user/fa/email/new-client.html new file mode 120000 index 00000000000..ea3647ea481 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/new-client.html @@ -0,0 +1 @@ +../../en/email/new-client.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/new-client.txt b/services/brig/deb/opt/brig/templates/user/fa/email/new-client.txt deleted file mode 100644 index 7bfdf6242c2..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/new-client.txt +++ /dev/null @@ -1,18 +0,0 @@ -Wire - - -Hi ${name}, - -Your Wire account was used on: - - ${date} - ${model} - -You may have installed Wire on a new device or installed it again on an existing one. If that was not the case, go to Wire Settings, remove the device and reset your password. - -The Wire team - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/new-client.txt b/services/brig/deb/opt/brig/templates/user/fa/email/new-client.txt new file mode 120000 index 00000000000..43680a08a51 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/new-client.txt @@ -0,0 +1 @@ +../../en/email/new-client.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/password-reset-subject.txt b/services/brig/deb/opt/brig/templates/user/fa/email/password-reset-subject.txt deleted file mode 100644 index dfba835fc9a..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/password-reset-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Password Change at Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/password-reset-subject.txt b/services/brig/deb/opt/brig/templates/user/fa/email/password-reset-subject.txt new file mode 120000 index 00000000000..609f0965b59 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/password-reset-subject.txt @@ -0,0 +1 @@ +../../en/email/password-reset-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/password-reset.html b/services/brig/deb/opt/brig/templates/user/fa/email/password-reset.html deleted file mode 100644 index 602666c1672..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/password-reset.html +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

-

- We’ve received a request to change the password for your Wire account. - To change your password, click on the button below. -

-

- - CHANGE PASSWORD - -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- This is an automated message and no one will see your response. -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/password-reset.html b/services/brig/deb/opt/brig/templates/user/fa/email/password-reset.html new file mode 120000 index 00000000000..f28f353893f --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/password-reset.html @@ -0,0 +1 @@ +../../en/email/password-reset.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/password-reset.txt b/services/brig/deb/opt/brig/templates/user/fa/email/password-reset.txt deleted file mode 100644 index 6f8e36a7212..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/password-reset.txt +++ /dev/null @@ -1,21 +0,0 @@ -Wire - - -Hello, - -We've received a request to change the password for your Wire account. - -To change your password, follow the link below. - -${url} - -Please don't reply to this message. - -This is an automated message and no one will see your response. -If you need more help, please visit https://support.wire.com - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/password-reset.txt b/services/brig/deb/opt/brig/templates/user/fa/email/password-reset.txt new file mode 120000 index 00000000000..cbd03c4ff08 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/password-reset.txt @@ -0,0 +1 @@ +../../en/email/password-reset.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/fa/email/update-subject.txt deleted file mode 100644 index 97b5791f48e..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/update-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your new email address on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/fa/email/update-subject.txt new file mode 120000 index 00000000000..52adaf74932 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/update-subject.txt @@ -0,0 +1 @@ +../../en/email/update-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/update.html b/services/brig/deb/opt/brig/templates/user/fa/email/update.html deleted file mode 100644 index 0bcf986aa4b..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/update.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your new address. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this change, you can ignore this email or - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/update.html b/services/brig/deb/opt/brig/templates/user/fa/email/update.html new file mode 120000 index 00000000000..37d6464a1f9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/update.html @@ -0,0 +1 @@ +../../en/email/update.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/update.txt b/services/brig/deb/opt/brig/templates/user/fa/email/update.txt deleted file mode 100644 index b230828d559..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fa/email/update.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. - -Follow the link below to verify your new address. - - -${url} - -Please don't reply to this message. - -If you didn't request this change, you can ignore this email or visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/fa/email/update.txt b/services/brig/deb/opt/brig/templates/user/fa/email/update.txt new file mode 120000 index 00000000000..b056c56f546 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fa/email/update.txt @@ -0,0 +1 @@ +../../en/email/update.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fr/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/fr/email/update-subject.txt deleted file mode 100644 index 97b5791f48e..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fr/email/update-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your new email address on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fr/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/fr/email/update-subject.txt new file mode 120000 index 00000000000..52adaf74932 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fr/email/update-subject.txt @@ -0,0 +1 @@ +../../en/email/update-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fr/email/update.html b/services/brig/deb/opt/brig/templates/user/fr/email/update.html deleted file mode 100644 index 0bcf986aa4b..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fr/email/update.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your new address. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this change, you can ignore this email or - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/fr/email/update.html b/services/brig/deb/opt/brig/templates/user/fr/email/update.html new file mode 120000 index 00000000000..37d6464a1f9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fr/email/update.html @@ -0,0 +1 @@ +../../en/email/update.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/fr/email/update.txt b/services/brig/deb/opt/brig/templates/user/fr/email/update.txt deleted file mode 100644 index b230828d559..00000000000 --- a/services/brig/deb/opt/brig/templates/user/fr/email/update.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. - -Follow the link below to verify your new address. - - -${url} - -Please don't reply to this message. - -If you didn't request this change, you can ignore this email or visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/fr/email/update.txt b/services/brig/deb/opt/brig/templates/user/fr/email/update.txt new file mode 120000 index 00000000000..b056c56f546 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/fr/email/update.txt @@ -0,0 +1 @@ +../../en/email/update.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/activation-subject.txt b/services/brig/deb/opt/brig/templates/user/it/email/activation-subject.txt deleted file mode 100644 index 7566d46a576..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/activation-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your Wire Account \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/activation-subject.txt b/services/brig/deb/opt/brig/templates/user/it/email/activation-subject.txt new file mode 120000 index 00000000000..da6935bfa64 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/activation-subject.txt @@ -0,0 +1 @@ +../../en/email/activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/activation.html b/services/brig/deb/opt/brig/templates/user/it/email/activation.html deleted file mode 100644 index 9e9e6f7f3d9..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/activation.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was used to create a Wire account. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your address. You won’t be able to use Wire until you do. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t create a Wire account using this email address, please - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/it/email/activation.html b/services/brig/deb/opt/brig/templates/user/it/email/activation.html new file mode 120000 index 00000000000..349321f857c --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/activation.html @@ -0,0 +1 @@ +../../en/email/activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/activation.txt b/services/brig/deb/opt/brig/templates/user/it/email/activation.txt deleted file mode 100644 index 682451dda69..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/activation.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -Your email address ${email} was used to create a Wire account. We want to verify that you are indeed ${name}. - -Follow the link below to verify your address. You won't be able to use Wire until you do. - - -${url} - -Please don't reply to this message. - -If you didn't create a Wire account using this email address, please visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/it/email/activation.txt b/services/brig/deb/opt/brig/templates/user/it/email/activation.txt new file mode 120000 index 00000000000..3302d12c5bb --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/activation.txt @@ -0,0 +1 @@ +../../en/email/activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/deletion-subject.txt b/services/brig/deb/opt/brig/templates/user/it/email/deletion-subject.txt deleted file mode 100644 index 8a92b9f9a36..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/deletion-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Delete account? \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/deletion-subject.txt b/services/brig/deb/opt/brig/templates/user/it/email/deletion-subject.txt new file mode 120000 index 00000000000..28f2b222a88 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/deletion-subject.txt @@ -0,0 +1 @@ +../../en/email/deletion-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/deletion.html b/services/brig/deb/opt/brig/templates/user/it/email/deletion.html deleted file mode 100644 index 57991954819..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/deletion.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hi ${name}, -

- -

- We’ve received a request to delete your Wire account. Click the button below within 10 minutes to delete all your conversations, content and connections.
 -

-

- - DELETE ACCOUNT - -

-

- If you can’t click the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this, reset your password. -

-

- The Wire team -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/it/email/deletion.html b/services/brig/deb/opt/brig/templates/user/it/email/deletion.html new file mode 120000 index 00000000000..81cade358d2 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/deletion.html @@ -0,0 +1 @@ +../../en/email/deletion.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/deletion.txt b/services/brig/deb/opt/brig/templates/user/it/email/deletion.txt deleted file mode 100644 index ac781ddb43a..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/deletion.txt +++ /dev/null @@ -1,17 +0,0 @@ -Wire - - -Hi ${name}, - -We’ve received a request to delete your Wire account. Visit the link below within 10 minutes to delete all your conversations, content and connections.
 - -${url} - -If you didn’t request this, reset your password. - -The Wire team - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/it/email/deletion.txt b/services/brig/deb/opt/brig/templates/user/it/email/deletion.txt new file mode 120000 index 00000000000..e80fd1061b9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/deletion.txt @@ -0,0 +1 @@ +../../en/email/deletion.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/invitation-subject.txt b/services/brig/deb/opt/brig/templates/user/it/email/invitation-subject.txt deleted file mode 100644 index ce512e8f4e8..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/invitation-subject.txt +++ /dev/null @@ -1 +0,0 @@ -${inviter} wants to connect on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/invitation-subject.txt b/services/brig/deb/opt/brig/templates/user/it/email/invitation-subject.txt new file mode 120000 index 00000000000..85829cb4b42 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/invitation-subject.txt @@ -0,0 +1 @@ +../../en/email/invitation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/invitation.html b/services/brig/deb/opt/brig/templates/user/it/email/invitation.html deleted file mode 100644 index cc7b6347910..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/invitation.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - -
- -
-

- Hello ${invitee},
- ${inviter} wants to connect on Wire. -

-

- - ACCEPT INVITATION - -

-

- Wire is an app for calling, messaging, and sharing pics, music, videos and more in personal and group conversations. Learn more
-

-

- If you can’t click on the button, use this link: ${url}
-

-
- Please do not reply to this email.
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/it/email/invitation.html b/services/brig/deb/opt/brig/templates/user/it/email/invitation.html new file mode 120000 index 00000000000..37456503673 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/invitation.html @@ -0,0 +1 @@ +../../en/email/invitation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/invitation.txt b/services/brig/deb/opt/brig/templates/user/it/email/invitation.txt deleted file mode 100644 index 19c147333e0..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/invitation.txt +++ /dev/null @@ -1,17 +0,0 @@ -Wire - - -Hi ${name}, - -${inviter} has invited you to join Wire. Accept this invitation to join the conversation by following the link: - -${url} - -Please don't reply to this message. - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/it/email/invitation.txt b/services/brig/deb/opt/brig/templates/user/it/email/invitation.txt new file mode 120000 index 00000000000..d3d40de079c --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/invitation.txt @@ -0,0 +1 @@ +../../en/email/invitation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/new-client-subject.txt b/services/brig/deb/opt/brig/templates/user/it/email/new-client-subject.txt deleted file mode 100644 index 7c90a198403..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/new-client-subject.txt +++ /dev/null @@ -1 +0,0 @@ -New device \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/new-client-subject.txt b/services/brig/deb/opt/brig/templates/user/it/email/new-client-subject.txt new file mode 120000 index 00000000000..6778711c1a5 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/new-client-subject.txt @@ -0,0 +1 @@ +../../en/email/new-client-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/new-client.html b/services/brig/deb/opt/brig/templates/user/it/email/new-client.html deleted file mode 100644 index ba1a69c6223..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/new-client.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hi ${name}, -

- -

- Your Wire account was used on: -

- -

- ${date} -

-

- ${model} -

- -

- You may have installed Wire on a new device or installed it again on an existing one. If that was not the case, go to Wire Settings, remove the device and reset your password. -

- -

- The Wire team -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/it/email/new-client.html b/services/brig/deb/opt/brig/templates/user/it/email/new-client.html new file mode 120000 index 00000000000..ea3647ea481 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/new-client.html @@ -0,0 +1 @@ +../../en/email/new-client.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/new-client.txt b/services/brig/deb/opt/brig/templates/user/it/email/new-client.txt deleted file mode 100644 index 7bfdf6242c2..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/new-client.txt +++ /dev/null @@ -1,18 +0,0 @@ -Wire - - -Hi ${name}, - -Your Wire account was used on: - - ${date} - ${model} - -You may have installed Wire on a new device or installed it again on an existing one. If that was not the case, go to Wire Settings, remove the device and reset your password. - -The Wire team - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/it/email/new-client.txt b/services/brig/deb/opt/brig/templates/user/it/email/new-client.txt new file mode 120000 index 00000000000..43680a08a51 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/new-client.txt @@ -0,0 +1 @@ +../../en/email/new-client.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/password-reset-subject.txt b/services/brig/deb/opt/brig/templates/user/it/email/password-reset-subject.txt deleted file mode 100644 index dfba835fc9a..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/password-reset-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Password Change at Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/password-reset-subject.txt b/services/brig/deb/opt/brig/templates/user/it/email/password-reset-subject.txt new file mode 120000 index 00000000000..609f0965b59 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/password-reset-subject.txt @@ -0,0 +1 @@ +../../en/email/password-reset-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/password-reset.html b/services/brig/deb/opt/brig/templates/user/it/email/password-reset.html deleted file mode 100644 index 602666c1672..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/password-reset.html +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

-

- We’ve received a request to change the password for your Wire account. - To change your password, click on the button below. -

-

- - CHANGE PASSWORD - -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- This is an automated message and no one will see your response. -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/it/email/password-reset.html b/services/brig/deb/opt/brig/templates/user/it/email/password-reset.html new file mode 120000 index 00000000000..f28f353893f --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/password-reset.html @@ -0,0 +1 @@ +../../en/email/password-reset.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/password-reset.txt b/services/brig/deb/opt/brig/templates/user/it/email/password-reset.txt deleted file mode 100644 index 6f8e36a7212..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/password-reset.txt +++ /dev/null @@ -1,21 +0,0 @@ -Wire - - -Hello, - -We've received a request to change the password for your Wire account. - -To change your password, follow the link below. - -${url} - -Please don't reply to this message. - -This is an automated message and no one will see your response. -If you need more help, please visit https://support.wire.com - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/it/email/password-reset.txt b/services/brig/deb/opt/brig/templates/user/it/email/password-reset.txt new file mode 120000 index 00000000000..cbd03c4ff08 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/password-reset.txt @@ -0,0 +1 @@ +../../en/email/password-reset.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/it/email/update-subject.txt deleted file mode 100644 index 97b5791f48e..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/update-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your new email address on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/it/email/update-subject.txt new file mode 120000 index 00000000000..52adaf74932 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/update-subject.txt @@ -0,0 +1 @@ +../../en/email/update-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/update.html b/services/brig/deb/opt/brig/templates/user/it/email/update.html deleted file mode 100644 index 0bcf986aa4b..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/update.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your new address. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this change, you can ignore this email or - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/it/email/update.html b/services/brig/deb/opt/brig/templates/user/it/email/update.html new file mode 120000 index 00000000000..37d6464a1f9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/update.html @@ -0,0 +1 @@ +../../en/email/update.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/it/email/update.txt b/services/brig/deb/opt/brig/templates/user/it/email/update.txt deleted file mode 100644 index b230828d559..00000000000 --- a/services/brig/deb/opt/brig/templates/user/it/email/update.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. - -Follow the link below to verify your new address. - - -${url} - -Please don't reply to this message. - -If you didn't request this change, you can ignore this email or visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/it/email/update.txt b/services/brig/deb/opt/brig/templates/user/it/email/update.txt new file mode 120000 index 00000000000..b056c56f546 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/it/email/update.txt @@ -0,0 +1 @@ +../../en/email/update.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/pt-BR/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/pt-BR/email/update-subject.txt deleted file mode 100644 index 97b5791f48e..00000000000 --- a/services/brig/deb/opt/brig/templates/user/pt-BR/email/update-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your new email address on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/pt-BR/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/pt-BR/email/update-subject.txt new file mode 120000 index 00000000000..52adaf74932 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/pt-BR/email/update-subject.txt @@ -0,0 +1 @@ +../../en/email/update-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/pt-BR/email/update.html b/services/brig/deb/opt/brig/templates/user/pt-BR/email/update.html deleted file mode 100644 index 0bcf986aa4b..00000000000 --- a/services/brig/deb/opt/brig/templates/user/pt-BR/email/update.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your new address. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this change, you can ignore this email or - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/pt-BR/email/update.html b/services/brig/deb/opt/brig/templates/user/pt-BR/email/update.html new file mode 120000 index 00000000000..37d6464a1f9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/pt-BR/email/update.html @@ -0,0 +1 @@ +../../en/email/update.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/pt-BR/email/update.txt b/services/brig/deb/opt/brig/templates/user/pt-BR/email/update.txt deleted file mode 100644 index b230828d559..00000000000 --- a/services/brig/deb/opt/brig/templates/user/pt-BR/email/update.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. - -Follow the link below to verify your new address. - - -${url} - -Please don't reply to this message. - -If you didn't request this change, you can ignore this email or visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/pt-BR/email/update.txt b/services/brig/deb/opt/brig/templates/user/pt-BR/email/update.txt new file mode 120000 index 00000000000..b056c56f546 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/pt-BR/email/update.txt @@ -0,0 +1 @@ +../../en/email/update.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/ru/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/ru/email/update-subject.txt deleted file mode 100644 index 97b5791f48e..00000000000 --- a/services/brig/deb/opt/brig/templates/user/ru/email/update-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your new email address on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/ru/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/ru/email/update-subject.txt new file mode 120000 index 00000000000..52adaf74932 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/ru/email/update-subject.txt @@ -0,0 +1 @@ +../../en/email/update-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/ru/email/update.html b/services/brig/deb/opt/brig/templates/user/ru/email/update.html deleted file mode 100644 index 0bcf986aa4b..00000000000 --- a/services/brig/deb/opt/brig/templates/user/ru/email/update.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your new address. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this change, you can ignore this email or - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/ru/email/update.html b/services/brig/deb/opt/brig/templates/user/ru/email/update.html new file mode 120000 index 00000000000..37d6464a1f9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/ru/email/update.html @@ -0,0 +1 @@ +../../en/email/update.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/ru/email/update.txt b/services/brig/deb/opt/brig/templates/user/ru/email/update.txt deleted file mode 100644 index b230828d559..00000000000 --- a/services/brig/deb/opt/brig/templates/user/ru/email/update.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. - -Follow the link below to verify your new address. - - -${url} - -Please don't reply to this message. - -If you didn't request this change, you can ignore this email or visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/ru/email/update.txt b/services/brig/deb/opt/brig/templates/user/ru/email/update.txt new file mode 120000 index 00000000000..b056c56f546 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/ru/email/update.txt @@ -0,0 +1 @@ +../../en/email/update.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/sv-SE/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/sv-SE/email/update-subject.txt deleted file mode 100644 index 97b5791f48e..00000000000 --- a/services/brig/deb/opt/brig/templates/user/sv-SE/email/update-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your new email address on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/sv-SE/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/sv-SE/email/update-subject.txt new file mode 120000 index 00000000000..52adaf74932 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/sv-SE/email/update-subject.txt @@ -0,0 +1 @@ +../../en/email/update-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/sv-SE/email/update.html b/services/brig/deb/opt/brig/templates/user/sv-SE/email/update.html deleted file mode 100644 index 0bcf986aa4b..00000000000 --- a/services/brig/deb/opt/brig/templates/user/sv-SE/email/update.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your new address. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this change, you can ignore this email or - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/sv-SE/email/update.html b/services/brig/deb/opt/brig/templates/user/sv-SE/email/update.html new file mode 120000 index 00000000000..37d6464a1f9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/sv-SE/email/update.html @@ -0,0 +1 @@ +../../en/email/update.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/sv-SE/email/update.txt b/services/brig/deb/opt/brig/templates/user/sv-SE/email/update.txt deleted file mode 100644 index b230828d559..00000000000 --- a/services/brig/deb/opt/brig/templates/user/sv-SE/email/update.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. - -Follow the link below to verify your new address. - - -${url} - -Please don't reply to this message. - -If you didn't request this change, you can ignore this email or visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/sv-SE/email/update.txt b/services/brig/deb/opt/brig/templates/user/sv-SE/email/update.txt new file mode 120000 index 00000000000..b056c56f546 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/sv-SE/email/update.txt @@ -0,0 +1 @@ +../../en/email/update.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/activation-subject.txt b/services/brig/deb/opt/brig/templates/user/tr/email/activation-subject.txt deleted file mode 100644 index 7566d46a576..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/activation-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your Wire Account \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/activation-subject.txt b/services/brig/deb/opt/brig/templates/user/tr/email/activation-subject.txt new file mode 120000 index 00000000000..da6935bfa64 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/activation-subject.txt @@ -0,0 +1 @@ +../../en/email/activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/activation.html b/services/brig/deb/opt/brig/templates/user/tr/email/activation.html deleted file mode 100644 index 9e9e6f7f3d9..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/activation.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was used to create a Wire account. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your address. You won’t be able to use Wire until you do. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t create a Wire account using this email address, please - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/activation.html b/services/brig/deb/opt/brig/templates/user/tr/email/activation.html new file mode 120000 index 00000000000..349321f857c --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/activation.html @@ -0,0 +1 @@ +../../en/email/activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/activation.txt b/services/brig/deb/opt/brig/templates/user/tr/email/activation.txt deleted file mode 100644 index 682451dda69..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/activation.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -Your email address ${email} was used to create a Wire account. We want to verify that you are indeed ${name}. - -Follow the link below to verify your address. You won't be able to use Wire until you do. - - -${url} - -Please don't reply to this message. - -If you didn't create a Wire account using this email address, please visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/activation.txt b/services/brig/deb/opt/brig/templates/user/tr/email/activation.txt new file mode 120000 index 00000000000..3302d12c5bb --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/activation.txt @@ -0,0 +1 @@ +../../en/email/activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/deletion-subject.txt b/services/brig/deb/opt/brig/templates/user/tr/email/deletion-subject.txt deleted file mode 100644 index 8a92b9f9a36..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/deletion-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Delete account? \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/deletion-subject.txt b/services/brig/deb/opt/brig/templates/user/tr/email/deletion-subject.txt new file mode 120000 index 00000000000..28f2b222a88 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/deletion-subject.txt @@ -0,0 +1 @@ +../../en/email/deletion-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/deletion.html b/services/brig/deb/opt/brig/templates/user/tr/email/deletion.html deleted file mode 100644 index 57991954819..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/deletion.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hi ${name}, -

- -

- We’ve received a request to delete your Wire account. Click the button below within 10 minutes to delete all your conversations, content and connections.
 -

-

- - DELETE ACCOUNT - -

-

- If you can’t click the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this, reset your password. -

-

- The Wire team -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/deletion.html b/services/brig/deb/opt/brig/templates/user/tr/email/deletion.html new file mode 120000 index 00000000000..81cade358d2 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/deletion.html @@ -0,0 +1 @@ +../../en/email/deletion.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/deletion.txt b/services/brig/deb/opt/brig/templates/user/tr/email/deletion.txt deleted file mode 100644 index ac781ddb43a..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/deletion.txt +++ /dev/null @@ -1,17 +0,0 @@ -Wire - - -Hi ${name}, - -We’ve received a request to delete your Wire account. Visit the link below within 10 minutes to delete all your conversations, content and connections.
 - -${url} - -If you didn’t request this, reset your password. - -The Wire team - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/deletion.txt b/services/brig/deb/opt/brig/templates/user/tr/email/deletion.txt new file mode 120000 index 00000000000..e80fd1061b9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/deletion.txt @@ -0,0 +1 @@ +../../en/email/deletion.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/invitation-subject.txt b/services/brig/deb/opt/brig/templates/user/tr/email/invitation-subject.txt deleted file mode 100644 index ce512e8f4e8..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/invitation-subject.txt +++ /dev/null @@ -1 +0,0 @@ -${inviter} wants to connect on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/invitation-subject.txt b/services/brig/deb/opt/brig/templates/user/tr/email/invitation-subject.txt new file mode 120000 index 00000000000..85829cb4b42 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/invitation-subject.txt @@ -0,0 +1 @@ +../../en/email/invitation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/invitation.html b/services/brig/deb/opt/brig/templates/user/tr/email/invitation.html deleted file mode 100644 index cc7b6347910..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/invitation.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - -
- -
-

- Hello ${invitee},
- ${inviter} wants to connect on Wire. -

-

- - ACCEPT INVITATION - -

-

- Wire is an app for calling, messaging, and sharing pics, music, videos and more in personal and group conversations. Learn more
-

-

- If you can’t click on the button, use this link: ${url}
-

-
- Please do not reply to this email.
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/invitation.html b/services/brig/deb/opt/brig/templates/user/tr/email/invitation.html new file mode 120000 index 00000000000..37456503673 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/invitation.html @@ -0,0 +1 @@ +../../en/email/invitation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/invitation.txt b/services/brig/deb/opt/brig/templates/user/tr/email/invitation.txt deleted file mode 100644 index 19c147333e0..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/invitation.txt +++ /dev/null @@ -1,17 +0,0 @@ -Wire - - -Hi ${name}, - -${inviter} has invited you to join Wire. Accept this invitation to join the conversation by following the link: - -${url} - -Please don't reply to this message. - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/invitation.txt b/services/brig/deb/opt/brig/templates/user/tr/email/invitation.txt new file mode 120000 index 00000000000..d3d40de079c --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/invitation.txt @@ -0,0 +1 @@ +../../en/email/invitation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/new-client-subject.txt b/services/brig/deb/opt/brig/templates/user/tr/email/new-client-subject.txt deleted file mode 100644 index 7c90a198403..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/new-client-subject.txt +++ /dev/null @@ -1 +0,0 @@ -New device \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/new-client-subject.txt b/services/brig/deb/opt/brig/templates/user/tr/email/new-client-subject.txt new file mode 120000 index 00000000000..6778711c1a5 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/new-client-subject.txt @@ -0,0 +1 @@ +../../en/email/new-client-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/new-client.html b/services/brig/deb/opt/brig/templates/user/tr/email/new-client.html deleted file mode 100644 index ba1a69c6223..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/new-client.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hi ${name}, -

- -

- Your Wire account was used on: -

- -

- ${date} -

-

- ${model} -

- -

- You may have installed Wire on a new device or installed it again on an existing one. If that was not the case, go to Wire Settings, remove the device and reset your password. -

- -

- The Wire team -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/new-client.html b/services/brig/deb/opt/brig/templates/user/tr/email/new-client.html new file mode 120000 index 00000000000..ea3647ea481 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/new-client.html @@ -0,0 +1 @@ +../../en/email/new-client.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/new-client.txt b/services/brig/deb/opt/brig/templates/user/tr/email/new-client.txt deleted file mode 100644 index 7bfdf6242c2..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/new-client.txt +++ /dev/null @@ -1,18 +0,0 @@ -Wire - - -Hi ${name}, - -Your Wire account was used on: - - ${date} - ${model} - -You may have installed Wire on a new device or installed it again on an existing one. If that was not the case, go to Wire Settings, remove the device and reset your password. - -The Wire team - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/new-client.txt b/services/brig/deb/opt/brig/templates/user/tr/email/new-client.txt new file mode 120000 index 00000000000..43680a08a51 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/new-client.txt @@ -0,0 +1 @@ +../../en/email/new-client.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/password-reset-subject.txt b/services/brig/deb/opt/brig/templates/user/tr/email/password-reset-subject.txt deleted file mode 100644 index dfba835fc9a..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/password-reset-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Password Change at Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/password-reset-subject.txt b/services/brig/deb/opt/brig/templates/user/tr/email/password-reset-subject.txt new file mode 120000 index 00000000000..609f0965b59 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/password-reset-subject.txt @@ -0,0 +1 @@ +../../en/email/password-reset-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/password-reset.html b/services/brig/deb/opt/brig/templates/user/tr/email/password-reset.html deleted file mode 100644 index 602666c1672..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/password-reset.html +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

-

- We’ve received a request to change the password for your Wire account. - To change your password, click on the button below. -

-

- - CHANGE PASSWORD - -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- This is an automated message and no one will see your response. -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/password-reset.html b/services/brig/deb/opt/brig/templates/user/tr/email/password-reset.html new file mode 120000 index 00000000000..f28f353893f --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/password-reset.html @@ -0,0 +1 @@ +../../en/email/password-reset.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/password-reset.txt b/services/brig/deb/opt/brig/templates/user/tr/email/password-reset.txt deleted file mode 100644 index 6f8e36a7212..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/password-reset.txt +++ /dev/null @@ -1,21 +0,0 @@ -Wire - - -Hello, - -We've received a request to change the password for your Wire account. - -To change your password, follow the link below. - -${url} - -Please don't reply to this message. - -This is an automated message and no one will see your response. -If you need more help, please visit https://support.wire.com - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/password-reset.txt b/services/brig/deb/opt/brig/templates/user/tr/email/password-reset.txt new file mode 120000 index 00000000000..cbd03c4ff08 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/password-reset.txt @@ -0,0 +1 @@ +../../en/email/password-reset.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/tr/email/update-subject.txt deleted file mode 100644 index 97b5791f48e..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/update-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your new email address on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/tr/email/update-subject.txt new file mode 120000 index 00000000000..52adaf74932 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/update-subject.txt @@ -0,0 +1 @@ +../../en/email/update-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/update.html b/services/brig/deb/opt/brig/templates/user/tr/email/update.html deleted file mode 100644 index 0bcf986aa4b..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/update.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your new address. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this change, you can ignore this email or - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/update.html b/services/brig/deb/opt/brig/templates/user/tr/email/update.html new file mode 120000 index 00000000000..37d6464a1f9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/update.html @@ -0,0 +1 @@ +../../en/email/update.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/update.txt b/services/brig/deb/opt/brig/templates/user/tr/email/update.txt deleted file mode 100644 index b230828d559..00000000000 --- a/services/brig/deb/opt/brig/templates/user/tr/email/update.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. - -Follow the link below to verify your new address. - - -${url} - -Please don't reply to this message. - -If you didn't request this change, you can ignore this email or visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/tr/email/update.txt b/services/brig/deb/opt/brig/templates/user/tr/email/update.txt new file mode 120000 index 00000000000..b056c56f546 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/tr/email/update.txt @@ -0,0 +1 @@ +../../en/email/update.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/uk/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/uk/email/update-subject.txt deleted file mode 100644 index 97b5791f48e..00000000000 --- a/services/brig/deb/opt/brig/templates/user/uk/email/update-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your new email address on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/uk/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/uk/email/update-subject.txt new file mode 120000 index 00000000000..52adaf74932 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/uk/email/update-subject.txt @@ -0,0 +1 @@ +../../en/email/update-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/uk/email/update.html b/services/brig/deb/opt/brig/templates/user/uk/email/update.html deleted file mode 100644 index 0bcf986aa4b..00000000000 --- a/services/brig/deb/opt/brig/templates/user/uk/email/update.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your new address. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this change, you can ignore this email or - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/uk/email/update.html b/services/brig/deb/opt/brig/templates/user/uk/email/update.html new file mode 120000 index 00000000000..37d6464a1f9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/uk/email/update.html @@ -0,0 +1 @@ +../../en/email/update.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/uk/email/update.txt b/services/brig/deb/opt/brig/templates/user/uk/email/update.txt deleted file mode 100644 index b230828d559..00000000000 --- a/services/brig/deb/opt/brig/templates/user/uk/email/update.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. - -Follow the link below to verify your new address. - - -${url} - -Please don't reply to this message. - -If you didn't request this change, you can ignore this email or visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/uk/email/update.txt b/services/brig/deb/opt/brig/templates/user/uk/email/update.txt new file mode 120000 index 00000000000..b056c56f546 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/uk/email/update.txt @@ -0,0 +1 @@ +../../en/email/update.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation-subject.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation-subject.txt deleted file mode 100644 index 7566d46a576..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your Wire Account \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation-subject.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation-subject.txt new file mode 120000 index 00000000000..da6935bfa64 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation-subject.txt @@ -0,0 +1 @@ +../../en/email/activation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation.html b/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation.html deleted file mode 100644 index 9e9e6f7f3d9..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was used to create a Wire account. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your address. You won’t be able to use Wire until you do. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t create a Wire account using this email address, please - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation.html b/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation.html new file mode 120000 index 00000000000..349321f857c --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation.html @@ -0,0 +1 @@ +../../en/email/activation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation.txt deleted file mode 100644 index 682451dda69..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -Your email address ${email} was used to create a Wire account. We want to verify that you are indeed ${name}. - -Follow the link below to verify your address. You won't be able to use Wire until you do. - - -${url} - -Please don't reply to this message. - -If you didn't create a Wire account using this email address, please visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation.txt new file mode 120000 index 00000000000..3302d12c5bb --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/activation.txt @@ -0,0 +1 @@ +../../en/email/activation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion-subject.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion-subject.txt deleted file mode 100644 index 8a92b9f9a36..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Delete account? \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion-subject.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion-subject.txt new file mode 120000 index 00000000000..28f2b222a88 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion-subject.txt @@ -0,0 +1 @@ +../../en/email/deletion-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion.html b/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion.html deleted file mode 100644 index 57991954819..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hi ${name}, -

- -

- We’ve received a request to delete your Wire account. Click the button below within 10 minutes to delete all your conversations, content and connections.
 -

-

- - DELETE ACCOUNT - -

-

- If you can’t click the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this, reset your password. -

-

- The Wire team -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion.html b/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion.html new file mode 120000 index 00000000000..81cade358d2 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion.html @@ -0,0 +1 @@ +../../en/email/deletion.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion.txt deleted file mode 100644 index ac781ddb43a..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion.txt +++ /dev/null @@ -1,17 +0,0 @@ -Wire - - -Hi ${name}, - -We’ve received a request to delete your Wire account. Visit the link below within 10 minutes to delete all your conversations, content and connections.
 - -${url} - -If you didn’t request this, reset your password. - -The Wire team - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion.txt new file mode 120000 index 00000000000..e80fd1061b9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/deletion.txt @@ -0,0 +1 @@ +../../en/email/deletion.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation-subject.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation-subject.txt deleted file mode 100644 index ce512e8f4e8..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation-subject.txt +++ /dev/null @@ -1 +0,0 @@ -${inviter} wants to connect on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation-subject.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation-subject.txt new file mode 120000 index 00000000000..85829cb4b42 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation-subject.txt @@ -0,0 +1 @@ +../../en/email/invitation-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation.html b/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation.html deleted file mode 100644 index cc7b6347910..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - -
- -
-

- Hello ${invitee},
- ${inviter} wants to connect on Wire. -

-

- - ACCEPT INVITATION - -

-

- Wire is an app for calling, messaging, and sharing pics, music, videos and more in personal and group conversations. Learn more
-

-

- If you can’t click on the button, use this link: ${url}
-

-
- Please do not reply to this email.
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation.html b/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation.html new file mode 120000 index 00000000000..37456503673 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation.html @@ -0,0 +1 @@ +../../en/email/invitation.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation.txt deleted file mode 100644 index 19c147333e0..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation.txt +++ /dev/null @@ -1,17 +0,0 @@ -Wire - - -Hi ${name}, - -${inviter} has invited you to join Wire. Accept this invitation to join the conversation by following the link: - -${url} - -Please don't reply to this message. - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation.txt new file mode 120000 index 00000000000..d3d40de079c --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/invitation.txt @@ -0,0 +1 @@ +../../en/email/invitation.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client-subject.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client-subject.txt deleted file mode 100644 index 7c90a198403..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client-subject.txt +++ /dev/null @@ -1 +0,0 @@ -New device \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client-subject.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client-subject.txt new file mode 120000 index 00000000000..6778711c1a5 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client-subject.txt @@ -0,0 +1 @@ +../../en/email/new-client-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client.html b/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client.html deleted file mode 100644 index ba1a69c6223..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hi ${name}, -

- -

- Your Wire account was used on: -

- -

- ${date} -

-

- ${model} -

- -

- You may have installed Wire on a new device or installed it again on an existing one. If that was not the case, go to Wire Settings, remove the device and reset your password. -

- -

- The Wire team -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client.html b/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client.html new file mode 120000 index 00000000000..ea3647ea481 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client.html @@ -0,0 +1 @@ +../../en/email/new-client.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client.txt deleted file mode 100644 index 7bfdf6242c2..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client.txt +++ /dev/null @@ -1,18 +0,0 @@ -Wire - - -Hi ${name}, - -Your Wire account was used on: - - ${date} - ${model} - -You may have installed Wire on a new device or installed it again on an existing one. If that was not the case, go to Wire Settings, remove the device and reset your password. - -The Wire team - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client.txt new file mode 120000 index 00000000000..43680a08a51 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/new-client.txt @@ -0,0 +1 @@ +../../en/email/new-client.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset-subject.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset-subject.txt deleted file mode 100644 index dfba835fc9a..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Password Change at Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset-subject.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset-subject.txt new file mode 120000 index 00000000000..609f0965b59 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset-subject.txt @@ -0,0 +1 @@ +../../en/email/password-reset-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset.html b/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset.html deleted file mode 100644 index 602666c1672..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset.html +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

-

- We’ve received a request to change the password for your Wire account. - To change your password, click on the button below. -

-

- - CHANGE PASSWORD - -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- This is an automated message and no one will see your response. -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset.html b/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset.html new file mode 120000 index 00000000000..f28f353893f --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset.html @@ -0,0 +1 @@ +../../en/email/password-reset.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset.txt deleted file mode 100644 index 6f8e36a7212..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset.txt +++ /dev/null @@ -1,21 +0,0 @@ -Wire - - -Hello, - -We've received a request to change the password for your Wire account. - -To change your password, follow the link below. - -${url} - -Please don't reply to this message. - -This is an automated message and no one will see your response. -If you need more help, please visit https://support.wire.com - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset.txt new file mode 120000 index 00000000000..cbd03c4ff08 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/password-reset.txt @@ -0,0 +1 @@ +../../en/email/password-reset.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/update-subject.txt deleted file mode 100644 index 97b5791f48e..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/update-subject.txt +++ /dev/null @@ -1 +0,0 @@ -Your new email address on Wire \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/update-subject.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/update-subject.txt new file mode 120000 index 00000000000..52adaf74932 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/update-subject.txt @@ -0,0 +1 @@ +../../en/email/update-subject.txt \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/update.html b/services/brig/deb/opt/brig/templates/user/zh-TW/email/update.html deleted file mode 100644 index 0bcf986aa4b..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/update.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - wire.com -
-

- Hello, -

- -

- ${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. -

-

- - VERIFY - -

-

- Click the button above to verify your new address. -

-

- If you can’t click on the button, use this link:
-

-

- ${url} -

-

- If you didn’t request this change, you can ignore this email or - - contact us - . -

-
- Privacy Policy · - Report misuse -
- © Wire Swiss GmbH. All rights reserved. -
- - diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/update.html b/services/brig/deb/opt/brig/templates/user/zh-TW/email/update.html new file mode 120000 index 00000000000..37d6464a1f9 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/update.html @@ -0,0 +1 @@ +../../en/email/update.html \ No newline at end of file diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/update.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/update.txt deleted file mode 100644 index b230828d559..00000000000 --- a/services/brig/deb/opt/brig/templates/user/zh-TW/email/update.txt +++ /dev/null @@ -1,22 +0,0 @@ -Wire - - -Hello, - -${email} was registered as your new email address on Wire. We want to verify that you are indeed ${name}. - -Follow the link below to verify your new address. - - -${url} - -Please don't reply to this message. - -If you didn't request this change, you can ignore this email or visit https://support.wire.com - - - - -(c) Wire Swiss GmbH - -Privacy Policy | Report misuse diff --git a/services/brig/deb/opt/brig/templates/user/zh-TW/email/update.txt b/services/brig/deb/opt/brig/templates/user/zh-TW/email/update.txt new file mode 120000 index 00000000000..b056c56f546 --- /dev/null +++ b/services/brig/deb/opt/brig/templates/user/zh-TW/email/update.txt @@ -0,0 +1 @@ +../../en/email/update.txt \ No newline at end of file From a857af5d900bd0aa94751664b750ba50392a05aa Mon Sep 17 00:00:00 2001 From: Tiago Loureiro Date: Fri, 6 Oct 2017 16:49:17 +0200 Subject: [PATCH 06/10] Ensure proper error code when the team is too large --- services/brig/brig.cabal | 4 ++-- services/brig/src/Brig/API/Error.hs | 4 ++++ services/brig/src/Brig/API/Types.hs | 1 + services/brig/src/Brig/API/User.hs | 4 +++- services/brig/src/Brig/IO/Intra.hs | 9 ++++++--- services/brig/stack.yaml | 1 + services/brig/test/integration/API/Team.hs | 19 ++++++++++++++++++- 7 files changed, 35 insertions(+), 7 deletions(-) diff --git a/services/brig/brig.cabal b/services/brig/brig.cabal index 3ba092f2295..4ecad54eb88 100644 --- a/services/brig/brig.cabal +++ b/services/brig/brig.cabal @@ -130,7 +130,7 @@ library , iproute >= 1.5 , lens >= 3.8 , lens-aeson >= 1.0 - , lifted-async >= 0.8 + , lifted-async >= 0.9.3 , mime-mail >= 0.4 , metrics-core >= 0.3 , metrics-wai >= 0.3 @@ -326,7 +326,7 @@ test-suite brig-integration , HsOpenSSL , lens >= 3.9 , lens-aeson >= 1.0 - , lifted-async >= 0.7 + , lifted-async >= 0.9.3 , mtl >= 2.1 , network , options >= 0.1 diff --git a/services/brig/src/Brig/API/Error.hs b/services/brig/src/Brig/API/Error.hs index ba11b881de1..a556ffcfde1 100644 --- a/services/brig/src/Brig/API/Error.hs +++ b/services/brig/src/Brig/API/Error.hs @@ -71,6 +71,7 @@ newUserError (InvalidPhone _) = StdError invalidPhone newUserError (DuplicateUserKey _) = StdError userKeyExists newUserError (PhoneActivationError e) = actError e newUserError (BlacklistedUserKey k) = StdError $ foldKey (const blacklistedEmail) (const blacklistedPhone) k +newUserError TooManyTeamMembers = StdError tooManyTeamMembers sendLoginCodeError :: SendLoginCodeError -> Error sendLoginCodeError (SendLoginInvalidPhone _) = StdError invalidPhone @@ -338,6 +339,9 @@ noOtherOwner :: Wai.Error noOtherOwner = Wai.Error status403 "no-other-owner" "You are trying to remove or downgrade\ \ an owner. Promote another team member before proceeding." +tooManyTeamMembers :: Wai.Error +tooManyTeamMembers = Wai.Error status403 "too-many-team-members" "Too many members in this team." + loginsTooFrequent :: Wai.Error loginsTooFrequent = Wai.Error status429 "client-error" "Logins too frequent" diff --git a/services/brig/src/Brig/API/Types.hs b/services/brig/src/Brig/API/Types.hs index 1a2c1d8878d..81b63470e27 100644 --- a/services/brig/src/Brig/API/Types.hs +++ b/services/brig/src/Brig/API/Types.hs @@ -58,6 +58,7 @@ data CreateUserError | InvalidPhone Phone | DuplicateUserKey UserKey | BlacklistedUserKey UserKey + | TooManyTeamMembers data InvitationError = InviteeEmailExists UserId diff --git a/services/brig/src/Brig/API/User.hs b/services/brig/src/Brig/API/User.hs index e180368b559..633443381ee 100644 --- a/services/brig/src/Brig/API/User.hs +++ b/services/brig/src/Brig/API/User.hs @@ -238,8 +238,10 @@ createUser new@NewUser{..} = do ok <- lift $ Data.claimKey uk uid unless ok $ throwE $ DuplicateUserKey uk + added <- lift $ Intra.addTeamMember uid (Team.iiTeam ii) + unless added $ + throwE TooManyTeamMembers lift $ do - Intra.addTeamMember uid (Team.iiTeam ii) activateUser uid ident void $ onActivated (AccountActivated account) Log.info $ field "user" (toByteString uid) diff --git a/services/brig/src/Brig/IO/Intra.hs b/services/brig/src/Brig/IO/Intra.hs index 66d39917627..73d27582823 100644 --- a/services/brig/src/Brig/IO/Intra.hs +++ b/services/brig/src/Brig/IO/Intra.hs @@ -494,14 +494,17 @@ rmClient u c = do ------------------------------------------------------------------------------- -- Team Management -addTeamMember :: UserId -> TeamId -> AppIO () +addTeamMember :: UserId -> TeamId -> AppIO Bool addTeamMember u tid = do debug $ remote "galley" . msg (val "Adding member to team") permissions <- maybe (throwM incorrectPermissions) return (Team.newPermissions perms perms) - void $ galleyRequest POST (req permissions) + rs <- galleyRequest POST (req permissions) + return $ case Bilge.statusCode rs of + 200 -> True + _ -> False where perms = Set.fromList [ Team.CreateConversation , Team.DeleteConversation @@ -514,7 +517,7 @@ addTeamMember u tid = do req p = paths ["i", "teams", toByteString' tid, "members"] . header "Content-Type" "application/json" . zUser u - . expect2xx + . expect [status200, status403] . lbytes (encode $ t p) createTeam :: UserId -> Team.BindingNewTeam -> AppIO TeamId diff --git a/services/brig/stack.yaml b/services/brig/stack.yaml index db2c041030a..8784c074bc2 100644 --- a/services/brig/stack.yaml +++ b/services/brig/stack.yaml @@ -40,6 +40,7 @@ extra-deps: - data-timeout-0.3 - geoip2-0.2.2.0 - html-entities-1.1.4.1 +- lifted-async-0.9.3 - raw-strings-qq-1.0.2 - temporary-1.2.1.1 - text-icu-translit-0.1.0.7 diff --git a/services/brig/test/integration/API/Team.hs b/services/brig/test/integration/API/Team.hs index 99238fdcf80..7567fde0fbb 100644 --- a/services/brig/test/integration/API/Team.hs +++ b/services/brig/test/integration/API/Team.hs @@ -11,7 +11,7 @@ import Brig.Types.Team.Invitation import Brig.Types.User.Auth import Brig.Types.Intra import Control.Arrow ((&&&)) -import Control.Concurrent.Async.Lifted.Safe (mapConcurrently_) +import Control.Concurrent.Async.Lifted.Safe (mapConcurrently_, replicateConcurrently_) import Control.Lens ((^.), (^?), view) import Control.Monad import Control.Monad.IO.Class @@ -50,6 +50,7 @@ tests m b c g = , test m "post /register - 400 bad code" $ testInvitationInvalidCode b , test m "post /register - 400 no wireless" $ testInvitationCodeNoIdentity b , test m "post /register - 400 mutually exclusive" $ testInvitationMutuallyExclusive b + , test m "post /register - 403 too many members" $ testInvitationTooManyMembers b g , test m "get /teams/:tid/invitations - 200 (paging)" $ testInvitationPaging b g , test m "get /teams/:tid/invitations/info - 200" $ testInvitationInfo b g , test m "get /teams/:tid/invitations/info - 400" $ testInvitationInfoBadCode b @@ -248,6 +249,22 @@ testInvitationMutuallyExclusive brig = do ] )) +testInvitationTooManyMembers :: Brig -> Galley -> Http () +testInvitationTooManyMembers brig galley = do + creator <- userId <$> randomUser brig + tid <- createTeam creator galley + replicateConcurrently_ 127 $ inviteAndRegisterUser creator tid brig + + em <- randomEmail + let invite = InvitationRequest em (Name "Bob") Nothing + Just inv <- decodeBody <$> postInvitation brig tid creator invite + Just inviteeCode <- getInvitationCode brig tid (inInvitation inv) + post (brig . path "/register" + . contentJson + . body (accept em inviteeCode)) !!! do + const 403 === statusCode + const (Just "too-many-team-members") === fmap Error.label . decodeBody + testInvitationPaging :: Brig -> Galley -> Http () testInvitationPaging b g = do u <- userId <$> randomUser b From b11cdf034174e9b246a275543d200be0ca444ba8 Mon Sep 17 00:00:00 2001 From: jschaul Date: Thu, 5 Oct 2017 16:37:58 +0200 Subject: [PATCH 07/10] Activate team on account activation only Add Pending state to Teams, which is their initial state. Upon the first user account activation, teams also become active. --- .../src/Galley/Types/Teams/Intra.hs | 4 ++++ services/brig/src/Brig/API/User.hs | 8 +++++++ services/brig/src/Brig/IO/Intra.hs | 13 +++++++++++ services/brig/test/integration/API/Team.hs | 20 ++++++++++++++++- services/galley/src/Galley/API.hs | 3 +++ services/galley/src/Galley/API/Teams.hs | 22 ++++++++++++++----- services/galley/src/Galley/Data.hs | 5 ++++- services/galley/src/Galley/Data/Instances.hs | 3 +++ services/galley/test/integration/API/Teams.hs | 6 ++--- services/galley/test/integration/API/Util.hs | 12 ++++++++-- 10 files changed, 83 insertions(+), 13 deletions(-) diff --git a/libs/galley-types/src/Galley/Types/Teams/Intra.hs b/libs/galley-types/src/Galley/Types/Teams/Intra.hs index c65f2cfda3a..4da7b2f3f52 100644 --- a/libs/galley-types/src/Galley/Types/Teams/Intra.hs +++ b/libs/galley-types/src/Galley/Types/Teams/Intra.hs @@ -13,6 +13,7 @@ data TeamStatus | PendingDelete | Deleted | Suspended + | PendingActive deriving (Eq, Show) instance ToJSON TeamStatus where @@ -20,12 +21,14 @@ instance ToJSON TeamStatus where toJSON PendingDelete = String "pending_delete" toJSON Deleted = String "deleted" toJSON Suspended = String "suspended" + toJSON PendingActive = String "pending_active" instance FromJSON TeamStatus where parseJSON (String "active") = pure Active parseJSON (String "pending_delete") = pure PendingDelete parseJSON (String "deleted") = pure Deleted parseJSON (String "suspended") = pure Suspended + parseJSON (String "pending_active") = pure PendingActive parseJSON other = fail $ "Unknown TeamStatus: " <> show other data TeamData = TeamData @@ -56,3 +59,4 @@ instance FromJSON TeamStatusUpdate where instance ToJSON TeamStatusUpdate where toJSON s = object ["status" .= tuStatus s] + diff --git a/services/brig/src/Brig/API/User.hs b/services/brig/src/Brig/API/User.hs index e180368b559..cbc11aab07a 100644 --- a/services/brig/src/Brig/API/User.hs +++ b/services/brig/src/Brig/API/User.hs @@ -111,6 +111,7 @@ import qualified Brig.Types.Team.Invitation as Team import qualified Brig.Team.DB as Team import qualified Data.Map.Strict as Map import qualified Galley.Types.Teams as Team +import qualified Galley.Types.Teams.Intra as Team import qualified System.Logger.Class as Log ------------------------------------------------------------------------------- @@ -469,6 +470,7 @@ onActivated (AccountActivated account) = do let uid = userId (accountUser account) Log.info $ field "user" (toByteString uid) . msg (val "User activated") Intra.onUserEvent uid Nothing $ UserActivated account + activateTeam uid return (userIdentity (accountUser account), True) onActivated (EmailActivated uid email) = do Intra.onUserEvent uid Nothing (emailUpdated uid email) @@ -477,6 +479,11 @@ onActivated (PhoneActivated uid phone) = do Intra.onUserEvent uid Nothing (phoneUpdated uid phone) return (Just (PhoneIdentity phone), False) +activateTeam :: UserId -> AppIO () +activateTeam uid = do + tid <- Intra.getTeamId uid + for_ tid $ flip Intra.changeTeamStatus Team.Active + sendActivationCode :: Either Email Phone -> Maybe Locale -> Bool -> ExceptT SendActivationCodeError AppIO () sendActivationCode emailOrPhone loc call = case emailOrPhone of Left email -> do @@ -774,3 +781,4 @@ fetchUserIdentity :: UserId -> AppIO (Maybe UserIdentity) fetchUserIdentity uid = lookupSelfProfile uid >>= maybe (throwM $ UserProfileNotFound uid) (return . userIdentity . selfUser) + diff --git a/services/brig/src/Brig/IO/Intra.hs b/services/brig/src/Brig/IO/Intra.hs index 66d39917627..29229720739 100644 --- a/services/brig/src/Brig/IO/Intra.hs +++ b/services/brig/src/Brig/IO/Intra.hs @@ -36,6 +36,7 @@ module Brig.IO.Intra , getTeamMember , getTeamMembers , getTeam + , getTeamId , getTeamContacts , changeTeamStatus ) where @@ -564,6 +565,17 @@ getTeamContacts u = do req = paths ["i", "users", toByteString' u, "team", "members"] . expect [status200, status404] +getTeamId :: UserId -> AppIO (Maybe TeamId) +getTeamId u = do + debug $ remote "galley" . msg (val "Get team from user") + rs <- galleyRequest GET req + case Bilge.statusCode rs of + 200 -> Just <$> decodeBody "galley" rs + _ -> return Nothing + where + req = paths ["i", "users", toByteString' u, "team"] + . expect [status200, status404] + getTeam :: TeamId -> AppIO Team.TeamData getTeam tid = do debug $ remote "galley" . msg (val "Get team info") @@ -582,3 +594,4 @@ changeTeamStatus tid s = do . header "Content-Type" "application/json" . expect2xx . lbytes (encode $ Team.TeamStatusUpdate s) + diff --git a/services/brig/test/integration/API/Team.hs b/services/brig/test/integration/API/Team.hs index 99238fdcf80..344aefe69d2 100644 --- a/services/brig/test/integration/API/Team.hs +++ b/services/brig/test/integration/API/Team.hs @@ -35,6 +35,7 @@ import qualified Data.Text.Encoding as T import qualified Data.UUID.V4 as UUID import qualified Network.Wai.Utilities.Error as Error import qualified Galley.Types.Teams as Team +import qualified Galley.Types.Teams.Intra as Team import qualified Test.Tasty.Cannon as WS tests :: Manager -> Brig -> Cannon -> Galley -> IO TestTree @@ -113,7 +114,7 @@ testInvitationEmailAccepted brig galley = do Just inv <- decodeBody <$> postInvitation brig tid inviter invite Just inviteeCode <- getInvitationCode brig tid (inInvitation inv) rsp2 <- post (brig . path "/register" - . contentJson + . contentJson . body (accept inviteeEmail inviteeCode)) decodeBody rsp2 @@ -143,6 +144,17 @@ testCreateTeam brig galley = do inviteeEmail <- randomEmail let invite = InvitationRequest inviteeEmail (Name "Bob") Nothing postInvitation brig (team^.Team.teamId) uid invite !!! const 403 === statusCode + -- Verify that the team is still in status "pending" + team2 <- getTeam galley (team^.Team.teamId) + liftIO $ assertEqual "status" Team.PendingActive (Team.tdStatus team2) + -- Activate account + act <- getActivationCode brig (Left email) + case act of + Nothing -> liftIO $ assertFailure "activation key/code not found" + Just kc -> activate brig kc !!! const 200 === statusCode + -- Verify that Team has status Active now + team3 <- getTeam galley (team^.Team.teamId) + liftIO $ assertEqual "status" Team.Active (Team.tdStatus team3) testInvitationNoPermission :: Brig -> Http () testInvitationNoPermission brig = do @@ -398,6 +410,11 @@ unsuspendTeam brig t = post $ brig . paths ["i", "teams", toByteString' t, "unsuspend"] . contentJson +getTeam :: Galley -> TeamId -> Http Team.TeamData +getTeam galley t = do + r <- get $ galley . paths ["i", "teams", toByteString' t] + return $ fromMaybe (error "getTeam: failed to parse response") (decodeBody r) + getInvitationCode :: Brig -> TeamId -> InvitationId -> Http (Maybe InvitationCode) getInvitationCode brig t ref = do r <- get ( brig @@ -496,3 +513,4 @@ updatePermissions from tid (to, perm) galley = newTeam :: Team.BindingNewTeam newTeam = Team.BindingNewTeam $ Team.newNewTeam (unsafeRange "teamName") (unsafeRange "defaultIcon") + diff --git a/services/galley/src/Galley/API.hs b/services/galley/src/Galley/API.hs index e326d51e1ea..c35e4405ba4 100644 --- a/services/galley/src/Galley/API.hs +++ b/services/galley/src/Galley/API.hs @@ -681,6 +681,9 @@ sitemap = do get "/i/users/:uid/team/members" (continue getBindingTeamMembers) $ capture "uid" + get "/i/users/:uid/team" (continue getBindingTeamId) $ + capture "uid" + get "/i/test/clients" (continue getClients) zauthUserId diff --git a/services/galley/src/Galley/API/Teams.hs b/services/galley/src/Galley/API/Teams.hs index 7f4a0c45ab6..797dd9bb633 100644 --- a/services/galley/src/Galley/API/Teams.hs +++ b/services/galley/src/Galley/API/Teams.hs @@ -9,6 +9,7 @@ module Galley.API.Teams , updateTeamStatus , getTeam , getTeamInternal + , getBindingTeamId , getBindingTeamMembers , getManyTeams , deleteTeam @@ -107,12 +108,14 @@ createBindingTeam (zusr ::: tid ::: req ::: _) = do BindingNewTeam body <- fromBody req invalidPayload let owner = newTeamMember zusr fullPermissions team <- Data.createTeam (Just tid) zusr (body^.newTeamName) (body^.newTeamIcon) (body^.newTeamIconKey) Binding - Journal.teamCreate tid zusr finishCreateTeam team owner [] Nothing updateTeamStatus :: TeamId ::: Request ::: JSON ::: JSON -> Galley Response updateTeamStatus (tid ::: req ::: _) = do TeamStatusUpdate body <- fromBody req invalidPayload + team <- Data.team tid >>= ifNothing teamNotFound + when (body == Active && tdStatus team == PendingActive) $ + Journal.teamCreate tid $ (tdTeam team)^.teamCreator Data.updateTeamStatus tid body return empty @@ -391,12 +394,19 @@ finishCreateTeam team owner others zcon = do push1 $ newPush1 zusr (TeamEvent e) (list1 (userRecipient zusr) r) & pushConn .~ zcon pure (empty & setStatus status201 . location (team^.teamId)) -getBindingTeamMembers :: UserId -> Galley Response -getBindingTeamMembers zusr = do +withBindingTeam :: UserId -> (TeamId -> Galley b) -> Galley b +withBindingTeam zusr callback = do tid <- Data.oneUserTeam zusr >>= ifNothing teamNotFound binding <- Data.teamBinding tid >>= ifNothing teamNotFound case binding of - Binding -> do - members <- Data.teamMembers tid - pure $ json $ teamMemberListJson True (newTeamMemberList members) + Binding -> callback tid NonBinding -> throwM nonBindingTeam + +getBindingTeamId :: UserId -> Galley Response +getBindingTeamId zusr = withBindingTeam zusr $ pure . json + +getBindingTeamMembers :: UserId -> Galley Response +getBindingTeamMembers zusr = withBindingTeam zusr $ \tid -> do + members <- Data.teamMembers tid + pure $ json $ teamMemberListJson True (newTeamMemberList members) + diff --git a/services/galley/src/Galley/Data.hs b/services/galley/src/Galley/Data.hs index 5f445a0d12a..8b62bcfc4de 100644 --- a/services/galley/src/Galley/Data.hs +++ b/services/galley/src/Galley/Data.hs @@ -181,8 +181,11 @@ createTeam :: MonadClient m -> m Team createTeam t uid (fromRange -> n) (fromRange -> i) k b = do tid <- maybe (Id <$> liftIO nextRandom) return t - retry x5 $ write Cql.insertTeam (params Quorum (tid, uid, n, i, fromRange <$> k, Active, b)) + retry x5 $ write Cql.insertTeam (params Quorum (tid, uid, n, i, fromRange <$> k, initialStatus b, b)) pure (newTeam tid uid n i b & teamIconKey .~ (fromRange <$> k)) + where + initialStatus Binding = PendingActive -- Team becomes Active after User account activation + initialStatus NonBinding = Active deleteTeam :: MonadClient m => TeamId -> m () deleteTeam tid = do diff --git a/services/galley/src/Galley/Data/Instances.hs b/services/galley/src/Galley/Data/Instances.hs index bb549ffca27..4b80c190cb8 100644 --- a/services/galley/src/Galley/Data/Instances.hs +++ b/services/galley/src/Galley/Data/Instances.hs @@ -100,11 +100,14 @@ instance Cql TeamStatus where toCql PendingDelete = CqlInt 1 toCql Deleted = CqlInt 2 toCql Suspended = CqlInt 3 + toCql PendingActive = CqlInt 4 fromCql (CqlInt i) = case i of 0 -> return Active 1 -> return PendingDelete 2 -> return Deleted 3 -> return Suspended + 4 -> return PendingActive n -> fail $ "unexpected team-status: " ++ show n fromCql _ = fail "team-status: int expected" + diff --git a/services/galley/test/integration/API/Teams.hs b/services/galley/test/integration/API/Teams.hs index bc1a61d84af..430db72cc88 100644 --- a/services/galley/test/integration/API/Teams.hs +++ b/services/galley/test/integration/API/Teams.hs @@ -81,8 +81,7 @@ testCreateMulitpleBindingTeams g b a = do assertQueue a tCreate -- Cannot create more teams if bound (used internal API) let nt = NonBindingNewTeam $ newNewTeam (unsafeRange "owner") (unsafeRange "icon") - void $ post (g . path "/teams" . zUser owner . zConn "conn" . json nt) do case evtData e of Just (Conv.EdMembers mm) -> mm @?= Conv.Members [usr] other -> assertFailure $ "Unexpected event data: " <> show other + diff --git a/services/galley/test/integration/API/Util.hs b/services/galley/test/integration/API/Util.hs index 520f5c0e898..46da6c38234 100644 --- a/services/galley/test/integration/API/Util.hs +++ b/services/galley/test/integration/API/Util.hs @@ -29,6 +29,7 @@ import Data.Text.Encoding (decodeUtf8) import Data.UUID.V4 import Galley.Types import Galley.Types.Teams hiding (EventType (..)) +import Galley.Types.Teams.Intra import Gundeck.Types.Notification import Gundeck.Types.Push import Prelude hiding (head, mapM_) @@ -70,14 +71,21 @@ createTeam g name owner mems = do const True === isJust . getHeader "Location" fromBS (getHeader' "Location" resp) +changeTeamStatus :: Galley -> TeamId -> TeamStatus -> Http () +changeTeamStatus g tid s = put + ( g . paths ["i", "teams", toByteString' tid, "status"] + . json (TeamStatusUpdate s) + ) !!! const 200 === statusCode + createTeamInternal :: Galley -> Text -> UserId -> Http TeamId createTeamInternal g name owner = do tid <- randomId let nt = BindingNewTeam $ newNewTeam (unsafeRange name) (unsafeRange "icon") - resp <- put (g . paths ["/i/teams", toByteString' tid] . zUser owner . zConn "conn" . zType "access" . json nt) UserId -> TeamId -> Http Team getTeam g usr tid = do From f54c40f8245e801a4ca02b6f27c937965b488a75 Mon Sep 17 00:00:00 2001 From: Tiago Loureiro Date: Tue, 10 Oct 2017 12:40:57 +0200 Subject: [PATCH 08/10] Improve test case --- services/brig/.ghci | 1 - services/brig/brig.cabal | 1 + services/brig/test/integration/API/Team.hs | 17 +++++++++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/services/brig/.ghci b/services/brig/.ghci index 0bfc9da170d..222adaf8d94 100644 --- a/services/brig/.ghci +++ b/services/brig/.ghci @@ -1,2 +1 @@ -:set -isrc :set -XOverloadedStrings diff --git a/services/brig/brig.cabal b/services/brig/brig.cabal index 4ecad54eb88..019dae43e04 100644 --- a/services/brig/brig.cabal +++ b/services/brig/brig.cabal @@ -317,6 +317,7 @@ test-suite brig-integration , directory >= 1.2 , errors >= 1.4 , exceptions >= 0.5 + , extra , filepath >= 1.4 , galley-types , gundeck-types diff --git a/services/brig/test/integration/API/Team.hs b/services/brig/test/integration/API/Team.hs index 7567fde0fbb..31b29d541d1 100644 --- a/services/brig/test/integration/API/Team.hs +++ b/services/brig/test/integration/API/Team.hs @@ -11,7 +11,7 @@ import Brig.Types.Team.Invitation import Brig.Types.User.Auth import Brig.Types.Intra import Control.Arrow ((&&&)) -import Control.Concurrent.Async.Lifted.Safe (mapConcurrently_, replicateConcurrently_) +import Control.Concurrent.Async.Lifted.Safe (mapConcurrently_, replicateConcurrently) import Control.Lens ((^.), (^?), view) import Control.Monad import Control.Monad.IO.Class @@ -20,6 +20,7 @@ import Data.Aeson.Lens import Data.ByteString.Conversion import Data.ByteString.Lazy.Internal (ByteString) import Data.Id hiding (client) +import Data.List.Extra (chunksOf) import Data.Maybe import Data.Monoid ((<>)) import Data.Range @@ -253,7 +254,8 @@ testInvitationTooManyMembers :: Brig -> Galley -> Http () testInvitationTooManyMembers brig galley = do creator <- userId <$> randomUser brig tid <- createTeam creator galley - replicateConcurrently_ 127 $ inviteAndRegisterUser creator tid brig + uids <- fmap toNewMember <$> replicateConcurrently 127 randomId + mapM_ (mapConcurrently_ (addTeamMember galley tid)) $ chunksOf 16 uids em <- randomEmail let invite = InvitationRequest em (Name "Bob") Nothing @@ -264,6 +266,8 @@ testInvitationTooManyMembers brig galley = do . body (accept em inviteeCode)) !!! do const 403 === statusCode const (Just "too-many-team-members") === fmap Error.label . decodeBody + where + toNewMember u = Team.newNewTeamMember $ Team.newTeamMember u Team.fullPermissions testInvitationPaging :: Brig -> Galley -> Http () testInvitationPaging b g = do @@ -451,6 +455,15 @@ createTeam u galley = do maybe (error "invalid team id") return $ fromByteString $ getHeader' "Location" r +addTeamMember :: Galley -> TeamId -> Team.NewTeamMember -> Http () +addTeamMember galley tid mem = + void $ post ( galley + . paths ["i", "teams", toByteString' tid, "members"] + . contentJson + . expect2xx + . lbytes (encode mem) + ) + getTeamMember :: UserId -> TeamId -> Galley -> Http Team.TeamMember getTeamMember u tid galley = do r <- get ( galley From 1ed9457c7eb076ff3635d878f21ae915d0d6ace6 Mon Sep 17 00:00:00 2001 From: Tiago Loureiro Date: Tue, 10 Oct 2017 13:16:24 +0200 Subject: [PATCH 09/10] Fail early to avoid inserting unnecessary data to the DB --- services/brig/src/Brig/API/User.hs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/services/brig/src/Brig/API/User.hs b/services/brig/src/Brig/API/User.hs index 633443381ee..fb5aa67dc71 100644 --- a/services/brig/src/Brig/API/User.hs +++ b/services/brig/src/Brig/API/User.hs @@ -229,10 +229,16 @@ createUser new@NewUser{..} = do Just ii -> do inv <- lift $ Team.lookupInvitation (Team.iiTeam ii) (Team.iiInvId ii) case (inv, Team.inIdentity <$> inv) of - (Just invite, Just em) | e == userEmailKey em -> return $ Just (invite, ii) + (Just invite, Just em) | e == userEmailKey em -> ensureMemberCanJoin (Team.iiTeam ii) >> + (return $ Just (invite, ii)) _ -> throwE InvalidInvitationCode Nothing -> throwE InvalidInvitationCode + ensureMemberCanJoin tid = do + mems <- lift $ Intra.getTeamMembers tid + when (length (mems^.Team.teamMembers) >= 128) $ + throwE TooManyTeamMembers + acceptTeamInvitation account inv ii uk ident = do let uid = userId (accountUser account) ok <- lift $ Data.claimKey uk uid From 7569350c5b4d8bfd89c21ad4d01a52cd020ab9bf Mon Sep 17 00:00:00 2001 From: jschaul Date: Tue, 10 Oct 2017 17:16:21 +0200 Subject: [PATCH 10/10] Retry on RequestThrottled --- services/galley/src/Galley/Aws.hs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/services/galley/src/Galley/Aws.hs b/services/galley/src/Galley/Aws.hs index f0ca233993d..2256dc9e628 100644 --- a/services/galley/src/Galley/Aws.hs +++ b/services/galley/src/Galley/Aws.hs @@ -31,7 +31,8 @@ import Control.Monad.IO.Class import Control.Monad.Reader import Control.Monad.Trans.Control import Control.Monad.Trans.Resource -import Control.Retry (retrying, limitRetries) +import Control.Retry (retrying, limitRetries, exponentialBackoff) +import Data.Monoid ((<>)) import Data.ProtoLens.Encoding import Data.Text (Text) import Data.Text.Encoding (decodeLatin1) @@ -154,7 +155,7 @@ execute e m = liftIO $ runResourceT (runReaderT (unAmazon m) e) enqueue :: E.TeamEvent -> Amazon () enqueue e = do QueueUrl url <- view eventQueue - res <- retrying (limitRetries 1) (const isTimeout) $ const (sendCatch (req url)) + res <- retrying (limitRetries 5 <> exponentialBackoff 1000000) (const canRetry) $ const (sendCatch (req url)) either (throwM . GeneralError) (const (return ())) res where event = decodeLatin1 $ B64.encode $ encodeMessage e @@ -166,8 +167,10 @@ enqueue e = do sendCatch :: AWS.AWSRequest r => r -> Amazon (Either AWS.Error (AWS.Rs r)) sendCatch = AWST.trying AWS._Error . AWS.send -isTimeout :: MonadIO m => Either AWS.Error a -> m Bool -isTimeout (Right _) = pure False -isTimeout (Left e) = case e of - AWS.TransportError (HttpExceptionRequest _ ResponseTimeout) -> pure True - _ -> pure False +canRetry :: MonadIO m => Either AWS.Error a -> m Bool +canRetry (Right _) = pure False +canRetry (Left e) = case e of + AWS.TransportError (HttpExceptionRequest _ ResponseTimeout) -> pure True + AWS.ServiceError se | se^.AWS.serviceCode == AWS.ErrorCode "RequestThrottled" -> pure True + _ -> pure False +