+
-
- Die anzahl der offene Schöpfungen stimmen nicht! Diese wird bei absenden im $store
- hochgezählt. Die Liste die hier angezeigt wird ist SIMULIERT!
-
diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue
index 056bb14a6..1c58751bc 100644
--- a/admin/src/pages/Overview.vue
+++ b/admin/src/pages/Overview.vue
@@ -76,7 +76,24 @@
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index ae0ade7b2..7fae2cdcd 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -32,7 +32,13 @@ export default {
{ key: 'email', label: 'Email' },
{ key: 'firstName', label: 'Firstname' },
{ key: 'lastName', label: 'Lastname' },
- { key: 'creation', label: 'Creation' },
+ {
+ key: 'creation',
+ label: 'Creation',
+ formatter: (value, key, item) => {
+ return String(value)
+ },
+ },
{ key: 'show_details', label: 'Details' },
],
searchResult: [],
diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js
index d59234a25..4ed6c8516 100644
--- a/admin/src/router/guards.js
+++ b/admin/src/router/guards.js
@@ -1,12 +1,28 @@
+import { verifyLogin } from '../graphql/verifyLogin'
import CONFIG from '../config'
-const addNavigationGuards = (router, store) => {
+const addNavigationGuards = (router, store, apollo) => {
// store token on `authenticate`
- router.beforeEach((to, from, next) => {
+ router.beforeEach(async (to, from, next) => {
if (to.path === '/authenticate' && to.query && to.query.token) {
- // TODO verify user to get user data
store.commit('token', to.query.token)
- next({ path: '/' })
+ await apollo
+ .query({
+ query: verifyLogin,
+ fetchPolicy: 'network-only',
+ })
+ .then((result) => {
+ const moderator = result.data.verifyLogin
+ if (moderator.isAdmin) {
+ store.commit('moderator', moderator)
+ next({ path: '/' })
+ } else {
+ next({ path: '/not-found' })
+ }
+ })
+ .catch(() => {
+ next({ path: '/not-found' })
+ })
} else {
next()
}
@@ -16,7 +32,9 @@ const addNavigationGuards = (router, store) => {
router.beforeEach((to, from, next) => {
if (
!CONFIG.DEBUG_DISABLE_AUTH && // we did not disabled the auth module for debug purposes
- !store.state.token && // we do not have a token
+ (!store.state.token || // we do not have a token
+ !store.state.moderator || // no moderator set in store
+ !store.state.moderator.isAdmin) && // user is no admin
to.path !== '/not-found' && // we are not on `not-found`
to.path !== '/logout' // we are not on `logout`
) {
diff --git a/admin/src/router/guards.test.js b/admin/src/router/guards.test.js
index e69846aab..cd5b33e68 100644
--- a/admin/src/router/guards.test.js
+++ b/admin/src/router/guards.test.js
@@ -2,6 +2,13 @@ import addNavigationGuards from './guards'
import router from './router'
const storeCommitMock = jest.fn()
+const apolloQueryMock = jest.fn().mockResolvedValue({
+ data: {
+ verifyLogin: {
+ isAdmin: true,
+ },
+ },
+})
const store = {
commit: storeCommitMock,
@@ -10,7 +17,11 @@ const store = {
},
}
-addNavigationGuards(router, store)
+const apollo = {
+ query: apolloQueryMock,
+}
+
+addNavigationGuards(router, store, apollo)
describe('navigation guards', () => {
beforeEach(() => {
@@ -21,18 +32,70 @@ describe('navigation guards', () => {
const navGuard = router.beforeHooks[0]
const next = jest.fn()
- describe('with valid token', () => {
- it('commits the token to the store', async () => {
+ describe('with valid token and as admin', () => {
+ beforeEach(() => {
navGuard({ path: '/authenticate', query: { token: 'valid-token' } }, {}, next)
+ })
+
+ it('commits the token to the store', async () => {
expect(storeCommitMock).toBeCalledWith('token', 'valid-token')
})
+ it('commits the moderator to the store', () => {
+ expect(storeCommitMock).toBeCalledWith('moderator', { isAdmin: true })
+ })
+
it('redirects to /', async () => {
- navGuard({ path: '/authenticate', query: { token: 'valid-token' } }, {}, next)
expect(next).toBeCalledWith({ path: '/' })
})
})
+ describe('with valid token and not as admin', () => {
+ beforeEach(() => {
+ apolloQueryMock.mockResolvedValue({
+ data: {
+ verifyLogin: {
+ isAdmin: false,
+ },
+ },
+ })
+ navGuard({ path: '/authenticate', query: { token: 'valid-token' } }, {}, next)
+ })
+
+ it('commits the token to the store', async () => {
+ expect(storeCommitMock).toBeCalledWith('token', 'valid-token')
+ })
+
+ it('does not commit the moderator to the store', () => {
+ expect(storeCommitMock).not.toBeCalledWith('moderator', { isAdmin: false })
+ })
+
+ it('redirects to /not-found', async () => {
+ expect(next).toBeCalledWith({ path: '/not-found' })
+ })
+ })
+
+ describe('with valid token and server error on verification', () => {
+ beforeEach(() => {
+ apolloQueryMock.mockRejectedValue({
+ message: 'Ouch!',
+ })
+ navGuard({ path: '/authenticate', query: { token: 'valid-token' } }, {}, next)
+ })
+
+ it('commits the token to the store', async () => {
+ expect(storeCommitMock).toBeCalledWith('token', 'valid-token')
+ })
+
+ it('does not commit the moderator to the store', () => {
+ expect(storeCommitMock).not.toBeCalledWith('moderator', { isAdmin: false })
+ })
+
+ it('redirects to /not-found', async () => {
+ expect(next).toBeCalledWith({ path: '/not-found' })
+ })
+ })
+
describe('without valid token', () => {
it('does not commit the token to the store', async () => {
navGuard({ path: '/authenticate' }, {}, next)
@@ -55,9 +118,16 @@ describe('navigation guards', () => {
expect(next).toBeCalledWith({ path: '/not-found' })
})
- it('does not redirect when token in store', () => {
+ it('redirects to not found with token in store and not moderator', () => {
store.state.token = 'valid token'
navGuard({ path: '/' }, {}, next)
+ expect(next).toBeCalledWith({ path: '/not-found' })
+ })
+
+ it('does not redirect with token in store and as moderator', () => {
+ store.state.token = 'valid token'
+ store.state.moderator = { isAdmin: true }
+ navGuard({ path: '/' }, {}, next)
expect(next).toBeCalledWith()
})
})
diff --git a/admin/src/store/store.js b/admin/src/store/store.js
index 754c559c8..fe5629e19 100644
--- a/admin/src/store/store.js
+++ b/admin/src/store/store.js
@@ -18,11 +18,18 @@ export const mutations = {
token: (state, token) => {
state.token = token
},
+ setOpenCreations: (state, openCreations) => {
+ state.openCreations = openCreations
+ },
+ moderator: (state, moderator) => {
+ state.moderator = moderator
+ },
}
export const actions = {
logout: ({ commit, state }) => {
commit('token', null)
+ commit('moderator', null)
window.localStorage.clear()
},
}
@@ -35,7 +42,7 @@ const store = new Vuex.Store({
],
state: {
token: CONFIG.DEBUG_DISABLE_AUTH ? 'validToken' : null,
- moderator: 'Dertest Moderator',
+ moderator: null,
openCreations: 0,
},
// Syncronous mutation of the state
diff --git a/admin/src/store/store.test.js b/admin/src/store/store.test.js
index 4482a46bf..e027ebf1a 100644
--- a/admin/src/store/store.test.js
+++ b/admin/src/store/store.test.js
@@ -1,11 +1,19 @@
import store, { mutations, actions } from './store'
+import CONFIG from '../config'
-const { token, openCreationsPlus, openCreationsMinus, resetOpenCreations } = mutations
+jest.mock('../config')
+
+const {
+ token,
+ openCreationsPlus,
+ openCreationsMinus,
+ resetOpenCreations,
+ setOpenCreations,
+ moderator,
+} = mutations
const { logout } = actions
-const CONFIG = {
- DEBUG_DISABLE_AUTH: true,
-}
+CONFIG.DEBUG_DISABLE_AUTH = true
describe('Vuex store', () => {
describe('mutations', () => {
@@ -40,6 +48,22 @@ describe('Vuex store', () => {
expect(state.openCreations).toEqual(0)
})
})
+
+ describe('moderator', () => {
+ it('sets the moderator object in state', () => {
+ const state = { moderator: null }
+ moderator(state, { id: 1 })
+ expect(state.moderator).toEqual({ id: 1 })
+ })
+ })
+
+ describe('setOpenCreations', () => {
+ it('sets the open creations to given value', () => {
+ const state = { openCreations: 24 }
+ setOpenCreations(state, 12)
+ expect(state.openCreations).toEqual(12)
+ })
+ })
})
describe('actions', () => {
@@ -57,6 +81,11 @@ describe('Vuex store', () => {
expect(commit).toBeCalledWith('token', null)
})
+ it('deletes the moderator in store', () => {
+ logout({ commit, state })
+ expect(commit).toBeCalledWith('moderator', null)
+ })
+
it.skip('clears the window local storage', () => {
expect(windowStorageMock).toBeCalled()
})
diff --git a/admin/yarn.lock b/admin/yarn.lock
index d7960320b..46b5aaa93 100644
--- a/admin/yarn.lock
+++ b/admin/yarn.lock
@@ -12524,6 +12524,11 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
+vue-toasted@^1.1.28:
+ version "1.1.28"
+ resolved "https://registry.yarnpkg.com/vue-toasted/-/vue-toasted-1.1.28.tgz#dbabb83acc89f7a9e8765815e491d79f0dc65c26"
+ integrity sha512-UUzr5LX51UbbiROSGZ49GOgSzFxaMHK6L00JV8fir/CYNJCpIIvNZ5YmS4Qc8Y2+Z/4VVYRpeQL2UO0G800Raw==
+
vue@^2.6.11:
version "2.6.14"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
diff --git a/backend/package.json b/backend/package.json
index 375046363..e573a2704 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -29,6 +29,7 @@
"jest": "^27.2.4",
"jsonwebtoken": "^8.5.1",
"module-alias": "^2.2.2",
+ "moment": "^2.29.1",
"mysql2": "^2.3.0",
"nodemailer": "^6.6.5",
"random-bigint": "^0.0.1",
diff --git a/backend/src/graphql/arg/CreatePendingCreationArgs.ts b/backend/src/graphql/arg/CreatePendingCreationArgs.ts
new file mode 100644
index 000000000..d2c17abf1
--- /dev/null
+++ b/backend/src/graphql/arg/CreatePendingCreationArgs.ts
@@ -0,0 +1,19 @@
+import { ArgsType, Field, Int } from 'type-graphql'
+
+@ArgsType()
+export default class CreatePendingCreationArgs {
+ @Field(() => String)
+ email: string
+
+ @Field(() => Int)
+ amount: number
+
+ @Field(() => String)
+ memo: string
+
+ @Field(() => String)
+ creationDate: string
+
+ @Field(() => Int)
+ moderator: number
+}
diff --git a/backend/src/graphql/model/CreatePendingCreation.ts b/backend/src/graphql/model/CreatePendingCreation.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/backend/src/graphql/model/PendingCreation.ts b/backend/src/graphql/model/PendingCreation.ts
new file mode 100644
index 000000000..f1087ea0b
--- /dev/null
+++ b/backend/src/graphql/model/PendingCreation.ts
@@ -0,0 +1,34 @@
+import { ObjectType, Field, Int } from 'type-graphql'
+
+@ObjectType()
+export class PendingCreation {
+ @Field(() => String)
+ firstName: string
+
+ @Field(() => Int)
+ id?: number
+
+ @Field(() => String)
+ lastName: string
+
+ @Field(() => Number)
+ userId: number
+
+ @Field(() => String)
+ email: string
+
+ @Field(() => Date)
+ date: Date
+
+ @Field(() => String)
+ memo: string
+
+ @Field(() => Number)
+ amount: BigInt
+
+ @Field(() => Number)
+ moderator: number
+
+ @Field(() => [Number])
+ creation: number[]
+}
diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts
index cdb46c954..c7b5806ca 100644
--- a/backend/src/graphql/model/User.ts
+++ b/backend/src/graphql/model/User.ts
@@ -12,6 +12,7 @@ export class User {
*/
constructor(json?: any) {
if (json) {
+ this.id = json.id
this.email = json.email
this.firstName = json.first_name
this.lastName = json.last_name
@@ -24,6 +25,9 @@ export class User {
}
}
+ @Field(() => Number)
+ id: number
+
@Field(() => String)
email: string
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 4ae259087..169b79250 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -1,28 +1,200 @@
-import { Resolver, Query, Arg, Authorized } from 'type-graphql'
-import { getCustomRepository } from 'typeorm'
+import { Resolver, Query, Arg, Args, Authorized, Mutation } from 'type-graphql'
+import { getCustomRepository, Raw } from 'typeorm'
import { UserAdmin } from '../model/UserAdmin'
-import { LoginUserRepository } from '../../typeorm/repository/LoginUser'
+import { PendingCreation } from '../model/PendingCreation'
import { RIGHTS } from '../../auth/RIGHTS'
+import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation'
+import { PendingCreationRepository } from '../../typeorm/repository/PendingCreation'
+import { UserRepository } from '../../typeorm/repository/User'
+import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs'
+import moment from 'moment'
@Resolver()
export class AdminResolver {
@Authorized([RIGHTS.SEARCH_USERS])
@Query(() => [UserAdmin])
async searchUsers(@Arg('searchText') searchText: string): Promise
+ {{ $t('publisher.infoText') }}
+ {{ $t('publisher.infoNoRegister') }}
+
+
+
+
+
+
@@ -176,6 +212,7 @@ export default {
showError: false,
messageError: '',
register: true,
+ publisherId: this.$store.state.publisherId,
}
},
methods: {
@@ -188,6 +225,9 @@ export default {
getValidationState({ dirty, validated, valid = null }) {
return dirty || validated ? valid : null
},
+ commitStore(val) {
+ this.$store.commit('publisherId', val)
+ },
async onSubmit() {
this.$apollo
.mutate({
diff --git a/scripts/release.sh b/scripts/release.sh
index d18c4948c..0b70e76ad 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -6,6 +6,7 @@ PROJECT_DIR="${SCRIPT_DIR}/../"
FRONTEND_DIR="${PROJECT_DIR}/frontend/"
BACKEND_DIR="${PROJECT_DIR}/backend/"
DATABASE_DIR="${PROJECT_DIR}/database/"
+ADMIN_DIR="${PROJECT_DIR}/admin/"
# navigate to project directory
cd ${PROJECT_DIR}
@@ -23,6 +24,8 @@ cd ${BACKEND_DIR}
yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version ${VERSION}
cd ${DATABASE_DIR}
yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version ${VERSION}
+cd ${ADMIN_DIR}
+yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version ${VERSION}
# generate changelog
cd ${PROJECT_DIR}