Merge branch 'master' into fix-admin-creation-list

.github/workflows/test.yml

@@ -470,7 +470,7 @@ jobs:
           report_name: Coverage Admin Interface
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 76
+          min_coverage: 77
           token: ${{ github.token }}
 
   ##############################################################################

admin/src/graphql/verifyLogin.js

@@ -7,6 +7,7 @@ export const verifyLogin = gql`
       lastName
       isAdmin
       id
+      language
     }
   }
 `

admin/src/main.js

@@ -42,7 +42,7 @@ Vue.use(Toasted, {
   },
 })
 
-addNavigationGuards(router, store, apolloProvider.defaultClient)
+addNavigationGuards(router, store, apolloProvider.defaultClient, i18n)
 
 new Vue({
   moment,

admin/src/pages/UserSearch.vue

@@ -42,15 +42,13 @@ export default {
         { key: 'lastName', label: this.$t('lastname') },
         {
           key: 'creation',
-          // label: this.$t('open_creation') + 'Jan | Feb | März',
-          label:
-            this.$moment().subtract(2, 'month').format('MMM') +
-            ' | ' +
-            this.$moment().subtract(1, 'month').format('MMM') +
-            ' | ' +
+          label: [
+            this.$moment().subtract(2, 'month').format('MMM'),
+            this.$moment().subtract(1, 'month').format('MMM'),
             this.$moment().format('MMM'),
+          ].join(' | '),
           formatter: (value, key, item) => {
-            return String(value[0]) + ` | ` + String(value[1]) + ` |  ` + String(value[2])
+            return value.join(' | ')
           },
         },
         { key: 'show_details', label: this.$t('details') },

admin/src/router/guards.js

@@ -1,7 +1,7 @@
 import { verifyLogin } from '../graphql/verifyLogin'
 import CONFIG from '../config'
 
-const addNavigationGuards = (router, store, apollo) => {
+const addNavigationGuards = (router, store, apollo, i18n) => {
   // store token on `authenticate`
   router.beforeEach(async (to, from, next) => {
     if (to.path === '/authenticate' && to.query && to.query.token) {
@@ -14,6 +14,7 @@ const addNavigationGuards = (router, store, apollo) => {
         .then((result) => {
           const moderator = result.data.verifyLogin
           if (moderator.isAdmin) {
+            i18n.locale = moderator.language
             store.commit('moderator', moderator)
             next({ path: '/' })
           } else {

admin/src/router/guards.test.js

@@ -6,9 +6,11 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
   data: {
     verifyLogin: {
       isAdmin: true,
+      language: 'de',
     },
   },
 })
+const i18nLocaleMock = jest.fn()
 
 const store = {
   commit: storeCommitMock,
@@ -21,7 +23,11 @@ const apollo = {
   query: apolloQueryMock,
 }
 
-addNavigationGuards(router, store, apollo)
+const i18n = {
+  locale: i18nLocaleMock,
+}
+
+addNavigationGuards(router, store, apollo, i18n)
 
 describe('navigation guards', () => {
   beforeEach(() => {
@@ -33,19 +39,23 @@ describe('navigation guards', () => {
     const next = jest.fn()
 
     describe('with valid token and as admin', () => {
-      beforeEach(() => {
-        navGuard({ path: '/authenticate', query: { token: 'valid-token' } }, {}, next)
+      beforeEach(async () => {
+        await navGuard({ path: '/authenticate', query: { token: 'valid-token' } }, {}, next)
       })
 
-      it('commits the token to the store', async () => {
+      it('commits the token to the store', () => {
         expect(storeCommitMock).toBeCalledWith('token', 'valid-token')
       })
 
-      it('commits the moderator to the store', () => {
-        expect(storeCommitMock).toBeCalledWith('moderator', { isAdmin: true })
+      it.skip('sets the locale', () => {
+        expect(i18nLocaleMock).toBeCalledWith('de')
       })
 
-      it('redirects to /', async () => {
+      it('commits the moderator to the store', () => {
+        expect(storeCommitMock).toBeCalledWith('moderator', { isAdmin: true, language: 'de' })
+      })
+
+      it('redirects to /', () => {
         expect(next).toBeCalledWith({ path: '/' })
       })
     })

backend/src/graphql/resolver/AdminResolver.ts

@@ -65,9 +65,9 @@ export class AdminResolver {
       loginPendingTaskAdmin.memo = memo
       loginPendingTaskAdmin.moderator = moderator
 
-      loginPendingTasksAdminRepository.save(loginPendingTaskAdmin)
+      await loginPendingTasksAdminRepository.save(loginPendingTaskAdmin)
     }
-    return await getUserCreations(user.id)
+    return getUserCreations(user.id)
   }
 
   @Authorized([RIGHTS.CREATE_PENDING_CREATION])

backend/src/server/plugins.ts

@@ -8,7 +8,11 @@ const plugins = [
         willSendResponse(requestContext: any) {
           const { setHeaders = [] } = requestContext.context
           setHeaders.forEach(({ key, value }: { [key: string]: string }) => {
-            requestContext.response.http.headers.append(key, value)
+            if (requestContext.response.http.headers.get(key)) {
+              requestContext.response.http.headers.set(key, value)
+            } else {
+              requestContext.response.http.headers.append(key, value)
+            }
           })
           return requestContext
         },

database/src/factories/login-user.factory.ts

@@ -19,7 +19,7 @@ define(LoginUser, (faker: typeof Faker, context?: LoginUserContext) => {
   user.privKey = context.privKey ? context.privKey : randomBytes(80)
   user.emailHash = context.emailHash ? context.emailHash : randomBytes(32)
   user.createdAt = context.createdAt ? context.createdAt : faker.date.recent()
-  user.emailChecked = context.emailChecked ? context.emailChecked : true
+  user.emailChecked = context.emailChecked === undefined ? false : context.emailChecked
   user.passphraseShown = context.passphraseShown ? context.passphraseShown : false
   user.language = context.language ? context.language : 'en'
   user.disabled = context.disabled ? context.disabled : false

database/src/index.ts

@@ -6,6 +6,7 @@ import { CreatePeterLustigSeed } from './seeds/users/peter-lustig.admin.seed'
 import { CreateBibiBloxbergSeed } from './seeds/users/bibi-bloxberg.seed'
 import { CreateRaeuberHotzenplotzSeed } from './seeds/users/raeuber-hotzenplotz.seed'
 import { CreateBobBaumeisterSeed } from './seeds/users/bob-baumeister.seed'
+import { CreateGarrickOllivanderSeed } from './seeds/users/garrick-ollivander.seed'
 import { DecayStartBlockSeed } from './seeds/decay-start-block.seed'
 import { resetDB, pool, migration } from './helpers'
 
@@ -44,6 +45,7 @@ const run = async (command: string) => {
       await runSeeder(CreateBibiBloxbergSeed)
       await runSeeder(CreateRaeuberHotzenplotzSeed)
       await runSeeder(CreateBobBaumeisterSeed)
+      await runSeeder(CreateGarrickOllivanderSeed)
       break
     default:
       throw new Error(`Unsupported command ${command}`)

database/src/interface/UserContext.ts

@@ -23,7 +23,7 @@ export interface LoginUserContext {
   language?: string
   disabled?: boolean
   groupId?: number
-  publisherId?: number | null
+  publisherId?: number
 }
 
 export interface LoginUserBackupContext {

database/src/interface/UserInterface.ts

@@ -15,7 +15,7 @@ export interface UserInterface {
   language?: string
   disabled?: boolean
   groupId?: number
-  publisherId?: number | null
+  publisherId?: number
   // from login user backup
   passphrase?: string
   mnemonicType?: number

database/src/seeds/users/bibi-bloxberg.ts

@@ -17,7 +17,6 @@ export const bibiBloxberg = {
   language: 'de',
   disabled: false,
   groupId: 1,
-  publisherId: null,
   passphrase:
     'knife normal level all hurdle crucial color avoid warrior stadium road bachelor affair topple hawk pottery right afford immune two ceiling budget glance hour ',
   mnemonicType: 2,

database/src/seeds/users/bob-baumeister.ts

@@ -17,7 +17,6 @@ export const bobBaumeister = {
   language: 'de',
   disabled: false,
   groupId: 1,
-  publisherId: null,
   passphrase:
     'detail master source effort unable waste tilt flush domain orchard art truck hint barrel response gate impose peanut secret merry three uncle wink resource ',
   mnemonicType: 2,

database/src/seeds/users/garrick-ollivander.seed.ts

@@ -0,0 +1,9 @@
+import { Factory, Seeder } from 'typeorm-seeding'
+import { garrickOllivander } from './garrick-ollivander'
+import { userSeeder } from '../helpers/user-helpers'
+
+export class CreateGarrickOllivanderSeed implements Seeder {
+  public async run(factory: Factory): Promise<void> {
+    await userSeeder(factory, garrickOllivander)
+  }
+}

database/src/seeds/users/garrick-ollivander.ts

@@ -0,0 +1,21 @@
+export const garrickOllivander = {
+  email: 'garrick@ollivander.com',
+  firstName: 'Garrick',
+  lastName: 'Ollivander',
+  username: 'garrick',
+  description: `Curious ... curious ...
+Renowned wandmaker Mr Ollivander owns the wand shop Ollivanders: Makers of Fine Wands Since 382 BC in Diagon Alley. His shop is widely considered the best place to purchase a wand.`,
+  password: BigInt('0'),
+  emailHash: Buffer.from('91e358000e908146342789979d62a7255b2b88a71dad0c6a10e32af44be57886', 'hex'),
+  createdAt: new Date('2022-01-10T10:23:17'),
+  emailChecked: false,
+  passphraseShown: false,
+  language: 'en',
+  disabled: false,
+  groupId: 1,
+  passphrase:
+    'human glide theory clump wish history other duty door fringe neck industry ostrich equal plate diesel tornado neck people antenna door category moon hen ',
+  mnemonicType: 2,
+  isAdmin: false,
+  addBalance: false,
+}

database/src/seeds/users/peter-lustig.ts

@@ -17,7 +17,6 @@ export const peterLustig = {
   language: 'de',
   disabled: false,
   groupId: 1,
-  publisherId: null,
   passphrase:
     'okay property choice naive calm present weird increase stuff royal vibrant frame attend wood one else tribe pull hedgehog woman kitchen hawk snack smart ',
   mnemonicType: 2,

database/src/seeds/users/raeuber-hotzenplotz.ts

@@ -17,7 +17,6 @@ export const raeuberHotzenplotz = {
   language: 'de',
   disabled: false,
   groupId: 1,
-  publisherId: null,
   passphrase:
     'gospel trip tenant mouse spider skill auto curious man video chief response same little over expire drum display fancy clinic keen throw urge basket ',
   mnemonicType: 2,

frontend/src/main.js

@@ -28,7 +28,7 @@ Vue.toasted.register(
 
 loadAllRules(i18n)
 
-addNavigationGuards(router, store, apolloProvider.defaultClient)
+addNavigationGuards(router, store, apolloProvider.defaultClient, i18n)
 
 if (!store) {
   setTimeout(

frontend/src/routes/guards.js

@@ -1,6 +1,6 @@
 import { verifyLogin } from '../graphql/queries'
 
-const addNavigationGuards = (router, store, apollo) => {
+const addNavigationGuards = (router, store, apollo, i18n) => {
   // handle publisherId
   router.beforeEach((to, from, next) => {
     const publisherId = to.query.pid
@@ -21,6 +21,7 @@ const addNavigationGuards = (router, store, apollo) => {
           fetchPolicy: 'network-only',
         })
         .then((result) => {
+          i18n.locale = result.data.verifyLogin.language
           store.dispatch('login', result.data.verifyLogin)
           next({ path: '/overview' })
         })

frontend/src/routes/guards.test.js

@@ -23,7 +23,11 @@ const apollo = {
   query: apolloQueryMock,
 }
 
-addNavigationGuards(router, store, apollo)
+const i18n = {
+  locale: jest.fn(),
+}
+
+addNavigationGuards(router, store, apollo, i18n)
 
 describe('navigation guards', () => {
   beforeEach(() => {