diff --git a/backend/.env.dist b/backend/.env.dist index 2dc6f2b5f..02ffb265a 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -1,9 +1,9 @@ -CONFIG_VERSION=v3.2022-03-29 +CONFIG_VERSION=v4.2022-04-05 # Server PORT=4000 JWT_SECRET=secret123 -JWT_EXPIRES_IN=10m +JWT_EXPIRES_IN=30m GRAPHIQL=false GDT_API_URL=https://gdt.gradido.net @@ -42,7 +42,7 @@ EMAIL_PASSWORD=xxx EMAIL_SMTP_URL=gmail.com EMAIL_SMTP_PORT=587 EMAIL_LINK_VERIFICATION=http://localhost/checkEmail/{optin}{code} -EMAIL_LINK_SETPASSWORD=http://localhost/reset/{optin} +EMAIL_LINK_SETPASSWORD=http://localhost/reset-password/{optin} EMAIL_LINK_FORGOTPASSWORD=http://localhost/forgot-password EMAIL_CODE_VALID_TIME=1440 EMAIL_CODE_REQUEST_TIME=10 diff --git a/backend/.env.template b/backend/.env.template index f9a5f3e32..567d3c599 100644 --- a/backend/.env.template +++ b/backend/.env.template @@ -2,7 +2,7 @@ CONFIG_VERSION=$BACKEND_CONFIG_VERSION # Server JWT_SECRET=$JWT_SECRET -JWT_EXPIRES_IN=10m +JWT_EXPIRES_IN=$JWT_EXPIRES_IN GRAPHIQL=false GDT_API_URL=$GDT_API_URL diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 9c6e082c7..aed8aecec 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -14,7 +14,7 @@ const constants = { DECAY_START_TIME: new Date('2021-05-13 17:46:31'), // GMT+0 CONFIG_VERSION: { DEFAULT: 'DEFAULT', - EXPECTED: 'v3.2022-03-29', + EXPECTED: 'v4.2022-04-05', CURRENT: '', }, } @@ -22,7 +22,7 @@ const constants = { const server = { PORT: process.env.PORT || 4000, JWT_SECRET: process.env.JWT_SECRET || 'secret123', - JWT_EXPIRES_IN: process.env.JWT_EXPIRES_IN || '10m', + JWT_EXPIRES_IN: process.env.JWT_EXPIRES_IN || '30m', GRAPHIQL: process.env.GRAPHIQL === 'true' || false, GDT_API_URL: process.env.GDT_API_URL || 'https://gdt.gradido.net', PRODUCTION: process.env.NODE_ENV === 'production' || false, diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index aa1bba639..8747f14a3 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -263,6 +263,9 @@ export class TransactionResolver { if (recipientUser.deletedAt) { throw new Error('The recipient account was deleted') } + if (!recipientUser.emailChecked) { + throw new Error('The recipient account is not activated') + } if (!isHexPublicKey(recipientUser.pubKey.toString('hex'))) { throw new Error('invalid recipient public key') } diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist index f2b0bcbb3..8254fd9c2 100644 --- a/deployment/bare_metal/.env.dist +++ b/deployment/bare_metal/.env.dist @@ -18,7 +18,23 @@ WEBHOOK_GITHUB_SECRET=secret WEBHOOK_GITHUB_BRANCH=master # backend -BACKEND_CONFIG_VERSION=v3.2022-03-29 +BACKEND_CONFIG_VERSION=v4.2022-04-05 + +JWT_EXPIRES_IN=30m +GDT_API_URL=https://gdt.gradido.net + +TYPEORM_LOGGING_RELATIVE_PATH=../deployment/bare_metal/log/typeorm.backend.log + +KLICKTIPP=false +KLICKTIPP_USER= +KLICKTIPP_PASSWORD= +KLICKTIPP_APIKEY_DE= +KLICKTIPP_APIKEY_EN= + +COMMUNITY_NAME="Gradido Development Stage1" +COMMUNITY_URL=https://stage1.gradido.net/ +COMMUNITY_REGISTER_URL=https://stage1.gradido.net/register +COMMUNITY_DESCRIPTION="Gradido Development Stage1 Test Community" EMAIL=true EMAIL_USERNAME=peter@lustig.de @@ -26,28 +42,13 @@ EMAIL_SENDER=peter@lustig.de EMAIL_PASSWORD=1234 EMAIL_SMTP_URL=smtp.lustig.de EMAIL_LINK_VERIFICATION=https://stage1.gradido.net/checkEmail/{optin}{code} -EMAIL_LINK_SETPASSWORD=https://stage1.gradido.net/reset/{optin} +EMAIL_LINK_SETPASSWORD=https://stage1.gradido.net/reset-password/{optin} EMAIL_LINK_FORGOTPASSWORD=https://stage1.gradido.net/forgot-password EMAIL_CODE_VALID_TIME=1440 EMAIL_CODE_REQUEST_TIME=10 -TYPEORM_LOGGING_RELATIVE_PATH=../deployment/bare_metal/log/typeorm.backend.log - WEBHOOK_ELOPAGE_SECRET=secret -GDT_API_URL=https://gdt.gradido.net - -COMMUNITY_NAME="Gradido Development Stage1" -COMMUNITY_URL=https://stage1.gradido.net/ -COMMUNITY_REGISTER_URL=https://stage1.gradido.net/register -COMMUNITY_DESCRIPTION="Gradido Development Stage1 Test Community" - -KLICKTIPP=false -KLICKTIPP_USER= -KLICKTIPP_PASSWORD= -KLICKTIPP_APIKEY_DE= -KLICKTIPP_APIKEY_EN= - # database DATABASE_CONFIG_VERSION=v1.2022-03-18 diff --git a/docu/presentation/gradido-as-platform.drawio b/docu/presentation/gradido-as-platform.drawio new file mode 100644 index 000000000..9ddcad246 --- /dev/null +++ b/docu/presentation/gradido-as-platform.drawio @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/docu/presentation/scope-of-gradido.odp b/docu/presentation/scope-of-gradido.odp new file mode 100644 index 000000000..821bd1563 Binary files /dev/null and b/docu/presentation/scope-of-gradido.odp differ diff --git a/docu/presentation/scope-of-gradido.pdf b/docu/presentation/scope-of-gradido.pdf new file mode 100644 index 000000000..adc45e8d4 Binary files /dev/null and b/docu/presentation/scope-of-gradido.pdf differ