diff --git a/CHANGELOG.md b/CHANGELOG.md index 8eb3dab66..49fdfd07f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,23 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [1.10.1](https://github.com/gradido/gradido/compare/1.10.0...1.10.1) + +- automatic session logout with info modal [`#2001`](https://github.com/gradido/gradido/pull/2001) +- 1910 separate text for the slideshow images. [`#1998`](https://github.com/gradido/gradido/pull/1998) +- Origin/1921 additional parameter checks for createContributionLinks [`#1996`](https://github.com/gradido/gradido/pull/1996) +- add missing locales [`#1999`](https://github.com/gradido/gradido/pull/1999) +- 1906 feature concept for gdd creation per linkqr code [`#1907`](https://github.com/gradido/gradido/pull/1907) +- refactor: 🍰 Not Throwing An Error When Register With Existing Email [`#1962`](https://github.com/gradido/gradido/pull/1962) +- feat: 🍰 Set Role In Admin Interface [`#1974`](https://github.com/gradido/gradido/pull/1974) +- refactor mobile style step 1 [`#1977`](https://github.com/gradido/gradido/pull/1977) +- changed mobil stage picture [`#1995`](https://github.com/gradido/gradido/pull/1995) + #### [1.10.0](https://github.com/gradido/gradido/compare/1.9.0...1.10.0) +> 17 June 2022 + +- release: v1.10.0 [`#1993`](https://github.com/gradido/gradido/pull/1993) - frontend redeem contribution link [`#1988`](https://github.com/gradido/gradido/pull/1988) - change new start picture [`#1990`](https://github.com/gradido/gradido/pull/1990) - feat: Redeem Contribution Link [`#1987`](https://github.com/gradido/gradido/pull/1987) diff --git a/admin/package.json b/admin/package.json index 73d8dd879..50145d44a 100644 --- a/admin/package.json +++ b/admin/package.json @@ -3,7 +3,7 @@ "description": "Administraion Interface for Gradido", "main": "index.js", "author": "Moriz Wahl", - "version": "1.10.0", + "version": "1.10.1", "license": "Apache-2.0", "private": false, "scripts": { diff --git a/backend/.env.dist b/backend/.env.dist index db01cf4cc..780e60e5a 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -3,7 +3,7 @@ CONFIG_VERSION=v8.2022-06-20 # Server PORT=4000 JWT_SECRET=secret123 -JWT_EXPIRES_IN=30m +JWT_EXPIRES_IN=10m GRAPHIQL=false GDT_API_URL=https://gdt.gradido.net diff --git a/backend/package.json b/backend/package.json index 3675a5eb0..50f26351d 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "gradido-backend", - "version": "1.10.0", + "version": "1.10.1", "description": "Gradido unified backend providing an API-Service for Gradido Transactions", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/backend", diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index a9cae6770..aa4197a43 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -25,7 +25,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 || '30m', + JWT_EXPIRES_IN: process.env.JWT_EXPIRES_IN || '10m', 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/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 5476fd8a1..75175edc2 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -50,9 +50,9 @@ import { getCreationIndex, getUserCreation, getUserCreations, - isContributionValid, + validateContribution, isStartEndDateValid, -} from './util/isContributionValid' +} from './util/creations' import { CONTRIBUTIONLINK_MEMO_MAX_CHARS, CONTRIBUTIONLINK_MEMO_MIN_CHARS, @@ -252,7 +252,7 @@ export class AdminResolver { const creations = await getUserCreation(user.id) logger.trace('creations', creations) const creationDateObj = new Date(creationDate) - isContributionValid(creations, amount, creationDateObj) + validateContribution(creations, amount, creationDateObj) const contribution = Contribution.create() contribution.userId = user.id contribution.amount = amount @@ -328,7 +328,7 @@ export class AdminResolver { } // all possible cases not to be true are thrown in this function - isContributionValid(creations, amount, creationDateObj) + validateContribution(creations, amount, creationDateObj) contributionToUpdate.amount = amount contributionToUpdate.memo = memo contributionToUpdate.contributionDate = new Date(creationDate) @@ -405,7 +405,7 @@ export class AdminResolver { if (user.deletedAt) throw new Error('This user was deleted. Cannot confirm a contribution.') const creations = await getUserCreation(contribution.userId, false) - isContributionValid(creations, contribution.amount, contribution.contributionDate) + validateContribution(creations, contribution.amount, contribution.contributionDate) const receivedCallDate = new Date() diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index 6669ef20d..59f1f359f 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -10,7 +10,7 @@ import { Order } from '../enum/Order' import { Contribution } from '../model/Contribution' import { UnconfirmedContribution } from '../model/UnconfirmedContribution' import { User } from '../model/User' -import { isContributionValid, getUserCreation } from './util/isContributionValid' +import { validateContribution, getUserCreation } from './util/creations' @Resolver() export class ContributionResolver { @@ -24,7 +24,7 @@ export class ContributionResolver { const creations = await getUserCreation(user.id) logger.trace('creations', creations) const creationDateObj = new Date(creationDate) - isContributionValid(creations, amount, creationDateObj) + validateContribution(creations, amount, creationDateObj) const contribution = dbContribution.create() contribution.userId = user.id diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts index 8d1555f58..8696065ed 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts @@ -28,7 +28,7 @@ import { executeTransaction } from './TransactionResolver' import { Order } from '@enum/Order' import { Contribution as DbContribution } from '@entity/Contribution' import { ContributionLink as DbContributionLink } from '@entity/ContributionLink' -import { getUserCreation, isContributionValid } from './util/isContributionValid' +import { getUserCreation, validateContribution } from './util/creations' import { Decay } from '@model/Decay' import Decimal from 'decimal.js-light' import { TransactionTypeId } from '@enum/TransactionTypeId' @@ -223,7 +223,7 @@ export class TransactionLinkResolver { const creations = await getUserCreation(user.id, false) logger.info('open creations', creations) - isContributionValid(creations, contributionLink.amount, now) + validateContribution(creations, contributionLink.amount, now) const contribution = new DbContribution() contribution.userId = user.id contribution.createdAt = now diff --git a/backend/src/graphql/resolver/util/isContributionValid.ts b/backend/src/graphql/resolver/util/creations.ts similarity index 99% rename from backend/src/graphql/resolver/util/isContributionValid.ts rename to backend/src/graphql/resolver/util/creations.ts index 0a9b57170..dcdce2bfa 100644 --- a/backend/src/graphql/resolver/util/isContributionValid.ts +++ b/backend/src/graphql/resolver/util/creations.ts @@ -9,7 +9,7 @@ interface CreationMap { creations: Decimal[] } -export const isContributionValid = ( +export const validateContribution = ( creations: Decimal[], amount: Decimal, creationDate: Date, diff --git a/database/package.json b/database/package.json index 88885b9fc..23ab63f2b 100644 --- a/database/package.json +++ b/database/package.json @@ -1,6 +1,6 @@ { "name": "gradido-database", - "version": "1.10.0", + "version": "1.10.1", "description": "Gradido Database Tool to execute database migrations", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/database", diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist index 67c153661..edb878040 100644 --- a/deployment/bare_metal/.env.dist +++ b/deployment/bare_metal/.env.dist @@ -28,7 +28,7 @@ COMMUNITY_DESCRIPTION="Gradido Development Stage1 Test Community" # backend BACKEND_CONFIG_VERSION=v8.2022-06-20 -JWT_EXPIRES_IN=30m +JWT_EXPIRES_IN=10m GDT_API_URL=https://gdt.gradido.net TYPEORM_LOGGING_RELATIVE_PATH=../deployment/bare_metal/log/typeorm.backend.log diff --git a/frontend/package.json b/frontend/package.json index 0aeb7c353..f51dd8266 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue-gradido-wallet", - "version": "1.10.0", + "version": "1.10.1", "private": true, "scripts": { "start": "node run/server.js", @@ -45,6 +45,7 @@ "jest": "^26.6.3", "jest-canvas-mock": "^2.3.1", "jest-environment-jsdom-sixteen": "^2.0.0", + "jwt-decode": "^3.1.2", "portal-vue": "^2.1.7", "prettier": "^2.2.1", "qrcanvas-vue": "2.1.1", @@ -59,6 +60,7 @@ "vue-loading-overlay": "^3.4.2", "vue-moment": "^4.1.0", "vue-router": "^3.0.6", + "vue-timers": "^2.0.4", "vue2-transitions": "^0.2.3", "vuex": "^3.6.0", "vuex-persistedstate": "^4.0.0-beta.3" diff --git a/frontend/src/components/Auth/AuthNavbar.vue b/frontend/src/components/Auth/AuthNavbar.vue index e1f47e5a7..1192d6db3 100644 --- a/frontend/src/components/Auth/AuthNavbar.vue +++ b/frontend/src/components/Auth/AuthNavbar.vue @@ -46,7 +46,7 @@ export default {