From 933275c36702dd143b24eb7466be0f10d7eeeefc Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 10 Jan 2022 13:03:05 +0100 Subject: [PATCH 01/11] .global.error to .error as global is not defined so far --- admin/src/components/CreationTransactionListFormular.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue index 09e1fa92a..d3ffc3e29 100644 --- a/admin/src/components/CreationTransactionListFormular.vue +++ b/admin/src/components/CreationTransactionListFormular.vue @@ -33,7 +33,7 @@ export default { this.items = result.data.transactionList.transactions }) .catch((error) => { - this.$toasted.global.error(error.message) + this.$toasted.error(error.message) }) }, }, From 814f9e18ddb3c46d868c6a20018c559f70f3587c Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 10 Jan 2022 13:25:35 +0100 Subject: [PATCH 02/11] fix update of open creations --- admin/src/pages/UserSearch.vue | 12 +++++------- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index d811fe2ad..a5d4c05cf 100644 --- a/admin/src/pages/UserSearch.vue +++ b/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') }, diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 0d16769c7..11d8c99cd 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/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]) From 5c3c22780a4a8119e7716c0619c4450b49ab3de1 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 10 Jan 2022 13:45:38 +0100 Subject: [PATCH 03/11] get the tests running --- .../components/CreationTransactionListFormular.spec.js | 4 +--- admin/src/components/UserTable.spec.js | 9 +++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/admin/src/components/CreationTransactionListFormular.spec.js b/admin/src/components/CreationTransactionListFormular.spec.js index 9817d6b8f..1c7b81c25 100644 --- a/admin/src/components/CreationTransactionListFormular.spec.js +++ b/admin/src/components/CreationTransactionListFormular.spec.js @@ -58,9 +58,7 @@ const mocks = { query: apolloQueryMock, }, $toasted: { - global: { - error: toastedErrorMock, - }, + error: toastedErrorMock, }, } diff --git a/admin/src/components/UserTable.spec.js b/admin/src/components/UserTable.spec.js index 80bdf6047..e26a548cc 100644 --- a/admin/src/components/UserTable.spec.js +++ b/admin/src/components/UserTable.spec.js @@ -3,6 +3,9 @@ import UserTable from './UserTable.vue' const localVue = global.localVue +const apolloQueryMock = jest.fn() +apolloQueryMock.mockResolvedValue() + describe('UserTable', () => { let wrapper @@ -114,6 +117,12 @@ describe('UserTable', () => { }), } }), + $apollo: { + query: apolloQueryMock, + }, + $store: { + commit: jest.fn(), + }, } const Wrapper = (propsData) => { From b5a54929fd03e484a3a4d9eb3fccc8fe9b01eb0f Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 11 Jan 2022 08:47:53 +0100 Subject: [PATCH 04/11] feat: Seed Garrick Ollivander --- database/src/factories/login-user.factory.ts | 2 +- database/src/index.ts | 2 ++ database/src/interface/UserContext.ts | 6 ++--- database/src/interface/UserInterface.ts | 4 ++-- .../seeds/users/garrick-ollivander.seed.ts | 9 +++++++ .../src/seeds/users/garrick-ollivander.ts | 24 +++++++++++++++++++ 6 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 database/src/seeds/users/garrick-ollivander.seed.ts create mode 100644 database/src/seeds/users/garrick-ollivander.ts diff --git a/database/src/factories/login-user.factory.ts b/database/src/factories/login-user.factory.ts index a5a28943e..b3c0312f3 100644 --- a/database/src/factories/login-user.factory.ts +++ b/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 diff --git a/database/src/index.ts b/database/src/index.ts index 488d098d3..033a36d8b 100644 --- a/database/src/index.ts +++ b/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}`) diff --git a/database/src/interface/UserContext.ts b/database/src/interface/UserContext.ts index 4e188904c..87cc70af6 100644 --- a/database/src/interface/UserContext.ts +++ b/database/src/interface/UserContext.ts @@ -1,5 +1,5 @@ export interface UserContext { - pubkey?: Buffer + pubkey?: Buffer | null email?: string firstName?: string lastName?: string @@ -14,8 +14,8 @@ export interface LoginUserContext { username?: string description?: string password?: BigInt - pubKey?: Buffer - privKey?: Buffer + pubKey?: Buffer | null + privKey?: Buffer | null emailHash?: Buffer createdAt?: Date emailChecked?: boolean diff --git a/database/src/interface/UserInterface.ts b/database/src/interface/UserInterface.ts index 70be6cff4..e68c23ec3 100644 --- a/database/src/interface/UserInterface.ts +++ b/database/src/interface/UserInterface.ts @@ -6,8 +6,8 @@ export interface UserInterface { username?: string description?: string password?: BigInt - pubKey?: Buffer - privKey?: Buffer + pubKey?: Buffer | null + privKey?: Buffer | null emailHash?: Buffer createdAt?: Date emailChecked?: boolean diff --git a/database/src/seeds/users/garrick-ollivander.seed.ts b/database/src/seeds/users/garrick-ollivander.seed.ts new file mode 100644 index 000000000..54adc3475 --- /dev/null +++ b/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 { + await userSeeder(factory, garrickOllivander) + } +} diff --git a/database/src/seeds/users/garrick-ollivander.ts b/database/src/seeds/users/garrick-ollivander.ts new file mode 100644 index 000000000..b04648dd5 --- /dev/null +++ b/database/src/seeds/users/garrick-ollivander.ts @@ -0,0 +1,24 @@ +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'), + pubKey: null, + privKey: null, + emailHash: Buffer.from('91e358000e908146342789979d62a7255b2b88a71dad0c6a10e32af44be57886', 'hex'), + createdAt: new Date('2022-01-10T10:23:17'), + emailChecked: false, + passphraseShown: false, + language: 'en', + disabled: false, + groupId: 1, + publisherId: null, + 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, +} From 121b7530dc0fcaa5fb85d72a79a9814c399fcb38 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 11 Jan 2022 09:22:51 +0100 Subject: [PATCH 05/11] fix: Override Existing Token in Response Header --- backend/src/server/plugins.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/src/server/plugins.ts b/backend/src/server/plugins.ts index 5436d595b..948f9ae1c 100644 --- a/backend/src/server/plugins.ts +++ b/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 }, From fbf88d6d5bd4c6f3be754b3b7ffa53b97c89b255 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 11 Jan 2022 09:56:45 +0100 Subject: [PATCH 06/11] fix: Pass Language to Admin Interface --- admin/src/graphql/verifyLogin.js | 1 + admin/src/main.js | 2 +- admin/src/router/guards.js | 3 ++- admin/src/router/guards.test.js | 24 +++++++++++++++++------- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/admin/src/graphql/verifyLogin.js b/admin/src/graphql/verifyLogin.js index 553557f3c..ea08bb5b1 100644 --- a/admin/src/graphql/verifyLogin.js +++ b/admin/src/graphql/verifyLogin.js @@ -7,6 +7,7 @@ export const verifyLogin = gql` lastName isAdmin id + language } } ` diff --git a/admin/src/main.js b/admin/src/main.js index 2743e0f9a..c0004beca 100644 --- a/admin/src/main.js +++ b/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, diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js index 4ed6c8516..dd61e8657 100644 --- a/admin/src/router/guards.js +++ b/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 { diff --git a/admin/src/router/guards.test.js b/admin/src/router/guards.test.js index cd5b33e68..da4dd5969 100644 --- a/admin/src/router/guards.test.js +++ b/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: '/' }) }) }) From 370994b35323c7f8b1879bd88844476643e27b12 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 10 Jan 2022 13:45:38 +0100 Subject: [PATCH 07/11] get the tests running --- .../components/CreationTransactionListFormular.spec.js | 4 +--- admin/src/components/UserTable.spec.js | 9 +++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/admin/src/components/CreationTransactionListFormular.spec.js b/admin/src/components/CreationTransactionListFormular.spec.js index 9817d6b8f..1c7b81c25 100644 --- a/admin/src/components/CreationTransactionListFormular.spec.js +++ b/admin/src/components/CreationTransactionListFormular.spec.js @@ -58,9 +58,7 @@ const mocks = { query: apolloQueryMock, }, $toasted: { - global: { - error: toastedErrorMock, - }, + error: toastedErrorMock, }, } diff --git a/admin/src/components/UserTable.spec.js b/admin/src/components/UserTable.spec.js index 80bdf6047..e26a548cc 100644 --- a/admin/src/components/UserTable.spec.js +++ b/admin/src/components/UserTable.spec.js @@ -3,6 +3,9 @@ import UserTable from './UserTable.vue' const localVue = global.localVue +const apolloQueryMock = jest.fn() +apolloQueryMock.mockResolvedValue() + describe('UserTable', () => { let wrapper @@ -114,6 +117,12 @@ describe('UserTable', () => { }), } }), + $apollo: { + query: apolloQueryMock, + }, + $store: { + commit: jest.fn(), + }, } const Wrapper = (propsData) => { From a679b9042513a3630d0855a897faf4578afcec75 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 11 Jan 2022 10:03:57 +0100 Subject: [PATCH 08/11] get the user table test up again --- admin/src/components/CreationTransactionListFormular.spec.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/admin/src/components/CreationTransactionListFormular.spec.js b/admin/src/components/CreationTransactionListFormular.spec.js index 1c7b81c25..9817d6b8f 100644 --- a/admin/src/components/CreationTransactionListFormular.spec.js +++ b/admin/src/components/CreationTransactionListFormular.spec.js @@ -58,7 +58,9 @@ const mocks = { query: apolloQueryMock, }, $toasted: { - error: toastedErrorMock, + global: { + error: toastedErrorMock, + }, }, } From b244f31a533476221e38443e638a5f14f00eee10 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 11 Jan 2022 10:06:40 +0100 Subject: [PATCH 09/11] catch language when comming back from admin interface --- frontend/src/main.js | 2 +- frontend/src/routes/guards.js | 3 ++- frontend/src/routes/guards.test.js | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/frontend/src/main.js b/frontend/src/main.js index edc9e575e..544dff66d 100755 --- a/frontend/src/main.js +++ b/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( diff --git a/frontend/src/routes/guards.js b/frontend/src/routes/guards.js index 1838fa0fc..15d1eb5a1 100644 --- a/frontend/src/routes/guards.js +++ b/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' }) }) diff --git a/frontend/src/routes/guards.test.js b/frontend/src/routes/guards.test.js index fa9f60f56..d4d2869d4 100644 --- a/frontend/src/routes/guards.test.js +++ b/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(() => { From dc8d838e004571009cbbd466eaeaabf1c0fb603d Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 11 Jan 2022 10:07:25 +0100 Subject: [PATCH 10/11] coverage admin interface 77% --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 15a736630..51f8e49b0 100644 --- a/.github/workflows/test.yml +++ b/.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 }} ############################################################################## From d157240d3b158e57f62365a009f4036d9bb9b657 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 11 Jan 2022 12:17:08 +0100 Subject: [PATCH 11/11] remove null definitions --- database/src/interface/UserContext.ts | 8 ++++---- database/src/interface/UserInterface.ts | 6 +++--- database/src/seeds/users/bibi-bloxberg.ts | 1 - database/src/seeds/users/bob-baumeister.ts | 1 - database/src/seeds/users/garrick-ollivander.ts | 3 --- database/src/seeds/users/peter-lustig.ts | 1 - database/src/seeds/users/raeuber-hotzenplotz.ts | 1 - 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/database/src/interface/UserContext.ts b/database/src/interface/UserContext.ts index 87cc70af6..eb4323aee 100644 --- a/database/src/interface/UserContext.ts +++ b/database/src/interface/UserContext.ts @@ -1,5 +1,5 @@ export interface UserContext { - pubkey?: Buffer | null + pubkey?: Buffer email?: string firstName?: string lastName?: string @@ -14,8 +14,8 @@ export interface LoginUserContext { username?: string description?: string password?: BigInt - pubKey?: Buffer | null - privKey?: Buffer | null + pubKey?: Buffer + privKey?: Buffer emailHash?: Buffer createdAt?: Date emailChecked?: boolean @@ -23,7 +23,7 @@ export interface LoginUserContext { language?: string disabled?: boolean groupId?: number - publisherId?: number | null + publisherId?: number } export interface LoginUserBackupContext { diff --git a/database/src/interface/UserInterface.ts b/database/src/interface/UserInterface.ts index e68c23ec3..63804af6b 100644 --- a/database/src/interface/UserInterface.ts +++ b/database/src/interface/UserInterface.ts @@ -6,8 +6,8 @@ export interface UserInterface { username?: string description?: string password?: BigInt - pubKey?: Buffer | null - privKey?: Buffer | null + pubKey?: Buffer + privKey?: Buffer emailHash?: Buffer createdAt?: Date emailChecked?: boolean @@ -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 diff --git a/database/src/seeds/users/bibi-bloxberg.ts b/database/src/seeds/users/bibi-bloxberg.ts index 30ad4eb4c..221349cb7 100644 --- a/database/src/seeds/users/bibi-bloxberg.ts +++ b/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, diff --git a/database/src/seeds/users/bob-baumeister.ts b/database/src/seeds/users/bob-baumeister.ts index a6933d7c1..013636079 100644 --- a/database/src/seeds/users/bob-baumeister.ts +++ b/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, diff --git a/database/src/seeds/users/garrick-ollivander.ts b/database/src/seeds/users/garrick-ollivander.ts index b04648dd5..1c7bbb9fc 100644 --- a/database/src/seeds/users/garrick-ollivander.ts +++ b/database/src/seeds/users/garrick-ollivander.ts @@ -6,8 +6,6 @@ export const garrickOllivander = { 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'), - pubKey: null, - privKey: null, emailHash: Buffer.from('91e358000e908146342789979d62a7255b2b88a71dad0c6a10e32af44be57886', 'hex'), createdAt: new Date('2022-01-10T10:23:17'), emailChecked: false, @@ -15,7 +13,6 @@ Renowned wandmaker Mr Ollivander owns the wand shop Ollivanders: Makers of Fine language: 'en', disabled: false, groupId: 1, - publisherId: null, 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, diff --git a/database/src/seeds/users/peter-lustig.ts b/database/src/seeds/users/peter-lustig.ts index 63caf55f6..c96b28a65 100644 --- a/database/src/seeds/users/peter-lustig.ts +++ b/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, diff --git a/database/src/seeds/users/raeuber-hotzenplotz.ts b/database/src/seeds/users/raeuber-hotzenplotz.ts index eb2118af5..c1f31b490 100644 --- a/database/src/seeds/users/raeuber-hotzenplotz.ts +++ b/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,