Mock Route
' } }],
+})
-const stubs = {
- RouterView: true,
-}
-
-const mocks = {
- $store: {
- state: {
- token: null,
+const createVuexStore = (initialState = { token: null }) => {
+ return createStore({
+ state() {
+ return initialState
},
- },
+ })
}
-describe('App', () => {
+describe('App.vue', () => {
+ let store
let wrapper
- const Wrapper = () => {
- return shallowMount(App, { localVue, stubs, mocks })
+ const createWrapper = (token = null) => {
+ store = createVuexStore({ token })
+ return shallowMount(App, {
+ global: {
+ plugins: [store, router],
+ stubs: {
+ BToastOrchestrator: true,
+ BModalOrchestrator: true,
+ defaultLayout: true,
+ },
+ },
+ })
}
- describe('shallowMount', () => {
- beforeEach(() => {
- wrapper = Wrapper()
- })
+ beforeEach(() => {
+ wrapper = createWrapper()
+ })
- it('has a div with id "app"', () => {
- expect(wrapper.find('div#app').exists()).toBeTruthy()
- })
+ it('div#app is present', () => {
+ expect(wrapper.find('div#app').exists()).toBe(true)
+ })
+
+ it('renders default layout when token is present', () => {
+ wrapper = createWrapper('some-token')
+
+ expect(wrapper.findComponent(defaultLayout).exists()).toBe(true)
+ expect(wrapper.find('router-view-stub').exists()).toBe(false)
+ })
+
+ it('does not render defaultLayout when token is not present', () => {
+ expect(wrapper.findComponent(defaultLayout).exists()).toBe(false)
+ expect(wrapper.find('router-view-stub').exists()).toBe(true)
+ })
+
+ it('always renders BToastOrchestrator and BModalOrchestrator', () => {
+ expect(wrapper.findComponent({ name: 'BToastOrchestrator' }).exists()).toBe(true)
+ expect(wrapper.findComponent({ name: 'BModalOrchestrator' }).exists()).toBe(true)
})
})
diff --git a/admin/src/App.vue b/admin/src/App.vue
index 2094e06b1..126cebb70 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -1,23 +1,22 @@
+
-
diff --git a/admin/src/assets/icons/circle-slash.png b/admin/src/assets/icons/circle-slash.png
new file mode 100644
index 000000000..b57bf7fc8
Binary files /dev/null and b/admin/src/assets/icons/circle-slash.png differ
diff --git a/admin/public/img/elopage_favicon.png b/admin/src/assets/icons/elopage_favicon.png
similarity index 100%
rename from admin/public/img/elopage_favicon.png
rename to admin/src/assets/icons/elopage_favicon.png
diff --git a/admin/src/assets/icons/envelope.png b/admin/src/assets/icons/envelope.png
new file mode 100644
index 000000000..ba6e484d9
Binary files /dev/null and b/admin/src/assets/icons/envelope.png differ
diff --git a/admin/src/assets/icons/person.png b/admin/src/assets/icons/person.png
new file mode 100644
index 000000000..06dd31b53
Binary files /dev/null and b/admin/src/assets/icons/person.png differ
diff --git a/admin/src/components/AiChat.vue b/admin/src/components/AiChat.vue
new file mode 100644
index 000000000..e167d685d
--- /dev/null
+++ b/admin/src/components/AiChat.vue
@@ -0,0 +1,333 @@
+
+
+
+
+
+
+
+
diff --git a/admin/src/components/ChangeUserRoleFormular.spec.js b/admin/src/components/ChangeUserRoleFormular.spec.js
index 5af22d257..792812fe6 100644
--- a/admin/src/components/ChangeUserRoleFormular.spec.js
+++ b/admin/src/components/ChangeUserRoleFormular.spec.js
@@ -1,22 +1,23 @@
import { mount } from '@vue/test-utils'
-import ChangeUserRoleFormular from './ChangeUserRoleFormular'
-import { setUserRole } from '../graphql/setUserRole'
-import { toastSuccessSpy, toastErrorSpy } from '../../test/testSetup'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import ChangeUserRoleFormular from './ChangeUserRoleFormular.vue'
+import { useMutation } from '@vue/apollo-composable'
+import { useStore } from 'vuex'
-const localVue = global.localVue
+vi.mock('vue-i18n', () => ({
+ useI18n: () => ({
+ t: (key) => key,
+ }),
+}))
-const apolloMutateMock = jest.fn().mockResolvedValue({
- data: {
- setUserRole: null,
- },
-})
+vi.mock('@vue/apollo-composable', () => ({
+ useMutation: vi.fn(() => ({
+ mutate: vi.fn(),
+ })),
+}))
-const mocks = {
- $t: jest.fn((t) => t),
- $apollo: {
- mutate: apolloMutateMock,
- },
- $store: {
+vi.mock('vuex', () => ({
+ useStore: vi.fn(() => ({
state: {
moderator: {
id: 0,
@@ -24,648 +25,225 @@ const mocks = {
roles: ['ADMIN'],
},
},
- },
+ })),
+}))
+
+vi.mock('@/composables/useToast', () => ({
+ useAppToast: () => ({
+ toastSuccess: vi.fn(),
+ toastError: vi.fn(),
+ }),
+}))
+
+const mockBFormSelect = {
+ name: 'BFormSelect',
+ template: '',
+ props: ['modelValue', 'options'],
+}
+const mockBButton = {
+ name: 'BButton',
+ template: '',
}
-let propsData
-let wrapper
-let spy
-
describe('ChangeUserRoleFormular', () => {
- const Wrapper = () => {
- return mount(ChangeUserRoleFormular, { localVue, mocks, propsData })
+ let wrapper
+ let propsData
+
+ beforeEach(() => {
+ vi.clearAllMocks()
+ })
+
+ const createWrapper = () => {
+ return mount(ChangeUserRoleFormular, {
+ props: propsData,
+ global: {
+ stubs: {
+ BFormSelect: mockBFormSelect,
+ BButton: mockBButton,
+ },
+ mocks: {
+ $t: (key) => key,
+ },
+ },
+ })
}
- describe('mount', () => {
+ describe('DOM elements', () => {
beforeEach(() => {
- jest.clearAllMocks()
+ propsData = {
+ item: {
+ userId: 1,
+ roles: [],
+ },
+ }
+ wrapper = createWrapper()
})
- describe('DOM has', () => {
+ it('has a DIV element with the class change-user-role-formular', () => {
+ expect(wrapper.find('.change-user-role-formular').exists()).toBe(true)
+ })
+ })
+
+ describe('change own role', () => {
+ beforeEach(() => {
+ propsData = {
+ item: {
+ userId: 0,
+ roles: ['ADMIN'],
+ },
+ }
+ wrapper = createWrapper()
+ })
+
+ it('has the text that you cannot change own role', () => {
+ expect(wrapper.text()).toContain('userRole.notChangeYourSelf')
+ })
+
+ it('has no role select', () => {
+ expect(wrapper.find('[data-testid="mock-bformselect"]').exists()).toBe(false)
+ })
+
+ it('has no button', () => {
+ expect(wrapper.find('[data-testid="mock-bbutton"]').exists()).toBe(false)
+ })
+ })
+
+ describe("change other user's role", () => {
+ beforeEach(() => {
+ propsData = {
+ item: {
+ userId: 1,
+ roles: [],
+ },
+ }
+ wrapper = createWrapper()
+ })
+
+ it('has no text that you cannot change own role', () => {
+ expect(wrapper.text()).not.toContain('userRole.notChangeYourSelf')
+ })
+
+ it('has the select label', () => {
+ expect(wrapper.text()).toContain('userRole.selectLabel')
+ })
+
+ it('has a select', () => {
+ expect(wrapper.find('[data-testid="mock-bformselect"]').exists()).toBe(true)
+ })
+
+ it('has "change_user_role" button', () => {
+ const button = wrapper.find('[data-testid="mock-bbutton"]')
+ expect(button.exists()).toBe(true)
+ expect(button.text()).toBe('change_user_role')
+ })
+
+ describe('user has role "usual user"', () => {
beforeEach(() => {
- propsData = {
- item: {
- userId: 1,
- roles: [],
- },
- }
- wrapper = Wrapper()
+ propsData.item.roles = ['USER']
+ wrapper = createWrapper()
})
- it('has a DIV element with the class.delete-user-formular', () => {
- expect(wrapper.find('.change-user-role-formular').exists()).toBe(true)
- })
- })
-
- describe('change own role', () => {
- beforeEach(() => {
- propsData = {
- item: {
- userId: 0,
- roles: ['ADMIN'],
- },
- }
- wrapper = Wrapper()
+ it('has selected option set to "USER"', () => {
+ expect(wrapper.vm.roleSelected).toBe('USER')
})
- it('has the text that you cannot change own role', () => {
- expect(wrapper.text()).toContain('userRole.notChangeYourSelf')
- })
-
- it('has no role select', () => {
- expect(wrapper.find('select.role-select').exists()).toBe(false)
- })
-
- it('has no button', () => {
- expect(wrapper.find('button.btn.btn-dange').exists()).toBe(false)
- })
- })
-
- describe("change other user's role", () => {
- let rolesToSelect
-
- describe('general', () => {
- beforeEach(() => {
- propsData = {
- item: {
- userId: 1,
- roles: [],
- },
- }
- wrapper = Wrapper()
- rolesToSelect = wrapper.find('select.role-select').findAll('option')
+ describe('change select to new role "MODERATOR"', () => {
+ beforeEach(async () => {
+ wrapper.vm.roleSelected = 'MODERATOR'
+ await wrapper.vm.$nextTick()
})
- it('has no text that you cannot change own role', () => {
- expect(wrapper.text()).not.toContain('userRole.notChangeYourSelf')
+ it('has "change_user_role" button enabled', () => {
+ const button = wrapper.find('[data-testid="mock-bbutton"]')
+ expect(button.attributes('disabled')).toBeFalsy()
})
- it('has the select label', () => {
- expect(wrapper.text()).toContain('userRole.selectLabel')
- })
-
- it('has a select', () => {
- expect(wrapper.find('select.role-select').exists()).toBe(true)
- })
-
- it('has role select enabled', () => {
- expect(wrapper.find('select.role-select[disabled="disabled"]').exists()).toBe(false)
- })
-
- it('has "change_user_role" button', () => {
- expect(wrapper.find('button.btn.btn-danger').text()).toBe('change_user_role')
- })
- })
-
- describe('user has role "usual user"', () => {
- beforeEach(() => {
- apolloMutateMock.mockResolvedValue({
- data: {
- setUserRole: 'ADMIN',
- },
- })
- propsData = {
- item: {
- userId: 1,
- roles: ['USER'],
- },
- }
- wrapper = Wrapper()
- rolesToSelect = wrapper.find('select.role-select').findAll('option')
- })
-
- it('has selected option set to "usual user"', () => {
- expect(wrapper.find('select.role-select').element.value).toBe('USER')
- })
-
- describe('change select to', () => {
- describe('same role', () => {
- it('has "change_user_role" button disabled', () => {
- expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(true)
- })
-
- it('does not call the API', () => {
- rolesToSelect.at(0).setSelected()
- expect(apolloMutateMock).not.toHaveBeenCalled()
- })
+ describe('clicking the "change_user_role" button', () => {
+ beforeEach(async () => {
+ await wrapper.find('[data-testid="mock-bbutton"]').trigger('click')
})
- describe('new role "MODERATOR"', () => {
- beforeEach(() => {
- rolesToSelect.at(1).setSelected()
- })
-
- it('has "change_user_role" button enabled', () => {
- expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
- expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
- false,
- )
- })
-
- describe('clicking the "change_user_role" button', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- spy.mockImplementation(() => Promise.resolve(true))
- await wrapper.find('button').trigger('click')
- await wrapper.vm.$nextTick()
- })
-
- it('calls the modal', () => {
- expect(wrapper.emitted('showModal'))
- expect(spy).toHaveBeenCalled()
- })
-
- describe('confirm role change with success', () => {
- it('calls the API', () => {
- expect(apolloMutateMock).toBeCalledWith(
- expect.objectContaining({
- mutation: setUserRole,
- variables: {
- userId: 1,
- role: 'MODERATOR',
- },
- }),
- )
- })
-
- it('emits "updateRoles" with role moderator', () => {
- expect(wrapper.emitted('updateRoles')).toEqual(
- expect.arrayContaining([
- expect.arrayContaining([
- {
- userId: 1,
- roles: ['MODERATOR'],
- },
- ]),
- ]),
- )
- })
-
- it('toasts success message', () => {
- expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
- })
- })
-
- describe('confirm role change with error', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
- await wrapper.find('button').trigger('click')
- await wrapper.vm.$nextTick()
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Oh no!')
- })
- })
- })
- })
-
- describe('new role "ADMIN"', () => {
- beforeEach(() => {
- rolesToSelect.at(2).setSelected()
- })
-
- it('has "change_user_role" button enabled', () => {
- expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
- expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
- false,
- )
- })
-
- describe('clicking the "change_user_role" button', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- spy.mockImplementation(() => Promise.resolve(true))
- await wrapper.find('button').trigger('click')
- await wrapper.vm.$nextTick()
- })
-
- it('calls the modal', () => {
- expect(wrapper.emitted('showModal'))
- expect(spy).toHaveBeenCalled()
- })
-
- describe('confirm role change with success', () => {
- it('calls the API', () => {
- expect(apolloMutateMock).toBeCalledWith(
- expect.objectContaining({
- mutation: setUserRole,
- variables: {
- userId: 1,
- role: 'ADMIN',
- },
- }),
- )
- })
-
- it('emits "updateRoles" with role moderator', () => {
- expect(wrapper.emitted('updateRoles')).toEqual(
- expect.arrayContaining([
- expect.arrayContaining([
- {
- userId: 1,
- roles: ['ADMIN'],
- },
- ]),
- ]),
- )
- })
-
- it('toasts success message', () => {
- expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
- })
- })
-
- describe('confirm role change with error', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
- await wrapper.find('button').trigger('click')
- await wrapper.vm.$nextTick()
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Oh no!')
- })
- })
- })
+ it('emits "show-modal" event', () => {
+ expect(wrapper.emitted('show-modal')).toBeTruthy()
})
})
})
-
- describe('user has role "moderator"', () => {
- beforeEach(() => {
- apolloMutateMock.mockResolvedValue({
- data: {
- setUserRole: null,
- },
- })
- propsData = {
- item: {
- userId: 1,
- roles: ['MODERATOR'],
- },
- }
- wrapper = Wrapper()
- rolesToSelect = wrapper.find('select.role-select').findAll('option')
- })
-
- it('has selected option set to "MODERATOR"', () => {
- expect(wrapper.find('select.role-select').element.value).toBe('MODERATOR')
- })
-
- describe('change select to', () => {
- describe('same role', () => {
- it('has "change_user_role" button disabled', () => {
- expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(true)
- })
-
- it('does not call the API', () => {
- rolesToSelect.at(1).setSelected()
- expect(apolloMutateMock).not.toHaveBeenCalled()
- })
- })
-
- describe('new role "USER"', () => {
- beforeEach(() => {
- rolesToSelect.at(0).setSelected()
- })
-
- it('has "change_user_role" button enabled', () => {
- expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
- expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
- false,
- )
- })
-
- describe('clicking the "change_user_role" button', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- spy.mockImplementation(() => Promise.resolve(true))
- await wrapper.find('button').trigger('click')
- await wrapper.vm.$nextTick()
- })
-
- it('calls the modal', () => {
- expect(wrapper.emitted('showModal'))
- expect(spy).toHaveBeenCalled()
- })
-
- describe('confirm role change with success', () => {
- it('calls the API', () => {
- expect(apolloMutateMock).toBeCalledWith(
- expect.objectContaining({
- mutation: setUserRole,
- variables: {
- userId: 1,
- role: 'USER',
- },
- }),
- )
- })
-
- it('emits "updateRoles"', () => {
- expect(wrapper.emitted('updateRoles')).toEqual(
- expect.arrayContaining([
- expect.arrayContaining([
- {
- userId: 1,
- roles: [],
- },
- ]),
- ]),
- )
- })
-
- it('toasts success message', () => {
- expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
- })
- })
-
- describe('confirm role change with error', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
- await wrapper.find('button').trigger('click')
- await wrapper.vm.$nextTick()
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Oh no!')
- })
- })
- })
- })
-
- describe('new role "ADMIN"', () => {
- beforeEach(() => {
- rolesToSelect.at(2).setSelected()
- })
-
- it('has "change_user_role" button enabled', () => {
- expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
- expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
- false,
- )
- })
-
- describe('clicking the "change_user_role" button', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- spy.mockImplementation(() => Promise.resolve(true))
- await wrapper.find('button').trigger('click')
- await wrapper.vm.$nextTick()
- })
-
- it('calls the modal', () => {
- expect(wrapper.emitted('showModal'))
- expect(spy).toHaveBeenCalled()
- })
-
- describe('confirm role change with success', () => {
- it('calls the API', () => {
- expect(apolloMutateMock).toBeCalledWith(
- expect.objectContaining({
- mutation: setUserRole,
- variables: {
- userId: 1,
- role: 'ADMIN',
- },
- }),
- )
- })
-
- it('emits "updateRoles"', () => {
- expect(wrapper.emitted('updateRoles')).toEqual(
- expect.arrayContaining([
- expect.arrayContaining([
- {
- userId: 1,
- roles: ['ADMIN'],
- },
- ]),
- ]),
- )
- })
-
- it('toasts success message', () => {
- expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
- })
- })
-
- describe('confirm role change with error', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
- await wrapper.find('button').trigger('click')
- await wrapper.vm.$nextTick()
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Oh no!')
- })
- })
- })
- })
- })
- })
-
- describe('user has role "admin"', () => {
- beforeEach(() => {
- apolloMutateMock.mockResolvedValue({
- data: {
- setUserRole: null,
- },
- })
- propsData = {
- item: {
- userId: 1,
- roles: ['ADMIN'],
- },
- }
- wrapper = Wrapper()
- rolesToSelect = wrapper.find('select.role-select').findAll('option')
- })
-
- it('has selected option set to "admin"', () => {
- expect(wrapper.find('select.role-select').element.value).toBe('ADMIN')
- })
-
- describe('change select to', () => {
- describe('same role', () => {
- it('has "change_user_role" button disabled', () => {
- expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(true)
- })
-
- it('does not call the API', () => {
- rolesToSelect.at(1).setSelected()
- // TODO: Fix this
- expect(apolloMutateMock).not.toHaveBeenCalled()
- })
- })
-
- describe('new role "USER"', () => {
- beforeEach(() => {
- rolesToSelect.at(0).setSelected()
- })
-
- it('has "change_user_role" button enabled', () => {
- expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
- expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
- false,
- )
- })
-
- describe('clicking the "change_user_role" button', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- spy.mockImplementation(() => Promise.resolve(true))
- await wrapper.find('button').trigger('click')
- await wrapper.vm.$nextTick()
- })
-
- it('calls the modal', () => {
- expect(wrapper.emitted('showModal'))
- expect(spy).toHaveBeenCalled()
- })
-
- describe('confirm role change with success', () => {
- it('calls the API', () => {
- expect(apolloMutateMock).toBeCalledWith(
- expect.objectContaining({
- mutation: setUserRole,
- variables: {
- userId: 1,
- role: 'USER',
- },
- }),
- )
- })
-
- it('emits "updateRoles"', () => {
- expect(wrapper.emitted('updateRoles')).toEqual(
- expect.arrayContaining([
- expect.arrayContaining([
- {
- userId: 1,
- roles: [],
- },
- ]),
- ]),
- )
- })
-
- it('toasts success message', () => {
- expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
- })
- })
-
- describe('confirm role change with error', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
- await wrapper.find('button').trigger('click')
- await wrapper.vm.$nextTick()
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Oh no!')
- })
- })
- })
- })
-
- describe('new role "MODERATOR"', () => {
- beforeEach(() => {
- rolesToSelect.at(1).setSelected()
- })
-
- it('has "change_user_role" button enabled', () => {
- expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
- expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
- false,
- )
- })
-
- describe('clicking the "change_user_role" button', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- spy.mockImplementation(() => Promise.resolve(true))
- await wrapper.find('button').trigger('click')
- await wrapper.vm.$nextTick()
- })
-
- it('calls the modal', () => {
- expect(wrapper.emitted('showModal'))
- expect(spy).toHaveBeenCalled()
- })
-
- describe('confirm role change with success', () => {
- it('calls the API', () => {
- expect(apolloMutateMock).toBeCalledWith(
- expect.objectContaining({
- mutation: setUserRole,
- variables: {
- userId: 1,
- role: 'MODERATOR',
- },
- }),
- )
- })
-
- it('emits "updateRoles"', () => {
- expect(wrapper.emitted('updateRoles')).toEqual(
- expect.arrayContaining([
- expect.arrayContaining([
- {
- userId: 1,
- roles: ['MODERATOR'],
- },
- ]),
- ]),
- )
- })
-
- it('toasts success message', () => {
- expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
- })
- })
-
- describe('confirm role change with error', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
- await wrapper.find('button').trigger('click')
- await wrapper.vm.$nextTick()
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Oh no!')
- })
- })
- })
- })
- })
- })
- })
-
- describe('authenticated user is MODERATOR', () => {
- beforeEach(() => {
- mocks.$store.state.moderator.roles = ['MODERATOR']
- })
-
- it('displays text with role', () => {
- expect(wrapper.text()).toBe('userRole.selectRoles.admin')
- })
-
- it('has no role select', () => {
- expect(wrapper.find('select.role-select').exists()).toBe(false)
- })
-
- it('has no button', () => {
- expect(wrapper.find('button.btn.btn-dange').exists()).toBe(false)
- })
+ })
+ })
+
+ describe('authenticated user is MODERATOR', () => {
+ beforeEach(() => {
+ vi.mocked(useStore).mockReturnValue({
+ state: {
+ moderator: {
+ id: 0,
+ name: 'test moderator',
+ roles: ['MODERATOR'],
+ },
+ },
+ })
+ propsData = {
+ item: {
+ userId: 1,
+ roles: [],
+ },
+ }
+ wrapper = createWrapper()
+ })
+
+ it('has no role select', () => {
+ expect(wrapper.find('[data-testid="mock-bformselect"]').exists()).toBe(false)
+ })
+
+ it('has no button', () => {
+ expect(wrapper.find('[data-testid="mock-bbutton"]').exists()).toBe(false)
+ })
+ })
+
+ describe('updateUserRole method', () => {
+ let mockMutate
+
+ beforeEach(() => {
+ mockMutate = vi.fn()
+ useMutation.mockReturnValue({
+ mutate: mockMutate,
+ })
+
+ propsData = {
+ item: {
+ userId: 1,
+ roles: ['USER'],
+ },
+ }
+ wrapper = createWrapper()
+ })
+
+ it('calls setUserRole mutation and emits update-roles on success', async () => {
+ mockMutate.mockResolvedValue({ data: { setUserRole: 'MODERATOR' } })
+
+ await wrapper.vm.updateUserRole('MODERATOR', 'USER')
+
+ expect(mockMutate).toHaveBeenCalledWith({
+ userId: 1,
+ role: 'MODERATOR',
+ })
+ expect(wrapper.emitted('update-roles')).toBeTruthy()
+ expect(wrapper.emitted('update-roles')[0]).toEqual([
+ {
+ userId: 1,
+ roles: ['MODERATOR'],
+ },
+ ])
+ })
+
+ it('handles error and resets role on failure', async () => {
+ mockMutate.mockRejectedValue(new Error('API Error'))
+
+ await wrapper.vm.updateUserRole('MODERATOR', 'USER')
+
+ expect(mockMutate).toHaveBeenCalled()
+ expect(wrapper.vm.roleSelected).toBe('USER')
+ expect(wrapper.emitted('update-roles')).toBeFalsy()
})
})
})
diff --git a/admin/src/components/ChangeUserRoleFormular.vue b/admin/src/components/ChangeUserRoleFormular.vue
index 7f048d0e2..45e569b07 100644
--- a/admin/src/components/ChangeUserRoleFormular.vue
+++ b/admin/src/components/ChangeUserRoleFormular.vue
@@ -1,124 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+ {{ buttonText }}
+
+
+
+
+ {{ $t('ai.chat-clear') }}
+
+
+
-
- + diff --git a/admin/src/components/ContributionLink/ContributionLink.spec.js b/admin/src/components/ContributionLink/ContributionLink.spec.js index 85117e071..4c00166aa 100644 --- a/admin/src/components/ContributionLink/ContributionLink.spec.js +++ b/admin/src/components/ContributionLink/ContributionLink.spec.js @@ -1,114 +1,125 @@ import { mount } from '@vue/test-utils' -import ContributionLink from './ContributionLink' +import { describe, it, expect, beforeEach } from 'vitest' +import ContributionLink from './ContributionLink.vue' +import { BButton, BCard, BCardText, BCollapse } from 'bootstrap-vue-next' -const localVue = global.localVue - -const mocks = { - $t: jest.fn((t) => t), - $d: jest.fn((d) => d), -} - -const propsData = { - items: [ - { - id: 1, - name: 'Meditation', - memo: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut l', - amount: '200', - validFrom: '2022-04-01', - validTo: '2022-08-01', - cycle: 'täglich', - maxPerCycle: '3', - maxAmountPerMonth: 0, - link: 'https://localhost/redeem/CL-1a2345678', - }, - ], - count: 1, -} +const mockItems = [ + { + id: 1, + name: 'Meditation', + memo: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut l', + amount: '200', + validFrom: '2022-04-01', + validTo: '2022-08-01', + cycle: 'täglich', + maxPerCycle: '3', + maxAmountPerMonth: 0, + link: 'https://localhost/redeem/CL-1a2345678', + }, +] describe('ContributionLink', () => { let wrapper - const Wrapper = () => { - return mount(ContributionLink, { localVue, mocks, propsData }) + const createWrapper = () => { + return mount(ContributionLink, { + props: { + items: mockItems, + count: 1, + }, + global: { + mocks: { + $t: (key) => key, + $d: (d) => d, + }, + stubs: { + BCard, + BButton, + BCollapse, + BCardText, + ContributionLinkForm: true, + ContributionLinkList: true, + }, + }, + }) } - describe('mount', () => { + beforeEach(() => { + wrapper = createWrapper() + }) + + it('renders the Div Element ".contribution-link"', () => { + expect(wrapper.find('div.contribution-link').exists()).toBe(true) + }) + + it('has ContributionLinkList component when count > 0', () => { + expect(wrapper.findComponent({ name: 'ContributionLinkList' }).exists()).toBe(true) + }) + + it('shows "no contribution links" message when count is 0', async () => { + await wrapper.setProps({ count: 0 }) + expect(wrapper.text()).toContain('contributionLink.noContributionLinks') + }) + + it('has contribution form not visible by default', () => { + expect(wrapper.vm.visible).toBe(false) + }) + + describe('click on create new contribution', () => { + beforeEach(async () => { + await wrapper.find('[data-test="new-contribution-link-button"]').trigger('click') + }) + + it('shows the contribution form', () => { + expect(wrapper.vm.visible).toBe(true) + }) + + it('hides the form when clicked again', async () => { + await wrapper.find('[data-test="new-contribution-link-button"]').trigger('click') + expect(wrapper.vm.visible).toBe(false) + }) + }) + + describe('edit contribution link', () => { + beforeEach(async () => { + wrapper.vm.editContributionLinkData(mockItems[0]) + }) + + it('shows the contribution form', () => { + expect(wrapper.vm.visible).toBe(true) + }) + + it('sets editContributionLink to true', () => { + expect(wrapper.vm.editContributionLink).toBe(true) + }) + + it('sets contributionLinkData', () => { + expect(wrapper.vm.contributionLinkData).toEqual(mockItems[0]) + }) + + it('hides new contribution button', () => { + expect(wrapper.find('[data-test="new-contribution-link-button"]').exists()).toBe(false) + }) + }) + + describe('closeContributionForm', () => { beforeEach(() => { - wrapper = Wrapper() + wrapper.vm.visible = true + wrapper.vm.editContributionLink = true + wrapper.vm.contributionLinkData = mockItems[0] + wrapper.vm.closeContributionForm() }) - it('renders the Div Element ".contribution-link"', () => { - expect(wrapper.find('div.contribution-link').exists()).toBe(true) + it('hides the form', () => { + expect(wrapper.vm.visible).toBe(false) }) - it('has one contribution link in table', () => { - expect(wrapper.find('div.contribution-link-list').find('tbody').findAll('tr')).toHaveLength(1) + it('resets editContributionLink', () => { + expect(wrapper.vm.editContributionLink).toBe(false) }) - it('has contribution form not visible by default', () => { - expect(wrapper.find('#newContribution').isVisible()).toBe(false) - }) - - describe('click on create new contribution', () => { - beforeEach(async () => { - await wrapper.find('[data-test="new-contribution-link-button"]').trigger('click') - }) - - it('shows the contribution form', () => { - expect(wrapper.find('#newContribution').isVisible()).toBe(true) - }) - - describe('click on create new contribution again', () => { - beforeEach(async () => { - await wrapper.find('[data-test="new-contribution-link-button"]').trigger('click') - }) - - it('closes the contribution form', () => { - expect(wrapper.find('#newContribution').isVisible()).toBe(false) - }) - }) - - describe('click on close button', () => { - beforeEach(async () => { - await wrapper.find('button.btn-secondary').trigger('click') - }) - - it('closes the contribution form', () => { - expect(wrapper.find('#newContribution').isVisible()).toBe(false) - }) - }) - }) - - describe('edit contribution link', () => { - beforeEach(async () => { - await wrapper - .find('div.contribution-link-list') - .find('tbody') - .findAll('tr') - .at(0) - .findAll('button') - .at(1) - .trigger('click') - }) - - it('shows the contribution form', () => { - expect(wrapper.find('#newContribution').isVisible()).toBe(true) - }) - - it('does not show the new contribution button', () => { - expect(wrapper.find('[data-test="new-contribution-link-button"]').exists()).toBe(false) - }) - - describe('click on close button', () => { - beforeEach(async () => { - await wrapper.find('button.btn-secondary').trigger('click') - }) - - it('closes the contribution form', () => { - expect(wrapper.find('#newContribution').isVisible()).toBe(false) - }) - }) + it('resets contributionLinkData', () => { + expect(wrapper.vm.contributionLinkData).toEqual({}) }) }) }) diff --git a/admin/src/components/ContributionLink/ContributionLink.vue b/admin/src/components/ContributionLink/ContributionLink.vue index 027eb35d7..1bc8ef43b 100644 --- a/admin/src/components/ContributionLink/ContributionLink.vue +++ b/admin/src/components/ContributionLink/ContributionLink.vue @@ -1,6 +1,6 @@
- {{ roles.find((role) => role.value === currentRole).text }}
+
-
diff --git a/admin/src/components/ContentFooter.spec.js b/admin/src/components/ContentFooter.spec.js
index b7b8d5aef..f3ccb3562 100644
--- a/admin/src/components/ContentFooter.spec.js
+++ b/admin/src/components/ContentFooter.spec.js
@@ -1,29 +1,15 @@
import { mount } from '@vue/test-utils'
-import ContentFooter from './ContentFooter'
-
-const localVue = global.localVue
-
-const mocks = {
- $t: jest.fn((t) => t),
- $i18n: {
- locale: jest.fn(() => 'en'),
- },
-}
+import { describe, it, expect, beforeEach } from 'vitest'
+import ContentFooter from './ContentFooter.vue'
describe('ContentFooter', () => {
let wrapper
- const Wrapper = () => {
- return mount(ContentFooter, { localVue, mocks })
- }
+ beforeEach(() => {
+ wrapper = mount(ContentFooter, {})
+ })
- describe('mount', () => {
- beforeEach(() => {
- wrapper = Wrapper()
- })
-
- it('renders the div element ".content-footer"', () => {
- expect(wrapper.find('div.content-footer').exists()).toBe(true)
- })
+ it('renders the footer', () => {
+ expect(wrapper.find('.content-footer').exists()).toBe(true)
})
})
diff --git a/admin/src/components/ContentFooter.vue b/admin/src/components/ContentFooter.vue
index 5947c7b9e..d59796add 100644
--- a/admin/src/components/ContentFooter.vue
+++ b/admin/src/components/ContentFooter.vue
@@ -1,19 +1,23 @@
+
+ {{ roles.find((role) => role.value === currentRole.value)?.text }}
-
+
{{ $t('userRole.notChangeYourSelf') }}
-
-
-
+
+
{{ $t('change_user_role') }}
-
+
- + diff --git a/admin/src/components/ContributionLink/ContributionLink.spec.js b/admin/src/components/ContributionLink/ContributionLink.spec.js index 85117e071..4c00166aa 100644 --- a/admin/src/components/ContributionLink/ContributionLink.spec.js +++ b/admin/src/components/ContributionLink/ContributionLink.spec.js @@ -1,114 +1,125 @@ import { mount } from '@vue/test-utils' -import ContributionLink from './ContributionLink' +import { describe, it, expect, beforeEach } from 'vitest' +import ContributionLink from './ContributionLink.vue' +import { BButton, BCard, BCardText, BCollapse } from 'bootstrap-vue-next' -const localVue = global.localVue - -const mocks = { - $t: jest.fn((t) => t), - $d: jest.fn((d) => d), -} - -const propsData = { - items: [ - { - id: 1, - name: 'Meditation', - memo: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut l', - amount: '200', - validFrom: '2022-04-01', - validTo: '2022-08-01', - cycle: 'täglich', - maxPerCycle: '3', - maxAmountPerMonth: 0, - link: 'https://localhost/redeem/CL-1a2345678', - }, - ], - count: 1, -} +const mockItems = [ + { + id: 1, + name: 'Meditation', + memo: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut l', + amount: '200', + validFrom: '2022-04-01', + validTo: '2022-08-01', + cycle: 'täglich', + maxPerCycle: '3', + maxAmountPerMonth: 0, + link: 'https://localhost/redeem/CL-1a2345678', + }, +] describe('ContributionLink', () => { let wrapper - const Wrapper = () => { - return mount(ContributionLink, { localVue, mocks, propsData }) + const createWrapper = () => { + return mount(ContributionLink, { + props: { + items: mockItems, + count: 1, + }, + global: { + mocks: { + $t: (key) => key, + $d: (d) => d, + }, + stubs: { + BCard, + BButton, + BCollapse, + BCardText, + ContributionLinkForm: true, + ContributionLinkList: true, + }, + }, + }) } - describe('mount', () => { + beforeEach(() => { + wrapper = createWrapper() + }) + + it('renders the Div Element ".contribution-link"', () => { + expect(wrapper.find('div.contribution-link').exists()).toBe(true) + }) + + it('has ContributionLinkList component when count > 0', () => { + expect(wrapper.findComponent({ name: 'ContributionLinkList' }).exists()).toBe(true) + }) + + it('shows "no contribution links" message when count is 0', async () => { + await wrapper.setProps({ count: 0 }) + expect(wrapper.text()).toContain('contributionLink.noContributionLinks') + }) + + it('has contribution form not visible by default', () => { + expect(wrapper.vm.visible).toBe(false) + }) + + describe('click on create new contribution', () => { + beforeEach(async () => { + await wrapper.find('[data-test="new-contribution-link-button"]').trigger('click') + }) + + it('shows the contribution form', () => { + expect(wrapper.vm.visible).toBe(true) + }) + + it('hides the form when clicked again', async () => { + await wrapper.find('[data-test="new-contribution-link-button"]').trigger('click') + expect(wrapper.vm.visible).toBe(false) + }) + }) + + describe('edit contribution link', () => { + beforeEach(async () => { + wrapper.vm.editContributionLinkData(mockItems[0]) + }) + + it('shows the contribution form', () => { + expect(wrapper.vm.visible).toBe(true) + }) + + it('sets editContributionLink to true', () => { + expect(wrapper.vm.editContributionLink).toBe(true) + }) + + it('sets contributionLinkData', () => { + expect(wrapper.vm.contributionLinkData).toEqual(mockItems[0]) + }) + + it('hides new contribution button', () => { + expect(wrapper.find('[data-test="new-contribution-link-button"]').exists()).toBe(false) + }) + }) + + describe('closeContributionForm', () => { beforeEach(() => { - wrapper = Wrapper() + wrapper.vm.visible = true + wrapper.vm.editContributionLink = true + wrapper.vm.contributionLinkData = mockItems[0] + wrapper.vm.closeContributionForm() }) - it('renders the Div Element ".contribution-link"', () => { - expect(wrapper.find('div.contribution-link').exists()).toBe(true) + it('hides the form', () => { + expect(wrapper.vm.visible).toBe(false) }) - it('has one contribution link in table', () => { - expect(wrapper.find('div.contribution-link-list').find('tbody').findAll('tr')).toHaveLength(1) + it('resets editContributionLink', () => { + expect(wrapper.vm.editContributionLink).toBe(false) }) - it('has contribution form not visible by default', () => { - expect(wrapper.find('#newContribution').isVisible()).toBe(false) - }) - - describe('click on create new contribution', () => { - beforeEach(async () => { - await wrapper.find('[data-test="new-contribution-link-button"]').trigger('click') - }) - - it('shows the contribution form', () => { - expect(wrapper.find('#newContribution').isVisible()).toBe(true) - }) - - describe('click on create new contribution again', () => { - beforeEach(async () => { - await wrapper.find('[data-test="new-contribution-link-button"]').trigger('click') - }) - - it('closes the contribution form', () => { - expect(wrapper.find('#newContribution').isVisible()).toBe(false) - }) - }) - - describe('click on close button', () => { - beforeEach(async () => { - await wrapper.find('button.btn-secondary').trigger('click') - }) - - it('closes the contribution form', () => { - expect(wrapper.find('#newContribution').isVisible()).toBe(false) - }) - }) - }) - - describe('edit contribution link', () => { - beforeEach(async () => { - await wrapper - .find('div.contribution-link-list') - .find('tbody') - .findAll('tr') - .at(0) - .findAll('button') - .at(1) - .trigger('click') - }) - - it('shows the contribution form', () => { - expect(wrapper.find('#newContribution').isVisible()).toBe(true) - }) - - it('does not show the new contribution button', () => { - expect(wrapper.find('[data-test="new-contribution-link-button"]').exists()).toBe(false) - }) - - describe('click on close button', () => { - beforeEach(async () => { - await wrapper.find('button.btn-secondary').trigger('click') - }) - - it('closes the contribution form', () => { - expect(wrapper.find('#newContribution').isVisible()).toBe(false) - }) - }) + it('resets contributionLinkData', () => { + expect(wrapper.vm.contributionLinkData).toEqual({}) }) }) }) diff --git a/admin/src/components/ContributionLink/ContributionLink.vue b/admin/src/components/ContributionLink/ContributionLink.vue index 027eb35d7..1bc8ef43b 100644 --- a/admin/src/components/ContributionLink/ContributionLink.vue +++ b/admin/src/components/ContributionLink/ContributionLink.vue @@ -1,6 +1,6 @@
-
-
{{ $t('math.plus') }} {{ $t('contributionLink.newContributionLink') }}
-
+
-
-
-
+
+
-
+
+
-
+
-
+
+
+
diff --git a/admin/src/components/ContributionLink/ContributionLinkList.spec.js b/admin/src/components/ContributionLink/ContributionLinkList.spec.js
index de4798d41..4c1faaabe 100644
--- a/admin/src/components/ContributionLink/ContributionLinkList.spec.js
+++ b/admin/src/components/ContributionLink/ContributionLinkList.spec.js
@@ -1,147 +1,122 @@
import { mount } from '@vue/test-utils'
-import ContributionLinkList from './ContributionLinkList'
-import { toastSuccessSpy, toastErrorSpy } from '../../../test/testSetup'
-// import { deleteContributionLink } from '../graphql/deleteContributionLink'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import ContributionLinkList from './ContributionLinkList.vue'
+import { BButton, BCard, BCardText, BModal, BTable } from 'bootstrap-vue-next'
+import * as apolloComposable from '@vue/apollo-composable'
-const localVue = global.localVue
+vi.mock('vue-i18n', () => ({
+ useI18n: vi.fn(() => ({
+ t: (key) => key,
+ d: (date) => date.toISOString(),
+ })),
+}))
-const mockAPIcall = jest.fn()
+vi.mock('@vue/apollo-composable', () => ({
+ useMutation: vi.fn(() => ({
+ mutate: vi.fn(),
+ })),
+}))
-const mocks = {
- $t: jest.fn((t) => t),
- $d: jest.fn((d) => d),
- $apollo: {
- mutate: mockAPIcall,
- },
-}
-
-const propsData = {
- items: [
- {
- id: 1,
- name: 'Meditation',
- memo: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut l',
- amount: '200',
- validFrom: '2022-04-01',
- validTo: '2022-08-01',
- cycle: 'täglich',
- maxPerCycle: '3',
- maxAmountPerMonth: 0,
- link: 'https://localhost/redeem/CL-1a2345678',
- },
- ],
-}
+// Mock useAppToast
+const mockToastError = vi.fn()
+const mockToastSuccess = vi.fn()
+vi.mock('@/composables/useToast', () => ({
+ useAppToast: vi.fn(() => ({
+ toastError: mockToastError,
+ toastSuccess: mockToastSuccess,
+ })),
+}))
describe('ContributionLinkList', () => {
let wrapper
+ let mutateMock
- const Wrapper = () => {
- return mount(ContributionLinkList, { localVue, mocks, propsData })
+ const createWrapper = () => {
+ return mount(ContributionLinkList, {
+ props: {
+ items: [
+ {
+ id: 1,
+ name: 'Meditation',
+ memo: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut l',
+ amount: '200',
+ validFrom: '2022-04-01',
+ validTo: '2022-08-01',
+ cycle: 'täglich',
+ maxPerCycle: '3',
+ maxAmountPerMonth: 0,
+ link: 'https://localhost/redeem/CL-1a2345678',
+ },
+ ],
+ },
+ global: {
+ components: {
+ BTable,
+ BButton,
+ BModal,
+ BCard,
+ BCardText,
+ },
+ stubs: {
+ IBiTrash: true,
+ IBiPencil: true,
+ IBiEye: true,
+ FigureQrCode: true,
+ },
+ },
+ })
}
- describe('mount', () => {
- beforeEach(() => {
- wrapper = Wrapper()
+ beforeEach(() => {
+ vi.clearAllMocks()
+ mutateMock = vi.fn()
+ vi.spyOn(apolloComposable, 'useMutation').mockReturnValue({ mutate: mutateMock })
+ wrapper = createWrapper()
+ })
+
+ it('renders the Div Element ".contribution-link-list"', () => {
+ expect(wrapper.find('div.contribution-link-list').exists()).toBe(true)
+ })
+
+ it('renders table with contribution link', () => {
+ expect(wrapper.findComponent({ name: 'BTable' }).exists()).toBe(true)
+ })
+
+ describe('edit contribution link', () => {
+ it('emits editContributionLinkData', async () => {
+ await wrapper.vm.editContributionLink({ id: 1 })
+ expect(wrapper.emitted('edit-contribution-link-data')).toBeTruthy()
})
+ })
- it('renders the Div Element ".contribution-link-list"', () => {
- expect(wrapper.find('div.contribution-link-list').exists()).toBe(true)
- })
-
- it('renders table with contribution link', () => {
- expect(wrapper.findAll('table').at(0).findAll('tbody > tr').at(0).text()).toContain(
- 'Meditation',
- )
- })
-
- describe('edit contribution link', () => {
- beforeEach(() => {
- wrapper.vm.editContributionLink()
- })
-
- it('emits editContributionLinkData', async () => {
- expect(wrapper.vm.$emit('editContributionLinkData')).toBeTruthy()
- })
- })
-
- describe('delete contribution link', () => {
- let spy
-
+ describe('delete contribution link', () => {
+ describe('with success', () => {
beforeEach(async () => {
- jest.clearAllMocks()
- wrapper.vm.deleteContributionLink()
+ mutateMock.mockResolvedValue({})
+ await wrapper.vm.handleDelete({ item: { id: 1, name: 'Test' } })
+ await wrapper.vm.executeDelete()
})
- describe('with success', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- spy.mockImplementation(() => Promise.resolve('some value'))
- mockAPIcall.mockResolvedValue()
- await wrapper.find('.test-delete-link').trigger('click')
- })
-
- it('opens the modal ', () => {
- expect(spy).toBeCalled()
- })
-
- it.skip('calls the API', () => {
- // expect(mockAPIcall).toBeCalledWith(
- // expect.objectContaining({
- // mutation: deleteContributionLink,
- // variables: {
- // id: 1,
- // },
- // }),
- // )
- })
-
- it('toasts a success message', () => {
- expect(toastSuccessSpy).toBeCalledWith('contributionLink.deleted')
- })
+ it('calls the mutation and emits events', async () => {
+ expect(mutateMock).toHaveBeenCalledWith({ id: 1 })
+ expect(wrapper.emitted('close-contribution-form')).toBeTruthy()
+ expect(wrapper.emitted('get-contribution-links')).toBeTruthy()
})
- describe('with error', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- spy.mockImplementation(() => Promise.resolve('some value'))
- mockAPIcall.mockRejectedValue({ message: 'Something went wrong :(' })
- await wrapper.find('.test-delete-link').trigger('click')
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Something went wrong :(')
- })
- })
-
- describe('cancel delete', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- spy.mockImplementation(() => Promise.resolve(false))
- mockAPIcall.mockResolvedValue()
- await wrapper.find('.test-delete-link').trigger('click')
- })
-
- it('does not call the API', () => {
- expect(mockAPIcall).not.toBeCalled()
- })
+ it('toasts a success message', () => {
+ expect(mockToastSuccess).toHaveBeenCalledWith('contributionLink.deleted')
})
})
- describe('onClick showButton', () => {
- it('modelData contains contribution link', () => {
- wrapper.find('button.test-show').trigger('click')
- expect(wrapper.vm.modalData).toEqual({
- amount: '200',
- cycle: 'täglich',
- id: 1,
- link: 'https://localhost/redeem/CL-1a2345678',
- maxAmountPerMonth: 0,
- maxPerCycle: '3',
- memo: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut l',
- name: 'Meditation',
- validFrom: '2022-04-01',
- validTo: '2022-08-01',
- })
+ describe('with error', () => {
+ beforeEach(async () => {
+ mutateMock.mockRejectedValue(new Error('Something went wrong :('))
+ await wrapper.vm.handleDelete({ item: { id: 1, name: 'Test' } })
+ await wrapper.vm.executeDelete()
+ })
+
+ it('toasts an error message', () => {
+ expect(mockToastError).toHaveBeenCalledWith('Something went wrong :(')
})
})
})
diff --git a/admin/src/components/ContributionLink/ContributionLinkList.vue b/admin/src/components/ContributionLink/ContributionLinkList.vue
index 163b0917b..e95adc1b7 100644
--- a/admin/src/components/ContributionLink/ContributionLinkList.vue
+++ b/admin/src/components/ContributionLink/ContributionLinkList.vue
@@ -1,125 +1,151 @@
{{ $t('contributionLink.contributionLinks') }}
+{{ $t('contributionLink.contributionLinks') }}
{{ $t('contributionLink.noContributionLinks') }}
-
-
+
-
-
+
-
+
+
-
-
+
+
-
-
+
+
+
{{ modalData.memo ? modalData.memo : '' }}
+
{{ modalData ? modalData.link : '' }}
-
-
+
+
+
+
+ {{ t('contributionLink.deleteNow', { name: itemToBeDeleted.name }) }}
+
+
-
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index bb12d0ce7..fdf562a80 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -1,247 +1,162 @@
import { mount } from '@vue/test-utils'
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import { nextTick } from 'vue'
import ContributionMessagesFormular from './ContributionMessagesFormular'
-import { toastErrorSpy, toastSuccessSpy } from '../../../test/testSetup'
-import { adminCreateContributionMessage } from '@/graphql/adminCreateContributionMessage'
-import { adminUpdateContribution } from '@/graphql/adminUpdateContribution'
+import { BButton, BForm } from 'bootstrap-vue-next'
-const localVue = global.localVue
+const mockToastError = vi.fn()
+vi.mock('@/composables/useToast', () => ({
+ useAppToast: () => ({
+ toastError: mockToastError,
+ toastSuccess: vi.fn(),
+ }),
+}))
-const apolloMutateMock = jest.fn().mockResolvedValue()
+const mockMutate = vi.fn().mockResolvedValue({})
+vi.mock('@vue/apollo-composable', () => ({
+ useMutation: () => ({
+ mutate: mockMutate,
+ }),
+}))
+
+vi.mock('vue-i18n', () => ({
+ useI18n: () => ({
+ locale: { value: 'en' },
+ t: (key) => key,
+ }),
+}))
+
+const mockChildComponents = {
+ BForm,
+ BFormGroup: { template: '{{ modalData ? modalData.name : '' }}
-
-
-
+
+
+
+ {{ contribution.user.firstName }} {{ contribution.user.lastName }}
+
+
+ {{ email }}
+
+ {{ $t('filter.byEmail') }}
+
+
+ {{ contribution.user.humhubUsername }}
+
+
+
+
+ {{ $t('goTo.humhubProfile') }}
+
+
+
+
+ {{ $t('registered') }}: {{ new Date(contribution.user.createdAt).toLocaleDateString() }},
+ {{ $t('createdAt') }}: {{ new Date(contribution.createdAt).toLocaleDateString() }}
+
+
+
+
+
+
-
diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js
index 8f8cc03b0..e0ea750b7 100644
--- a/admin/src/components/CreationFormular.spec.js
+++ b/admin/src/components/CreationFormular.spec.js
@@ -1,364 +1,147 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
import { mount } from '@vue/test-utils'
-import CreationFormular from './CreationFormular'
-import { adminCreateContribution } from '../graphql/adminCreateContribution'
-import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
-import VueApollo from 'vue-apollo'
-import { createMockClient } from 'mock-apollo-client'
-import { adminOpenCreations } from '../graphql/adminOpenCreations'
+import { nextTick, ref } from 'vue'
+import CreationFormular from './CreationFormular.vue'
+import { BFormRadioGroup } from 'bootstrap-vue-next'
-const mockClient = createMockClient()
-const apolloProvider = new VueApollo({
- defaultClient: mockClient,
-})
-
-const localVue = global.localVue
-localVue.use(VueApollo)
-
-const stateCommitMock = jest.fn()
-
-const mocks = {
- $t: jest.fn((t, options) => (options ? [t, options] : t)),
- $d: jest.fn((d) => {
- const date = new Date(d)
- return date.toISOString().split('T')[0]
+vi.mock('vue-i18n', () => ({
+ useI18n: () => ({
+ t: (key) => key,
}),
- $store: {
- commit: stateCommitMock,
- },
-}
+}))
-const propsData = {
- type: '',
- creation: [],
-}
+vi.mock('@/composables/useToast', () => ({
+ useAppToast: () => ({
+ toastError: vi.fn(),
+ toastSuccess: vi.fn(),
+ }),
+}))
-const now = new Date()
+vi.mock('@vue/apollo-composable', () => ({
+ useMutation: () => ({
+ mutate: vi.fn(),
+ }),
+ useQuery: () => ({
+ refetch: vi.fn(),
+ }),
+}))
-const getCreationDate = (sub) => {
- const date = sub === 0 ? now : new Date(now.getFullYear(), now.getMonth() - sub, 1, 0)
- return date.toISOString().split('T')[0]
+vi.mock('vuex', () => ({
+ useStore: () => ({
+ commit: vi.fn(),
+ }),
+}))
+
+vi.mock('../composables/useCreationMonths', () => ({
+ default: () => ({
+ creationDateObjects: ref([
+ { short: 'Jan', year: '2024', date: '2024-01-01' },
+ { short: 'Feb', year: '2024', date: '2024-02-01' },
+ ]),
+ }),
+}))
+
+const mockChildComponents = {
+ BForm: { template: '
+
+
-
diff --git a/admin/src/components/DeletedUserFormular.spec.js b/admin/src/components/DeletedUserFormular.spec.js
index 1711222bf..63460b29d 100644
--- a/admin/src/components/DeletedUserFormular.spec.js
+++ b/admin/src/components/DeletedUserFormular.spec.js
@@ -1,220 +1,212 @@
import { mount } from '@vue/test-utils'
-import DeletedUserFormular from './DeletedUserFormular'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import DeletedUserFormular from './DeletedUserFormular.vue'
import { deleteUser } from '../graphql/deleteUser'
import { unDeleteUser } from '../graphql/unDeleteUser'
-import { toastErrorSpy } from '../../test/testSetup'
+import { useApolloClient } from '@vue/apollo-composable'
+import { useI18n } from 'vue-i18n'
+import { useAppToast } from '@/composables/useToast'
+import { createStore } from 'vuex'
+import { BButton } from 'bootstrap-vue-next'
-const localVue = global.localVue
+vi.mock('@vue/apollo-composable')
+vi.mock('vue-i18n')
+vi.mock('@/composables/useToast')
-const date = new Date()
-
-const apolloMutateMock = jest.fn().mockResolvedValue({
- data: {
- deleteUser: date,
- },
-})
-
-const mocks = {
- $t: jest.fn((t) => t),
- $apollo: {
- mutate: apolloMutateMock,
- },
- $store: {
+const createVuexStore = (moderatorId = 0) => {
+ return createStore({
state: {
moderator: {
- id: 0,
+ id: moderatorId,
name: 'test moderator',
},
},
- },
-}
-
-const propsData = {
- item: {},
+ })
}
describe('DeletedUserFormular', () => {
let wrapper
- let spy
+ let store
+ const mockMutate = vi.fn()
+ const mockT = vi.fn((key) => key)
+ const mockToastError = vi.fn()
+ const date = new Date()
- const Wrapper = () => {
- return mount(DeletedUserFormular, { localVue, mocks, propsData })
- }
+ beforeEach(() => {
+ store = createVuexStore()
- describe('mount', () => {
+ useApolloClient.mockReturnValue({
+ client: {
+ mutate: mockMutate,
+ },
+ })
+
+ useI18n.mockReturnValue({
+ t: mockT,
+ })
+
+ useAppToast.mockReturnValue({
+ toastError: mockToastError,
+ })
+
+ wrapper = mount(DeletedUserFormular, {
+ props: {
+ item: {
+ userId: 1,
+ deletedAt: null,
+ },
+ },
+ global: {
+ plugins: [store],
+ mocks: {
+ $t: mockT,
+ },
+ stubs: {
+ BButton,
+ },
+ },
+ })
+ })
+
+ it('renders the component', () => {
+ expect(wrapper.find('.deleted-user-formular').exists()).toBe(true)
+ })
+
+ describe('when user is not a moderator', () => {
+ it('shows delete button when user is not deleted', () => {
+ expect(wrapper.find('button').text()).toBe('delete_user')
+ })
+
+ it('shows undelete button when user is deleted', async () => {
+ await wrapper.setProps({
+ item: {
+ userId: 1,
+ deletedAt: date,
+ },
+ })
+ expect(wrapper.find('button').text()).toBe('undelete_user')
+ })
+
+ it('emits show-delete-modal when delete button is clicked', async () => {
+ await wrapper.find('button').trigger('click')
+ expect(wrapper.emitted('show-delete-modal')).toBeTruthy()
+ })
+
+ it('emits show-undelete-modal when undelete button is clicked', async () => {
+ await wrapper.setProps({
+ item: {
+ userId: 1,
+ deletedAt: date,
+ },
+ })
+ await wrapper.find('button').trigger('click')
+ expect(wrapper.emitted('show-undelete-modal')).toBeTruthy()
+ })
+ })
+
+ describe('when user is a moderator', () => {
beforeEach(() => {
- jest.clearAllMocks()
- wrapper = Wrapper()
- })
-
- it('has a DIV element with the class.delete-user-formular', () => {
- expect(wrapper.find('.deleted-user-formular').exists()).toBe(true)
- })
-
- describe('delete self', () => {
- beforeEach(() => {
- wrapper.setProps({
- item: {
- userId: 0,
- },
- })
- })
-
- it('shows a text that you cannot delete yourself', () => {
- expect(wrapper.text()).toBe('removeNotSelf')
- })
-
- it('has no "delete_user" button', () => {
- expect(wrapper.find('button').exists()).toBe(false)
- })
- })
-
- describe('delete other user', () => {
- beforeEach(() => {
- wrapper.setProps({
+ store = createVuexStore(1)
+ wrapper = mount(DeletedUserFormular, {
+ props: {
item: {
userId: 1,
deletedAt: null,
},
- static: true,
- })
- })
-
- it('shows the text "delete_user"', () => {
- expect(wrapper.text()).toBe('delete_user')
- })
-
- it('has a "delete_user" button', () => {
- expect(wrapper.find('button').text()).toBe('delete_user')
- })
-
- describe('click on "delete_user" button', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- spy.mockImplementation(() => Promise.resolve(true))
- await wrapper.find('button').trigger('click')
- await wrapper.vm.$nextTick()
- })
-
- it('calls the modal', () => {
- expect(wrapper.emitted('showDeleteModal'))
- expect(spy).toHaveBeenCalled()
- })
-
- describe('confirm delete with success', () => {
- it('calls the API', () => {
- expect(apolloMutateMock).toBeCalledWith(
- expect.objectContaining({
- mutation: deleteUser,
- variables: {
- userId: 1,
- },
- }),
- )
- })
-
- it('emits update deleted At', () => {
- expect(wrapper.emitted('updateDeletedAt')).toEqual(
- expect.arrayContaining([
- expect.arrayContaining([
- {
- userId: 1,
- deletedAt: date,
- },
- ]),
- ]),
- )
- })
- })
-
- describe('confirm delete with error', () => {
- beforeEach(async () => {
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
- await wrapper.find('button').trigger('click')
- await wrapper.vm.$nextTick()
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Oh no!')
- })
- })
+ },
+ global: {
+ plugins: [store],
+ mocks: {
+ $t: mockT,
+ },
+ },
})
})
- describe('recover user', () => {
- beforeEach(() => {
- wrapper.setProps({
- item: {
+ it('shows removeNotSelf message', () => {
+ expect(wrapper.text()).toBe('removeNotSelf')
+ })
+
+ it('does not show any button', () => {
+ expect(wrapper.find('button').exists()).toBe(false)
+ })
+ })
+
+ describe('deleteUserMutation', () => {
+ beforeEach(() => {
+ mockMutate.mockResolvedValue({
+ data: {
+ deleteUser: date,
+ },
+ })
+ })
+
+ it('calls the mutation with correct parameters', async () => {
+ await wrapper.vm.deleteUserMutation()
+ expect(mockMutate).toHaveBeenCalledWith({
+ mutation: deleteUser,
+ variables: {
+ userId: 1,
+ },
+ })
+ })
+
+ it('emits update-deleted-at with correct data on success', async () => {
+ await wrapper.vm.deleteUserMutation()
+ expect(wrapper.emitted('update-deleted-at')).toEqual([
+ [
+ {
userId: 1,
deletedAt: date,
},
- })
+ ],
+ ])
+ })
+
+ it('calls toastError on failure', async () => {
+ const error = new Error('Delete failed')
+ mockMutate.mockRejectedValueOnce(error)
+ await wrapper.vm.deleteUserMutation()
+ expect(mockToastError).toHaveBeenCalledWith('Delete failed')
+ })
+ })
+
+ describe('undeleteUserMutation', () => {
+ beforeEach(() => {
+ mockMutate.mockResolvedValue({
+ data: {
+ unDeleteUser: null,
+ },
})
+ })
- it('shows the text "undelete_user"', () => {
- expect(wrapper.text()).toBe('undelete_user')
+ it('calls the mutation with correct parameters', async () => {
+ await wrapper.vm.undeleteUserMutation()
+ expect(mockMutate).toHaveBeenCalledWith({
+ mutation: unDeleteUser,
+ variables: {
+ userId: 1,
+ },
})
+ })
- it('has a "undelete_user" button', () => {
- expect(wrapper.find('button').text()).toBe('undelete_user')
- })
+ it('emits update-deleted-at with correct data on success', async () => {
+ await wrapper.vm.undeleteUserMutation()
+ expect(wrapper.emitted('update-deleted-at')).toEqual([
+ [
+ {
+ userId: 1,
+ deletedAt: null,
+ },
+ ],
+ ])
+ })
- describe('click on "undelete_user" button', () => {
- beforeEach(async () => {
- apolloMutateMock.mockResolvedValue({
- data: {
- unDeleteUser: null,
- },
- })
- spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
- spy.mockImplementation(() => Promise.resolve(true))
- await wrapper.find('button').trigger('click')
- await wrapper.vm.$nextTick()
- })
-
- it('calls the modal', () => {
- expect(wrapper.emitted('showUndeleteModal'))
- expect(spy).toHaveBeenCalled()
- })
-
- describe('confirm recover with success', () => {
- it('calls the API', () => {
- expect(apolloMutateMock).toBeCalledWith(
- expect.objectContaining({
- mutation: unDeleteUser,
- variables: {
- userId: 1,
- },
- }),
- )
- })
-
- it('emits update deleted At', () => {
- expect(wrapper.emitted('updateDeletedAt')).toMatchObject(
- expect.arrayContaining([
- expect.arrayContaining([
- {
- userId: 1,
- deletedAt: null,
- },
- ]),
- ]),
- )
- })
- })
-
- describe('confirm recover with error', () => {
- beforeEach(async () => {
- apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
- await wrapper.find('button').trigger('click')
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Oh no!')
- })
- })
- })
+ it('calls toastError on failure', async () => {
+ const error = new Error('Undelete failed')
+ mockMutate.mockRejectedValueOnce(error)
+ await wrapper.vm.undeleteUserMutation()
+ expect(mockToastError).toHaveBeenCalledWith('Undelete failed')
})
})
})
diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index 2160f82e1..1cf535582 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -1,128 +1,97 @@
{{ $t('creation_form.form') }}
-
+
diff --git a/admin/src/components/CreationTransactionList.spec.js b/admin/src/components/CreationTransactionList.spec.js
index 394cfd9ea..4b6b43b66 100644
--- a/admin/src/components/CreationTransactionList.spec.js
+++ b/admin/src/components/CreationTransactionList.spec.js
@@ -1,139 +1,104 @@
import { mount } from '@vue/test-utils'
-import CreationTransactionList from './CreationTransactionList'
-import { toastErrorSpy } from '../../test/testSetup'
-import VueApollo from 'vue-apollo'
-import { createMockClient } from 'mock-apollo-client'
-import { adminListContributions } from '../graphql/adminListContributions'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import CreationTransactionList from './CreationTransactionList.vue'
+import { useQuery } from '@vue/apollo-composable'
+import { adminListContributionsShort } from '../graphql/adminListContributions.graphql'
+import { useI18n } from 'vue-i18n'
+import { useAppToast } from '@/composables/useToast'
-const mockClient = createMockClient()
-const apolloProvider = new VueApollo({
- defaultClient: mockClient,
-})
-
-const localVue = global.localVue
-localVue.use(VueApollo)
-
-const defaultData = () => {
- return {
- adminListContributions: {
- contributionCount: 2,
- contributionList: [
- {
- id: 1,
- firstName: 'Bibi',
- lastName: 'Bloxberg',
- userId: 99,
- email: 'bibi@bloxberg.de',
- amount: 500,
- memo: 'Danke für alles',
- date: new Date(),
- moderator: 1,
- status: 'PENDING',
- creation: [500, 500, 500],
- messagesCount: 0,
- deniedBy: null,
- deniedAt: null,
- confirmedBy: null,
- confirmedAt: null,
- contributionDate: new Date(),
- deletedBy: null,
- deletedAt: null,
- updatedAt: null,
- updatedBy: null,
- createdAt: new Date(),
- moderatorId: null,
- },
- {
- id: 2,
- firstName: 'Räuber',
- lastName: 'Hotzenplotz',
- userId: 100,
- email: 'raeuber@hotzenplotz.de',
- amount: 1000000,
- memo: 'Gut Ergattert',
- date: new Date(),
- moderator: 1,
- status: 'PENDING',
- creation: [500, 500, 500],
- messagesCount: 0,
- deniedBy: null,
- deniedAt: null,
- confirmedBy: null,
- confirmedAt: new Date(),
- contributionDate: new Date(),
- deletedBy: null,
- deletedAt: null,
- updatedAt: null,
- updatedBy: null,
- createdAt: new Date(),
- moderatorId: null,
- },
- ],
- },
- }
-}
-
-const mocks = {
- $d: jest.fn((t) => t),
- $t: jest.fn((t) => t),
-}
-
-const propsData = {
- userId: 1,
- fields: ['createdAt', 'contributionDate', 'confirmedAt', 'amount', 'memo'],
-}
+vi.mock('@vue/apollo-composable')
+vi.mock('vue-i18n')
+vi.mock('@/composables/useToast')
describe('CreationTransactionList', () => {
let wrapper
+ const mockResult = vi.fn()
+ const mockRefetch = vi.fn()
+ const mockT = vi.fn((key) => key)
+ const mockD = vi.fn((date) => date.toISOString())
+ const mockToastError = vi.fn()
- const adminListContributionsMock = jest.fn()
- mockClient.setRequestHandler(
- adminListContributions,
- adminListContributionsMock
- .mockRejectedValueOnce({ message: 'Ouch!' })
- .mockResolvedValue({ data: defaultData() }),
- )
-
- const Wrapper = () => {
- return mount(CreationTransactionList, { localVue, mocks, propsData, apolloProvider })
- }
-
- describe('mount', () => {
- beforeEach(() => {
- jest.clearAllMocks()
- wrapper = Wrapper()
+ beforeEach(() => {
+ useQuery.mockReturnValue({
+ result: mockResult,
+ refetch: mockRefetch,
})
- describe('server error', () => {
- it('toast error', () => {
- expect(toastErrorSpy).toBeCalledWith('Ouch!')
- })
+ useI18n.mockReturnValue({
+ t: mockT,
+ d: mockD,
})
- describe('sever success', () => {
- it('sends query to Apollo when created', () => {
- expect(adminListContributionsMock).toBeCalledWith({
- currentPage: 1,
- pageSize: 10,
- order: 'DESC',
- userId: 1,
- })
- })
+ useAppToast.mockReturnValue({
+ toastError: mockToastError,
+ })
- it('has two values for the transaction', () => {
- expect(wrapper.find('tbody').findAll('tr').length).toBe(2)
- })
-
- describe('watch currentPage', () => {
- beforeEach(async () => {
- jest.clearAllMocks()
- await wrapper.setData({ currentPage: 2 })
- })
-
- it('returns the string in normal order if reversed property is not true', () => {
- expect(wrapper.vm.currentPage).toBe(2)
- })
- })
+ wrapper = mount(CreationTransactionList, {
+ props: {
+ userId: 1,
+ },
+ global: {
+ stubs: {
+ BTable: true,
+ BPagination: true,
+ BButton: true,
+ BCollapse: true,
+ },
+ directives: {
+ 'b-toggle': {},
+ },
+ },
})
})
+
+ it('renders the component', () => {
+ expect(wrapper.find('.component-creation-transaction-list').exists()).toBe(true)
+ })
+
+ it('initializes with correct data', () => {
+ expect(wrapper.vm.currentPage).toBe(1)
+ expect(wrapper.vm.perPage).toBe(10)
+ expect(wrapper.vm.items).toEqual([])
+ expect(wrapper.vm.rows).toBe(0)
+ })
+
+ it('calls useQuery with correct parameters', () => {
+ expect(useQuery).toHaveBeenCalled()
+ const call = useQuery.mock.calls[0]
+ expect(call[0]).toBe(adminListContributionsShort)
+ expect(call[1]).toEqual(
+ expect.objectContaining({
+ filter: {
+ userId: 1,
+ },
+ paginated: {
+ currentPage: expect.any(Number),
+ pageSize: expect.any(Number),
+ order: 'DESC',
+ },
+ }),
+ )
+ })
+
+ it('refetches data when currentPage changes', async () => {
+ wrapper.vm.currentPage = 2
+ await wrapper.vm.$nextTick()
+ expect(mockRefetch).toHaveBeenCalled()
+ })
+
+ it('formats fields correctly', () => {
+ const fields = wrapper.vm.fields
+ expect(fields).toHaveLength(6)
+ expect(fields[0].key).toBe('createdAt')
+ expect(fields[1].key).toBe('contributionDate')
+ expect(fields[2].key).toBe('confirmedAt')
+ expect(fields[3].key).toBe('status')
+ expect(fields[4].key).toBe('amount')
+ expect(fields[5].key).toBe('memo')
+ })
+
+ it('formats amount correctly', () => {
+ const amountField = wrapper.vm.fields.find((f) => f.key === 'amount')
+ expect(amountField.formatter(100)).toBe('100 GDD')
+ })
})
diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index 5ce3f0644..09dd41901 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -1,118 +1,117 @@
-
-
-
-
-
- {{ $t('creation_form.reset') }}
-
-
-
-
-
-
+
+
+
+
-
-
+ />
+
+
-
-
-
-
-
-
+
+
+
+
-
+
-
-
- {{ $t('creation_form.update_creation') }}
-
-
- {{ $t('creation_form.submit_creation') }}
-
-
- {{ $t('transactionlist.title') }}
-
{{ $d(new Date(data.item.contributionDate), 'month') }}
{{ $d(new Date(data.item.contributionDate)) }}
-
- {{ $t('help.help') }}
-
+ />
+ {{ t('help.help') }}
+
+
- {{ $t('transactionlist.submitted') }} {{ $t('math.equals') }}
- {{ $t('help.transactionlist.submitted') }}
+ {{ t('transactionlist.submitted') }} {{ t('math.equals') }}
+ {{ t('help.transactionlist.submitted') }}
- {{ $t('transactionlist.period') }} {{ $t('math.equals') }}
- {{ $t('help.transactionlist.periods') }}
+ {{ t('transactionlist.period') }} {{ t('math.equals') }}
+ {{ t('help.transactionlist.periods') }}
- {{ $t('transactionlist.confirmed') }} {{ $t('math.equals') }}
- {{ $t('help.transactionlist.confirmed') }}
+ {{ t('transactionlist.confirmed') }} {{ t('math.equals') }}
+ {{ t('help.transactionlist.confirmed') }}
- {{ $t('transactionlist.status') }} {{ $t('math.equals') }}
- {{ $t('help.transactionlist.status') }}
+ {{ t('transactionlist.status') }} {{ t('math.equals') }}
+ {{ t('help.transactionlist.status') }}
-
-
+
+
+
+
diff --git a/admin/src/components/input/LabeledInput.vue b/admin/src/components/input/LabeledInput.vue
new file mode 100644
index 000000000..920fceacd
--- /dev/null
+++ b/admin/src/components/input/LabeledInput.vue
@@ -0,0 +1,45 @@
+
+
+
+
diff --git a/admin/src/components/input/ValidatedInput.vue b/admin/src/components/input/ValidatedInput.vue
new file mode 100644
index 000000000..2ee340eec
--- /dev/null
+++ b/admin/src/components/input/ValidatedInput.vue
@@ -0,0 +1,86 @@
+
+
+
+ {{ errorMessage }}
+
+
+
+
+
diff --git a/admin/src/composables/useCreationMonths.js b/admin/src/composables/useCreationMonths.js
new file mode 100644
index 000000000..b2ea5ab81
--- /dev/null
+++ b/admin/src/composables/useCreationMonths.js
@@ -0,0 +1,70 @@
+import { ref, computed, watch } from 'vue'
+import { adminOpenCreations } from '../graphql/adminOpenCreations'
+import { useQuery } from '@vue/apollo-composable'
+import { useI18n } from 'vue-i18n'
+import toast from 'bootstrap/js/src/toast'
+
+export default () => {
+ const { d } = useI18n()
+
+ const creation = ref([1000, 1000, 1000])
+ const userId = ref(0)
+
+ const creationDates = computed(() => {
+ const now = new Date(Date.now())
+ const dates = [now]
+ for (let i = 1; i < 3; i++) {
+ dates.push(new Date(now.getFullYear(), now.getMonth() - i, 1))
+ }
+ return dates.reverse()
+ })
+
+ const creationDateObjects = computed(() => {
+ const result = []
+ creationDates.value.forEach((date) => {
+ result.push({
+ short: d(date, 'month'),
+ long: d(date, 'long'),
+ year: d(date, 'year'),
+ date: d(date, 'short', 'en'),
+ })
+ })
+ return result
+ })
+
+ const radioOptions = () => {
+ return creationDateObjects.value.map((obj, idx) => {
+ return {
+ item: { ...obj, creation: creation.value[idx] },
+ name: obj.short + (creation.value[idx] ? ' ' + creation.value[idx] + ' GDD' : ''),
+ }
+ })
+ }
+
+ const creationLabel = () => {
+ return creationDates.value.map((date) => d(date, 'monthShort')).join(' | ')
+ }
+
+ const { result, error } = useQuery(adminOpenCreations, { userId }, { fetchPolicy: 'no-cache' })
+
+ watch(result, (newResult) => {
+ if (newResult && newResult.adminOpenCreations) {
+ creation.value = newResult.adminOpenCreations.map((obj) => obj.amount)
+ }
+ })
+
+ watch(error, (err) => {
+ if (err) {
+ toast.error(err.message)
+ }
+ })
+
+ return {
+ creation,
+ userId,
+ creationDates,
+ creationDateObjects,
+ radioOptions,
+ creationLabel,
+ }
+}
diff --git a/admin/src/composables/useDateFormatter.js b/admin/src/composables/useDateFormatter.js
new file mode 100644
index 000000000..8f3c85bfe
--- /dev/null
+++ b/admin/src/composables/useDateFormatter.js
@@ -0,0 +1,10 @@
+export const useDateFormatter = () => {
+ const formatDateFromDateTime = (datetimeString) => {
+ if (!datetimeString || !datetimeString?.includes('T')) return datetimeString
+ return datetimeString.split('T')[0]
+ }
+
+ return {
+ formatDateFromDateTime,
+ }
+}
diff --git a/admin/src/composables/useDateLocale.js b/admin/src/composables/useDateLocale.js
new file mode 100644
index 000000000..ccd8fc953
--- /dev/null
+++ b/admin/src/composables/useDateLocale.js
@@ -0,0 +1,10 @@
+import { useI18n } from 'vue-i18n'
+import { de, enUS as en, fr, es, nl } from 'date-fns/locale'
+
+const locales = { en, de, es, fr, nl }
+
+export function useDateLocale() {
+ const { locale } = useI18n()
+ const dateLocale = locales[locale.value] || en
+ return dateLocale
+}
diff --git a/admin/src/composables/useToast.js b/admin/src/composables/useToast.js
new file mode 100644
index 000000000..f9000210f
--- /dev/null
+++ b/admin/src/composables/useToast.js
@@ -0,0 +1,41 @@
+import { useI18n } from 'vue-i18n'
+import { useToastController } from 'bootstrap-vue-next'
+
+export function useAppToast() {
+ const { t } = useI18n()
+ const { show } = useToastController()
+ const toastSuccess = (message) => {
+ toast(message, {
+ title: t('success'),
+ variant: 'success',
+ })
+ }
+
+ const toastError = (message) => {
+ toast(message, {
+ title: t('error'),
+ variant: 'danger',
+ })
+ }
+
+ const toast = (message, options = {}) => {
+ if (message.replace) message = message.replace(/^GraphQL error: /, '')
+ options = {
+ solid: true,
+ toaster: 'b-toaster-top-right',
+ headerClass: 'gdd-toaster-title',
+ bodyClass: 'gdd-toaster-body',
+ toastClass: 'gdd-toaster',
+ ...options,
+ body: message,
+ }
+
+ show({ props: { ...options } })
+ }
+
+ return {
+ toastSuccess,
+ toastError,
+ toast,
+ }
+}
diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index 708815398..5e3192733 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -4,20 +4,28 @@
// Load Package Details for some default values
const pkg = require('../../package')
-const constants = {
- CONFIG_VERSION: {
- DEFAULT: 'DEFAULT',
- EXPECTED: 'v2.2024-01-04',
- CURRENT: '',
- },
-}
-
const version = {
+ ADMIN_MODULE_PROTOCOL: process.env.ADMIN_MODULE_PROTOCOL ?? 'http',
+ ADMIN_MODULE_HOST: process.env.ADMIN_MODULE_HOST ?? '0.0.0.0',
+ ADMIN_MODULE_PORT: process.env.ADMIN_MODULE_PORT ?? '8080',
APP_VERSION: pkg.version,
- BUILD_COMMIT: process.env.BUILD_COMMIT ?? null,
+ BUILD_COMMIT: process.env.BUILD_COMMIT ?? undefined,
// self reference of `version.BUILD_COMMIT` is not possible at this point, hence the duplicate code
BUILD_COMMIT_SHORT: (process.env.BUILD_COMMIT ?? '0000000').slice(0, 7),
- PORT: process.env.PORT ?? 8080,
+}
+
+let ADMIN_MODULE_URL
+// in case of hosting the admin module with a nodejs-instance
+if (process.env.ADMIN_HOSTING === 'nodejs') {
+ ADMIN_MODULE_URL =
+ version.ADMIN_MODULE_PROTOCOL +
+ '://' +
+ version.ADMIN_MODULE_HOST +
+ ':' +
+ version.ADMIN_MODULE_PORT
+} else {
+ // in case of hosting the admin module with a nginx
+ ADMIN_MODULE_URL = version.ADMIN_MODULE_PROTOCOL + '://' + version.ADMIN_MODULE_HOST
}
const environment = {
@@ -26,42 +34,38 @@ const environment = {
PRODUCTION: process.env.NODE_ENV === 'production' ?? false,
}
-const COMMUNITY_HOST = process.env.COMMUNITY_HOST ?? undefined
-const URL_PROTOCOL = process.env.URL_PROTOCOL ?? 'http'
-const COMMUNITY_URL =
- COMMUNITY_HOST && URL_PROTOCOL ? URL_PROTOCOL + '://' + COMMUNITY_HOST : undefined
-const WALLET_URL = process.env.WALLET_URL ?? COMMUNITY_URL ?? 'http://localhost'
+// const COMMUNITY_HOST = process.env.COMMUNITY_HOST ?? undefined
+// const URL_PROTOCOL = process.env.URL_PROTOCOL ?? 'http'
+// const COMMUNITY_URL =
+// COMMUNITY_HOST && URL_PROTOCOL ? URL_PROTOCOL + '://' + COMMUNITY_HOST : undefined
+const COMMUNITY_URL = process.env.COMMUNITY_URL ?? ADMIN_MODULE_URL
+const WALLET_URL = process.env.WALLET_URL ?? COMMUNITY_URL ?? 'http://0.0.0.0'
const endpoints = {
- GRAPHQL_URL:
- (process.env.GRAPHQL_URL ?? COMMUNITY_URL ?? 'http://localhost:4000') +
- process.env.GRAPHQL_PATH ?? '/graphql',
- WALLET_AUTH_URL: WALLET_URL + (process.env.WALLET_AUTH_PATH ?? '/authenticate?token={token}'),
+ GRAPHQL_URI: process.env.GRAPHQL_URL ?? COMMUNITY_URL + (process.env.GRAPHQL_PATH ?? '/graphql'),
+ WALLET_AUTH_URL: WALLET_URL + (process.env.WALLET_AUTH_PATH ?? '/authenticate?token='),
WALLET_LOGIN_URL: WALLET_URL + (process.env.WALLET_LOGIN_PATH ?? '/login'),
}
const debug = {
DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true' ?? false,
}
-
-// Check config version
-constants.CONFIG_VERSION.CURRENT = process.env.CONFIG_VERSION ?? constants.CONFIG_VERSION.DEFAULT
-if (
- ![constants.CONFIG_VERSION.EXPECTED, constants.CONFIG_VERSION.DEFAULT].includes(
- constants.CONFIG_VERSION.CURRENT,
- )
-) {
- throw new Error(
- `Fatal: Config Version incorrect - expected "${constants.CONFIG_VERSION.EXPECTED}" or "${constants.CONFIG_VERSION.DEFAULT}", but found "${constants.CONFIG_VERSION.CURRENT}"`,
- )
+const humhub = {
+ HUMHUB_ACTIVE: process.env.HUMHUB_ACTIVE === 'true' || false,
+ HUMHUB_API_URL: process.env.HUMHUB_API_URL ?? COMMUNITY_URL + '/community/',
}
+const OPENAI_ACTIVE = process.env.OPENAI_ACTIVE === 'true' ?? false
+
const CONFIG = {
- ...constants,
...version,
...environment,
...endpoints,
...debug,
+ OPENAI_ACTIVE,
+ ...humhub,
+ ADMIN_MODULE_URL,
+ COMMUNITY_URL,
}
module.exports = CONFIG
diff --git a/admin/src/config/schema.js b/admin/src/config/schema.js
new file mode 100644
index 000000000..5e81434e5
--- /dev/null
+++ b/admin/src/config/schema.js
@@ -0,0 +1,112 @@
+const {
+ APP_VERSION,
+ BUILD_COMMIT,
+ BUILD_COMMIT_SHORT,
+ COMMUNITY_URL,
+ DEBUG,
+ GRAPHQL_URI,
+ HUMHUB_ACTIVE,
+ HUMHUB_API_URL,
+ NODE_ENV,
+ OPENAI_ACTIVE,
+ PRODUCTION,
+} = require('gradido-config/build/src/commonSchema.js')
+const Joi = require('joi')
+
+module.exports = Joi.object({
+ APP_VERSION,
+ BUILD_COMMIT,
+ BUILD_COMMIT_SHORT,
+ COMMUNITY_URL,
+ DEBUG,
+ GRAPHQL_URI,
+ HUMHUB_ACTIVE,
+ HUMHUB_API_URL,
+ NODE_ENV,
+ OPENAI_ACTIVE,
+ PRODUCTION,
+
+ ADMIN_HOSTING: Joi.string()
+ .valid('nodejs', 'nginx')
+ .description('set to `nodejs` if admin is hosted by vite with a own nodejs instance')
+ .optional(),
+
+ ADMIN_MODULE_URL: Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .when('COMMUNITY_URL', {
+ is: Joi.exist(),
+ then: Joi.optional(), // not required if COMMUNITY_URL is provided
+ otherwise: Joi.required(), // required if COMMUNITY_URL is missing
+ })
+ .description("Base Url for reaching admin in browser, only needed if COMMUNITY_URL wasn't set")
+ .optional(), // optional in general, but conditionally required
+
+ ADMIN_MODULE_PROTOCOL: Joi.string()
+ .when('ADMIN_HOSTING', {
+ is: Joi.valid('nodejs'),
+ then: Joi.valid('http').required(),
+ otherwise: Joi.valid('http', 'https').required(),
+ })
+ .description(
+ `
+ Protocol for admin module hosting
+ - it has to be the same as for backend api url and frontend to prevent mixed block errors,
+ - if admin is served with nodejs:
+ is have to be http or setup must be updated to include a ssl certificate
+ `,
+ )
+ .default('http')
+ .required(),
+
+ ADMIN_MODULE_HOST: Joi.alternatives()
+ .try(
+ Joi.string().valid('localhost').messages({ 'any.invalid': 'Must be localhost' }),
+ Joi.string()
+ .ip({ version: ['ipv4'] })
+ .messages({ 'string.ip': 'Must be a valid IPv4 address' }),
+ Joi.string().domain().messages({ 'string.domain': 'Must be a valid domain' }),
+ )
+ .when('ADMIN_HOSTING', {
+ is: 'nodejs',
+ then: Joi.required(),
+ otherwise: Joi.optional(),
+ })
+ .when('COMMUNITY_URL', {
+ is: null,
+ then: Joi.required(),
+ otherwise: Joi.optional(),
+ })
+ .description(
+ 'Host (domain, IPv4, or localhost) for the admin, default is 0.0.0.0 for local hosting during develop',
+ )
+ .default('0.0.0.0'),
+
+ ADMIN_MODULE_PORT: Joi.number()
+ .integer()
+ .min(1024)
+ .max(49151)
+ .description('Port for hosting Admin with Vite as a Node.js instance, default: 8080')
+ .default(8080)
+ .when('ADMIN_HOSTING', {
+ is: 'nodejs',
+ then: Joi.required(),
+ otherwise: Joi.optional(),
+ }),
+
+ WALLET_AUTH_URL: Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .description('Extern Url from wallet-frontend for forwarding from admin')
+ .default('http://0.0.0.0/authenticate?token=')
+ .required(),
+
+ WALLET_LOGIN_URL: Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .description('Extern Url from wallet-frontend for forwarding after logout')
+ .default('http://0.0.0.0/login')
+ .required(),
+
+ DEBUG_DISABLE_AUTH: Joi.boolean()
+ .description('Flag for disable authorization during development')
+ .default(false)
+ .optional(), // true is only allowed in not-production setup
+})
diff --git a/admin/src/graphql/adminListContributions.graphql b/admin/src/graphql/adminListContributions.graphql
new file mode 100644
index 000000000..cb696a51b
--- /dev/null
+++ b/admin/src/graphql/adminListContributions.graphql
@@ -0,0 +1,70 @@
+#import './fragments.graphql'
+
+query adminListContributions(
+ $filter: SearchContributionsFilterArgs
+ $paginated: Paginated
+) {
+ adminListContributions(paginated: $paginated, filter: $filter) {
+ contributionCount
+ contributionList {
+ id
+ user {
+ emailContact {
+ email
+ }
+ ...UserCommonFields
+ humhubUsername
+ createdAt
+ }
+ amount
+ memo
+ createdAt
+ contributionDate
+ confirmedAt
+ confirmedBy
+ updatedAt
+ updatedBy
+ status
+ messagesCount
+ deniedAt
+ deniedBy
+ deletedAt
+ deletedBy
+ moderatorId
+ userId
+ resubmissionAt
+ }
+ }
+}
+
+query adminListContributionsShort(
+ $filter: SearchContributionsFilterArgs
+ $paginated: Paginated
+) {
+ adminListContributions(
+ paginated: $paginated,
+ filter: $filter
+ ) {
+ contributionCount
+ contributionList {
+ id
+ amount
+ memo
+ createdAt
+ contributionDate
+ confirmedAt
+ status
+ }
+ }
+}
+
+
+query adminListContributionsCount(
+ $filter: SearchContributionsFilterArgs
+) {
+ adminListContributions(
+ filter: $filter
+ ) {
+ contributionCount
+ }
+}
diff --git a/admin/src/graphql/adminListContributions.js b/admin/src/graphql/adminListContributions.js
deleted file mode 100644
index aa6c0c713..000000000
--- a/admin/src/graphql/adminListContributions.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import gql from 'graphql-tag'
-
-export const adminListContributions = gql`
- query (
- $currentPage: Int = 1
- $pageSize: Int = 25
- $order: Order = DESC
- $statusFilter: [ContributionStatus!]
- $userId: Int
- $query: String
- $noHashtag: Boolean
- $hideResubmission: Boolean
- ) {
- adminListContributions(
- currentPage: $currentPage
- pageSize: $pageSize
- order: $order
- statusFilter: $statusFilter
- userId: $userId
- query: $query
- noHashtag: $noHashtag
- hideResubmission: $hideResubmission
- ) {
- contributionCount
- contributionList {
- id
- firstName
- lastName
- amount
- memo
- createdAt
- contributionDate
- confirmedAt
- confirmedBy
- updatedAt
- updatedBy
- status
- messagesCount
- deniedAt
- deniedBy
- deletedAt
- deletedBy
- moderatorId
- userId
- resubmissionAt
- }
- }
- }
-`
diff --git a/admin/src/graphql/aiChat.graphql b/admin/src/graphql/aiChat.graphql
new file mode 100644
index 000000000..30f7c7f82
--- /dev/null
+++ b/admin/src/graphql/aiChat.graphql
@@ -0,0 +1,17 @@
+#import './fragments.graphql'
+
+mutation sendMessage($input: OpenaiMessage!) {
+ sendMessage(input: $input) {
+ ...AiChatMessageFields
+ }
+}
+
+mutation deleteThread($threadId: String!) {
+ deleteThread(threadId: $threadId)
+}
+
+query resumeChat {
+ resumeChat {
+ ...AiChatMessageFields
+ }
+}
\ No newline at end of file
diff --git a/admin/src/graphql/allCommunities.js b/admin/src/graphql/allCommunities.js
new file mode 100644
index 000000000..c2ccdd15e
--- /dev/null
+++ b/admin/src/graphql/allCommunities.js
@@ -0,0 +1,30 @@
+import gql from 'graphql-tag'
+
+export const allCommunities = gql`
+ query {
+ allCommunities {
+ foreign
+ url
+ publicKey
+ uuid
+ authenticatedAt
+ name
+ description
+ gmsApiKey
+ location
+ creationDate
+ createdAt
+ updatedAt
+ federatedCommunities {
+ id
+ apiVersion
+ endPoint
+ lastAnnouncedAt
+ verifiedAt
+ lastErrorAt
+ createdAt
+ updatedAt
+ }
+ }
+ }
+`
diff --git a/admin/src/graphql/createContributionLink.js b/admin/src/graphql/createContributionLink.js
index fb6728243..47b522aba 100644
--- a/admin/src/graphql/createContributionLink.js
+++ b/admin/src/graphql/createContributionLink.js
@@ -9,7 +9,6 @@ export const createContributionLink = gql`
$memo: String!
$cycle: String!
$maxPerCycle: Int! = 1
- $maxAmountPerMonth: Decimal
) {
createContributionLink(
validFrom: $validFrom
@@ -19,7 +18,6 @@ export const createContributionLink = gql`
memo: $memo
cycle: $cycle
maxPerCycle: $maxPerCycle
- maxAmountPerMonth: $maxAmountPerMonth
) {
link
}
diff --git a/admin/src/graphql/fragments.graphql b/admin/src/graphql/fragments.graphql
new file mode 100644
index 000000000..113e15606
--- /dev/null
+++ b/admin/src/graphql/fragments.graphql
@@ -0,0 +1,36 @@
+
+fragment SpaceFields on Space {
+ id
+ name
+ description
+ url
+}
+
+fragment PaginationFields on Pagination {
+ total
+ page
+ pages
+}
+
+fragment ProjectBrandingCommonFields on ProjectBranding {
+ id
+ name
+ alias
+ description
+ spaceId
+ newUserToSpace
+ logoUrl
+}
+
+fragment AiChatMessageFields on ChatGptMessage {
+ content
+ role
+ threadId
+}
+
+fragment UserCommonFields on User {
+ id
+ firstName
+ lastName
+ alias
+}
diff --git a/admin/src/graphql/getCommunities.js b/admin/src/graphql/getCommunities.js
deleted file mode 100644
index ccf894f6b..000000000
--- a/admin/src/graphql/getCommunities.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import gql from 'graphql-tag'
-
-export const getCommunities = gql`
- query {
- getCommunities {
- id
- foreign
- publicKey
- url
- lastAnnouncedAt
- verifiedAt
- lastErrorAt
- createdAt
- updatedAt
- }
- }
-`
diff --git a/admin/src/graphql/projectBranding.graphql b/admin/src/graphql/projectBranding.graphql
new file mode 100644
index 000000000..98f38dab0
--- /dev/null
+++ b/admin/src/graphql/projectBranding.graphql
@@ -0,0 +1,35 @@
+#import './fragments.graphql'
+
+query projectBrandings {
+ projectBrandings {
+ ...ProjectBrandingCommonFields
+ }
+}
+
+mutation upsertProjectBranding($input: ProjectBrandingInput!) {
+ upsertProjectBranding(input: $input) {
+ ...ProjectBrandingCommonFields
+ }
+}
+
+mutation deleteProjectBranding($id: ID!) {
+ deleteProjectBranding(id: $id)
+}
+
+query spaces($page: Int!, $limit: Int!) {
+ spaces(page: $page, limit: $limit) {
+ pagination {
+ ...PaginationFields
+ }
+ results {
+ ...SpaceFields
+ }
+ }
+}
+
+query spaceWithNameAndDescription($id: ID!) {
+ space(id: $id) {
+ name
+ description
+ }
+}
\ No newline at end of file
diff --git a/admin/src/graphql/updateContributionLink.js b/admin/src/graphql/updateContributionLink.js
index 24824bd86..21cfd7f45 100644
--- a/admin/src/graphql/updateContributionLink.js
+++ b/admin/src/graphql/updateContributionLink.js
@@ -8,7 +8,6 @@ export const updateContributionLink = gql`
$cycle: String!
$validFrom: String
$validTo: String
- $maxAmountPerMonth: Decimal
$maxPerCycle: Int! = 1
$id: Int!
) {
@@ -19,7 +18,6 @@ export const updateContributionLink = gql`
cycle: $cycle
validFrom: $validFrom
validTo: $validTo
- maxAmountPerMonth: $maxAmountPerMonth
maxPerCycle: $maxPerCycle
id: $id
) {
@@ -32,7 +30,6 @@ export const updateContributionLink = gql`
createdAt
validFrom
validTo
- maxAmountPerMonth
cycle
maxPerCycle
}
diff --git a/admin/src/graphql/updateHomeCommunity.js b/admin/src/graphql/updateHomeCommunity.js
new file mode 100644
index 000000000..a05cb7fd8
--- /dev/null
+++ b/admin/src/graphql/updateHomeCommunity.js
@@ -0,0 +1,9 @@
+import gql from 'graphql-tag'
+
+export const updateHomeCommunity = gql`
+ mutation ($uuid: String!, $gmsApiKey: String, $location: Location) {
+ updateHomeCommunity(uuid: $uuid, gmsApiKey: $gmsApiKey, location: $location) {
+ id
+ }
+ }
+`
diff --git a/admin/src/i18n.js b/admin/src/i18n.js
index b2bb08074..050d6dacd 100644
--- a/admin/src/i18n.js
+++ b/admin/src/i18n.js
@@ -1,20 +1,6 @@
-import Vue from 'vue'
-import VueI18n from 'vue-i18n'
-
-Vue.use(VueI18n)
-
-const loadLocaleMessages = () => {
- const locales = require.context('./locales/', true, /[A-Za-z0-9-_,\s]+\.json$/i)
- const messages = {}
- locales.keys().forEach((key) => {
- const matched = key.match(/([A-Za-z0-9-_]+)\./i)
- if (matched && matched.length > 1) {
- const locale = matched[1]
- messages[locale] = locales(key)
- }
- })
- return messages
-}
+import { createI18n } from 'vue-i18n'
+import de from './locales/de.json'
+import en from './locales/en.json'
const numberFormats = {
en: {
@@ -45,7 +31,7 @@ const numberFormats = {
},
}
-const dateTimeFormats = {
+const datetimeFormats = {
en: {
short: {
year: 'numeric',
@@ -96,12 +82,13 @@ const dateTimeFormats = {
},
}
-const i18n = new VueI18n({
+const i18n = createI18n({
locale: 'en',
+ legacy: false,
fallbackLocale: 'en',
- messages: loadLocaleMessages(),
+ messages: { de, en },
numberFormats,
- dateTimeFormats,
+ datetimeFormats,
})
export default i18n
diff --git a/admin/src/i18n.test.js b/admin/src/i18n.test.js
index e39e0e824..50bb60626 100644
--- a/admin/src/i18n.test.js
+++ b/admin/src/i18n.test.js
@@ -1,29 +1,86 @@
-import i18n from './i18n'
-import VueI18n from 'vue-i18n'
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import { createI18n } from 'vue-i18n'
+import de from './locales/de.json'
+import en from './locales/en.json'
-jest.mock('vue-i18n')
+vi.mock('vue-i18n')
+vi.mock('./locales/de.json', () => ({ default: { test: 'Test DE' } }))
+vi.mock('./locales/en.json', () => ({ default: { test: 'Test EN' } }))
describe('i18n', () => {
- it('calls i18n with locale en', () => {
- expect(VueI18n).toBeCalledWith(
- expect.objectContaining({
+ beforeEach(() => {
+ vi.clearAllMocks()
+ vi.resetModules()
+ })
+
+ it('creates i18n instance with correct configuration', async () => {
+ const mockCreateI18n = vi.mocked(createI18n)
+ mockCreateI18n.mockReturnValue({
+ global: {
locale: 'en',
- }),
- )
- })
-
- it('calls i18n with fallback locale en', () => {
- expect(VueI18n).toBeCalledWith(
- expect.objectContaining({
fallbackLocale: 'en',
+ t: vi.fn(),
+ d: vi.fn(),
+ n: vi.fn(),
+ },
+ })
+
+ const i18n = (await import('./i18n')).default
+
+ expect(mockCreateI18n).toHaveBeenCalledWith({
+ locale: 'en',
+ legacy: false,
+ fallbackLocale: 'en',
+ messages: { de, en },
+ numberFormats: expect.any(Object),
+ datetimeFormats: expect.any(Object),
+ })
+
+ expect(i18n.global.t).toBeDefined()
+ expect(i18n.global.d).toBeDefined()
+ expect(i18n.global.n).toBeDefined()
+ })
+
+ it('configures number formats correctly', async () => {
+ const mockCreateI18n = vi.mocked(createI18n)
+ await import('./i18n')
+
+ const callArg = mockCreateI18n.mock.calls[0][0]
+ expect(callArg.numberFormats).toEqual(
+ expect.objectContaining({
+ en: expect.objectContaining({
+ decimal: expect.any(Object),
+ ungroupedDecimal: expect.any(Object),
+ }),
+ de: expect.objectContaining({
+ decimal: expect.any(Object),
+ ungroupedDecimal: expect.any(Object),
+ }),
}),
)
})
- it('has a _t function', () => {
- expect(i18n).toEqual(
+ it('configures datetime formats correctly', async () => {
+ const mockCreateI18n = vi.mocked(createI18n)
+ await import('./i18n')
+
+ const callArg = mockCreateI18n.mock.calls[0][0]
+ expect(callArg.datetimeFormats).toEqual(
expect.objectContaining({
- _t: expect.anything(),
+ en: expect.objectContaining({
+ short: expect.any(Object),
+ long: expect.any(Object),
+ monthShort: expect.any(Object),
+ month: expect.any(Object),
+ year: expect.any(Object),
+ }),
+ de: expect.objectContaining({
+ short: expect.any(Object),
+ long: expect.any(Object),
+ monthShort: expect.any(Object),
+ month: expect.any(Object),
+ year: expect.any(Object),
+ }),
}),
)
})
diff --git a/admin/src/layouts/defaultLayout.vue b/admin/src/layouts/defaultLayout.vue
index 9fbc7b8ed..ab7c45120 100644
--- a/admin/src/layouts/defaultLayout.vue
+++ b/admin/src/layouts/defaultLayout.vue
@@ -10,7 +10,7 @@
import NavBar from '@/components/NavBar'
import ContentFooter from '@/components/ContentFooter'
export default {
- name: 'defaultLayout',
+ name: 'DefaultLayout',
components: {
NavBar,
ContentFooter,
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 7cc0affac..51e7c351b 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -1,14 +1,25 @@
{
"GDD": "GDD",
+ "actions": "Aktionen",
+ "ai": {
+ "chat": "Chat",
+ "chat-open": "Chat öffnen",
+ "chat-clear": "Chat-Verlauf löschen",
+ "chat-placeholder": "Schreibe eine Nachricht...",
+ "chat-placeholder-loading": "Warte, ich denke nach...",
+ "chat-thread-deleted": "Chatverlauf gelöscht",
+ "error-chat-thread-deleted": "Fehler beim Löschen des Chatverlaufs: {error}",
+ "start-prompt": "Sprache: Deutsch\nTonfall: Freundlich, per Du\nKontext: Du bist \"Crea\", ein Support-Assistent im Admin-Interface des Gradido-Kontos. Deine Aufgabe ist es, Moderatoren bei der Bearbeitung von Gemeinwohl-Beiträgen zu unterstützen.\nBegrüßung:\n\"Hallo, ich bin Crea! Ich unterstütze Dich bei der Beantwortung der eingereichten Gemeinwohl-Beiträge. Damit ich Deine Antworten personalisieren kann, nenne mir bitte Deinen Namen. 😊\"\nWarte nun die Eingabe des Namens ab!\nNach Eingabe des Namens:\n\"Danke, [Name]! Schön, mit Dir zusammenzuarbeiten. 😊 Kopiere nun bitte einen oder mehrere Gemeinwohl-Beiträge in das Textfeld, und ich helfe Dir bei der Bearbeitung.\""
+ },
+ "alias": "Alias",
"all_emails": "Alle Nutzer",
"back": "zurück",
"change_user_role": "Nutzerrolle ändern",
- "chat": "Chat",
+ "close": "Schließen",
"contributionLink": {
"amount": "Betrag",
"changeSaved": "Änderungen gespeichert",
"clear": "Löschen",
- "close": "Schließen",
"contributionLinks": "Beitragslinks",
"create": "Anlegen",
"cycle": "Zyklus",
@@ -33,7 +44,8 @@
"validTo": "Enddatum"
},
"contributionMessagesForm": {
- "resubmissionDateInPast": "Wiedervorlage Datum befindet sich in der Vergangenheit!"
+ "resubmissionDateInPast": "Wiedervorlage Datum befindet sich in der Vergangenheit!",
+ "hasRegisteredAt": "hat sich am {createdAt} registriert."
},
"contributions": {
"all": "Alle",
@@ -42,6 +54,8 @@
"denied": "Abgelehnt",
"open": "Offen"
},
+ "copied-to-clipboard": "In die Zwischenablage kopiert",
+ "copy-to-clipboard": "In die Zwischenablage kopieren",
"created": "Geschöpft",
"createdAt": "Angelegt",
"creation": "Schöpfung",
@@ -68,16 +82,34 @@
"deleted": "gelöscht",
"deleted_user": "Alle gelöschten Nutzer",
"deny": "Ablehnen",
+ "description": "Beschreibung",
+ "details": "Details",
"e_mail": "E-Mail",
+ "edit": "bearbeiten",
"enabled": "aktiviert",
"error": "Fehler",
"expired": "abgelaufen",
"federation": {
+ "apiVersion": "API Version",
+ "authenticatedAt": "Verifiziert am:",
+ "communityUuid": "Community UUID:",
+ "coordinates": "Koordinaten:",
"createdAt": "Erstellt am",
+ "gmsApiKey": "GMS API Key:",
+ "toast_gmsApiKeyAndLocationUpdated": "Der GMS Api Key und die Location wurden erfolgreich aktualisiert!",
+ "toast_gmsApiKeyUpdated": "Der GMS Api Key wurde erfolgreich aktualisiert!",
+ "toast_gmsLocationUpdated": "Die GMS Location wurde erfolgreich aktualisiert!",
"gradidoInstances": "Gradido Instanzen",
"lastAnnouncedAt": "letzte Bekanntgabe",
+ "lastErrorAt": "Letzer Fehler am",
+ "name": "Name",
+ "publicKey": "PublicKey:",
"url": "Url",
- "verified": "Verifiziert"
+ "verified": "Verifiziert",
+ "verifiedAt": "Verifiziert am"
+ },
+ "filter": {
+ "byEmail": "Nach E-Mail filtern"
},
"firstname": "Vorname",
"footer": {
@@ -91,6 +123,18 @@
"form": {
"cancel": "Abbrechen"
},
+ "geo-coordinates": {
+ "both-or-none": "Bitte beide oder keine eingeben!",
+ "format": "{latitude}, {longitude}",
+ "label": "Geo-Koordinaten",
+ "latitude-longitude-smart": {
+ "describe": "Teilt Koordinaten im Format 'Breitengrad, Längengrad' automatisch auf. Fügen sie hier einfach z.B. ihre Koordinaten von Google Maps, zum Beispiel: 49.28187664243721, 9.740672183943639, ein."
+ }
+ },
+ "goTo": {
+ "userSearch": "Zur Nutzersuche gehen",
+ "humhubProfile": "Zum Humhub Profil gehen"
+ },
"help": {
"help": "Hilfe",
"transactionlist": {
@@ -104,13 +148,18 @@
"hide_resubmission": "Wiedervorlage verbergen",
"hide_resubmission_tooltip": "Verbirgt alle Schöpfungen für die ein Moderator ein Erinnerungsdatum festgelegt hat.",
"lastname": "Nachname",
+ "latitude": "Breitengrad:",
+ "latitude-longitude-smart": "Breitengrad, Längengrad",
+ "link": "Link",
+ "logo": "Logo",
+ "longitude": "Längengrad:",
"math": {
"equals": "=",
"pipe": "|",
"plus": "+"
},
"message": {
- "request": "Die Anfrage wurde gesendet."
+ "request": "Die Eingabe wurde gespeichert."
},
"moderator": {
"history": "Die Daten wurden geändert. Dies sind die alten Daten.",
@@ -131,6 +180,8 @@
"instances": "Instanzen",
"logout": "Abmelden",
"my-account": "Mein Konto",
+ "projectBranding": "Projekt Branding",
+ "projectBrandingTooltip": "Nutze ein eigenes Logo im Gradido Login und füge neue Benutzer einem Humhub-Space hinzu",
"statistic": "Statistik",
"user_search": "Nutzersuche"
},
@@ -175,9 +226,26 @@
"yes": "Ja, Nutzer wiederherstellen"
}
},
+ "projectBranding": {
+ "addTooltip": "Neuen Projekt Branding Eintrag hinzufügen",
+ "chosenSpace": "Gewählter Space: {space}",
+ "created": "Neuer Projekt Branding Eintrag wurde erstellt.",
+ "error": "Fehler beim Erstellen des Projekt Branding Eintrags: {message}",
+ "noAccessRightSpace": "Gewählter Space: {spaceId} (Keine Zugriffsrechte)",
+ "openSpaceInHumhub": "In Humhub öffnen",
+ "spaceId": "Humhub Space ID",
+ "selectSpace": "Humhub Space auswählen",
+ "title": "Projekt Brandings",
+ "updated": "Projekt Branding Eintrag wurde aktualisiert.",
+ "newUserToSpace": "Benutzer hinzufügen?",
+ "newUserToSpaceTooltip": "Neue Benutzer automatisch zum Space hinzufügen, falls Space vorhanden"
+ },
"redeemed": "eingelöst",
+ "registered": "Registriert",
"removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
+ "reset": "Zurücksetzen",
"save": "Speichern",
+ "send": "Senden",
"statistic": {
"activeUsers": "Aktive Mitglieder",
"count": "Menge",
@@ -223,6 +291,7 @@
"selectRoles": {
"admin": "Administrator",
"moderator": "Moderator",
+ "moderatorAi": "KI-Moderator",
"user": "einfacher Nutzer"
},
"successfullyChangedTo": "Nutzer ist jetzt „{role}“.",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 084e2104f..070c2fc20 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -1,14 +1,25 @@
{
"GDD": "GDD",
+ "actions": "Actions",
+ "ai": {
+ "chat": "Chat",
+ "chat-open": "Open chat",
+ "chat-clear": "Clear chat",
+ "chat-placeholder": "Type your message here...",
+ "chat-placeholder-loading": "Wait, I think...",
+ "chat-thread-deleted": "Chat thread has been deleted",
+ "error-chat-thread-deleted": "Error while deleting chat thread: {error}",
+ "start-prompt": "Language: English\nTone of voice: Friendly, on a first-name basis\nContext: You are \"Crea\", a support assistant in the admin interface of the Gradido account. Your task is to support moderators in editing contributions for the common good.\nGreeting:\n\"Hello, I'm Crea! I support you in answering the contributions for the common good. So that I can personalize your answers, please tell me your name. 😊\"\nNow wait for the name to be entered!\nAfter entering the name:\n\"Thank you, [name]! Nice to work with you. 😊 Now please copy one or more contributions for the common good into the text field and I'll help you edit them.\""
+ },
+ "alias": "Alias",
"all_emails": "All users",
"back": "back",
"change_user_role": "Change user role",
- "chat": "Chat",
+ "close": "Close",
"contributionLink": {
"amount": "Amount",
"changeSaved": "Changes saved",
"clear": "Clear",
- "close": "Close",
"contributionLinks": "Contribution Links",
"create": "Create",
"cycle": "Cycle",
@@ -33,7 +44,8 @@
"validTo": "End-Date"
},
"contributionMessagesForm": {
- "resubmissionDateInPast": "Resubmission date is in the past!"
+ "resubmissionDateInPast": "Resubmission date is in the past!",
+ "hasRegisteredAt": "registered on {createdAt}."
},
"contributions": {
"all": "All",
@@ -42,6 +54,8 @@
"denied": "Rejected",
"open": "Open"
},
+ "copied-to-clipboard": "Copied to clipboard",
+ "copy-to-clipboard": "Copy to clipboard",
"created": "Created for",
"createdAt": "Created at",
"creation": "Creation",
@@ -68,16 +82,34 @@
"deleted": "deleted",
"deleted_user": "All deleted user",
"deny": "Reject",
+ "description": "Description",
+ "details": "Details",
"e_mail": "E-mail",
+ "edit": "edit",
"enabled": "enabled",
"error": "Error",
"expired": "expired",
"federation": {
+ "apiVersion": "API Version",
+ "authenticatedAt": "verified at:",
+ "communityUuid": "Community UUID:",
+ "coordinates": "Coordinates:",
"createdAt": "Created At ",
+ "gmsApiKey": "GMS API Key:",
+ "toast_gmsApiKeyAndLocationUpdated": "The GMS Api Key and the location have been successfully updated!",
+ "toast_gmsApiKeyUpdated": "The GMS Api Key has been successfully updated!",
+ "toast_gmsLocationUpdated": "The GMS location has been successfully updated!",
"gradidoInstances": "Gradido Instances",
"lastAnnouncedAt": "Last Announced",
+ "lastErrorAt": "last error at",
+ "name": "Name",
+ "publicKey": "PublicKey:",
"url": "Url",
- "verified": "Verified"
+ "verified": "Verified",
+ "verifiedAt": "Verified at"
+ },
+ "filter": {
+ "byEmail": "Filter by email"
},
"firstname": "Firstname",
"footer": {
@@ -91,6 +123,18 @@
"form": {
"cancel": "Cancel"
},
+ "geo-coordinates": {
+ "both-or-none": "Please enter both or none!",
+ "label": "geo-coordinates",
+ "format": "{latitude}, {longitude}",
+ "latitude-longitude-smart": {
+ "describe": "Automatically splits coordinates in the format 'latitude, longitude'. Simply enter your coordinates from Google Maps here, for example: 49.28187664243721, 9.740672183943639."
+ }
+ },
+ "goTo": {
+ "userSearch": "Go to user search",
+ "humhubProfile": "Go to Humhub profile"
+ },
"help": {
"help": "Help",
"transactionlist": {
@@ -104,13 +148,18 @@
"hide_resubmission": "Hide resubmission",
"hide_resubmission_tooltip": "Hides all creations for which a moderator has set a reminder date.",
"lastname": "Lastname",
+ "latitude": "Latitude:",
+ "latitude-longitude-smart": "Latitude, Longitude",
+ "link": "Link",
+ "logo": "Logo",
+ "longitude": "Longitude:",
"math": {
"equals": "=",
"pipe": "|",
"plus": "+"
},
"message": {
- "request": "Request has been sent."
+ "request": "The entry has been saved."
},
"moderator": {
"history": "The data has been changed. This is the old data.",
@@ -131,6 +180,8 @@
"instances": "Instances",
"logout": "Logout",
"my-account": "My Account",
+ "projectBranding": "Project Branding",
+ "projectBrandingTooltip": "Use your own logo in the Gradido login and add new users to a Humhub space",
"statistic": "Statistic",
"user_search": "User search"
},
@@ -175,9 +226,26 @@
"yes": "Yes,undelete user"
}
},
+ "projectBranding": {
+ "addTooltip": "Add new project branding entry",
+ "chosenSpace": "Choosen Humhub Space: {space}",
+ "created": "New project branding entry has been created.",
+ "error": "Error when creating the project branding entry: {message}",
+ "noAccessRightSpace": "Selected space: {spaceId} (No access rights)",
+ "openSpaceInHumhub": "Open in Humhub",
+ "spaceId": "Humhub Space ID",
+ "selectSpace": "Select Humhub Space",
+ "title": "Project Branding",
+ "updated": "Project branding entry has been updated.",
+ "newUserToSpace": "Add user?",
+ "newUserToSpaceTooltip": "The hours should contain a maximum of two decimal places"
+ },
"redeemed": "redeemed",
+ "registered": "Registered",
"removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
- "save": "Speichern",
+ "reset": "Reset",
+ "save": "Save",
+ "send": "Send",
"statistic": {
"activeUsers": "Active members",
"count": "Count",
@@ -223,6 +291,7 @@
"selectRoles": {
"admin": "administrator",
"moderator": "moderator",
+ "moderatorAi": "ai-moderator",
"user": "usual user"
},
"successfullyChangedTo": "User is now \"{role}\".",
diff --git a/admin/src/locales/index.test.js b/admin/src/locales/index.test.js
index 1abcadbec..142ab5133 100644
--- a/admin/src/locales/index.test.js
+++ b/admin/src/locales/index.test.js
@@ -1,12 +1,20 @@
+import { describe, it, expect, beforeEach } from 'vitest'
import locales from './index.js'
describe('locales', () => {
- it('should contain 2 locales', () => {
- expect(locales).toHaveLength(2)
+ let localeCopy
+
+ beforeEach(() => {
+ localeCopy = [...locales] // Create a copy to avoid modifying the original
+ })
+
+ it('should contain exactly 2 locales', () => {
+ expect(localeCopy).toHaveLength(2)
})
it('should contain a German locale', () => {
- expect(locales).toContainEqual(
+ const germanLocale = localeCopy.find((locale) => locale.code === 'de')
+ expect(germanLocale).toEqual(
expect.objectContaining({
name: 'Deutsch',
code: 'de',
@@ -15,4 +23,54 @@ describe('locales', () => {
}),
)
})
+
+ it('should contain an English locale', () => {
+ const englishLocale = localeCopy.find((locale) => locale.code === 'en')
+ expect(englishLocale).toEqual(
+ expect.objectContaining({
+ name: 'English',
+ code: 'en',
+ iso: 'en-US',
+ enabled: true,
+ }),
+ )
+ })
+
+ it('should have unique code and iso values for each locale', () => {
+ const codes = localeCopy.map((locale) => locale.code)
+ const isos = localeCopy.map((locale) => locale.iso)
+ expect(new Set(codes).size).toBe(localeCopy.length)
+ expect(new Set(isos).size).toBe(localeCopy.length)
+ })
+
+ it('should have all locales enabled', () => {
+ expect(localeCopy.every((locale) => locale.enabled)).toBe(true)
+ })
+
+ it('should have valid ISO codes', () => {
+ const isoRegex = /^[a-z]{2}-[A-Z]{2}$/
+ expect(localeCopy.every((locale) => isoRegex.test(locale.iso))).toBe(true)
+ })
+
+ it('should have matching language codes in code and iso properties', () => {
+ localeCopy.forEach((locale) => {
+ expect(locale.code).toBe(locale.iso.split('-')[0])
+ })
+ })
+
+ it('should have name property as a non-empty string', () => {
+ localeCopy.forEach((locale) => {
+ expect(typeof locale.name).toBe('string')
+ expect(locale.name.length).toBeGreaterThan(0)
+ })
+ })
+
+ it('should not have any additional unexpected properties', () => {
+ const expectedProps = ['name', 'code', 'iso', 'enabled']
+ localeCopy.forEach((locale) => {
+ const localeProps = Object.keys(locale)
+ expect(localeProps).toEqual(expect.arrayContaining(expectedProps))
+ expect(localeProps.length).toBe(expectedProps.length)
+ })
+ })
})
diff --git a/admin/src/main.js b/admin/src/main.js
index 6a8b017c5..fd1964516 100644
--- a/admin/src/main.js
+++ b/admin/src/main.js
@@ -1,5 +1,5 @@
-import Vue from 'vue'
-import App from './App'
+import { createApp } from 'vue'
+import App from './App.vue'
// without this async calls are not working
import 'regenerator-runtime'
@@ -11,36 +11,36 @@ import addNavigationGuards from './router/guards'
import i18n from './i18n'
-import VueApollo from 'vue-apollo'
-
import PortalVue from 'portal-vue'
-import { BootstrapVue, IconsPlugin } from 'bootstrap-vue'
-import 'bootstrap/dist/css/bootstrap.css'
-import 'bootstrap-vue/dist/bootstrap-vue.css'
+import { createBootstrap } from 'bootstrap-vue-next'
-import { toasters } from './mixins/toaster'
+// Add the necessary CSS
+import 'bootstrap/dist/css/bootstrap.css'
+import 'bootstrap-vue-next/dist/bootstrap-vue-next.css'
import { apolloProvider } from './plugins/apolloProvider'
-Vue.use(PortalVue)
-Vue.use(BootstrapVue)
+export function createAdminApp() {
+ const app = createApp(App)
-Vue.use(IconsPlugin)
+ app.use(router)
+ app.use(store)
-Vue.use(VueApollo)
+ i18n.global.locale.value =
+ store.state.moderator && store.state.moderator.language ? store.state.moderator.language : 'en'
-Vue.mixin(toasters)
+ app.use(i18n)
+ app.use(PortalVue)
+ app.use(createBootstrap())
-addNavigationGuards(router, store, apolloProvider.defaultClient, i18n)
+ app.use(() => apolloProvider)
-i18n.locale =
- store.state.moderator && store.state.moderator.language ? store.state.moderator.language : 'en'
+ addNavigationGuards(router, store, apolloProvider.defaultClient, i18n)
+ return app
+}
-new Vue({
- router,
- store,
- i18n,
- apolloProvider,
- render: (h) => h(App),
-}).$mount('#app')
+if (process.env.NODE_ENV !== 'test') {
+ const app = createAdminApp()
+ app.mount('#app')
+}
diff --git a/admin/src/main.test.js b/admin/src/main.test.js
index 20ee70741..b34773d3c 100644
--- a/admin/src/main.test.js
+++ b/admin/src/main.test.js
@@ -1,110 +1,70 @@
-import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost'
-import './main'
-import CONFIG from './config'
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import { createApp } from 'vue'
+import { createAdminApp } from '../src/main'
-import Vue from 'vue'
-import VueApollo from 'vue-apollo'
-import i18n from './i18n'
-import { BootstrapVue, IconsPlugin } from 'bootstrap-vue'
-import store from './store/store'
-import router from './router/router'
+// Mock dependencies
+vi.mock('vue', () => ({
+ createApp: vi.fn(() => ({
+ use: vi.fn(),
+ mixin: vi.fn(),
+ mount: vi.fn(),
+ })),
+}))
-jest.mock('vue')
-jest.mock('vue-apollo')
-jest.mock('vuex')
-jest.mock('vue-i18n')
-jest.mock('./store/store', () => {
- return {
- state: {
- moderator: {
- language: 'es',
- },
+vi.mock('./App.vue', () => ({ default: {} }))
+vi.mock('./store/store', () => ({
+ default: {
+ state: { moderator: { language: 'en' } },
+ },
+}))
+vi.mock('./router/router', () => ({ default: {} }))
+vi.mock('./router/guards', () => ({ default: vi.fn() }))
+vi.mock('./i18n', () => ({
+ default: {
+ global: {
+ locale: { value: 'en' },
},
- }
-})
-jest.mock('./i18n')
-jest.mock('./router/router')
+ },
+}))
+vi.mock('portal-vue', () => ({ default: {} }))
+vi.mock('bootstrap-vue-next', () => ({ createBootstrap: vi.fn() }))
+vi.mock('./mixins/toaster', () => ({ toasters: {} }))
+vi.mock('./plugins/apolloProvider', () => ({ apolloProvider: { defaultClient: {} } }))
-jest.mock('apollo-boost', () => {
- return {
- __esModule: true,
- ApolloClient: jest.fn(),
- ApolloLink: jest.fn(() => {
- return { concat: jest.fn() }
- }),
- InMemoryCache: jest.fn(),
- HttpLink: jest.fn(),
- }
-})
+describe('main.js', () => {
+ let app
-jest.mock('bootstrap-vue', () => {
- return {
- __esModule: true,
- BootstrapVue: jest.fn(),
- IconsPlugin: jest.fn(() => {
- return { concat: jest.fn() }
- }),
- }
-})
-
-describe('main', () => {
- it('calls the HttpLink', () => {
- expect(HttpLink).toBeCalledWith({ uri: CONFIG.GRAPHQL_URI })
+ beforeEach(() => {
+ vi.resetModules()
+ vi.clearAllMocks()
+ app = createAdminApp()
})
- it('calls the ApolloLink', () => {
- expect(ApolloLink).toBeCalled()
+ it('creates a Vue app', () => {
+ expect(createApp).toHaveBeenCalledWith(expect.anything())
})
- it('calls the ApolloClient', () => {
- expect(ApolloClient).toBeCalled()
+ it('uses the router plugin', () => {
+ expect(app.use).toHaveBeenCalled()
})
- it('calls the InMemoryCache', () => {
- expect(InMemoryCache).toBeCalled()
+ it('uses the Vuex store', () => {
+ expect(app.use).toHaveBeenCalled()
})
- it('calls the VueApollo', () => {
- expect(VueApollo).toBeCalled()
+ it('uses i18n plugin', () => {
+ expect(app.use).toHaveBeenCalled()
})
- it('calls Vue', () => {
- expect(Vue).toBeCalled()
+ it('uses PortalVue plugin', () => {
+ expect(app.use).toHaveBeenCalled()
})
- it('calls i18n', () => {
- expect(Vue).toBeCalledWith(
- expect.objectContaining({
- i18n,
- }),
- )
+ it('uses Bootstrap Vue plugin', () => {
+ expect(app.use).toHaveBeenCalled()
})
- it('calls BootstrapVue', () => {
- expect(Vue.use).toBeCalledWith(BootstrapVue)
- })
-
- it('calls IconsPlugin', () => {
- expect(Vue.use).toBeCalledWith(IconsPlugin)
- })
-
- it('creates a store', () => {
- expect(Vue).toBeCalledWith(
- expect.objectContaining({
- store,
- }),
- )
- })
-
- it('creates a router', () => {
- expect(Vue).toBeCalledWith(
- expect.objectContaining({
- router,
- }),
- )
- })
-
- it('sets the locale from store', () => {
- expect(i18n.locale).toBe('es')
+ it('uses Apollo provider', () => {
+ expect(app.use).toHaveBeenCalled()
})
})
diff --git a/admin/src/mixins/creationMonths.js b/admin/src/mixins/creationMonths.js
deleted file mode 100644
index 57e0ab17e..000000000
--- a/admin/src/mixins/creationMonths.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import { adminOpenCreations } from '../graphql/adminOpenCreations'
-
-export const creationMonths = {
- data() {
- return {
- creation: [1000, 1000, 1000],
- userId: 0,
- }
- },
- computed: {
- creationDates() {
- const now = new Date(Date.now())
- const dates = [now]
- for (let i = 1; i < 3; i++) {
- dates.push(new Date(now.getFullYear(), now.getMonth() - i, 1))
- }
- return dates.reverse()
- },
- creationDateObjects() {
- const result = []
- this.creationDates.forEach((date) => {
- result.push({
- short: this.$d(date, 'month'),
- long: this.$d(date, 'short'),
- year: this.$d(date, 'year'),
- date: this.$d(date, 'short', 'en'),
- })
- })
- return result
- },
- radioOptions() {
- return this.creationDateObjects.map((obj, idx) => {
- return {
- item: { ...obj, creation: this.creation[idx] },
- name: obj.short + (this.creation[idx] ? ' ' + this.creation[idx] + ' GDD' : ''),
- }
- })
- },
- creationLabel() {
- return this.creationDates.map((date) => this.$d(date, 'monthShort')).join(' | ')
- },
- },
- apollo: {
- OpenCreations: {
- query() {
- return adminOpenCreations
- },
- variables() {
- return {
- userId: this.userId,
- }
- },
- fetchPolicy: 'no-cache',
- update({ adminOpenCreations }) {
- this.creation = adminOpenCreations.map((obj) => obj.amount)
- },
- error({ message }) {
- this.toastError(message)
- },
- },
- },
-}
diff --git a/admin/src/mixins/toaster.js b/admin/src/mixins/toaster.js
deleted file mode 100644
index 2db632a81..000000000
--- a/admin/src/mixins/toaster.js
+++ /dev/null
@@ -1,30 +0,0 @@
-export const toasters = {
- methods: {
- toastSuccess(message) {
- this.toast(message, {
- title: this.$t('success'),
- variant: 'success',
- })
- },
- toastError(message) {
- this.toast(message, {
- title: this.$t('error'),
- variant: 'danger',
- })
- },
- toast(message, options) {
- // for unit tests, check that replace is present
- if (message.replace) message = message.replace(/^GraphQL error: /, '')
- this.$root.$bvToast.toast(message, {
- autoHideDelay: 5000,
- appendToast: true,
- solid: true,
- toaster: 'b-toaster-top-right',
- headerClass: 'gdd-toaster-title',
- bodyClass: 'gdd-toaster-body',
- toastClass: 'gdd-toaster',
- ...options,
- })
- },
- },
-}
diff --git a/admin/src/mixins/toggleRowDetails.js b/admin/src/mixins/toggleRowDetails.js
deleted file mode 100644
index cdfca1334..000000000
--- a/admin/src/mixins/toggleRowDetails.js
+++ /dev/null
@@ -1,34 +0,0 @@
-export const toggleRowDetails = {
- data() {
- return {
- slotIndex: 0,
- openRow: null,
- creationUserData: {},
- }
- },
- methods: {
- rowToggleDetails(row, index) {
- if (this.openRow) {
- if (this.openRow.index === row.index) {
- if (index === this.slotIndex) {
- row.toggleDetails()
- this.openRow = null
- } else {
- this.slotIndex = index
- }
- } else {
- this.openRow.toggleDetails()
- row.toggleDetails()
- this.slotIndex = index
- this.openRow = row
- this.creationUserData = row.item
- }
- } else {
- row.toggleDetails()
- this.slotIndex = index
- this.openRow = row
- this.creationUserData = row.item
- }
- },
- },
-}
diff --git a/admin/src/mixins/toggleRowDetails.test.js b/admin/src/mixins/toggleRowDetails.test.js
deleted file mode 100644
index 22bf7b925..000000000
--- a/admin/src/mixins/toggleRowDetails.test.js
+++ /dev/null
@@ -1,141 +0,0 @@
-import { toggleRowDetails } from './toggleRowDetails'
-import { mount } from '@vue/test-utils'
-
-const localVue = global.localVue
-
-const Component = {
- render() {},
- mixins: [toggleRowDetails],
-}
-
-const toggleDetailsMock = jest.fn()
-const secondToggleDetailsMock = jest.fn()
-
-const row = {
- toggleDetails: toggleDetailsMock,
- index: 0,
- item: {
- data: 'item-data',
- },
-}
-
-let wrapper
-
-describe('toggleRowDetails', () => {
- beforeEach(() => {
- jest.clearAllMocks()
- wrapper = mount(Component, { localVue })
- })
-
- it('sets default data', () => {
- expect(wrapper.vm.slotIndex).toBe(0)
- expect(wrapper.vm.openRow).toBe(null)
- expect(wrapper.vm.creationUserData).toEqual({})
- })
-
- describe('no open row', () => {
- beforeEach(() => {
- wrapper.vm.rowToggleDetails(row, 2)
- })
-
- it('calls toggleDetails', () => {
- expect(toggleDetailsMock).toBeCalled()
- })
-
- it('updates slot index', () => {
- expect(wrapper.vm.slotIndex).toBe(2)
- })
-
- it('updates open row', () => {
- expect(wrapper.vm.openRow).toEqual(
- expect.objectContaining({
- index: 0,
- item: {
- data: 'item-data',
- },
- }),
- )
- })
-
- it('updates creation user data', () => {
- expect(wrapper.vm.creationUserData).toEqual({ data: 'item-data' })
- })
- })
-
- describe('with open row', () => {
- beforeEach(() => {
- wrapper.setData({ openRow: row })
- })
-
- describe('row index is open row index', () => {
- describe('index is slot index', () => {
- beforeEach(() => {
- wrapper.vm.rowToggleDetails(row, 0)
- })
-
- it('calls toggleDetails', () => {
- expect(toggleDetailsMock).toBeCalled()
- })
-
- it('sets open row to null', () => {
- expect(wrapper.vm.openRow).toBe(null)
- })
- })
-
- describe('index is not slot index', () => {
- beforeEach(() => {
- wrapper.vm.rowToggleDetails(row, 2)
- })
-
- it('does not call toggleDetails', () => {
- expect(toggleDetailsMock).not.toBeCalled()
- })
-
- it('updates slot index', () => {
- expect(wrapper.vm.slotIndex).toBe(2)
- })
- })
- })
-
- describe('row index is not open row index', () => {
- beforeEach(() => {
- wrapper.vm.rowToggleDetails(
- {
- toggleDetails: secondToggleDetailsMock,
- index: 2,
- item: {
- data: 'new-item-data',
- },
- },
- 2,
- )
- })
-
- it('closes the open row', () => {
- expect(toggleDetailsMock).toBeCalled()
- })
-
- it('opens the new row', () => {
- expect(secondToggleDetailsMock).toBeCalled()
- })
-
- it('updates slot index', () => {
- expect(wrapper.vm.slotIndex).toBe(2)
- })
-
- it('updates open row', () => {
- expect(wrapper.vm.openRow).toEqual({
- toggleDetails: secondToggleDetailsMock,
- index: 2,
- item: {
- data: 'new-item-data',
- },
- })
- })
-
- it('updates creation user data', () => {
- expect(wrapper.vm.creationUserData).toEqual({ data: 'new-item-data' })
- })
- })
- })
-})
diff --git a/admin/src/pages/CommunityStatistic.spec.js b/admin/src/pages/CommunityStatistic.spec.js
index 4dbf5db5b..4eca1eba0 100644
--- a/admin/src/pages/CommunityStatistic.spec.js
+++ b/admin/src/pages/CommunityStatistic.spec.js
@@ -1,100 +1,103 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
import { mount } from '@vue/test-utils'
-import CommunityStatistic from './CommunityStatistic'
-import { communityStatistics } from '@/graphql/communityStatistics.js'
-import { toastErrorSpy } from '../../test/testSetup'
-import VueApollo from 'vue-apollo'
-import { createMockClient } from 'mock-apollo-client'
+import { ref } from 'vue'
+import CommunityStatistic from './CommunityStatistic.vue'
+import StatisticTable from '../components/Tables/StatisticTable.vue'
+import { useAppToast } from '@/composables/useToast'
+import { useQuery } from '@vue/apollo-composable'
-const mockClient = createMockClient()
-const apolloProvider = new VueApollo({
- defaultClient: mockClient,
-})
+vi.mock('@vue/apollo-composable', () => ({
+ useQuery: vi.fn(),
+}))
-const localVue = global.localVue
-localVue.use(VueApollo)
+vi.mock('@/composables/useToast', () => ({
+ useAppToast: vi.fn(),
+}))
-const defaultData = () => {
- return {
- communityStatistics: {
- totalUsers: 3113,
- deletedUsers: 35,
- totalGradidoCreated: '4083774.05000000000000000000',
- totalGradidoDecayed: '-1062639.13634129622923372197',
- dynamicStatisticsFields: {
- activeUsers: 1057,
- totalGradidoAvailable: '2513565.869444365732411569',
- totalGradidoUnbookedDecayed: '-500474.6738366222166261272',
- },
+const defaultData = {
+ communityStatistics: {
+ totalUsers: 3113,
+ deletedUsers: 35,
+ totalGradidoCreated: '4083774.05000000000000000000',
+ totalGradidoDecayed: '-1062639.13634129622923372197',
+ dynamicStatisticsFields: {
+ activeUsers: 1057,
+ totalGradidoAvailable: '2513565.869444365732411569',
+ totalGradidoUnbookedDecayed: '-500474.6738366222166261272',
},
- }
-}
-
-const mocks = {
- $t: jest.fn((t) => t),
- $n: jest.fn((n) => n),
+ },
}
describe('CommunityStatistic', () => {
let wrapper
+ let mockResult
+ let mockError
+ let mockLoading
+ let mockToastError
- const communityStatisticsMock = jest.fn()
+ beforeEach(() => {
+ mockResult = ref(null)
+ mockError = ref(null)
+ mockLoading = ref(false)
+ mockToastError = vi.fn()
- mockClient.setRequestHandler(
- communityStatistics,
- communityStatisticsMock
- .mockRejectedValueOnce({ message: 'Ouch!' })
- .mockResolvedValue({ data: defaultData() }),
- )
-
- const Wrapper = () => {
- return mount(CommunityStatistic, { localVue, mocks, apolloProvider })
- }
-
- describe('mount', () => {
- beforeEach(() => {
- wrapper = Wrapper()
+ vi.mocked(useQuery).mockReturnValue({
+ result: mockResult,
+ loading: mockLoading,
+ error: mockError,
})
- it('renders the Div Element ".community-statistic"', () => {
- expect(wrapper.find('div.community-statistic').exists()).toBe(true)
+ vi.mocked(useAppToast).mockReturnValue({
+ toastError: mockToastError,
})
- describe('server response for get statistics is an error', () => {
- it('toast an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Ouch!')
- })
+ wrapper = mount(CommunityStatistic, {
+ global: {
+ mocks: {
+ $t: (key) => key,
+ $n: (number) => number.toString(),
+ },
+ stubs: {
+ StatisticTable: true,
+ },
+ },
})
+ })
- describe('server response for getting statistics is success', () => {
- it('renders the data correctly', () => {
- expect(wrapper.findAll('tr').at(1).findAll('td').at(1).text()).toEqual('3113')
- expect(wrapper.findAll('tr').at(2).findAll('td').at(1).text()).toEqual('1057')
- expect(wrapper.findAll('tr').at(3).findAll('td').at(1).text()).toEqual('35')
- expect(wrapper.findAll('tr').at(4).findAll('td').at(1).text()).toEqual(
- '4083774.05000000000000000000 GDD',
- )
- expect(wrapper.findAll('tr').at(4).findAll('td').at(2).text()).toEqual(
- '4083774.05000000000000000000',
- )
- expect(wrapper.findAll('tr').at(5).findAll('td').at(1).text()).toEqual(
- '-1062639.13634129622923372197 GDD',
- )
- expect(wrapper.findAll('tr').at(5).findAll('td').at(2).text()).toEqual(
- '-1062639.13634129622923372197',
- )
- expect(wrapper.findAll('tr').at(6).findAll('td').at(1).text()).toEqual(
- '2513565.869444365732411569 GDD',
- )
- expect(wrapper.findAll('tr').at(6).findAll('td').at(2).text()).toEqual(
- '2513565.869444365732411569',
- )
- expect(wrapper.findAll('tr').at(7).findAll('td').at(1).text()).toEqual(
- '-500474.6738366222166261272 GDD',
- )
- expect(wrapper.findAll('tr').at(7).findAll('td').at(2).text()).toEqual(
- '-500474.6738366222166261272',
- )
- })
+ it('renders the component', () => {
+ expect(wrapper.find('.community-statistic').exists()).toBe(true)
+ })
+
+ it('renders StatisticTable when not loading', async () => {
+ mockLoading.value = false
+ await wrapper.vm.$nextTick()
+ expect(wrapper.findComponent(StatisticTable).exists()).toBe(true)
+ })
+
+ it('does not render StatisticTable when loading', async () => {
+ mockLoading.value = true
+ await wrapper.vm.$nextTick()
+ expect(wrapper.findComponent(StatisticTable).exists()).toBe(false)
+ })
+
+ it('calls toastError when there is an error', async () => {
+ mockError.value = new Error('Ouch!')
+ await wrapper.vm.$nextTick()
+ expect(mockToastError).toHaveBeenCalledWith('Ouch!')
+ })
+
+ it('updates statistics when result is available', async () => {
+ mockResult.value = defaultData
+ await wrapper.vm.$nextTick()
+ const statisticTable = wrapper.findComponent(StatisticTable)
+ expect(statisticTable.props('statistics')).toEqual({
+ totalUsers: 3113,
+ deletedUsers: 35,
+ totalGradidoCreated: '4083774.05000000000000000000',
+ totalGradidoDecayed: '-1062639.13634129622923372197',
+ activeUsers: 1057,
+ totalGradidoAvailable: '2513565.869444365732411569',
+ totalGradidoUnbookedDecayed: '-500474.6738366222166261272',
})
})
})
diff --git a/admin/src/pages/CommunityStatistic.vue b/admin/src/pages/CommunityStatistic.vue
index 81e087b45..b72bdb5b0 100644
--- a/admin/src/pages/CommunityStatistic.vue
+++ b/admin/src/pages/CommunityStatistic.vue
@@ -1,44 +1,43 @@
-
- {{ $t('federation.verified') }}
- {{ $t('federation.url') }}
- {{ $t('federation.lastAnnouncedAt') }}
- {{ $t('federation.createdAt') }}
-
-
+
+ {{ $t('federation.verified') }}
+ {{ $t('federation.url') }}
+ {{ $t('federation.name') }}
+ {{ $t('federation.lastAnnouncedAt') }}
+ {{ $t('federation.createdAt') }}
+
+
-
-
+ /test/testSetup.ts'],
@@ -16,6 +16,7 @@ module.exports = {
moduleNameMapper: {
'@/(.*)': '/src/$1',
'@arg/(.*)': '/src/graphql/arg/$1',
+ '@input/(.*)': '/src/graphql/input/$1',
'@dltConnector/(.*)': '/src/apis/dltConnector/$1',
'@enum/(.*)': '/src/graphql/enum/$1',
'@model/(.*)': '/src/graphql/model/$1',
@@ -38,5 +39,10 @@ module.exports = {
process.env.NODE_ENV === 'development'
? '/../database/src/$1'
: '/../database/build/src/$1',
+ '@config/(.*)':
+ // eslint-disable-next-line n/no-process-env
+ process.env.NODE_ENV === 'development'
+ ? '/../config/src/$1'
+ : '/../config/build/$1',
},
}
diff --git a/backend/package.json b/backend/package.json
index 8f70ab11e..2d4756afb 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
{
"name": "gradido-backend",
- "version": "2.2.0",
+ "version": "2.5.1",
"description": "Gradido unified backend providing an API-Service for Gradido Transactions",
"main": "src/index.ts",
"repository": "https://github.com/gradido/gradido/backend",
@@ -18,6 +18,7 @@
"klicktipp": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/util/executeKlicktipp.ts",
"gmsusers": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/gmsUsers.ts",
"gmsuserList": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/gmsUserList.ts",
+ "humhubUserExport": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/apis/humhub/ExportUsers.ts",
"locales": "scripts/sort.sh"
},
"dependencies": {
@@ -32,22 +33,30 @@
"email-templates": "^10.0.1",
"express": "^4.17.1",
"express-slow-down": "^2.0.1",
+ "gradido-config": "file:../config",
"gradido-database": "file:../database",
"graphql": "^15.5.1",
+ "graphql-parse-resolve-info": "^4.13.0",
"graphql-request": "5.0.0",
+ "graphql-type-json": "0.3.2",
"helmet": "^5.1.1",
"i18n": "^0.15.1",
+ "joi": "^17.13.3",
"jose": "^4.14.4",
"lodash.clonedeep": "^4.5.0",
"log4js": "^6.4.6",
"mysql2": "^2.3.0",
"nodemailer": "^6.6.5",
+ "openai": "^4.87.3",
"pug": "^3.0.2",
"random-bigint": "^0.0.1",
"reflect-metadata": "^0.1.13",
- "sodium-native": "^3.3.0",
+ "sodium-native": "^3.4.1",
"type-graphql": "^1.1.1",
- "uuid": "^8.3.2"
+ "typed-rest-client": "^1.8.11",
+ "uuid": "^8.3.2",
+ "workerpool": "^9.2.0",
+ "xregexp": "^5.1.1"
},
"devDependencies": {
"@eslint-community/eslint-plugin-eslint-comments": "^3.2.1",
@@ -56,15 +65,16 @@
"@types/faker": "^5.5.9",
"@types/i18n": "^0.13.4",
"@types/jest": "^27.0.2",
+ "@types/joi": "^17.2.3",
"@types/lodash.clonedeep": "^4.5.6",
- "@types/node": "^16.10.3",
+ "@types/node": "^17.0.21",
"@types/nodemailer": "^6.4.4",
"@types/sodium-native": "^2.3.5",
"@types/uuid": "^8.3.4",
- "@typescript-eslint/eslint-plugin": "^5.57.1",
- "@typescript-eslint/parser": "^5.57.1",
+ "@typescript-eslint/eslint-plugin": "^5.62.0",
+ "@typescript-eslint/parser": "^5.62.0",
"apollo-server-testing": "^2.25.2",
- "eslint": "^8.37.0",
+ "eslint": "^8.57.1",
"eslint-config-prettier": "^8.8.0",
"eslint-config-standard": "^17.0.0",
"eslint-import-resolver-typescript": "^3.5.4",
@@ -84,9 +94,9 @@
"nodemon": "^2.0.7",
"prettier": "^2.8.7",
"ts-jest": "^27.0.5",
- "ts-node": "^10.0.0",
+ "ts-node": "^10.9.2",
"tsconfig-paths": "^3.14.0",
- "typescript": "^4.3.4"
+ "typescript": "^4.9.5"
},
"nodemonConfig": {
"ignore": [
diff --git a/backend/src/apis/ConnectionAgents.ts b/backend/src/apis/ConnectionAgents.ts
new file mode 100644
index 000000000..8ce585242
--- /dev/null
+++ b/backend/src/apis/ConnectionAgents.ts
@@ -0,0 +1,5 @@
+import { Agent } from 'http'
+import { Agent as HttpsAgent } from 'https'
+
+export const httpAgent = new Agent({ keepAlive: true })
+export const httpsAgent = new HttpsAgent({ keepAlive: true })
diff --git a/backend/src/apis/HttpRequest.ts b/backend/src/apis/HttpRequest.ts
index 27578463a..2c7b8b5a1 100644
--- a/backend/src/apis/HttpRequest.ts
+++ b/backend/src/apis/HttpRequest.ts
@@ -7,10 +7,12 @@ import axios from 'axios'
import { LogError } from '@/server/LogError'
import { backendLogger as logger } from '@/server/logger'
+import { httpAgent, httpsAgent } from './ConnectionAgents'
+
export const apiPost = async (url: string, payload: unknown): Promise => {
logger.trace('POST', url, payload)
try {
- const result = await axios.post(url, payload)
+ const result = await axios.post(url, payload, { httpAgent, httpsAgent })
logger.trace('POST-Response', result)
if (result.status !== 200) {
throw new LogError('HTTP Status Error', result.status)
@@ -27,7 +29,7 @@ export const apiPost = async (url: string, payload: unknown): Promise => {
export const apiGet = async (url: string): Promise => {
logger.trace('GET: url=' + url)
try {
- const result = await axios.get(url)
+ const result = await axios.get(url, { httpAgent, httpsAgent })
logger.trace('GET-Response', result)
if (result.status !== 200) {
throw new LogError('HTTP Status Error', result.status)
diff --git a/backend/src/apis/gms/GmsClient.ts b/backend/src/apis/gms/GmsClient.ts
index 46fa64006..9af018e1c 100644
--- a/backend/src/apis/gms/GmsClient.ts
+++ b/backend/src/apis/gms/GmsClient.ts
@@ -4,15 +4,17 @@
/* eslint-disable @typescript-eslint/no-unsafe-argument */
import axios from 'axios'
+import { httpAgent, httpsAgent } from '@/apis/ConnectionAgents'
import { CONFIG } from '@/config'
import { LogError } from '@/server/LogError'
import { backendLogger as logger } from '@/server/logger'
+import { ensureUrlEndsWithSlash } from '@/util/utilities'
import { GmsUser } from './model/GmsUser'
/*
export async function communityList(): Promise {
- const baseUrl = CONFIG.GMS_URL.endsWith('/') ? CONFIG.GMS_URL : CONFIG.GMS_URL.concat('/')
+ const baseUrl = ensureUrlEndsWithSlash(CONFIG.GMS_URL)
const service = 'community/list?page=1&perPage=20'
const config = {
headers: {
@@ -44,7 +46,7 @@ export async function communityList(): Promise {
- const baseUrl = CONFIG.GMS_URL.endsWith('/') ? CONFIG.GMS_URL : CONFIG.GMS_URL.concat('/')
+ const baseUrl = ensureUrlEndsWithSlash(CONFIG.GMS_URL)
const service = 'community-user/list?page=1&perPage=20'
const config = {
headers: {
@@ -80,7 +82,7 @@ export async function userList(): Promise {
}
export async function userByUuid(uuid: string): Promise {
- const baseUrl = CONFIG.GMS_URL.endsWith('/') ? CONFIG.GMS_URL : CONFIG.GMS_URL.concat('/')
+ const baseUrl = ensureUrlEndsWithSlash(CONFIG.GMS_URL)
const service = 'community-user/list?page=1&perPage=20'
const config = {
headers: {
@@ -117,30 +119,109 @@ export async function userByUuid(uuid: string): Promise {
- const baseUrl = CONFIG.GMS_URL.endsWith('/') ? CONFIG.GMS_URL : CONFIG.GMS_URL.concat('/')
- const service = 'community-user'
+ if (CONFIG.GMS_ACTIVE) {
+ const baseUrl = ensureUrlEndsWithSlash(CONFIG.GMS_API_URL)
+ const service = 'community-user'
+ const config = {
+ headers: {
+ accept: 'application/json',
+ language: 'en',
+ timezone: 'UTC',
+ authorization: apiKey,
+ },
+ httpAgent,
+ httpsAgent,
+ }
+ try {
+ const result = await axios.post(baseUrl.concat(service), user, config)
+ logger.debug('POST-Response of community-user:', result)
+ if (result.status !== 200) {
+ throw new LogError('HTTP Status Error in community-user:', result.status, result.statusText)
+ }
+ logger.debug('responseData:', result.data.responseData)
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+ // const gmsUser = JSON.parse(result.data.responseData)
+ // logger.debug('gmsUser:', gmsUser)
+ return true
+ } catch (error: any) {
+ logger.error('Error in post community-user:', error)
+ throw new LogError(error.message)
+ }
+ } else {
+ logger.info('GMS-Communication disabled per ConfigKey GMS_ACTIVE=false!')
+ return false
+ }
+}
+
+export async function updateGmsUser(apiKey: string, user: GmsUser): Promise {
+ if (CONFIG.GMS_ACTIVE) {
+ const baseUrl = ensureUrlEndsWithSlash(CONFIG.GMS_API_URL)
+ const service = 'community-user'
+ const config = {
+ headers: {
+ accept: 'application/json',
+ language: 'en',
+ timezone: 'UTC',
+ authorization: apiKey,
+ },
+ httpAgent,
+ httpsAgent,
+ }
+ try {
+ const result = await axios.patch(baseUrl.concat(service), user, config)
+ logger.debug('PATCH-Response of community-user:', result)
+ if (result.status !== 200) {
+ throw new LogError('HTTP Status Error in community-user:', result.status, result.statusText)
+ }
+ logger.debug('responseData:', result.data.responseData)
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+ // const gmsUser = JSON.parse(result.data.responseData)
+ // logger.debug('gmsUser:', gmsUser)
+ return true
+ } catch (error: any) {
+ logger.error('Error in patch community-user:', error)
+ throw new LogError(error.message)
+ }
+ } else {
+ logger.info('GMS-Communication disabled per ConfigKey GMS_ACTIVE=false!')
+ return false
+ }
+}
+
+export async function verifyAuthToken(
+ // apiKey: string,
+ communityUuid: string,
+ token: string,
+): Promise {
+ const baseUrl = ensureUrlEndsWithSlash(CONFIG.GMS_API_URL)
+ const service = 'verify-auth-token?token='.concat(token).concat('&uuid=').concat(communityUuid)
const config = {
headers: {
accept: 'application/json',
language: 'en',
timezone: 'UTC',
- connection: 'keep-alive',
- authorization: apiKey,
+ // authorization: apiKey,
},
+ httpAgent,
+ httpsAgent,
}
try {
- const result = await axios.post(baseUrl.concat(service), user, config)
- logger.debug('POST-Response of community-user:', result)
+ const result = await axios.get(baseUrl.concat(service), config)
+ logger.debug('GET-Response of verify-auth-token:', result)
if (result.status !== 200) {
- throw new LogError('HTTP Status Error in community-user:', result.status, result.statusText)
+ throw new LogError(
+ 'HTTP Status Error in verify-auth-token:',
+ result.status,
+ result.statusText,
+ )
}
logger.debug('responseData:', result.data.responseData)
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
- // const gmsUser = JSON.parse(result.data.responseData)
- // logger.debug('gmsUser:', gmsUser)
- return true
+ const token: string = result.data.responseData.token
+ logger.debug('verifyAuthToken=', token)
+ return token
} catch (error: any) {
- logger.error('Error in Get community-user:', error)
+ logger.error('Error in verifyAuthToken:', error)
throw new LogError(error.message)
}
}
diff --git a/backend/src/apis/gms/model/GmsUser.ts b/backend/src/apis/gms/model/GmsUser.ts
index 7f7db7660..7dc81432f 100644
--- a/backend/src/apis/gms/model/GmsUser.ts
+++ b/backend/src/apis/gms/model/GmsUser.ts
@@ -1,21 +1,27 @@
import { User as dbUser } from '@entity/User'
-import { GmsPublishLocationType } from '@/graphql/enum/GmsPublishLocationType'
-import { GmsPublishNameType } from '@/graphql/enum/GmsPublishNameType'
+import { PublishNameLogic } from '@/data/PublishName.logic'
+// import { GmsPublishLocationType } from '@/graphql/enum/GmsPublishLocationType'
import { GmsPublishPhoneType } from '@/graphql/enum/GmsPublishPhoneType'
+import { PublishNameType } from '@/graphql/enum/PublishNameType'
export class GmsUser {
constructor(user: dbUser) {
+ const pnLogic = new PublishNameLogic(user)
+
this.userUuid = user.gradidoID
// this.communityUuid = user.communityUuid
+ this.language = user.language
this.email = this.getGmsEmail(user)
this.countryCode = this.getGmsCountryCode(user)
this.mobile = this.getGmsPhone(user)
- this.firstName = this.getGmsFirstName(user)
- this.lastName = this.getGmsLastName(user)
+ const fn = pnLogic.getFirstName(user.gmsPublishName)
+ this.firstName = fn !== '' ? fn : null // getGmsFirstName(user)
+ const ln = pnLogic.getLastName(user.gmsPublishName)
+ this.lastName = ln !== '' ? ln : null // getGmsLastName(user)
this.alias = this.getGmsAlias(user)
- this.type = GmsPublishLocationType.GMS_LOCATION_TYPE_RANDOM
- this.location = null
+ this.type = user.gmsPublishLocation // GmsPublishLocationType.GMS_LOCATION_TYPE_RANDOM
+ this.location = user.location
}
id: number
@@ -27,8 +33,8 @@ export class GmsUser {
status: number
createdAt: Date
updatedAt: Date
- firstName: string | undefined
- lastName: string | undefined
+ firstName: string | null | undefined
+ lastName: string | null | undefined
alias: string | undefined
type: number
address: string | undefined
@@ -43,48 +49,74 @@ export class GmsUser {
if (
user.gmsAllowed &&
user.alias &&
- user.gmsPublishName === GmsPublishNameType.GMS_PUBLISH_NAME_ALIAS_OR_INITALS
+ (user.gmsPublishName as PublishNameType) === PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS
) {
return user.alias
}
- }
-
- private getGmsFirstName(user: dbUser): string | undefined {
if (
user.gmsAllowed &&
- (user.gmsPublishName === GmsPublishNameType.GMS_PUBLISH_NAME_FIRST ||
- user.gmsPublishName === GmsPublishNameType.GMS_PUBLISH_NAME_FIRST_INITIAL ||
- user.gmsPublishName === GmsPublishNameType.GMS_PUBLISH_NAME_FULL)
+ ((!user.alias &&
+ (user.gmsPublishName as PublishNameType) ===
+ PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS) ||
+ (user.gmsPublishName as PublishNameType) === PublishNameType.PUBLISH_NAME_INITIALS)
+ ) {
+ return (
+ this.firstUpperCaseSecondLowerCase(user.firstName) +
+ this.firstUpperCaseSecondLowerCase(user.lastName)
+ )
+ }
+ }
+
+ private getGmsFirstName(user: dbUser): string | null | undefined {
+ if (
+ user.gmsAllowed &&
+ ((user.gmsPublishName as PublishNameType) === PublishNameType.PUBLISH_NAME_FIRST ||
+ (user.gmsPublishName as PublishNameType) === PublishNameType.PUBLISH_NAME_FIRST_INITIAL ||
+ (user.gmsPublishName as PublishNameType) === PublishNameType.PUBLISH_NAME_FULL)
) {
return user.firstName
}
if (
user.gmsAllowed &&
((!user.alias &&
- user.gmsPublishName === GmsPublishNameType.GMS_PUBLISH_NAME_ALIAS_OR_INITALS) ||
- user.gmsPublishName === GmsPublishNameType.GMS_PUBLISH_NAME_INITIALS)
+ (user.gmsPublishName as PublishNameType) ===
+ PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS) ||
+ (user.gmsPublishName as PublishNameType) === PublishNameType.PUBLISH_NAME_INITIALS)
) {
- return user.firstName.substring(0, 1)
+ // return this.firstUpperCaseSecondLowerCase(user.firstName)
+ return null // cause to delete firstname in gms
}
}
- private getGmsLastName(user: dbUser): string | undefined {
- if (user.gmsAllowed && user.gmsPublishName === GmsPublishNameType.GMS_PUBLISH_NAME_FULL) {
+ private getGmsLastName(user: dbUser): string | null | undefined {
+ if (
+ user.gmsAllowed &&
+ (user.gmsPublishName as PublishNameType) === PublishNameType.PUBLISH_NAME_FULL
+ ) {
return user.lastName
}
if (
user.gmsAllowed &&
- ((!user.alias &&
- user.gmsPublishName === GmsPublishNameType.GMS_PUBLISH_NAME_ALIAS_OR_INITALS) ||
- user.gmsPublishName === GmsPublishNameType.GMS_PUBLISH_NAME_FIRST_INITIAL ||
- user.gmsPublishName === GmsPublishNameType.GMS_PUBLISH_NAME_INITIALS)
+ (user.gmsPublishName as PublishNameType) === PublishNameType.PUBLISH_NAME_FIRST_INITIAL
) {
- return user.lastName.substring(0, 1)
+ return this.firstUpperCaseSecondLowerCase(user.lastName)
}
+ return null // cause to delete lastname in gms
+
+ /*
+ if (
+ user.gmsAllowed &&
+ ((!user.alias && user.gmsPublishName === PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS) ||
+ user.gmsPublishName === PublishNameType.PUBLISH_NAME_FIRST_INITIAL ||
+ user.gmsPublishName === PublishNameType.PUBLISH_NAME_INITIALS)
+ ) {
+ return this.firstUpperCaseSecondLowerCase(user.lastName)
+ }
+ */
}
private getGmsEmail(user: dbUser): string | undefined {
- if (user.gmsAllowed && user.emailContact.gmsPublishEmail) {
+ if (user.gmsAllowed && user.emailContact?.gmsPublishEmail) {
return user.emailContact.email
}
}
@@ -92,19 +124,29 @@ export class GmsUser {
private getGmsCountryCode(user: dbUser): string | undefined {
if (
user.gmsAllowed &&
- (user.emailContact.gmsPublishPhone === GmsPublishPhoneType.GMS_PUBLISH_PHONE_COUNTRY ||
- user.emailContact.gmsPublishPhone === GmsPublishPhoneType.GMS_PUBLISH_PHONE_FULL)
+ ((user.emailContact?.gmsPublishPhone as GmsPublishPhoneType) ===
+ GmsPublishPhoneType.GMS_PUBLISH_PHONE_COUNTRY ||
+ (user.emailContact?.gmsPublishPhone as GmsPublishPhoneType) ===
+ GmsPublishPhoneType.GMS_PUBLISH_PHONE_FULL)
) {
- return user.emailContact.countryCode
+ return user.emailContact?.countryCode
}
}
private getGmsPhone(user: dbUser): string | undefined {
if (
user.gmsAllowed &&
- user.emailContact.gmsPublishPhone === GmsPublishPhoneType.GMS_PUBLISH_PHONE_FULL
+ (user.emailContact?.gmsPublishPhone as GmsPublishPhoneType) ===
+ GmsPublishPhoneType.GMS_PUBLISH_PHONE_FULL
) {
- return user.emailContact.phone
+ return user.emailContact?.phone
}
}
+
+ private firstUpperCaseSecondLowerCase(name: string) {
+ if (name && name.length >= 2) {
+ return name.charAt(0).toUpperCase() + name.charAt(1).toLocaleLowerCase()
+ }
+ return name
+ }
}
diff --git a/backend/src/apis/humhub/ExportUsers.ts b/backend/src/apis/humhub/ExportUsers.ts
new file mode 100644
index 000000000..b3af27f7d
--- /dev/null
+++ b/backend/src/apis/humhub/ExportUsers.ts
@@ -0,0 +1,125 @@
+import { IsNull, Not } from '@dbTools/typeorm'
+import { User } from '@entity/User'
+
+import { CONFIG } from '@/config'
+import { LogError } from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
+import { Connection } from '@/typeorm/connection'
+import { checkDBVersion } from '@/typeorm/DBVersion'
+
+import { HumHubClient } from './HumHubClient'
+import { GetUser } from './model/GetUser'
+import { UsersResponse } from './model/UsersResponse'
+import { ExecutedHumhubAction, syncUser } from './syncUser'
+
+const USER_BULK_SIZE = 20
+const HUMHUB_BULK_SIZE = 50
+
+function getUsersPage(page: number, limit: number): Promise<[User[], number]> {
+ return User.findAndCount({
+ relations: { emailContact: true },
+ skip: page * limit,
+ take: limit,
+ where: { emailContact: { email: Not(IsNull()) } },
+ })
+}
+
+/**
+ * @param client
+ * @returns user map indices with email
+ */
+async function loadUsersFromHumHub(client: HumHubClient): Promise> {
+ const start = new Date().getTime()
+ const humhubUsers = new Map()
+ let page = 0
+ let skippedUsersCount = 0
+ let usersPage: UsersResponse | null = null
+ do {
+ usersPage = await client.users(page, HUMHUB_BULK_SIZE)
+ if (!usersPage) {
+ throw new LogError('error requesting next users page from humhub')
+ }
+ usersPage.results.forEach((user) => {
+ // deleted users have empty emails
+ if (user.account.email) {
+ humhubUsers.set(user.account.email.trim(), user)
+ } else {
+ skippedUsersCount++
+ }
+ })
+ page++
+ process.stdout.write(
+ `load users from humhub: ${humhubUsers.size}/${usersPage.total}, skipped: ${skippedUsersCount}\r`,
+ )
+ } while (usersPage && usersPage.results.length === HUMHUB_BULK_SIZE)
+
+ const elapsed = new Date().getTime() - start
+ logger.info('load users from humhub', {
+ total: humhubUsers.size,
+ timeSeconds: elapsed / 1000.0,
+ })
+ return humhubUsers
+}
+
+async function main() {
+ const start = new Date().getTime()
+
+ // open mysql connection
+ const con = await Connection.getInstance()
+ if (!con?.isConnected) {
+ logger.fatal(`Couldn't open connection to database!`)
+ throw new Error(`Fatal: Couldn't open connection to database`)
+ }
+
+ // check for correct database version
+ const dbVersion = await checkDBVersion(CONFIG.DB_VERSION)
+ if (!dbVersion) {
+ logger.fatal('Fatal: Database Version incorrect')
+ throw new Error('Fatal: Database Version incorrect')
+ }
+
+ let userCount = 0
+ let page = 0
+ const humHubClient = HumHubClient.getInstance()
+ if (!humHubClient) {
+ throw new LogError('error creating humhub client')
+ }
+ const humhubUsers = await loadUsersFromHumHub(humHubClient)
+
+ let dbUserCount = 0
+ const executedHumhubActionsCount = [0, 0, 0, 0]
+
+ do {
+ const [users, totalUsers] = await getUsersPage(page, USER_BULK_SIZE)
+ dbUserCount += users.length
+ userCount = users.length
+ page++
+ const promises: Promise[] = []
+ users.forEach((user: User) => promises.push(syncUser(user, humhubUsers)))
+ const executedActions = await Promise.all(promises)
+ executedActions.forEach((executedAction: ExecutedHumhubAction) => {
+ executedHumhubActionsCount[executedAction as number]++
+ })
+ // using process.stdout.write here so that carriage-return is working analog to c
+ // printf("\rchecked user: %d/%d", dbUserCount, totalUsers);
+ process.stdout.write(`checked user: ${dbUserCount}/${totalUsers}\r`)
+ } while (userCount === USER_BULK_SIZE)
+
+ await con.destroy()
+ const elapsed = new Date().getTime() - start
+ logger.info('export user to humhub, statistics:', {
+ timeSeconds: elapsed / 1000.0,
+ gradidoUserCount: dbUserCount,
+ createdCount: executedHumhubActionsCount[ExecutedHumhubAction.CREATE],
+ updatedCount: executedHumhubActionsCount[ExecutedHumhubAction.UPDATE],
+ skippedCount: executedHumhubActionsCount[ExecutedHumhubAction.SKIP],
+ deletedCount: executedHumhubActionsCount[ExecutedHumhubAction.DELETE],
+ })
+}
+
+main().catch((e) => {
+ // eslint-disable-next-line no-console
+ console.error(e)
+ // eslint-disable-next-line n/no-process-exit
+ process.exit(1)
+})
diff --git a/backend/src/apis/humhub/HumHubClient.ts b/backend/src/apis/humhub/HumHubClient.ts
new file mode 100644
index 000000000..27567e770
--- /dev/null
+++ b/backend/src/apis/humhub/HumHubClient.ts
@@ -0,0 +1,240 @@
+import { ProjectBranding } from '@entity/ProjectBranding'
+import { SignJWT } from 'jose'
+import { IRequestOptions, IRestResponse, RestClient } from 'typed-rest-client'
+
+import { CONFIG } from '@/config'
+import { LogError } from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
+
+import { PostUserLoggingView } from './logging/PostUserLogging.view'
+import { GetUser } from './model/GetUser'
+import { PostUser } from './model/PostUser'
+import { Space } from './model/Space'
+import { SpacesResponse } from './model/SpacesResponse'
+import { UsersResponse } from './model/UsersResponse'
+
+/**
+ * HumHubClient as singleton class
+ */
+export class HumHubClient {
+ // eslint-disable-next-line no-use-before-define
+ private static instance: HumHubClient
+ private restClient: RestClient
+
+ // eslint-disable-next-line no-useless-constructor, @typescript-eslint/no-empty-function
+ private constructor() {
+ this.restClient = new RestClient('gradido-backend', CONFIG.HUMHUB_API_URL, undefined, {
+ keepAlive: true,
+ })
+ logger.info('create rest client for', CONFIG.HUMHUB_API_URL)
+ }
+
+ public static getInstance(): HumHubClient | undefined {
+ if (!CONFIG.HUMHUB_ACTIVE || !CONFIG.HUMHUB_API_URL) {
+ logger.info(`humhub are disabled via config...`)
+ return
+ }
+ if (!HumHubClient.instance) {
+ HumHubClient.instance = new HumHubClient()
+ }
+ return HumHubClient.instance
+ }
+
+ protected async createRequestOptions(
+ queryParams?: Record,
+ ): Promise {
+ const requestOptions: IRequestOptions = {
+ additionalHeaders: { authorization: 'Bearer ' + (await this.createJWTToken()) },
+ }
+ if (queryParams) {
+ requestOptions.queryParameters = { params: queryParams }
+ }
+ return requestOptions
+ }
+
+ private async createJWTToken(): Promise {
+ const secret = new TextEncoder().encode(CONFIG.HUMHUB_JWT_KEY)
+ const token = await new SignJWT({ 'urn:gradido:claim': true, uid: 1 })
+ .setProtectedHeader({ alg: 'HS512' })
+ .setIssuedAt()
+ .setIssuer('urn:gradido:issuer')
+ .setAudience('urn:gradido:audience')
+ .setExpirationTime('5m')
+ .sign(secret)
+ return token
+ }
+
+ public async createAutoLoginUrl(username: string, project?: string | null) {
+ const secret = new TextEncoder().encode(CONFIG.HUMHUB_JWT_KEY)
+ logger.info(`user ${username} as username for humhub auto-login`)
+ let redirectLink: string | undefined
+ if (project) {
+ const projectBranding = await ProjectBranding.findOne({
+ where: { alias: project },
+ select: { spaceUrl: true },
+ })
+ if (projectBranding?.spaceUrl) {
+ redirectLink = projectBranding.spaceUrl
+ }
+ }
+ const token = await new SignJWT({ username, redirectLink })
+ .setProtectedHeader({ alg: 'HS256' })
+ .setIssuedAt()
+ .setExpirationTime(CONFIG.JWT_EXPIRES_IN)
+ .sign(secret)
+
+ return `${CONFIG.HUMHUB_API_URL}${
+ CONFIG.HUMHUB_API_URL.endsWith('/') ? '' : '/'
+ }user/auth/external?authclient=jwt&jwt=${token}`
+ }
+
+ /**
+ * Get all users from humhub
+ * https://marketplace.humhub.com/module/rest/docs/html/user.html#tag/User/paths/~1user/get
+ * @param page The number of page of the result set >= 0
+ * @param limit The numbers of items to return per page, Default: 20, [1 .. 50]
+ * @returns list of users
+ */
+ public async users(page = 0, limit = 20): Promise {
+ const options = await this.createRequestOptions({ page, limit })
+ const response = await this.restClient.get('/api/v1/user', options)
+ if (response.statusCode !== 200) {
+ throw new LogError('error requesting users from humhub', response)
+ }
+ return response.result
+ }
+
+ /**
+ * get user by email
+ * https://marketplace.humhub.com/module/rest/docs/html/user.html#tag/User/paths/~1user~1get-by-email/get
+ * @param email for user search
+ * @returns user object if found
+ */
+ public async userByEmail(email: string): Promise {
+ const options = await this.createRequestOptions({ email })
+ const response = await this.restClient.get('/api/v1/user/get-by-email', options)
+ // 404 = user not found
+ if (response.statusCode === 404) {
+ return null
+ }
+ return response.result
+ }
+
+ public async userByEmailAsync(email: string): Promise> {
+ const options = await this.createRequestOptions({ email })
+ return this.restClient.get('/api/v1/user/get-by-email', options)
+ }
+
+ public async userByUsernameAsync(username: string): Promise> {
+ const options = await this.createRequestOptions({ username })
+ return this.restClient.get('/api/v1/user/get-by-username', options)
+ }
+
+ /**
+ * get user by username
+ * https://marketplace.humhub.com/module/rest/docs/html/user.html#tag/User/paths/~1user~1get-by-username/get
+ * @param username for user search
+ * @returns user object if found
+ */
+ public async userByUsername(username: string): Promise {
+ const options = await this.createRequestOptions({ username })
+ const response = await this.restClient.get('/api/v1/user/get-by-username', options)
+ if (response.statusCode === 404) {
+ return null
+ }
+ return response.result
+ }
+
+ /**
+ * create user
+ * https://marketplace.humhub.com/module/rest/docs/html/user.html#tag/User/paths/~1user/post
+ * @param user for saving on humhub instance
+ */
+ public async createUser(user: PostUser): Promise {
+ logger.info('create new humhub user', new PostUserLoggingView(user))
+ const options = await this.createRequestOptions()
+ try {
+ const response = await this.restClient.create('/api/v1/user', user, options)
+ if (response.statusCode !== 200) {
+ throw new LogError('error creating user on humhub', { user, response })
+ }
+ } catch (error) {
+ throw new LogError('error on creating new user', {
+ user,
+ error: JSON.stringify(error, null, 2),
+ })
+ }
+ }
+
+ /**
+ * update user
+ * https://marketplace.humhub.com/module/rest/docs/html/user.html#tag/User/operation/updateUser
+ * @param user user object to update
+ * @param humhubUserId humhub user id
+ * @returns updated user object on success
+ */
+ public async updateUser(user: PostUser, humhubUserId: number): Promise {
+ logger.info('update humhub user', new PostUserLoggingView(user))
+ const options = await this.createRequestOptions()
+ const response = await this.restClient.update(
+ `/api/v1/user/${humhubUserId}`,
+ user,
+ options,
+ )
+ if (response.statusCode === 400) {
+ throw new LogError('Invalid user supplied', { user, response })
+ } else if (response.statusCode === 404) {
+ throw new LogError('User not found', { user, response })
+ }
+ return response.result
+ }
+
+ public async deleteUser(humhubUserId: number): Promise {
+ logger.info('delete humhub user', { userId: humhubUserId })
+ const options = await this.createRequestOptions()
+ const response = await this.restClient.del(`/api/v1/user/${humhubUserId}`, options)
+ if (response.statusCode === 400) {
+ throw new LogError('invalid user supplied', { userId: humhubUserId, response })
+ } else if (response.statusCode === 404) {
+ throw new LogError('User not found', { userId: humhubUserId, response })
+ } else if (response.statusCode !== 200) {
+ throw new LogError('error deleting user', { userId: humhubUserId, response })
+ }
+ }
+
+ // get spaces from humhub
+ // https://marketplace.humhub.com/module/rest/docs/html/space.html#tag/Space/paths/~1space/get
+ public async spaces(page = 0, limit = 20): Promise {
+ const options = await this.createRequestOptions({ page, limit })
+ const response = await this.restClient.get('/api/v1/space', options)
+ if (response.statusCode !== 200) {
+ throw new LogError('error requesting spaces from humhub', response)
+ }
+ return response.result
+ }
+
+ // get space by id from humhub instance
+ // https://marketplace.humhub.com/module/rest/docs/html/space.html#tag/Space/paths/~1space~1{id}/get
+ public async space(spaceId: number): Promise {
+ const options = await this.createRequestOptions()
+ const response = await this.restClient.get(`/api/v1/space/${spaceId}`, options)
+ if (response.statusCode !== 200) {
+ throw new LogError('error requesting space from humhub', response)
+ }
+ return response.result
+ }
+
+ // add user to space
+ // https://marketplace.humhub.com/module/rest/docs/html/space.html#tag/Membership/paths/~1space~1%7Bid%7D~1membership~1%7BuserId%7D/post
+ public async addUserToSpace(userId: number, spaceId: number): Promise {
+ const options = await this.createRequestOptions()
+ const response = await this.restClient.create(
+ `/api/v1/space/${spaceId}/membership/${userId}`,
+ { userId },
+ options,
+ )
+ if (response.statusCode !== 200) {
+ throw new LogError('error adding user to space', response)
+ }
+ }
+}
diff --git a/backend/src/apis/humhub/__mocks__/HumHubClient.ts b/backend/src/apis/humhub/__mocks__/HumHubClient.ts
new file mode 100644
index 000000000..cc9af4d76
--- /dev/null
+++ b/backend/src/apis/humhub/__mocks__/HumHubClient.ts
@@ -0,0 +1,70 @@
+import { User } from '@entity/User'
+import { UserContact } from '@entity/UserContact'
+import { IRestResponse } from 'typed-rest-client'
+
+import { GetUser } from '@/apis/humhub/model/GetUser'
+import { PostUser } from '@/apis/humhub/model/PostUser'
+import { UsersResponse } from '@/apis/humhub/model/UsersResponse'
+
+/**
+ * HumHubClient as singleton class
+ */
+export class HumHubClient {
+ // eslint-disable-next-line no-use-before-define
+ private static instance: HumHubClient
+
+ // eslint-disable-next-line no-useless-constructor, @typescript-eslint/no-empty-function
+ private constructor() {}
+
+ public static getInstance(): HumHubClient {
+ if (!HumHubClient.instance) {
+ HumHubClient.instance = new HumHubClient()
+ }
+ return HumHubClient.instance
+ }
+
+ public async users(): Promise {
+ return Promise.resolve(new UsersResponse())
+ }
+
+ public async userByEmail(email: string): Promise {
+ const user = new User()
+ user.emailContact = new UserContact()
+ user.emailContact.email = email
+ return Promise.resolve(new GetUser(user, 1))
+ }
+
+ public async userByEmailAsync(email: string): Promise> {
+ const user = new User()
+ user.emailContact = new UserContact()
+ user.emailContact.email = email
+ return Promise.resolve({
+ statusCode: 200,
+ result: new GetUser(user, 1),
+ headers: {},
+ })
+ }
+
+ public async userByUsername(username: string): Promise {
+ const user = new User()
+ user.alias = username
+ user.emailContact = new UserContact()
+ user.emailContact.email = 'testemail@gmail.com'
+ return Promise.resolve(new GetUser(user, 1))
+ }
+
+ public async createUser(): Promise {
+ return Promise.resolve()
+ }
+
+ public async updateUser(inputUser: PostUser, humhubUserId: number): Promise {
+ const user = new User()
+ user.emailContact = new UserContact()
+ user.emailContact.email = inputUser.account.email
+ return Promise.resolve(new GetUser(user, humhubUserId))
+ }
+
+ public async deleteUser(): Promise {
+ return Promise.resolve()
+ }
+}
diff --git a/backend/src/apis/humhub/__mocks__/syncUser.ts b/backend/src/apis/humhub/__mocks__/syncUser.ts
new file mode 100644
index 000000000..7e0660da4
--- /dev/null
+++ b/backend/src/apis/humhub/__mocks__/syncUser.ts
@@ -0,0 +1,44 @@
+import { User } from '@entity/User'
+
+import { isHumhubUserIdenticalToDbUser } from '@/apis/humhub/compareHumhubUserDbUser'
+import { GetUser } from '@/apis/humhub/model/GetUser'
+
+export enum ExecutedHumhubAction {
+ UPDATE,
+ CREATE,
+ SKIP,
+ DELETE,
+}
+/**
+ * Trigger action according to conditions
+ * | User exist on humhub | export to humhub allowed | changes in user data | ACTION
+ * | true | false | ignored | DELETE
+ * | true | true | true | UPDATE
+ * | true | true | false | SKIP
+ * | false | false | ignored | SKIP
+ * | false | true | ignored | CREATE
+ * @param user
+ * @param humHubClient
+ * @param humhubUsers
+ * @returns
+ */
+export async function syncUser(
+ user: User,
+ humhubUsers: Map,
+): Promise {
+ const humhubUser = humhubUsers.get(user.emailContact.email.trim())
+ if (humhubUser) {
+ if (!user.humhubAllowed) {
+ return Promise.resolve(ExecutedHumhubAction.DELETE)
+ }
+ if (!isHumhubUserIdenticalToDbUser(humhubUser, user)) {
+ // if humhub allowed
+ return Promise.resolve(ExecutedHumhubAction.UPDATE)
+ }
+ } else {
+ if (user.humhubAllowed) {
+ return Promise.resolve(ExecutedHumhubAction.CREATE)
+ }
+ }
+ return Promise.resolve(ExecutedHumhubAction.SKIP)
+}
diff --git a/backend/src/apis/humhub/compareHumhubUserDbUser.test.ts b/backend/src/apis/humhub/compareHumhubUserDbUser.test.ts
new file mode 100644
index 000000000..cc636d17a
--- /dev/null
+++ b/backend/src/apis/humhub/compareHumhubUserDbUser.test.ts
@@ -0,0 +1,64 @@
+/* eslint-disable prettier/prettier */
+import { communityDbUser } from '@/util/communityUser'
+
+import { isHumhubUserIdenticalToDbUser } from './compareHumhubUserDbUser'
+import { GetUser } from './model/GetUser'
+
+const defaultUser = communityDbUser
+
+describe('isHumhubUserIdenticalToDbUser', () => {
+ beforeEach(() => {
+ defaultUser.firstName = 'first name'
+ defaultUser.lastName = 'last name'
+ defaultUser.alias = 'alias'
+ defaultUser.emailContact.email = 'email@gmail.com'
+ defaultUser.language = 'en'
+ })
+
+ it('Should return true because humhubUser was created from entity user', () => {
+ const humhubUser = new GetUser(defaultUser, 1)
+ const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser)
+ expect(result).toBe(true)
+ })
+
+ it('Should return false because first name differ', () => {
+ const humhubUser = new GetUser(defaultUser, 1)
+ humhubUser.profile.firstname = 'changed first name'
+ const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser)
+ expect(result).toBe(false)
+ })
+ it('Should return false because last name differ', () => {
+ const humhubUser = new GetUser(defaultUser, 1)
+ humhubUser.profile.lastname = 'changed last name'
+ const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser)
+ expect(result).toBe(false)
+ })
+ it('Should return false because username differ', () => {
+ const humhubUser = new GetUser(defaultUser, 1)
+ humhubUser.account.username = 'changed username'
+ const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser)
+ expect(result).toBe(false)
+ })
+
+ it('Should return false because email differ', () => {
+ const humhubUser = new GetUser(defaultUser, 1)
+ humhubUser.account.email = 'new@gmail.com'
+ const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser)
+ expect(result).toBe(false)
+ })
+
+ it('Should return false because language differ', () => {
+ const humhubUser = new GetUser(defaultUser, 1)
+ humhubUser.account.language = 'de'
+ const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser)
+ expect(result).toBe(false)
+ })
+
+ it('Should return false because gradido_address differ', () => {
+ const humhubUser = new GetUser(defaultUser, 1)
+ // eslint-disable-next-line camelcase
+ humhubUser.profile.gradido_address = 'changed gradido address'
+ const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser)
+ expect(result).toBe(false)
+ })
+})
diff --git a/backend/src/apis/humhub/compareHumhubUserDbUser.ts b/backend/src/apis/humhub/compareHumhubUserDbUser.ts
new file mode 100644
index 000000000..9b7f0b51b
--- /dev/null
+++ b/backend/src/apis/humhub/compareHumhubUserDbUser.ts
@@ -0,0 +1,35 @@
+import { User } from '@entity/User'
+
+import { Account } from './model/Account'
+import { GetUser } from './model/GetUser'
+import { Profile } from './model/Profile'
+
+function profileIsTheSame(profile: Profile, user: User): boolean {
+ const gradidoUserProfile = new Profile(user)
+ if (profile.firstname !== gradidoUserProfile.firstname) return false
+ if (profile.lastname !== gradidoUserProfile.lastname) return false
+ if (profile.gradido_address !== gradidoUserProfile.gradido_address) return false
+ return true
+}
+
+function accountIsTheSame(account: Account, user: User): boolean {
+ const gradidoUserAccount = new Account(user)
+ if (account.username !== gradidoUserAccount.username) return false
+ if (account.email !== gradidoUserAccount.email) return false
+ if (account.language !== gradidoUserAccount.language) return false
+ if (account.status !== gradidoUserAccount.status) return false
+ return true
+}
+
+/**
+ * compare if gradido user (db entity) differ from humhub user
+ * @param humhubUser
+ * @param gradidoUse
+ * @return true if no differences
+ */
+export function isHumhubUserIdenticalToDbUser(humhubUser: GetUser, gradidoUser: User): boolean {
+ return (
+ profileIsTheSame(humhubUser.profile, gradidoUser) &&
+ accountIsTheSame(humhubUser.account, gradidoUser)
+ )
+}
diff --git a/backend/src/apis/humhub/convertLanguage.test.ts b/backend/src/apis/humhub/convertLanguage.test.ts
new file mode 100644
index 000000000..052e63075
--- /dev/null
+++ b/backend/src/apis/humhub/convertLanguage.test.ts
@@ -0,0 +1,31 @@
+import { convertGradidoLanguageToHumhub, convertHumhubLanguageToGradido } from './convertLanguage'
+
+describe('convertGradidoLanguageToHumhub', () => {
+ it('Should convert "en" to "en-US"', () => {
+ const result = convertGradidoLanguageToHumhub('en')
+ expect(result).toBe('en-US')
+ })
+
+ it('Should return the same language for other values', () => {
+ const languages = ['de', 'fr', 'es', 'pt']
+ languages.forEach((lang) => {
+ const result = convertGradidoLanguageToHumhub(lang)
+ expect(result).toBe(lang)
+ })
+ })
+})
+
+describe('convertHumhubLanguageToGradido', () => {
+ it('Should convert "en-US" to "en"', () => {
+ const result = convertHumhubLanguageToGradido('en-US')
+ expect(result).toBe('en')
+ })
+
+ it('Should return the same language for other values', () => {
+ const languages = ['de', 'fr', 'es', 'pt']
+ languages.forEach((lang) => {
+ const result = convertHumhubLanguageToGradido(lang)
+ expect(result).toBe(lang)
+ })
+ })
+})
diff --git a/backend/src/apis/humhub/convertLanguage.ts b/backend/src/apis/humhub/convertLanguage.ts
new file mode 100644
index 000000000..9555b0a52
--- /dev/null
+++ b/backend/src/apis/humhub/convertLanguage.ts
@@ -0,0 +1,18 @@
+/**
+ * convert gradido language in valid humhub language
+ * humhub doesn't know en for example, only en-US and en-GB
+ * @param gradidoLanguage
+ */
+export function convertGradidoLanguageToHumhub(gradidoLanguage: string): string {
+ if (gradidoLanguage === 'en') {
+ return 'en-US'
+ }
+ return gradidoLanguage
+}
+
+export function convertHumhubLanguageToGradido(humhubLanguage: string): string {
+ if (humhubLanguage === 'en-US') {
+ return 'en'
+ }
+ return humhubLanguage
+}
diff --git a/backend/src/apis/humhub/logging/AccountLogging.view.ts b/backend/src/apis/humhub/logging/AccountLogging.view.ts
new file mode 100644
index 000000000..e5a2df565
--- /dev/null
+++ b/backend/src/apis/humhub/logging/AccountLogging.view.ts
@@ -0,0 +1,18 @@
+import { AbstractLoggingView } from '@logging/AbstractLogging.view'
+
+import { Account } from '@/apis/humhub/model/Account'
+
+export class AccountLoggingView extends AbstractLoggingView {
+ public constructor(private self: Account) {
+ super()
+ }
+
+ public toJSON(): Account {
+ return {
+ username: this.self.username.substring(0, 3) + '...',
+ email: this.self.email.substring(0, 3) + '...',
+ language: this.self.language,
+ status: this.self.status,
+ }
+ }
+}
diff --git a/backend/src/apis/humhub/logging/PostUserLogging.view.ts b/backend/src/apis/humhub/logging/PostUserLogging.view.ts
new file mode 100644
index 000000000..47123c08b
--- /dev/null
+++ b/backend/src/apis/humhub/logging/PostUserLogging.view.ts
@@ -0,0 +1,23 @@
+import { AbstractLoggingView } from '@logging/AbstractLogging.view'
+
+import { PostUser } from '@/apis/humhub/model/PostUser'
+
+import { AccountLoggingView } from './AccountLogging.view'
+import { ProfileLoggingView } from './ProfileLogging.view'
+
+export class PostUserLoggingView extends AbstractLoggingView {
+ public constructor(private self: PostUser) {
+ super()
+ }
+
+ public toJSON(): PostUser {
+ return {
+ account: new AccountLoggingView(this.self.account).toJSON(),
+ profile: new ProfileLoggingView(this.self.profile).toJSON(),
+ password: {
+ newPassword: '',
+ mustChangePassword: false,
+ },
+ }
+ }
+}
diff --git a/backend/src/apis/humhub/logging/ProfileLogging.view.ts b/backend/src/apis/humhub/logging/ProfileLogging.view.ts
new file mode 100644
index 000000000..1c107676d
--- /dev/null
+++ b/backend/src/apis/humhub/logging/ProfileLogging.view.ts
@@ -0,0 +1,20 @@
+import { AbstractLoggingView } from '@logging/AbstractLogging.view'
+
+import { Profile } from '@/apis/humhub/model/Profile'
+
+export class ProfileLoggingView extends AbstractLoggingView {
+ public constructor(private self: Profile) {
+ super()
+ }
+
+ public toJSON(): Profile {
+ const gradidoAddressParts = this.self.gradido_address.split('/')
+ return {
+ firstname: this.self.firstname.substring(0, 3) + '...',
+ lastname: this.self.lastname.substring(0, 3) + '...',
+ // eslint-disable-next-line camelcase
+ gradido_address:
+ gradidoAddressParts[0] + '/' + gradidoAddressParts[1].substring(0, 3) + '...',
+ }
+ }
+}
diff --git a/backend/src/apis/humhub/model/AbstractUser.ts b/backend/src/apis/humhub/model/AbstractUser.ts
new file mode 100644
index 000000000..8f876f053
--- /dev/null
+++ b/backend/src/apis/humhub/model/AbstractUser.ts
@@ -0,0 +1,23 @@
+import { User } from '@entity/User'
+
+import { PublishNameLogic } from '@/data/PublishName.logic'
+import { PublishNameType } from '@/graphql/enum/PublishNameType'
+
+import { Account } from './Account'
+import { Profile } from './Profile'
+
+export abstract class AbstractUser {
+ public constructor(user: User) {
+ this.account = new Account(user)
+ this.profile = new Profile(user)
+ // temp fix for prevent double usernames in humhub, if the username ist created from initials
+ const publishNameLogic = new PublishNameLogic(user)
+ if (publishNameLogic.isUsernameFromInitials(user.humhubPublishName as PublishNameType)) {
+ this.profile.firstname = this.account.username
+ this.account.username = user.gradidoID
+ }
+ }
+
+ account: Account
+ profile: Profile
+}
diff --git a/backend/src/apis/humhub/model/Account.ts b/backend/src/apis/humhub/model/Account.ts
new file mode 100644
index 000000000..1eb3e37be
--- /dev/null
+++ b/backend/src/apis/humhub/model/Account.ts
@@ -0,0 +1,21 @@
+/* eslint-disable camelcase */
+import { User } from '@entity/User'
+
+import { convertGradidoLanguageToHumhub } from '@/apis/humhub/convertLanguage'
+import { PublishNameLogic } from '@/data/PublishName.logic'
+import { PublishNameType } from '@/graphql/enum/PublishNameType'
+
+export class Account {
+ public constructor(user: User) {
+ const publishNameLogic = new PublishNameLogic(user)
+ this.username = publishNameLogic.getUsername(user.humhubPublishName as PublishNameType)
+ this.email = user.emailContact.email
+ this.language = convertGradidoLanguageToHumhub(user.language)
+ this.status = 1
+ }
+
+ username: string
+ email: string
+ language: string
+ status: number
+}
diff --git a/backend/src/apis/humhub/model/GetUser.ts b/backend/src/apis/humhub/model/GetUser.ts
new file mode 100644
index 000000000..8f50c8676
--- /dev/null
+++ b/backend/src/apis/humhub/model/GetUser.ts
@@ -0,0 +1,15 @@
+import { User } from '@entity/User'
+
+import { AbstractUser } from './AbstractUser'
+
+export class GetUser extends AbstractUser {
+ public constructor(user: User, id: number) {
+ super(user)
+ this.id = id
+ }
+
+ id: number
+ guid: string
+ // eslint-disable-next-line camelcase
+ display_name: string
+}
diff --git a/backend/src/apis/humhub/model/Password.ts b/backend/src/apis/humhub/model/Password.ts
new file mode 100644
index 000000000..04cede68b
--- /dev/null
+++ b/backend/src/apis/humhub/model/Password.ts
@@ -0,0 +1,4 @@
+export class Password {
+ newPassword: string
+ mustChangePassword: boolean
+}
diff --git a/backend/src/apis/humhub/model/PostUser.ts b/backend/src/apis/humhub/model/PostUser.ts
new file mode 100644
index 000000000..b63c038cf
--- /dev/null
+++ b/backend/src/apis/humhub/model/PostUser.ts
@@ -0,0 +1,7 @@
+import { AbstractUser } from './AbstractUser'
+import { Password } from './Password'
+
+// only add password as filed, rest the same as AbstractUser
+export class PostUser extends AbstractUser {
+ password: Password
+}
diff --git a/backend/src/apis/humhub/model/PostUserError.ts b/backend/src/apis/humhub/model/PostUserError.ts
new file mode 100644
index 000000000..0e6b0e152
--- /dev/null
+++ b/backend/src/apis/humhub/model/PostUserError.ts
@@ -0,0 +1,6 @@
+export class PostUserError {
+ code: number
+ message: string
+ profile: string[]
+ account: string[]
+}
diff --git a/backend/src/apis/humhub/model/Profile.ts b/backend/src/apis/humhub/model/Profile.ts
new file mode 100644
index 000000000..3315378eb
--- /dev/null
+++ b/backend/src/apis/humhub/model/Profile.ts
@@ -0,0 +1,22 @@
+/* eslint-disable camelcase */
+import { User } from '@entity/User'
+
+import { CONFIG } from '@/config'
+import { PublishNameLogic } from '@/data/PublishName.logic'
+import { PublishNameType } from '@/graphql/enum/PublishNameType'
+
+export class Profile {
+ public constructor(user: User) {
+ const publishNameLogic = new PublishNameLogic(user)
+ this.firstname = publishNameLogic.getFirstName(user.humhubPublishName as PublishNameType)
+ this.lastname = publishNameLogic.getLastName(user.humhubPublishName as PublishNameType)
+
+ this.gradido_address = `${CONFIG.COMMUNITY_NAME}/${
+ publishNameLogic.hasAlias() ? user.alias : user.gradidoID
+ }`
+ }
+
+ firstname: string
+ lastname: string
+ gradido_address: string
+}
diff --git a/backend/src/apis/humhub/model/Space.ts b/backend/src/apis/humhub/model/Space.ts
new file mode 100644
index 000000000..f290fbbf1
--- /dev/null
+++ b/backend/src/apis/humhub/model/Space.ts
@@ -0,0 +1,7 @@
+export class Space {
+ id: number
+ guid: string
+ name: string
+ description: string
+ url: string
+}
diff --git a/backend/src/apis/humhub/model/SpacesResponse.ts b/backend/src/apis/humhub/model/SpacesResponse.ts
new file mode 100644
index 000000000..34e9df650
--- /dev/null
+++ b/backend/src/apis/humhub/model/SpacesResponse.ts
@@ -0,0 +1,8 @@
+import { Space } from './Space'
+
+export interface SpacesResponse {
+ total: number
+ page: number
+ pages: number
+ results: Space[]
+}
diff --git a/backend/src/apis/humhub/model/UsersResponse.ts b/backend/src/apis/humhub/model/UsersResponse.ts
new file mode 100644
index 000000000..22379739c
--- /dev/null
+++ b/backend/src/apis/humhub/model/UsersResponse.ts
@@ -0,0 +1,7 @@
+import { GetUser } from './GetUser'
+
+export class UsersResponse {
+ total: number
+ page: number
+ results: GetUser[]
+}
diff --git a/backend/src/apis/humhub/syncUser.test.ts b/backend/src/apis/humhub/syncUser.test.ts
new file mode 100644
index 000000000..20a6b2c33
--- /dev/null
+++ b/backend/src/apis/humhub/syncUser.test.ts
@@ -0,0 +1,79 @@
+/* eslint-disable @typescript-eslint/no-empty-function */
+import { User } from '@entity/User'
+import { UserContact } from '@entity/UserContact'
+
+import { GetUser } from './model/GetUser'
+import { syncUser, ExecutedHumhubAction } from './syncUser'
+
+jest.mock('@/apis/humhub/HumHubClient')
+
+const defaultUser = new User()
+defaultUser.emailContact = new UserContact()
+defaultUser.emailContact.email = 'email@gmail.com'
+
+describe('syncUser function', () => {
+ afterAll(() => {
+ jest.resetAllMocks()
+ })
+
+ /*
+ * Trigger action according to conditions
+ * | User exist on humhub | export to humhub allowed | changes in user data | ACTION
+ * | true | false | ignored | DELETE
+ * | true | true | true | UPDATE
+ * | true | true | false | SKIP
+ * | false | false | ignored | SKIP
+ * | false | true | ignored | CREATE
+ * */
+
+ it('When humhubUser exists and user.humhubAllowed is false, should return DELETE action', async () => {
+ const humhubUsers = new Map()
+ humhubUsers.set(defaultUser.emailContact.email, new GetUser(defaultUser, 1))
+
+ defaultUser.humhubAllowed = false
+ const result = await syncUser(defaultUser, humhubUsers)
+
+ expect(result).toBe(ExecutedHumhubAction.DELETE)
+ })
+
+ it('When humhubUser exists and user.humhubAllowed is true and there are changes in user data, should return UPDATE action', async () => {
+ const humhubUsers = new Map()
+ const humhubUser = new GetUser(defaultUser, 1)
+ humhubUser.account.username = 'test username'
+ humhubUsers.set(defaultUser.emailContact.email, humhubUser)
+
+ defaultUser.humhubAllowed = true
+ const result = await syncUser(defaultUser, humhubUsers)
+
+ expect(result).toBe(ExecutedHumhubAction.UPDATE)
+ })
+
+ it('When humhubUser exists and user.humhubAllowed is true and there are no changes in user data, should return SKIP action', async () => {
+ const humhubUsers = new Map()
+ const humhubUser = new GetUser(defaultUser, 1)
+ humhubUsers.set(defaultUser.emailContact.email, humhubUser)
+
+ defaultUser.humhubAllowed = true
+ const result = await syncUser(defaultUser, humhubUsers)
+
+ expect(result).toBe(ExecutedHumhubAction.SKIP)
+ })
+
+ it('When humhubUser not exists and user.humhubAllowed is false, should return SKIP action', async () => {
+ const humhubUsers = new Map()
+
+ defaultUser.humhubAllowed = false
+ const result = await syncUser(defaultUser, humhubUsers)
+
+ expect(result).toBe(ExecutedHumhubAction.SKIP)
+ })
+
+ it('When humhubUser not exists and user.humhubAllowed is true, should return CREATE action', async () => {
+ const humhubUsers = new Map()
+
+ defaultUser.humhubAllowed = true
+ const result = await syncUser(defaultUser, humhubUsers)
+
+ expect(result).toBe(ExecutedHumhubAction.CREATE)
+ })
+})
diff --git a/backend/src/apis/humhub/syncUser.ts b/backend/src/apis/humhub/syncUser.ts
new file mode 100644
index 000000000..fc6fcc99b
--- /dev/null
+++ b/backend/src/apis/humhub/syncUser.ts
@@ -0,0 +1,57 @@
+import { User } from '@entity/User'
+
+import { LogError } from '@/server/LogError'
+
+import { isHumhubUserIdenticalToDbUser } from './compareHumhubUserDbUser'
+import { HumHubClient } from './HumHubClient'
+import { GetUser } from './model/GetUser'
+import { PostUser } from './model/PostUser'
+
+export enum ExecutedHumhubAction {
+ UPDATE,
+ CREATE,
+ SKIP,
+ DELETE,
+}
+/**
+ * Trigger action according to conditions
+ * | User exist on humhub | export to humhub allowed | changes in user data | ACTION
+ * | true | false | ignored | DELETE
+ * | true | true | true | UPDATE
+ * | true | true | false | SKIP
+ * | false | false | ignored | SKIP
+ * | false | true | ignored | CREATE
+ * @param user
+ * @param humHubClient
+ * @param humhubUsers
+ * @returns
+ */
+export async function syncUser(
+ user: User,
+ humhubUsers: Map,
+): Promise {
+ const postUser = new PostUser(user)
+ const humhubUser = humhubUsers.get(user.emailContact.email.trim())
+ const humHubClient = HumHubClient.getInstance()
+ if (!humHubClient) {
+ throw new LogError('Error creating humhub client')
+ }
+
+ if (humhubUser) {
+ if (!user.humhubAllowed) {
+ await humHubClient.deleteUser(humhubUser.id)
+ return ExecutedHumhubAction.DELETE
+ }
+ if (!isHumhubUserIdenticalToDbUser(humhubUser, user)) {
+ // if humhub allowed
+ await humHubClient.updateUser(postUser, humhubUser.id)
+ return ExecutedHumhubAction.UPDATE
+ }
+ } else {
+ if (user.humhubAllowed) {
+ await humHubClient.createUser(postUser)
+ return ExecutedHumhubAction.CREATE
+ }
+ }
+ return ExecutedHumhubAction.SKIP
+}
diff --git a/backend/src/apis/openai/OpenaiClient.ts b/backend/src/apis/openai/OpenaiClient.ts
new file mode 100644
index 000000000..4e766f631
--- /dev/null
+++ b/backend/src/apis/openai/OpenaiClient.ts
@@ -0,0 +1,164 @@
+/* eslint-disable camelcase */
+import { OpenaiThreads } from '@entity/OpenaiThreads'
+import { User } from '@entity/User'
+import { OpenAI } from 'openai'
+import { Message } from 'openai/resources/beta/threads/messages'
+
+import { httpsAgent } from '@/apis/ConnectionAgents'
+import { CONFIG } from '@/config'
+import { backendLogger as logger } from '@/server/logger'
+
+import { Message as MessageModel } from './model/Message'
+
+/**
+ * The `OpenaiClient` class is a singleton that provides an interface to interact with the OpenAI API.
+ * It ensures that only one instance of the client is created and used throughout the application.
+ */
+export class OpenaiClient {
+ /**
+ * The singleton instance of the `OpenaiClient`.
+ */
+ // eslint-disable-next-line no-use-before-define
+ private static instance: OpenaiClient
+
+ /**
+ * The OpenAI client instance used to interact with the OpenAI API.
+ */
+ private openai: OpenAI
+
+ /**
+ * Private constructor to prevent direct instantiation.
+ * Initializes the OpenAI client with the provided API key from the configuration.
+ */
+ private constructor() {
+ this.openai = new OpenAI({ apiKey: CONFIG.OPENAI_API_KEY, httpAgent: httpsAgent })
+ }
+
+ /**
+ * Retrieves the singleton instance of the `OpenaiClient`.
+ * If the OpenAI integration is disabled via configuration or the API key is missing, it returns `undefined`.
+ *
+ * @returns {OpenaiClient | undefined} The singleton instance of the `OpenaiClient` or `undefined` if disabled.
+ */
+ public static getInstance(): OpenaiClient | undefined {
+ if (!CONFIG.OPENAI_ACTIVE || !CONFIG.OPENAI_API_KEY) {
+ logger.info(`openai are disabled via config...`)
+ return
+ }
+ if (!OpenaiClient.instance) {
+ OpenaiClient.instance = new OpenaiClient()
+ }
+ return OpenaiClient.instance
+ }
+
+ /**
+ * Creates a new message thread with the initial message provided.
+ *
+ * @param {Message} initialMessage - The initial message to start the thread.
+ * @returns {Promise} A promise that resolves to the ID of the created message thread.
+ */
+ public async createThread(initialMessage: MessageModel, user: User): Promise {
+ const messageThread = await this.openai.beta.threads.create({
+ messages: [initialMessage],
+ })
+ // store id in db because it isn't possible to list all open threads via openai api
+ const openaiThreadEntity = OpenaiThreads.create()
+ openaiThreadEntity.id = messageThread.id
+ openaiThreadEntity.userId = user.id
+ await openaiThreadEntity.save()
+
+ logger.info(`Created new message thread: ${messageThread.id}`)
+ return messageThread.id
+ }
+
+ /**
+ * Resumes the last message thread for the given user.
+ * @param user
+ * @returns
+ */
+ public async resumeThread(user: User): Promise {
+ const openaiThreadEntity = await OpenaiThreads.findOne({
+ where: { userId: user.id },
+ order: { createdAt: 'DESC' },
+ })
+ if (!openaiThreadEntity) {
+ logger.warn(`No openai thread found for user: ${user.id}`)
+ return []
+ }
+ const threadMessages = (
+ await this.openai.beta.threads.messages.list(openaiThreadEntity.id, { order: 'desc' })
+ ).getPaginatedItems()
+
+ logger.info(`Resumed thread: ${openaiThreadEntity.id}`)
+ return threadMessages
+ .map(
+ (message) =>
+ new MessageModel(
+ this.messageContentToString(message),
+ message.role,
+ openaiThreadEntity.id,
+ ),
+ )
+ .reverse()
+ }
+
+ public async deleteThread(threadId: string): Promise {
+ const [, result] = await Promise.all([
+ OpenaiThreads.delete({ id: threadId }),
+ this.openai.beta.threads.del(threadId),
+ ])
+ if (result.deleted) {
+ logger.info(`Deleted thread: ${threadId}`)
+ return true
+ } else {
+ logger.warn(`Failed to delete thread: ${threadId}, remove from db anyway`)
+ return false
+ }
+ }
+
+ public async addMessage(message: MessageModel, threadId: string): Promise {
+ const threadMessages = await this.openai.beta.threads.messages.create(threadId, message)
+ logger.info(`Added message to thread: ${threadMessages.id}`)
+ }
+
+ public async runAndGetLastNewMessage(threadId: string): Promise {
+ const run = await this.openai.beta.threads.runs.createAndPoll(threadId, {
+ assistant_id: CONFIG.OPENAI_ASSISTANT_ID,
+ })
+ logger.info('run status:', run.status)
+
+ const messagesPage = await this.openai.beta.threads.messages.list(threadId, { run_id: run.id })
+ if (messagesPage.data.length > 1) {
+ logger.warn(`More than one message in thread: ${threadId}, run: ${run.id}`, messagesPage.data)
+ }
+ const message = messagesPage.data.at(0)
+ if (!message) {
+ logger.warn(`No message in thread: ${threadId}, run: ${run.id}`, messagesPage.data)
+ return new MessageModel('No Answer', 'assistant')
+ }
+ return new MessageModel(this.messageContentToString(message), 'assistant')
+ }
+
+ private messageContentToString(message: Message): string {
+ if (message.content.length > 1) {
+ logger.warn(`More than one content in message: ${message.id}`, message.content)
+ }
+ const firstContent = message.content.at(0)
+ if (!firstContent) {
+ logger.warn(`No content in message: ${message.id}`, message)
+ return ''
+ }
+ if (firstContent.type === 'text') {
+ if (firstContent.text.annotations.length > 1) {
+ logger.info(`Annotations: ${JSON.stringify(firstContent.text.annotations, null, 2)}`)
+ }
+ return firstContent.text.value
+ } else if (firstContent.type === 'refusal') {
+ logger.info(`Refusal: ${firstContent.refusal}`)
+ return firstContent.refusal
+ } else {
+ logger.error(`Unhandled content type: ${firstContent.type}`, firstContent)
+ return ''
+ }
+ }
+}
diff --git a/backend/src/apis/openai/model/Message.ts b/backend/src/apis/openai/model/Message.ts
new file mode 100644
index 000000000..e9a5e86a4
--- /dev/null
+++ b/backend/src/apis/openai/model/Message.ts
@@ -0,0 +1,11 @@
+export class Message {
+ content: string
+ role: 'user' | 'assistant' = 'user'
+ threadId?: string
+
+ constructor(content: string, role: 'user' | 'assistant' = 'user', threadId?: string) {
+ this.content = content
+ this.role = role
+ this.threadId = threadId
+ }
+}
diff --git a/backend/src/auth/ADMIN_RIGHTS.ts b/backend/src/auth/ADMIN_RIGHTS.ts
index 79006a1de..9ba3e7ccd 100644
--- a/backend/src/auth/ADMIN_RIGHTS.ts
+++ b/backend/src/auth/ADMIN_RIGHTS.ts
@@ -6,4 +6,7 @@ export const ADMIN_RIGHTS = [
RIGHTS.UNDELETE_USER,
RIGHTS.COMMUNITY_UPDATE,
RIGHTS.COMMUNITY_BY_UUID,
+ RIGHTS.COMMUNITY_BY_IDENTIFIER,
+ RIGHTS.HOME_COMMUNITY,
+ RIGHTS.PROJECT_BRANDING_MUTATE,
]
diff --git a/backend/src/auth/DLT_CONNECTOR_RIGHTS.ts b/backend/src/auth/DLT_CONNECTOR_RIGHTS.ts
new file mode 100644
index 000000000..399b7c2d4
--- /dev/null
+++ b/backend/src/auth/DLT_CONNECTOR_RIGHTS.ts
@@ -0,0 +1,3 @@
+import { RIGHTS } from './RIGHTS'
+
+export const DLT_CONNECTOR_RIGHTS = [RIGHTS.COMMUNITY_BY_IDENTIFIER, RIGHTS.HOME_COMMUNITY]
diff --git a/backend/src/auth/INALIENABLE_RIGHTS.ts b/backend/src/auth/INALIENABLE_RIGHTS.ts
index 25a4fa76d..c3c96b95e 100644
--- a/backend/src/auth/INALIENABLE_RIGHTS.ts
+++ b/backend/src/auth/INALIENABLE_RIGHTS.ts
@@ -9,4 +9,5 @@ export const INALIENABLE_RIGHTS = [
RIGHTS.QUERY_TRANSACTION_LINK,
RIGHTS.QUERY_OPT_IN,
RIGHTS.CHECK_USERNAME,
+ RIGHTS.PROJECT_BRANDING_BANNER,
]
diff --git a/backend/src/auth/MODERATOR_AI_RIGHTS.ts b/backend/src/auth/MODERATOR_AI_RIGHTS.ts
new file mode 100644
index 000000000..0cc634c09
--- /dev/null
+++ b/backend/src/auth/MODERATOR_AI_RIGHTS.ts
@@ -0,0 +1,3 @@
+import { RIGHTS } from './RIGHTS'
+
+export const MODERATOR_AI_RIGHTS = [RIGHTS.AI_SEND_MESSAGE]
diff --git a/backend/src/auth/MODERATOR_RIGHTS.ts b/backend/src/auth/MODERATOR_RIGHTS.ts
index 61edad466..f62cc98df 100644
--- a/backend/src/auth/MODERATOR_RIGHTS.ts
+++ b/backend/src/auth/MODERATOR_RIGHTS.ts
@@ -17,4 +17,5 @@ export const MODERATOR_RIGHTS = [
RIGHTS.ADMIN_LIST_ALL_CONTRIBUTION_MESSAGES,
RIGHTS.DENY_CONTRIBUTION,
RIGHTS.ADMIN_OPEN_CREATIONS,
+ RIGHTS.VIEW_USER_CONTACT,
]
diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index c95aa18fd..0ccb9695f 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -8,6 +8,7 @@ export enum RIGHTS {
QUERY_TRANSACTION_LINK = 'QUERY_TRANSACTION_LINK',
QUERY_OPT_IN = 'QUERY_OPT_IN',
CHECK_USERNAME = 'CHECK_USERNAME',
+ PROJECT_BRANDING_BANNER = 'PROJECT_BRANDING_BANNER',
// User
VERIFY_LOGIN = 'VERIFY_LOGIN',
BALANCE = 'BALANCE',
@@ -37,6 +38,11 @@ export enum RIGHTS {
LIST_ALL_CONTRIBUTION_MESSAGES = 'LIST_ALL_CONTRIBUTION_MESSAGES',
OPEN_CREATIONS = 'OPEN_CREATIONS',
USER = 'USER',
+ GMS_USER_PLAYGROUND = 'GMS_USER_PLAYGROUND',
+ HUMHUB_AUTO_LOGIN = 'HUMHUB_AUTO_LOGIN',
+ PROJECT_BRANDING_VIEW = 'PROJECT_BRANDING_VIEW',
+ LIST_HUMHUB_SPACES = 'LIST_HUMHUB_SPACES',
+ VIEW_OWN_USER_CONTACT = 'VIEW_OWN_USER_CONTACT',
// Moderator
SEARCH_USERS = 'SEARCH_USERS',
ADMIN_CREATE_CONTRIBUTION = 'ADMIN_CREATE_CONTRIBUTION',
@@ -54,10 +60,16 @@ export enum RIGHTS {
DENY_CONTRIBUTION = 'DENY_CONTRIBUTION',
ADMIN_OPEN_CREATIONS = 'ADMIN_OPEN_CREATIONS',
ADMIN_LIST_ALL_CONTRIBUTION_MESSAGES = 'ADMIN_LIST_ALL_CONTRIBUTION_MESSAGES',
+ VIEW_USER_CONTACT = 'VIEW_USER_CONTACT',
+ // Moderator AI
+ AI_SEND_MESSAGE = 'AI_SEND_MESSAGE',
// Admin
SET_USER_ROLE = 'SET_USER_ROLE',
DELETE_USER = 'DELETE_USER',
UNDELETE_USER = 'UNDELETE_USER',
COMMUNITY_BY_UUID = 'COMMUNITY_BY_UUID',
+ COMMUNITY_BY_IDENTIFIER = 'COMMUNITY_BY_IDENTIFIER',
+ HOME_COMMUNITY = 'HOME_COMMUNITY',
COMMUNITY_UPDATE = 'COMMUNITY_UPDATE',
+ PROJECT_BRANDING_MUTATE = 'PROJECT_BRANDING_MUTATE',
}
diff --git a/backend/src/auth/ROLES.ts b/backend/src/auth/ROLES.ts
index 15ba7b263..487614163 100644
--- a/backend/src/auth/ROLES.ts
+++ b/backend/src/auth/ROLES.ts
@@ -1,7 +1,9 @@
import { RoleNames } from '@/graphql/enum/RoleNames'
import { ADMIN_RIGHTS } from './ADMIN_RIGHTS'
+import { DLT_CONNECTOR_RIGHTS } from './DLT_CONNECTOR_RIGHTS'
import { INALIENABLE_RIGHTS } from './INALIENABLE_RIGHTS'
+import { MODERATOR_AI_RIGHTS } from './MODERATOR_AI_RIGHTS'
import { MODERATOR_RIGHTS } from './MODERATOR_RIGHTS'
import { Role } from './Role'
import { USER_RIGHTS } from './USER_RIGHTS'
@@ -13,12 +15,22 @@ export const ROLE_MODERATOR = new Role(RoleNames.MODERATOR, [
...USER_RIGHTS,
...MODERATOR_RIGHTS,
])
+export const ROLE_MODERATOR_AI = new Role(RoleNames.MODERATOR_AI, [
+ ...INALIENABLE_RIGHTS,
+ ...USER_RIGHTS,
+ ...MODERATOR_RIGHTS,
+ ...MODERATOR_AI_RIGHTS,
+])
+
export const ROLE_ADMIN = new Role(RoleNames.ADMIN, [
...INALIENABLE_RIGHTS,
...USER_RIGHTS,
...MODERATOR_RIGHTS,
+ ...MODERATOR_AI_RIGHTS,
...ADMIN_RIGHTS,
])
+export const ROLE_DLT_CONNECTOR = new Role(RoleNames.DLT_CONNECTOR, DLT_CONNECTOR_RIGHTS)
+
// TODO from database
export const ROLES = [ROLE_UNAUTHORIZED, ROLE_USER, ROLE_MODERATOR, ROLE_ADMIN]
diff --git a/backend/src/auth/USER_RIGHTS.ts b/backend/src/auth/USER_RIGHTS.ts
index 9bf9fee93..2d0a4d980 100644
--- a/backend/src/auth/USER_RIGHTS.ts
+++ b/backend/src/auth/USER_RIGHTS.ts
@@ -29,4 +29,9 @@ export const USER_RIGHTS = [
RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES,
RIGHTS.OPEN_CREATIONS,
RIGHTS.USER,
+ RIGHTS.GMS_USER_PLAYGROUND,
+ RIGHTS.HUMHUB_AUTO_LOGIN,
+ RIGHTS.PROJECT_BRANDING_VIEW,
+ RIGHTS.LIST_HUMHUB_SPACES,
+ RIGHTS.VIEW_USER_CONTACT,
]
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 0aed77583..32118e248 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -1,9 +1,14 @@
// ATTENTION: DO NOT PUT ANY SECRETS IN HERE (or the .env)
/* eslint-disable n/no-process-env */
+// eslint-disable-next-line import/no-unresolved
+import { validate } from '@config/index'
+import { latestDbVersion } from '@dbTools/config/detectLastDBVersion'
import { Decimal } from 'decimal.js-light'
import dotenv from 'dotenv'
+import { schema } from './schema'
+
dotenv.config()
Decimal.set({
@@ -12,16 +17,10 @@ Decimal.set({
})
const constants = {
- DB_VERSION: '0082-introduce_gms_registration',
+ // DB_VERSION: '0087-add_index_on_user_roles',
+ DB_VERSION: latestDbVersion,
DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
LOG4JS_CONFIG: 'log4js-config.json',
- // default log level on production should be info
- LOG_LEVEL: process.env.LOG_LEVEL ?? 'info',
- CONFIG_VERSION: {
- DEFAULT: 'DEFAULT',
- EXPECTED: 'v21.2024-01-06',
- CURRENT: '',
- },
}
const server = {
@@ -29,8 +28,11 @@ const server = {
JWT_SECRET: process.env.JWT_SECRET ?? 'secret123',
JWT_EXPIRES_IN: process.env.JWT_EXPIRES_IN ?? '10m',
GRAPHIQL: process.env.GRAPHIQL === 'true' || false,
+ GDT_ACTIVE: process.env.GDT_ACTIVE === 'true' || false,
GDT_API_URL: process.env.GDT_API_URL ?? 'https://gdt.gradido.net',
PRODUCTION: process.env.NODE_ENV === 'production' || false,
+ // default log level on production should be info
+ LOG_LEVEL: process.env.LOG_LEVEL ?? 'info',
}
const database = {
@@ -64,10 +66,9 @@ const dltConnector = {
const community = {
COMMUNITY_NAME: process.env.COMMUNITY_NAME ?? 'Gradido Entwicklung',
COMMUNITY_URL,
- COMMUNITY_REGISTER_URL: COMMUNITY_URL + (process.env.COMMUNITY_REGISTER_PATH ?? '/register'),
- COMMUNITY_REDEEM_URL: COMMUNITY_URL + (process.env.COMMUNITY_REDEEM_PATH ?? '/redeem/{code}'),
+ COMMUNITY_REDEEM_URL: COMMUNITY_URL + (process.env.COMMUNITY_REDEEM_PATH ?? '/redeem/'),
COMMUNITY_REDEEM_CONTRIBUTION_URL:
- COMMUNITY_URL + (process.env.COMMUNITY_REDEEM_CONTRIBUTION_PATH ?? '/redeem/CL-{code}'),
+ COMMUNITY_URL + (process.env.COMMUNITY_REDEEM_CONTRIBUTION_PATH ?? '/redeem/CL-'),
COMMUNITY_DESCRIPTION:
process.env.COMMUNITY_DESCRIPTION ?? 'Die lokale Entwicklungsumgebung von Gradido.',
COMMUNITY_SUPPORT_MAIL: process.env.COMMUNITY_SUPPORT_MAIL ?? 'support@supportmail.com',
@@ -76,23 +77,24 @@ const community = {
const loginServer = {
LOGIN_APP_SECRET: process.env.LOGIN_APP_SECRET ?? '21ffbbc616fe',
LOGIN_SERVER_KEY: process.env.LOGIN_SERVER_KEY ?? 'a51ef8ac7ef1abf162fb7a65261acd7a',
+ USE_CRYPTO_WORKER: process.env.USE_CRYPTO_WORKER ?? false,
}
const email = {
- EMAIL: process.env.EMAIL === 'true' ?? false,
- EMAIL_TEST_MODUS: process.env.EMAIL_TEST_MODUS === 'true' ?? false,
+ EMAIL: process.env.EMAIL === 'true' || false,
+ EMAIL_TEST_MODUS: process.env.EMAIL_TEST_MODUS === 'true' || false,
EMAIL_TEST_RECEIVER: process.env.EMAIL_TEST_RECEIVER ?? 'stage1@gradido.net',
EMAIL_USERNAME: process.env.EMAIL_USERNAME ?? '',
EMAIL_SENDER: process.env.EMAIL_SENDER ?? 'info@gradido.net',
EMAIL_PASSWORD: process.env.EMAIL_PASSWORD ?? '',
- EMAIL_SMTP_URL: process.env.EMAIL_SMTP_URL ?? 'mailserver',
+ EMAIL_SMTP_HOST: process.env.EMAIL_SMTP_HOST ?? 'mailserver',
EMAIL_SMTP_PORT: Number(process.env.EMAIL_SMTP_PORT) || 1025,
// eslint-disable-next-line no-unneeded-ternary
EMAIL_TLS: process.env.EMAIL_TLS === 'false' ? false : true,
EMAIL_LINK_VERIFICATION:
- COMMUNITY_URL + (process.env.EMAIL_LINK_VERIFICATION_PATH ?? '/checkEmail/{optin}{code}'),
+ COMMUNITY_URL + (process.env.EMAIL_LINK_VERIFICATION_PATH ?? '/checkEmail/'),
EMAIL_LINK_SETPASSWORD:
- COMMUNITY_URL + (process.env.EMAIL_LINK_SETPASSWORD_PATH ?? '/reset-password/{optin}'),
+ COMMUNITY_URL + (process.env.EMAIL_LINK_SETPASSWORD_PATH ?? '/reset-password/'),
EMAIL_LINK_FORGOTPASSWORD:
COMMUNITY_URL + (process.env.EMAIL_LINK_FORGOTPASSWORD_PATH ?? '/forgot-password'),
EMAIL_LINK_OVERVIEW: COMMUNITY_URL + (process.env.EMAIL_LINK_OVERVIEW_PATH ?? '/overview'),
@@ -114,18 +116,6 @@ const webhook = {
// This is needed by graphql-directive-auth
process.env.APP_SECRET = server.JWT_SECRET
-// Check config version
-constants.CONFIG_VERSION.CURRENT = process.env.CONFIG_VERSION ?? constants.CONFIG_VERSION.DEFAULT
-if (
- ![constants.CONFIG_VERSION.EXPECTED, constants.CONFIG_VERSION.DEFAULT].includes(
- constants.CONFIG_VERSION.CURRENT,
- )
-) {
- throw new Error(
- `Fatal: Config Version incorrect - expected "${constants.CONFIG_VERSION.EXPECTED}" or "${constants.CONFIG_VERSION.DEFAULT}", but found "${constants.CONFIG_VERSION.CURRENT}"`,
- )
-}
-
const federation = {
FEDERATION_BACKEND_SEND_ON_API: process.env.FEDERATION_BACKEND_SEND_ON_API ?? '1_0',
// ?? operator don't work here as expected
@@ -133,18 +123,35 @@ const federation = {
process.env.FEDERATION_VALIDATE_COMMUNITY_TIMER ?? 60000,
),
FEDERATION_XCOM_SENDCOINS_ENABLED:
- process.env.FEDERATION_XCOM_SENDCOINS_ENABLED === 'true' ?? false,
+ process.env.FEDERATION_XCOM_SENDCOINS_ENABLED === 'true' || false,
// default value for community-uuid is equal uuid of stage-3
FEDERATION_XCOM_RECEIVER_COMMUNITY_UUID:
process.env.FEDERATION_XCOM_RECEIVER_COMMUNITY_UUID ?? '56a55482-909e-46a4-bfa2-cd025e894ebc',
- FEDERATION_XCOM_MAXREPEAT_REVERTSENDCOINS:
- process.env.FEDERATION_XCOM_MAXREPEAT_REVERTSENDCOINS ?? 3,
+ FEDERATION_XCOM_MAXREPEAT_REVERTSENDCOINS: parseInt(
+ process.env.FEDERATION_XCOM_MAXREPEAT_REVERTSENDCOINS ?? '3',
+ ),
}
const gms = {
GMS_ACTIVE: process.env.GMS_ACTIVE === 'true' || false,
+ GMS_CREATE_USER_THROW_ERRORS: process.env.GMS_CREATE_USER_THROW_ERRORS === 'true' || false,
// koordinates of Illuminz-instance of GMS
- GMS_URL: process.env.GMS_HOST ?? 'http://localhost:4044/',
+ GMS_API_URL: process.env.GMS_API_URL ?? 'http://localhost:4044/',
+ GMS_DASHBOARD_URL: process.env.GMS_DASHBOARD_URL ?? 'http://localhost:8080/',
+ // used as secret postfix attached at the gms community-auth-url endpoint ('/hook/gms/' + 'secret')
+ GMS_WEBHOOK_SECRET: process.env.GMS_WEBHOOK_SECRET ?? 'secret',
+}
+
+const humhub = {
+ HUMHUB_ACTIVE: process.env.HUMHUB_ACTIVE === 'true' || false,
+ HUMHUB_API_URL: process.env.HUMHUB_API_URL ?? COMMUNITY_URL + '/community/',
+ HUMHUB_JWT_KEY: process.env.HUMHUB_JWT_KEY ?? '',
+}
+
+const openai = {
+ OPENAI_ACTIVE: process.env.OPENAI_ACTIVE === 'true' || false,
+ OPENAI_API_KEY: process.env.OPENAI_API_KEY ?? '',
+ OPENAI_ASSISTANT_ID: process.env.OPENAI_ASSISTANT_ID ?? '',
}
export const CONFIG = {
@@ -159,4 +166,7 @@ export const CONFIG = {
...webhook,
...federation,
...gms,
+ ...humhub,
+ ...openai,
}
+validate(schema, CONFIG)
diff --git a/backend/src/config/schema.ts b/backend/src/config/schema.ts
new file mode 100644
index 000000000..19eed15ed
--- /dev/null
+++ b/backend/src/config/schema.ts
@@ -0,0 +1,367 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+// eslint-disable-next-line import/no-unresolved
+import {
+ COMMUNITY_NAME,
+ COMMUNITY_URL,
+ COMMUNITY_DESCRIPTION,
+ COMMUNITY_SUPPORT_MAIL,
+ DB_HOST,
+ DB_PASSWORD,
+ DB_PORT,
+ DB_USER,
+ DB_VERSION,
+ DB_DATABASE,
+ DECAY_START_TIME,
+ GDT_API_URL,
+ GDT_ACTIVE,
+ GMS_ACTIVE,
+ GRAPHIQL,
+ HUMHUB_ACTIVE,
+ HUMHUB_API_URL,
+ LOG4JS_CONFIG,
+ LOGIN_APP_SECRET,
+ LOGIN_SERVER_KEY,
+ LOG_LEVEL,
+ NODE_ENV,
+ OPENAI_ACTIVE,
+ PRODUCTION,
+ TYPEORM_LOGGING_RELATIVE_PATH,
+} from '@config/commonSchema'
+import Joi from 'joi'
+
+export const schema = Joi.object({
+ COMMUNITY_NAME,
+ COMMUNITY_URL,
+ COMMUNITY_DESCRIPTION,
+ COMMUNITY_SUPPORT_MAIL,
+ DB_HOST,
+ DB_PASSWORD,
+ DB_PORT,
+ DB_USER,
+ DB_VERSION,
+ DB_DATABASE,
+ DECAY_START_TIME,
+ GDT_API_URL,
+ GDT_ACTIVE,
+ GMS_ACTIVE,
+ GRAPHIQL,
+ HUMHUB_ACTIVE,
+ HUMHUB_API_URL,
+ LOG4JS_CONFIG,
+ LOGIN_APP_SECRET,
+ LOGIN_SERVER_KEY,
+ LOG_LEVEL,
+ NODE_ENV,
+ OPENAI_ACTIVE,
+ PRODUCTION,
+ TYPEORM_LOGGING_RELATIVE_PATH,
+
+ COMMUNITY_REDEEM_URL: Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .description('The url for redeeming link transactions, must start with frontend base url')
+ .default('http://0.0.0.0/redeem/')
+ .custom((value: string, helpers: Joi.CustomHelpers): string | Joi.ErrorReport => {
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+ if (!value.startsWith(helpers.state.ancestors[0].COMMUNITY_URL)) {
+ return helpers.error('string.pattern.base', { value, communityUrl: COMMUNITY_URL })
+ }
+ return value
+ })
+ .required(),
+
+ COMMUNITY_REDEEM_CONTRIBUTION_URL: Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .custom((value: string, helpers: Joi.CustomHelpers): string | Joi.ErrorReport => {
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+ if (!value.startsWith(helpers.state.ancestors[0].COMMUNITY_URL)) {
+ return helpers.error('string.pattern.base', { value, communityUrl: COMMUNITY_URL })
+ }
+ return value
+ })
+ .description(
+ 'The url for redeeming contribution link transactions, must start with frontend base url.',
+ )
+ .default('http://0.0.0.0/redeem/CL-')
+ .required(),
+
+ DLT_CONNECTOR: Joi.boolean()
+ .description('Flag to indicate if DLT-Connector is used. (Still in development)')
+ .default(false)
+ .required(),
+
+ DLT_CONNECTOR_URL: Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .default('http://localhost:6010')
+ .when('DLT_CONNECTOR', { is: true, then: Joi.required() })
+ .description('The URL for GDT API endpoint'),
+
+ EMAIL: Joi.boolean()
+ .default(false)
+ .description('Enable or disable email functionality')
+ .required(),
+
+ EMAIL_TEST_MODUS: Joi.boolean()
+ .default(false)
+ .description('When enabled, all emails are sended to EMAIL_TEST_RECEIVER')
+ .optional(),
+
+ EMAIL_TEST_RECEIVER: Joi.string()
+ .email()
+ .default('stage1@gradido.net')
+ .when('EMAIL_TEST_MODUS', { is: true, then: Joi.required() })
+ .description('Email address used in test mode'),
+
+ EMAIL_USERNAME: Joi.alternatives().conditional(Joi.ref('EMAIL'), {
+ is: true,
+ then: Joi.alternatives().conditional(Joi.ref('NODE_ENV'), {
+ is: 'development',
+ then: Joi.string()
+ .allow('')
+ .description('Username for SMTP authentication (optional in development)'),
+ otherwise: Joi.string()
+ .pattern(/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/)
+ .description('Valid SMTP username required in production')
+ .required(),
+ }),
+ otherwise: Joi.string().allow('').optional(),
+ }),
+
+ EMAIL_SENDER: Joi.string()
+ .email()
+ .when('EMAIL', { is: true, then: Joi.required() })
+ .default('info@gradido.net')
+ .description('Email address used as sender'),
+
+ EMAIL_PASSWORD: Joi.alternatives().conditional(Joi.ref('EMAIL'), {
+ is: true,
+ then: Joi.alternatives().conditional(Joi.ref('NODE_ENV'), {
+ is: 'development',
+ then: Joi.string()
+ .allow('')
+ .description('Password for SMTP authentication (optional in development)'),
+ otherwise: Joi.string()
+ .min(8)
+ .pattern(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&#]).{8,}$/)
+ .description(
+ 'Password must be at least 8 characters long, include uppercase and lowercase letters, a number, and a special character',
+ )
+ .required(),
+ }),
+ otherwise: Joi.string().allow('').optional(),
+ }),
+
+ EMAIL_SMTP_HOST: Joi.string()
+ .hostname()
+ .when('EMAIL', { is: true, then: Joi.required() })
+ .default('mailserver')
+ .description('SMTP server hostname'),
+
+ EMAIL_SMTP_PORT: Joi.number()
+ .integer()
+ .positive()
+ .when('EMAIL', { is: true, then: Joi.required() })
+ .default(1025)
+ .description('SMTP server port'),
+
+ EMAIL_TLS: Joi.boolean().default(true).description('Enable or disable TLS for SMTP').optional(),
+
+ EMAIL_LINK_VERIFICATION: Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .custom((value: string, helpers: Joi.CustomHelpers): string | Joi.ErrorReport => {
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+ if (!value.startsWith(helpers.state.ancestors[0].COMMUNITY_URL)) {
+ return helpers.error('string.pattern.base', { value, communityUrl: COMMUNITY_URL })
+ }
+ return value
+ })
+ .description('Email Verification link for activate Email.')
+ .required(),
+
+ EMAIL_LINK_SETPASSWORD: Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .custom((value: string, helpers: Joi.CustomHelpers): string | Joi.ErrorReport => {
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+ if (!value.startsWith(helpers.state.ancestors[0].COMMUNITY_URL)) {
+ return helpers.error('string.pattern.base', { value, communityUrl: COMMUNITY_URL })
+ }
+ return value
+ })
+ .description('Email Verification link for set initial Password.')
+ .required(),
+
+ EMAIL_LINK_FORGOTPASSWORD: Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .custom((value: string, helpers: Joi.CustomHelpers): string | Joi.ErrorReport => {
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+ if (!value.startsWith(helpers.state.ancestors[0].COMMUNITY_URL)) {
+ return helpers.error('string.pattern.base', { value, communityUrl: COMMUNITY_URL })
+ }
+ return value
+ })
+ .description('Email Verification link for set new Password, when old Password was forgotten.')
+ .required(),
+
+ EMAIL_LINK_OVERVIEW: Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .custom((value: string, helpers: Joi.CustomHelpers): string | Joi.ErrorReport => {
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+ if (!value.startsWith(helpers.state.ancestors[0].COMMUNITY_URL)) {
+ return helpers.error('string.pattern.base', { value, communityUrl: COMMUNITY_URL })
+ }
+ return value
+ })
+ .description('Link to Wallet Overview')
+ .required(),
+
+ EMAIL_CODE_VALID_TIME: Joi.number()
+ .integer()
+ .positive()
+ .max(43200) // max at 30 days
+ .default(1440)
+ .description('Time in minutes a code is valid')
+ .required(),
+
+ EMAIL_CODE_REQUEST_TIME: Joi.number()
+ .integer()
+ .positive()
+ .max(43200) // max at 30 days
+ .default(10)
+ .description('Time in minutes before a new code can be requested')
+ .required(),
+
+ FEDERATION_BACKEND_SEND_ON_API: Joi.string()
+ .pattern(/^\d+_\d+$/)
+ .default('1_0')
+ .description('API Version of sending requests to another communities, e.g., "1_0"')
+ .required(),
+
+ FEDERATION_VALIDATE_COMMUNITY_TIMER: Joi.number()
+ .integer()
+ .min(1000)
+ .default(60000)
+ .description('Timer interval in milliseconds for community validation')
+ .required(),
+
+ FEDERATION_XCOM_SENDCOINS_ENABLED: Joi.boolean()
+ .default(false)
+ .description('Enable or disable the federation send coins feature')
+ .optional(),
+
+ FEDERATION_XCOM_RECEIVER_COMMUNITY_UUID: Joi.string()
+ .uuid()
+ .default('56a55482-909e-46a4-bfa2-cd025e894ebc')
+ .description(
+ 'UUID of the receiver community for federation cross-community transactions if the receiver is unknown',
+ )
+ .required(),
+
+ FEDERATION_XCOM_MAXREPEAT_REVERTSENDCOINS: Joi.number()
+ .integer()
+ .min(0)
+ .default(3)
+ .description('Maximum number of retries for reverting send coins transactions')
+ .required(),
+
+ GMS_CREATE_USER_THROW_ERRORS: Joi.boolean()
+ .default(false)
+ .when('GMS_ACTIVE', { is: true, then: Joi.required(), otherwise: Joi.optional() })
+ .description('Whether errors should be thrown when creating users in GMS'),
+
+ GMS_API_URL: Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .when('GMS_ACTIVE', { is: true, then: Joi.required(), otherwise: Joi.optional() })
+ .default('http://localhost:4044/')
+ .description('The API URL for the GMS service'),
+
+ GMS_DASHBOARD_URL: Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .when('GMS_ACTIVE', { is: true, then: Joi.required(), otherwise: Joi.optional() })
+ .default('http://localhost:8080/')
+ .description('The URL for the GMS dashboard'),
+
+ GMS_WEBHOOK_SECRET: Joi.string()
+ .min(1)
+ .default('secret')
+ .when('GMS_ACTIVE', { is: true, then: Joi.required(), otherwise: Joi.optional() })
+ .description('The secret postfix for the GMS webhook endpoint'),
+
+ HUMHUB_JWT_KEY: Joi.string()
+ .min(1)
+ .when('HUMHUB_ACTIVE', {
+ is: true,
+ then: Joi.required(),
+ otherwise: Joi.string().allow('').optional(),
+ })
+ .description('JWT key for HumHub integration, must be the same as configured in humhub'),
+
+ PORT: Joi.number()
+ .integer()
+ .min(1024)
+ .max(49151)
+ .description('Port for hosting backend, default: 4000')
+ .default(4000)
+ .required(),
+
+ KLICKTIPP: Joi.boolean()
+ .default(false)
+ .description("Indicates whether Klicktipp integration is enabled, 'true' or 'false'"),
+
+ KLICKTTIPP_API_URL: Joi.string()
+ .uri({ scheme: ['https'] }) // Sicherstellen, dass es eine gültige HTTPS-URL ist
+ .default('https://api.klicktipp.com')
+ .description("The API URL for Klicktipp, must be a valid URL starting with 'https'"),
+
+ KLICKTIPP_USER: Joi.string().default('gradido_test').description('The username for Klicktipp'),
+
+ KLICKTIPP_PASSWORD: Joi.string()
+ .min(6)
+ .default('secret321')
+ .description('The password for Klicktipp, should be at least 6 characters'),
+
+ KLICKTIPP_APIKEY_DE: Joi.string()
+ .default('SomeFakeKeyDE')
+ .description('The API key for Klicktipp (German version)'),
+
+ KLICKTIPP_APIKEY_EN: Joi.string()
+ .default('SomeFakeKeyEN')
+ .description('The API key for Klicktipp (English version)'),
+
+ OPENAI_API_KEY: Joi.string()
+ .pattern(/^sk-[A-Za-z0-9-_]{20,}$/)
+ .when('OPENAI_ACTIVE', { is: true, then: Joi.required(), otherwise: Joi.optional().allow('') })
+ .description(
+ 'API key for OpenAI, must be at least 20 characters long and contain only alphanumeric characters, dashes, or underscores',
+ ),
+
+ OPENAI_ASSISTANT_ID: Joi.string()
+ .pattern(/^asst_[A-Za-z0-9-]{20,}$/)
+ .when('OPENAI_ACTIVE', { is: true, then: Joi.required(), otherwise: Joi.optional().allow('') })
+ .description('Assistant ID for OpenAI'),
+
+ USE_CRYPTO_WORKER: Joi.boolean()
+ .default(false)
+ .description(
+ 'Flag to enable or disable password encryption in separate thread, should be enabled if possible',
+ ),
+
+ // TODO: check format
+ JWT_SECRET: Joi.string()
+ .default('secret123')
+ .description('jwt secret for jwt tokens used for login')
+ .required(),
+
+ JWT_EXPIRES_IN: Joi.alternatives()
+ .try(
+ Joi.string()
+ .pattern(/^\d+[smhdw]$/) // Time specification such as “10m”, “1h”, “2d”, etc.
+ .description('Expiration time for JWT login token, in format like "10m", "1h", "1d"')
+ .default('10m'),
+ Joi.number()
+ .positive() // positive number to accept seconds
+ .description('Expiration time for JWT login token in seconds'),
+ )
+ .required()
+ .description('Time for JWT token to expire, auto logout'),
+
+ WEBHOOK_ELOPAGE_SECRET: Joi.string().description("isn't really used any more").optional(),
+})
diff --git a/backend/src/data/PublishName.logic.test.ts b/backend/src/data/PublishName.logic.test.ts
new file mode 100644
index 000000000..280836c5e
--- /dev/null
+++ b/backend/src/data/PublishName.logic.test.ts
@@ -0,0 +1,23 @@
+import { User } from '@entity/User'
+
+import { PublishNameType } from '@/graphql/enum/PublishNameType'
+
+import { PublishNameLogic } from './PublishName.logic'
+
+describe('test publish name logic', () => {
+ describe('test username', () => {
+ it('alias or initials with alias set', () => {
+ const user = new User()
+ user.alias = 'alias'
+ const logic = new PublishNameLogic(user)
+ expect(logic.getUsername(PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS)).toBe(user.alias)
+ })
+ it('alias or initials with empty alias', () => {
+ const user = new User()
+ user.firstName = 'John'
+ user.lastName = 'Smith'
+ const logic = new PublishNameLogic(user)
+ expect(logic.getUsername(PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS)).toBe('JoSm')
+ })
+ })
+})
diff --git a/backend/src/data/PublishName.logic.ts b/backend/src/data/PublishName.logic.ts
new file mode 100644
index 000000000..4e092cfe4
--- /dev/null
+++ b/backend/src/data/PublishName.logic.ts
@@ -0,0 +1,91 @@
+import { User } from '@entity/User'
+import XRegExp from 'xregexp'
+
+import { PublishNameType } from '@/graphql/enum/PublishNameType'
+
+export class PublishNameLogic {
+ // allowed characters for humhub usernames
+ private usernameRegex: RegExp = XRegExp('[\\p{L}\\d_\\-@\\.]', 'g')
+
+ constructor(private user: User) {}
+
+ private firstUpperCaseSecondLowerCase(name: string) {
+ if (name && name.length >= 2) {
+ return name.charAt(0).toUpperCase() + name.charAt(1).toLocaleLowerCase()
+ }
+ return name
+ }
+
+ // remove character which are invalid for humhub username
+ private filterOutInvalidChar(name: string) {
+ // eslint-disable-next-line import/no-named-as-default-member
+ return XRegExp.match(name, this.usernameRegex, 'all').join('')
+ }
+
+ public hasAlias(): boolean {
+ if (this.user.alias && this.user.alias.length >= 3) {
+ return true
+ }
+ return false
+ }
+
+ /**
+ * get first name based on publishNameType: PublishNameType value
+ * @param publishNameType
+ * @returns user.firstName for PUBLISH_NAME_FIRST, PUBLISH_NAME_FIRST_INITIAL or PUBLISH_NAME_FULL
+ */
+ public getFirstName(publishNameType: PublishNameType): string {
+ return [
+ PublishNameType.PUBLISH_NAME_FIRST,
+ PublishNameType.PUBLISH_NAME_FIRST_INITIAL,
+ PublishNameType.PUBLISH_NAME_FULL,
+ ].includes(publishNameType)
+ ? this.user.firstName
+ : ''
+ }
+
+ /**
+ * get last name based on publishNameType: GmsPublishNameType value
+ * @param publishNameType
+ * @returns user.lastName for PUBLISH_NAME_LAST, PUBLISH_NAME_FULL
+ * first initial from user.lastName for PUBLISH_NAME_FIRST_INITIAL
+ */
+ public getLastName(publishNameType: PublishNameType): string {
+ return publishNameType === PublishNameType.PUBLISH_NAME_FULL
+ ? this.user.lastName
+ : publishNameType === PublishNameType.PUBLISH_NAME_FIRST_INITIAL
+ ? this.user.lastName.charAt(0)
+ : ''
+ }
+
+ /**
+ * get username from user.alias for PUBLISH_NAME_ALIAS_OR_INITALS and if user has alias
+ * get first name first two characters and last name first two characters for PUBLISH_NAME_ALIAS_OR_INITALS
+ * if no alias or PUBLISH_NAME_INITIALS
+ * @param publishNameType
+ * @returns user.alias for publishNameType = PUBLISH_NAME_ALIAS_OR_INITALS and user has alias
+ * else return user.firstName[0,2] + user.lastName[0,2] for publishNameType = [PUBLISH_NAME_ALIAS_OR_INITALS, PUBLISH_NAME_INITIALS]
+ */
+ public getUsername(publishNameType: PublishNameType): string {
+ if (this.isUsernameFromInitials(publishNameType)) {
+ return (
+ this.firstUpperCaseSecondLowerCase(this.filterOutInvalidChar(this.user.firstName)) +
+ this.firstUpperCaseSecondLowerCase(this.filterOutInvalidChar(this.user.lastName))
+ )
+ } else if (this.isUsernameFromAlias(publishNameType)) {
+ return this.filterOutInvalidChar(this.user.alias)
+ }
+ return this.user.gradidoID
+ }
+
+ public isUsernameFromInitials(publishNameType: PublishNameType): boolean {
+ return (
+ PublishNameType.PUBLISH_NAME_INITIALS === publishNameType ||
+ (PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS === publishNameType && !this.hasAlias())
+ )
+ }
+
+ public isUsernameFromAlias(publishNameType: PublishNameType): boolean {
+ return PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS === publishNameType && this.hasAlias()
+ }
+}
diff --git a/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap b/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap
index 00ec365f0..37263e937 100644
--- a/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap
+++ b/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap
@@ -124,6 +124,10 @@ exports[`sendEmailVariants sendAccountActivationEmail result has the correct htm
line-break: anywhere;
margin-bottom: 40px;
}
+.button-5:hover {
+ transform: translateY(-5px);
+ box-shadow: 20px 25px 30px rgba(56, 56, 56, 0.4);
+}
.slink {
width: 150px;
}
@@ -142,11 +146,11 @@ exports[`sendEmailVariants sendAccountActivationEmail result has the correct htm
![\\"facebook\\"](\\"cid:facebookicon\\")
![\\"Telegram\\"](\\"cid:telegramicon\\")
![\\"Twitter\\"](\\"cid:twittericon\\")
![\\"youtube\\"](\\"cid:youtubeicon\\")
@@ -295,6 +300,10 @@ exports[`sendEmailVariants sendAccountMultiRegistrationEmail calls "sendEmailTra
line-break: anywhere;
margin-bottom: 40px;
}
+.button-5:hover {
+ transform: translateY(-5px);
+ box-shadow: 20px 25px 30px rgba(56, 56, 56, 0.4);
+}
.slink {
width: 150px;
}
@@ -314,10 +323,10 @@ exports[`sendEmailVariants sendAccountMultiRegistrationEmail calls "sendEmailTra
@@ -464,6 +474,10 @@ exports[`sendEmailVariants sendAddedContributionMessageEmail result has the corr
line-break: anywhere;
margin-bottom: 40px;
}
+.button-5:hover {
+ transform: translateY(-5px);
+ box-shadow: 20px 25px 30px rgba(56, 56, 56, 0.4);
+}
.slink {
width: 150px;
}
@@ -482,8 +496,8 @@ exports[`sendEmailVariants sendAddedContributionMessageEmail result has the corr
@@ -630,6 +645,10 @@ exports[`sendEmailVariants sendContributionChangedByModeratorEmail result has th
line-break: anywhere;
margin-bottom: 40px;
}
+.button-5:hover {
+ transform: translateY(-5px);
+ box-shadow: 20px 25px 30px rgba(56, 56, 56, 0.4);
+}
.slink {
width: 150px;
}
@@ -648,9 +667,9 @@ exports[`sendEmailVariants sendContributionChangedByModeratorEmail result has th
@@ -797,6 +817,10 @@ exports[`sendEmailVariants sendContributionConfirmedEmail result has the correct
line-break: anywhere;
margin-bottom: 40px;
}
+.button-5:hover {
+ transform: translateY(-5px);
+ box-shadow: 20px 25px 30px rgba(56, 56, 56, 0.4);
+}
.slink {
width: 150px;
}
@@ -815,9 +839,9 @@ exports[`sendEmailVariants sendContributionConfirmedEmail result has the correct
@@ -964,6 +989,10 @@ exports[`sendEmailVariants sendContributionDeletedEmail result has the correct h
line-break: anywhere;
margin-bottom: 40px;
}
+.button-5:hover {
+ transform: translateY(-5px);
+ box-shadow: 20px 25px 30px rgba(56, 56, 56, 0.4);
+}
.slink {
width: 150px;
}
@@ -982,9 +1011,9 @@ exports[`sendEmailVariants sendContributionDeletedEmail result has the correct h
@@ -1131,6 +1161,10 @@ exports[`sendEmailVariants sendContributionDeniedEmail result has the correct ht
line-break: anywhere;
margin-bottom: 40px;
}
+.button-5:hover {
+ transform: translateY(-5px);
+ box-shadow: 20px 25px 30px rgba(56, 56, 56, 0.4);
+}
.slink {
width: 150px;
}
@@ -1149,9 +1183,9 @@ exports[`sendEmailVariants sendContributionDeniedEmail result has the correct ht
@@ -1298,6 +1333,10 @@ exports[`sendEmailVariants sendResetPasswordEmail result has the correct html as
line-break: anywhere;
margin-bottom: 40px;
}
+.button-5:hover {
+ transform: translateY(-5px);
+ box-shadow: 20px 25px 30px rgba(56, 56, 56, 0.4);
+}
.slink {
width: 150px;
}
@@ -1316,11 +1355,11 @@ exports[`sendEmailVariants sendResetPasswordEmail result has the correct html as
@@ -1469,6 +1509,10 @@ exports[`sendEmailVariants sendTransactionLinkRedeemedEmail result has the corre
line-break: anywhere;
margin-bottom: 40px;
}
+.button-5:hover {
+ transform: translateY(-5px);
+ box-shadow: 20px 25px 30px rgba(56, 56, 56, 0.4);
+}
.slink {
width: 150px;
}
@@ -1487,9 +1531,9 @@ exports[`sendEmailVariants sendTransactionLinkRedeemedEmail result has the corre
@@ -1636,6 +1681,10 @@ exports[`sendEmailVariants sendTransactionReceivedEmail result has the correct h
line-break: anywhere;
margin-bottom: 40px;
}
+.button-5:hover {
+ transform: translateY(-5px);
+ box-shadow: 20px 25px 30px rgba(56, 56, 56, 0.4);
+}
.slink {
width: 150px;
}
@@ -1650,13 +1699,17 @@ exports[`sendEmailVariants sendTransactionReceivedEmail result has the correct h
![\\"chatbox\\"](\\"cid:chatboxicon\\")
Reply
+
+ To account
diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts
index d09d11bd5..f38342985 100644
--- a/backend/src/emails/sendEmailTranslated.test.ts
+++ b/backend/src/emails/sendEmailTranslated.test.ts
@@ -7,9 +7,12 @@ import { CONFIG } from '@/config'
import { sendEmailTranslated } from './sendEmailTranslated'
+const testMailServerHost = 'localhost'
+const testMailServerPort = 1025
+
CONFIG.EMAIL = false
-CONFIG.EMAIL_SMTP_URL = 'EMAIL_SMTP_URL'
-CONFIG.EMAIL_SMTP_PORT = 1234
+CONFIG.EMAIL_SMTP_HOST = testMailServerHost
+CONFIG.EMAIL_SMTP_PORT = testMailServerPort
CONFIG.EMAIL_SENDER = 'info@gradido.net'
CONFIG.EMAIL_USERNAME = 'user'
CONFIG.EMAIL_PASSWORD = 'pwd'
@@ -20,11 +23,11 @@ jest.mock('nodemailer', () => {
__esModule: true,
createTransport: jest.fn(() => {
return {
- sendMail: jest.fn(() => {
+ sendMail: () => {
return {
messageId: 'message',
}
- }),
+ },
}
}),
}
@@ -73,8 +76,8 @@ describe('sendEmailTranslated', () => {
it('calls the transporter', () => {
expect(createTransport).toBeCalledWith({
- host: 'EMAIL_SMTP_URL',
- port: 1234,
+ host: testMailServerHost,
+ port: testMailServerPort,
secure: false,
requireTLS: true,
auth: {
@@ -87,11 +90,6 @@ describe('sendEmailTranslated', () => {
describe('call of "sendEmailTranslated"', () => {
it('has expected result', () => {
expect(result).toMatchObject({
- envelope: {
- from: 'info@gradido.net',
- to: ['receiver@mail.org', 'support@gradido.net'],
- },
- message: expect.any(String),
originalMessage: expect.objectContaining({
to: 'receiver@mail.org',
cc: 'support@gradido.net',
@@ -135,11 +133,6 @@ describe('sendEmailTranslated', () => {
it('call of "sendEmailTranslated" with faked "to"', () => {
expect(result).toMatchObject({
- envelope: {
- from: CONFIG.EMAIL_SENDER,
- to: [CONFIG.EMAIL_TEST_RECEIVER, 'support@gradido.net'],
- },
- message: expect.any(String),
originalMessage: expect.objectContaining({
to: CONFIG.EMAIL_TEST_RECEIVER,
cc: 'support@gradido.net',
diff --git a/backend/src/emails/sendEmailTranslated.ts b/backend/src/emails/sendEmailTranslated.ts
index acef8a11f..f78ecf805 100644
--- a/backend/src/emails/sendEmailTranslated.ts
+++ b/backend/src/emails/sendEmailTranslated.ts
@@ -45,7 +45,7 @@ export const sendEmailTranslated = async ({
receiver.to = CONFIG.EMAIL_TEST_RECEIVER
}
const transport = createTransport({
- host: CONFIG.EMAIL_SMTP_URL,
+ host: CONFIG.EMAIL_SMTP_HOST,
port: CONFIG.EMAIL_SMTP_PORT,
secure: false, // true for 465, false for other ports
requireTLS: CONFIG.EMAIL_TLS,
@@ -62,6 +62,7 @@ export const sendEmailTranslated = async ({
message: {
from: `Gradido (${i18n.__('emails.general.doNotAnswer')}) <${CONFIG.EMAIL_SENDER}>`,
},
+ send: CONFIG.EMAIL,
transport,
preview: false,
// i18n, // is only needed if you don't install i18n
@@ -98,13 +99,18 @@ export const sendEmailTranslated = async ({
path: path.join(__dirname, 'templates/includes/youtube-icon.png'),
cid: 'youtubeicon',
},
+ {
+ filename: 'chatbox-icon.png',
+ path: path.join(__dirname, 'templates/includes/chatbox-icon.png'),
+ cid: 'chatboxicon',
+ },
],
},
locals, // the 'locale' in here seems not to be used by 'email-template', because it doesn't work if the language isn't set before by 'i18n.setLocale'
})
.catch((error: unknown) => {
logger.error('Error sending notification email', error)
- return false
+ return error
})
return resultSend
diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts
index 9a2cb4ce0..88cd851d2 100644
--- a/backend/src/emails/sendEmailVariants.test.ts
+++ b/backend/src/emails/sendEmailVariants.test.ts
@@ -11,7 +11,8 @@ import { logger, i18n as localization } from '@test/testSetup'
import { CONFIG } from '@/config'
-import { sendEmailTranslated } from './sendEmailTranslated'
+// eslint-disable-next-line import/no-namespace
+import * as sendEmailTranslatedApi from './sendEmailTranslated'
import {
sendAddedContributionMessageEmail,
sendAccountActivationEmail,
@@ -25,7 +26,29 @@ import {
sendContributionChangedByModeratorEmail,
} from './sendEmailVariants'
+const testMailServerHost = 'localhost'
+const testMailServerPort = 1025
+const testMailTLS = false
+
CONFIG.EMAIL_SENDER = 'info@gradido.net'
+CONFIG.EMAIL_SMTP_HOST = testMailServerHost
+CONFIG.EMAIL_SMTP_PORT = testMailServerPort
+CONFIG.EMAIL_TLS = testMailTLS
+
+jest.mock('nodemailer', () => {
+ return {
+ __esModule: true,
+ createTransport: jest.fn(() => {
+ return {
+ sendMail: () => {
+ return {
+ messageId: 'message',
+ }
+ },
+ }
+ }),
+ }
+})
let con: Connection
let testEnv: {
@@ -43,13 +66,7 @@ afterAll(async () => {
await con.close()
})
-jest.mock('./sendEmailTranslated', () => {
- const originalModule = jest.requireActual('./sendEmailTranslated')
- return {
- __esModule: true,
- sendEmailTranslated: jest.fn((a) => originalModule.sendEmailTranslated(a)),
- }
-})
+const sendEmailTranslatedSpy = jest.spyOn(sendEmailTranslatedApi, 'sendEmailTranslated')
describe('sendEmailVariants', () => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -70,7 +87,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
- expect(sendEmailTranslated).toBeCalledWith({
+ expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig ',
},
@@ -93,11 +110,6 @@ describe('sendEmailVariants', () => {
describe('result', () => {
it('is the expected object', () => {
expect(result).toMatchObject({
- envelope: {
- from: 'info@gradido.net',
- to: ['peter@lustig.de'],
- },
- message: expect.any(String),
originalMessage: expect.objectContaining({
to: 'Peter Lustig ',
from: 'Gradido (emails.general.doNotAnswer) ',
@@ -129,7 +141,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
- expect(sendEmailTranslated).toBeCalledWith({
+ expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig ',
},
@@ -151,11 +163,6 @@ describe('sendEmailVariants', () => {
describe('result', () => {
it('is the expected object', () => {
expect(result).toMatchObject({
- envelope: {
- from: 'info@gradido.net',
- to: ['peter@lustig.de'],
- },
- message: expect.any(String),
originalMessage: expect.objectContaining({
to: 'Peter Lustig ',
from: 'Gradido (emails.general.doNotAnswer) ',
@@ -185,7 +192,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
- expect(sendEmailTranslated).toBeCalledWith({
+ expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig ',
},
@@ -204,11 +211,6 @@ describe('sendEmailVariants', () => {
describe('result', () => {
it('is the expected object', () => {
expect(result).toMatchObject({
- envelope: {
- from: 'info@gradido.net',
- to: ['peter@lustig.de'],
- },
- message: expect.any(String),
originalMessage: expect.objectContaining({
to: 'Peter Lustig ',
from: 'Gradido (emails.general.doNotAnswer) ',
@@ -243,7 +245,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
- expect(sendEmailTranslated).toBeCalledWith({
+ expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig ',
},
@@ -267,11 +269,6 @@ describe('sendEmailVariants', () => {
describe('result', () => {
it('is the expected object', () => {
expect(result).toMatchObject({
- envelope: {
- from: 'info@gradido.net',
- to: ['peter@lustig.de'],
- },
- message: expect.any(String),
originalMessage: expect.objectContaining({
to: 'Peter Lustig ',
from: 'Gradido (emails.general.doNotAnswer) ',
@@ -305,7 +302,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
- expect(sendEmailTranslated).toBeCalledWith({
+ expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig ',
},
@@ -329,11 +326,6 @@ describe('sendEmailVariants', () => {
describe('result', () => {
it('is the expected object', () => {
expect(result).toMatchObject({
- envelope: {
- from: 'info@gradido.net',
- to: ['peter@lustig.de'],
- },
- message: expect.any(String),
originalMessage: expect.objectContaining({
to: 'Peter Lustig ',
from: 'Gradido (emails.general.doNotAnswer) ',
@@ -366,7 +358,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
- expect(sendEmailTranslated).toBeCalledWith({
+ expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig ',
},
@@ -389,11 +381,6 @@ describe('sendEmailVariants', () => {
describe('result', () => {
it('has expected result', () => {
expect(result).toMatchObject({
- envelope: {
- from: 'info@gradido.net',
- to: ['peter@lustig.de'],
- },
- message: expect.any(String),
originalMessage: expect.objectContaining({
to: 'Peter Lustig ',
from: 'Gradido (emails.general.doNotAnswer) ',
@@ -426,7 +413,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
- expect(sendEmailTranslated).toBeCalledWith({
+ expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig ',
},
@@ -449,11 +436,6 @@ describe('sendEmailVariants', () => {
describe('result', () => {
it('is the expected object', () => {
expect(result).toMatchObject({
- envelope: {
- from: 'info@gradido.net',
- to: ['peter@lustig.de'],
- },
- message: expect.any(String),
originalMessage: expect.objectContaining({
to: 'Peter Lustig ',
from: 'Gradido (emails.general.doNotAnswer) ',
@@ -485,7 +467,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
- expect(sendEmailTranslated).toBeCalledWith({
+ expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig ',
},
@@ -507,11 +489,6 @@ describe('sendEmailVariants', () => {
describe('result', () => {
it('is the expected object', () => {
expect(result).toMatchObject({
- envelope: {
- from: 'info@gradido.net',
- to: ['peter@lustig.de'],
- },
- message: expect.any(String),
originalMessage: expect.objectContaining({
to: 'Peter Lustig ',
from: 'Gradido (emails.general.doNotAnswer) ',
@@ -546,7 +523,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
- expect(sendEmailTranslated).toBeCalledWith({
+ expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig ',
},
@@ -571,11 +548,6 @@ describe('sendEmailVariants', () => {
describe('result', () => {
it('is the expected object', () => {
expect(result).toMatchObject({
- envelope: {
- from: 'info@gradido.net',
- to: ['peter@lustig.de'],
- },
- message: expect.any(String),
originalMessage: expect.objectContaining({
to: 'Peter Lustig ',
from: 'Gradido (emails.general.doNotAnswer) ',
@@ -600,6 +572,7 @@ describe('sendEmailVariants', () => {
lastName: 'Lustig',
email: 'peter@lustig.de',
language: 'en',
+ memo: 'Du bist schon lustiger ;)',
senderFirstName: 'Bibi',
senderLastName: 'Bloxberg',
senderEmail: 'bibi@bloxberg.de',
@@ -609,7 +582,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
- expect(sendEmailTranslated).toBeCalledWith({
+ expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig ',
},
@@ -618,6 +591,7 @@ describe('sendEmailVariants', () => {
firstName: 'Peter',
lastName: 'Lustig',
locale: 'en',
+ memo: 'Du bist schon lustiger ;)',
senderFirstName: 'Bibi',
senderLastName: 'Bloxberg',
senderEmail: 'bibi@bloxberg.de',
@@ -633,11 +607,6 @@ describe('sendEmailVariants', () => {
describe('result', () => {
it('is the expected object', () => {
expect(result).toMatchObject({
- envelope: {
- from: 'info@gradido.net',
- to: ['peter@lustig.de'],
- },
- message: expect.any(String),
originalMessage: expect.objectContaining({
to: 'Peter Lustig ',
from: 'Gradido (emails.general.doNotAnswer) ',
diff --git a/backend/src/emails/sendEmailVariants.ts b/backend/src/emails/sendEmailVariants.ts
index 8bcc9accd..3373f17ad 100644
--- a/backend/src/emails/sendEmailVariants.ts
+++ b/backend/src/emails/sendEmailVariants.ts
@@ -40,6 +40,7 @@ export const sendAccountActivationEmail = (data: {
language: string
activationLink: string
timeDurationObject: Record
+ logoUrl?: string | null
}): Promise | boolean | null> => {
return sendEmailTranslated({
receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` },
@@ -50,6 +51,7 @@ export const sendAccountActivationEmail = (data: {
locale: data.language,
activationLink: data.activationLink,
timeDurationObject: data.timeDurationObject,
+ logoUrl: data.logoUrl,
resendLink: CONFIG.EMAIL_LINK_FORGOTPASSWORD,
supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
communityURL: CONFIG.COMMUNITY_URL,
@@ -247,6 +249,7 @@ export const sendTransactionReceivedEmail = (data: {
senderFirstName: string
senderLastName: string
senderEmail: string
+ memo: string
transactionAmount: Decimal
}): Promise | boolean | null> => {
return sendEmailTranslated({
@@ -256,6 +259,7 @@ export const sendTransactionReceivedEmail = (data: {
firstName: data.firstName,
lastName: data.lastName,
locale: data.language,
+ memo: data.memo,
senderFirstName: data.senderFirstName,
senderLastName: data.senderLastName,
senderEmail: data.senderEmail,
diff --git a/backend/src/emails/templates/accountActivation/html.pug b/backend/src/emails/templates/accountActivation/html.pug
index 027dcbc63..6b5dd41c3 100644
--- a/backend/src/emails/templates/accountActivation/html.pug
+++ b/backend/src/emails/templates/accountActivation/html.pug
@@ -1,6 +1,8 @@
extend ../layout.pug
block content
+ if logoUrl
+ img(src=logoUrl, alt="Banner", style="max-width: 680px; max-height: 250px;border-radius:20px")
h2= t('emails.accountActivation.title')
.text-block
include ../includes/salutation.pug
diff --git a/backend/src/emails/templates/includes/Chatbox.svg b/backend/src/emails/templates/includes/Chatbox.svg
new file mode 100644
index 000000000..4eb68e0bb
--- /dev/null
+++ b/backend/src/emails/templates/includes/Chatbox.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/backend/src/emails/templates/includes/answear_button.svg b/backend/src/emails/templates/includes/answear_button.svg
new file mode 100644
index 000000000..f45fedc90
--- /dev/null
+++ b/backend/src/emails/templates/includes/answear_button.svg
@@ -0,0 +1,22 @@
+
diff --git a/backend/src/emails/templates/includes/chatbox-icon.png b/backend/src/emails/templates/includes/chatbox-icon.png
new file mode 100644
index 000000000..a25c7c209
Binary files /dev/null and b/backend/src/emails/templates/includes/chatbox-icon.png differ
diff --git a/backend/src/emails/templates/includes/chatbox-icon.pug b/backend/src/emails/templates/includes/chatbox-icon.pug
new file mode 100644
index 000000000..62775b0f0
--- /dev/null
+++ b/backend/src/emails/templates/includes/chatbox-icon.pug
@@ -0,0 +1,6 @@
+span.chatbox-wrapper
+ img.bi-chatbox(
+ alt="chatbox"
+ loading="lazy"
+ src="cid:chatboxicon"
+ )
\ No newline at end of file
diff --git a/backend/src/emails/templates/includes/footer.pug b/backend/src/emails/templates/includes/footer.pug
index 5827b203b..91a0e4543 100644
--- a/backend/src/emails/templates/includes/footer.pug
+++ b/backend/src/emails/templates/includes/footer.pug
@@ -44,9 +44,10 @@ footer
class="footer_p2"
href='mailto:' + t("emails.footer.supportEmail")
)= t("emails.footer.supportEmail")
- img.image(
- alt="Gradido Logo"
- src="https://gdd.gradido.net/img/brand/green.png"
+ div
+ img.image(
+ alt="Gradido Logo"
+ src="https://gdd.gradido.net/img/brand/green.png"
)
div
a(
diff --git a/backend/src/emails/templates/includes/webflow.css b/backend/src/emails/templates/includes/webflow.css
index 02e7fc4e0..45e4420c4 100644
--- a/backend/src/emails/templates/includes/webflow.css
+++ b/backend/src/emails/templates/includes/webflow.css
@@ -42,7 +42,7 @@ h2 {
.p_content{
margin: 15px 0 15px 0;
line-height: 26px;
- color: #9ca0a8;
+ color: #696c72;
}
.clink {
@@ -51,7 +51,8 @@ h2 {
}
.button-3,
-.button-4 {
+.button-4,
+.button-5 {
display: inline-block;
padding: 9px 15px;
color: white;
@@ -70,6 +71,35 @@ h2 {
background-image: radial-gradient(circle farthest-corner at 0% 0%, #616161, #c2c2c2);
}
+.button-5 {
+ background: linear-gradient(135deg, #53900c, #6e6e6e);
+ font-size: 20px;
+ font-weight: 600;
+ color: #f5f5f5;
+ width: auto;
+ box-shadow: 20px 20px 25px;
+ transition: all 0.3s ease;
+}
+
+.button-5:hover {
+ transform: translateY(-5px);
+ box-shadow: 20px 25px 30px rgba(56, 56, 56, 0.4);
+}
+
+.chatbox-wrapper {
+ margin-right: 8px;
+}
+.bi-chatbox {
+ margin-bottom: -5px;
+}
+
+.child-right {
+ text-align: right;
+}
+.child-left {
+ text-align: left;
+}
+
.socialmedia {
display: flex;
margin-top: 40px;
diff --git a/backend/src/emails/templates/transactionReceived/html.pug b/backend/src/emails/templates/transactionReceived/html.pug
index 5370ec03e..4f9aa9c31 100644
--- a/backend/src/emails/templates/transactionReceived/html.pug
+++ b/backend/src/emails/templates/transactionReceived/html.pug
@@ -1,15 +1,30 @@
extend ../layout.pug
-block content
+block content
+ mixin mailto(email, subject)
+ - var formattedSubject = encodeURIComponent(subject)
+ a(class!=attributes.class href=`mailto:${email}?subject=${formattedSubject}`)
+ block
+
+ - var subject= t('emails.transactionReceived.replySubject', { senderFirstName, senderLastName, transactionAmount })
h2= t('emails.transactionReceived.title', { senderFirstName, senderLastName, transactionAmount })
.text-block
include ../includes/salutation.pug
- p= t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName, senderEmail })
+ p
+ = t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName })
+ | (
+ +mailto(senderEmail, subject)=senderEmail
+ |).
.content
- h2= t('emails.general.transactionDetails')
- div(class="p_content")= t('emails.general.detailsYouFindOnLinkToYourAccount')
+ h2= t('emails.general.message')
+ .child-left
+ div(class="p_content")= memo
+ .child-right
+ +mailto(senderEmail, subject)(class="button-5")
+ include ../includes/chatbox-icon.pug
+ span #{t('emails.general.answerNow')}
- a.button-3(href=`${communityURL}/transactions`) #{t('emails.general.toAccount')}
+ a.button-3(href=`${communityURL}/transactions`) #{t('emails.general.toAccount')}
- include ../includes/doNotReply.pug
+
diff --git a/backend/src/federation/authenticateCommunities.ts b/backend/src/federation/authenticateCommunities.ts
index 8da8306fd..56899d4b0 100644
--- a/backend/src/federation/authenticateCommunities.ts
+++ b/backend/src/federation/authenticateCommunities.ts
@@ -6,6 +6,7 @@ import { CONFIG } from '@/config'
// eslint-disable-next-line camelcase
import { AuthenticationClient as V1_0_AuthenticationClient } from '@/federation/client/1_0/AuthenticationClient'
import { backendLogger as logger } from '@/server/logger'
+import { ensureUrlEndsWithSlash } from '@/util/utilities'
import { OpenConnectionArgs } from './client/1_0/model/OpenConnectionArgs'
import { AuthenticationClientFactory } from './client/AuthenticationClientFactory'
@@ -39,9 +40,7 @@ export async function startCommunityAuthentication(
const args = new OpenConnectionArgs()
args.publicKey = homeCom.publicKey.toString('hex')
// TODO encrypt url with foreignCom.publicKey and sign it with homeCom.privateKey
- args.url = homeFedCom.endPoint.endsWith('/')
- ? homeFedCom.endPoint
- : homeFedCom.endPoint + '/' + homeFedCom.apiVersion
+ args.url = ensureUrlEndsWithSlash(homeFedCom.endPoint).concat(homeFedCom.apiVersion)
logger.debug(
'Authentication: before client.openConnection() args:',
homeCom.publicKey.toString('hex'),
diff --git a/backend/src/federation/client/1_0/AuthenticationClient.ts b/backend/src/federation/client/1_0/AuthenticationClient.ts
index f73393255..c1d921823 100644
--- a/backend/src/federation/client/1_0/AuthenticationClient.ts
+++ b/backend/src/federation/client/1_0/AuthenticationClient.ts
@@ -2,6 +2,7 @@ import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCom
import { GraphQLClient } from 'graphql-request'
import { backendLogger as logger } from '@/server/logger'
+import { ensureUrlEndsWithSlash } from '@/util/utilities'
import { OpenConnectionArgs } from './model/OpenConnectionArgs'
import { openConnection } from './query/openConnection'
@@ -13,9 +14,7 @@ export class AuthenticationClient {
constructor(dbCom: DbFederatedCommunity) {
this.dbCom = dbCom
- this.endpoint = `${dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'}${
- dbCom.apiVersion
- }/`
+ this.endpoint = ensureUrlEndsWithSlash(dbCom.endPoint).concat(dbCom.apiVersion).concat('/')
this.client = new GraphQLClient(this.endpoint, {
method: 'POST',
jsonSerializer: {
diff --git a/backend/src/federation/client/1_0/FederationClient.ts b/backend/src/federation/client/1_0/FederationClient.ts
index b9939a12c..0c2b4101b 100644
--- a/backend/src/federation/client/1_0/FederationClient.ts
+++ b/backend/src/federation/client/1_0/FederationClient.ts
@@ -4,6 +4,7 @@ import { GraphQLClient } from 'graphql-request'
import { getPublicCommunityInfo } from '@/federation/client/1_0/query/getPublicCommunityInfo'
import { getPublicKey } from '@/federation/client/1_0/query/getPublicKey'
import { backendLogger as logger } from '@/server/logger'
+import { ensureUrlEndsWithSlash } from '@/util/utilities'
import { PublicCommunityInfoLoggingView } from './logging/PublicCommunityInfoLogging.view'
import { GetPublicKeyResult } from './model/GetPublicKeyResult'
@@ -16,9 +17,7 @@ export class FederationClient {
constructor(dbCom: DbFederatedCommunity) {
this.dbCom = dbCom
- this.endpoint = `${dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'}${
- dbCom.apiVersion
- }/`
+ this.endpoint = ensureUrlEndsWithSlash(dbCom.endPoint).concat(dbCom.apiVersion).concat('/')
this.client = new GraphQLClient(this.endpoint, {
method: 'GET',
jsonSerializer: {
diff --git a/backend/src/federation/client/1_0/SendCoinsClient.ts b/backend/src/federation/client/1_0/SendCoinsClient.ts
index bcf303584..2c3fcce4c 100644
--- a/backend/src/federation/client/1_0/SendCoinsClient.ts
+++ b/backend/src/federation/client/1_0/SendCoinsClient.ts
@@ -3,6 +3,7 @@ import { GraphQLClient } from 'graphql-request'
import { LogError } from '@/server/LogError'
import { backendLogger as logger } from '@/server/logger'
+import { ensureUrlEndsWithSlash } from '@/util/utilities'
import { SendCoinsArgsLoggingView } from './logging/SendCoinsArgsLogging.view'
import { SendCoinsResultLoggingView } from './logging/SendCoinsResultLogging.view'
@@ -20,9 +21,7 @@ export class SendCoinsClient {
constructor(dbCom: DbFederatedCommunity) {
this.dbCom = dbCom
- this.endpoint = `${dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'}${
- dbCom.apiVersion
- }/`
+ this.endpoint = ensureUrlEndsWithSlash(dbCom.endPoint).concat(dbCom.apiVersion).concat('/')
this.client = new GraphQLClient(this.endpoint, {
method: 'POST',
jsonSerializer: {
diff --git a/backend/src/federation/client/FederationClientFactory.ts b/backend/src/federation/client/FederationClientFactory.ts
index fe2ff0dbd..6010fa5eb 100644
--- a/backend/src/federation/client/FederationClientFactory.ts
+++ b/backend/src/federation/client/FederationClientFactory.ts
@@ -5,6 +5,7 @@ import { FederationClient as V1_0_FederationClient } from '@/federation/client/1
// eslint-disable-next-line camelcase
import { FederationClient as V1_1_FederationClient } from '@/federation/client/1_1/FederationClient'
import { ApiVersionType } from '@/federation/enum/apiVersionType'
+import { ensureUrlEndsWithSlash } from '@/util/utilities'
// eslint-disable-next-line camelcase
type FederationClient = V1_0_FederationClient | V1_1_FederationClient
@@ -47,10 +48,7 @@ export class FederationClientFactory {
const instance = FederationClientFactory.instanceArray.find(
(instance) => instance.id === dbCom.id,
)
- // TODO: found a way to prevent double code with FederationClient::constructor
- const endpoint = `${dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'}${
- dbCom.apiVersion
- }/`
+ const endpoint = ensureUrlEndsWithSlash(dbCom.endPoint).concat(dbCom.apiVersion)
// check if endpoint is still the same and not changed meanwhile
if (instance && instance.client.getEndpoint() === endpoint) {
return instance.client
diff --git a/backend/src/graphql/arg/CommunityArgs.ts b/backend/src/graphql/arg/CommunityArgs.ts
index 163a6e504..074901e06 100644
--- a/backend/src/graphql/arg/CommunityArgs.ts
+++ b/backend/src/graphql/arg/CommunityArgs.ts
@@ -1,14 +1,13 @@
-import { IsString } from 'class-validator'
-import { Field, ArgsType, InputType } from 'type-graphql'
+import { IsBoolean, IsString } from 'class-validator'
+import { ArgsType, Field } from 'type-graphql'
-@InputType()
@ArgsType()
export class CommunityArgs {
- @Field(() => String)
+ @Field(() => String, { nullable: true })
@IsString()
- uuid: string
+ communityIdentifier?: string | null
- @Field(() => String)
- @IsString()
- gmsApiKey: string
+ @Field(() => Boolean, { nullable: true })
+ @IsBoolean()
+ foreign?: boolean | null
}
diff --git a/backend/src/graphql/arg/CreateUserArgs.ts b/backend/src/graphql/arg/CreateUserArgs.ts
index 28105559d..d7182d81b 100644
--- a/backend/src/graphql/arg/CreateUserArgs.ts
+++ b/backend/src/graphql/arg/CreateUserArgs.ts
@@ -30,4 +30,8 @@ export class CreateUserArgs {
@Field(() => String, { nullable: true })
@IsString()
redeemCode?: string | null
+
+ @Field(() => String, { nullable: true })
+ @IsString()
+ project?: string | null
}
diff --git a/backend/src/graphql/arg/Paginated.ts b/backend/src/graphql/arg/Paginated.ts
index c63416e7e..f66c71c21 100644
--- a/backend/src/graphql/arg/Paginated.ts
+++ b/backend/src/graphql/arg/Paginated.ts
@@ -1,20 +1,27 @@
/* eslint-disable type-graphql/invalid-nullable-input-type */
import { IsPositive, IsEnum } from 'class-validator'
-import { ArgsType, Field, Int } from 'type-graphql'
+import { ArgsType, Field, Int, InputType } from 'type-graphql'
import { Order } from '@enum/Order'
@ArgsType()
+@InputType()
export class Paginated {
- @Field(() => Int, { nullable: true })
+ @Field(() => Int)
@IsPositive()
- currentPage?: number
+ currentPage: number
- @Field(() => Int, { nullable: true })
+ @Field(() => Int)
@IsPositive()
- pageSize?: number
+ pageSize: number
- @Field(() => Order, { nullable: true })
+ @Field(() => Order)
@IsEnum(Order)
- order?: Order
+ order: Order
+
+ public constructor(pageSize?: number, currentPage?: number, order?: Order) {
+ this.pageSize = pageSize ?? 3
+ this.currentPage = currentPage ?? 1
+ this.order = order ?? Order.DESC
+ }
}
diff --git a/backend/src/graphql/arg/SearchContributionsFilterArgs.ts b/backend/src/graphql/arg/SearchContributionsFilterArgs.ts
index 0d50457ca..7896ad67a 100644
--- a/backend/src/graphql/arg/SearchContributionsFilterArgs.ts
+++ b/backend/src/graphql/arg/SearchContributionsFilterArgs.ts
@@ -1,11 +1,12 @@
import { IsBoolean, IsPositive, IsString } from 'class-validator'
-import { Field, ArgsType, Int } from 'type-graphql'
+import { Field, ArgsType, Int, InputType } from 'type-graphql'
import { ContributionStatus } from '@enum/ContributionStatus'
import { isContributionStatusArray } from '@/graphql/validator/ContributionStatusArray'
@ArgsType()
+@InputType()
export class SearchContributionsFilterArgs {
@Field(() => [ContributionStatus], { nullable: true, defaultValue: null })
@isContributionStatusArray()
diff --git a/backend/src/graphql/arg/UnsecureLoginArgs.ts b/backend/src/graphql/arg/UnsecureLoginArgs.ts
index 5e82f12f3..72459df27 100644
--- a/backend/src/graphql/arg/UnsecureLoginArgs.ts
+++ b/backend/src/graphql/arg/UnsecureLoginArgs.ts
@@ -14,4 +14,8 @@ export class UnsecureLoginArgs {
@Field(() => Int, { nullable: true })
@IsInt()
publisherId?: number | null
+
+ @Field(() => String, { nullable: true })
+ @IsString()
+ project?: string | null
}
diff --git a/backend/src/graphql/arg/UpdateUserInfosArgs.ts b/backend/src/graphql/arg/UpdateUserInfosArgs.ts
index 0920fb3bc..c368bbd8b 100644
--- a/backend/src/graphql/arg/UpdateUserInfosArgs.ts
+++ b/backend/src/graphql/arg/UpdateUserInfosArgs.ts
@@ -1,6 +1,8 @@
-import { IsBoolean, IsInt, IsString } from 'class-validator'
+import { IsBoolean, IsEnum, IsInt, IsString } from 'class-validator'
import { ArgsType, Field, InputType, Int } from 'type-graphql'
+import { GmsPublishLocationType } from '@enum/GmsPublishLocationType'
+import { PublishNameType } from '@enum/PublishNameType'
import { Location } from '@model/Location'
import { isValidLocation } from '@/graphql/validator/Location'
@@ -44,19 +46,27 @@ export class UpdateUserInfosArgs {
@IsBoolean()
hideAmountGDT?: boolean
- @Field({ nullable: true, defaultValue: true })
+ @Field({ nullable: true })
+ @IsBoolean()
+ humhubAllowed?: boolean
+
+ @Field({ nullable: true })
@IsBoolean()
gmsAllowed?: boolean
- @Field(() => Int, { nullable: true, defaultValue: 0 })
- @IsInt()
- gmsPublishName?: number | null
+ @Field(() => PublishNameType, { nullable: true })
+ @IsEnum(PublishNameType)
+ gmsPublishName?: PublishNameType | null
+
+ @Field(() => PublishNameType, { nullable: true })
+ @IsEnum(PublishNameType)
+ humhubPublishName?: PublishNameType | null
@Field(() => Location, { nullable: true })
@isValidLocation()
gmsLocation?: Location | null
- @Field(() => Int, { nullable: true, defaultValue: 2 })
- @IsInt()
- gmsPublishLocation?: number | null
+ @Field(() => GmsPublishLocationType, { nullable: true })
+ @IsEnum(GmsPublishLocationType)
+ gmsPublishLocation?: GmsPublishLocationType | null
}
diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts
index 59309c91e..5912f16f7 100644
--- a/backend/src/graphql/directive/isAuthorized.ts
+++ b/backend/src/graphql/directive/isAuthorized.ts
@@ -6,7 +6,14 @@ import { RoleNames } from '@enum/RoleNames'
import { INALIENABLE_RIGHTS } from '@/auth/INALIENABLE_RIGHTS'
import { decode, encode } from '@/auth/JWT'
import { RIGHTS } from '@/auth/RIGHTS'
-import { ROLE_UNAUTHORIZED, ROLE_USER, ROLE_ADMIN, ROLE_MODERATOR } from '@/auth/ROLES'
+import {
+ ROLE_UNAUTHORIZED,
+ ROLE_USER,
+ ROLE_ADMIN,
+ ROLE_MODERATOR,
+ ROLE_MODERATOR_AI,
+ ROLE_DLT_CONNECTOR,
+} from '@/auth/ROLES'
import { Context } from '@/server/context'
import { LogError } from '@/server/LogError'
@@ -30,31 +37,38 @@ export const isAuthorized: AuthChecker = async ({ context }, rights) =>
// Set context gradidoID
context.gradidoID = decoded.gradidoID
- // TODO - load from database dynamically & admin - maybe encode this in the token to prevent many database requests
- // TODO this implementation is bullshit - two database queries cause our user identifiers are not aligned and vary between email, id and pubKey
- try {
- const user = await User.findOneOrFail({
- where: { gradidoID: decoded.gradidoID },
- withDeleted: true,
- relations: ['emailContact', 'userRoles'],
- })
- context.user = user
- context.role = ROLE_USER
- if (user.userRoles?.length > 0) {
- switch (user.userRoles[0].role) {
- case RoleNames.ADMIN:
- context.role = ROLE_ADMIN
- break
- case RoleNames.MODERATOR:
- context.role = ROLE_MODERATOR
- break
- default:
- context.role = ROLE_USER
+ if (context.gradidoID === 'dlt-connector') {
+ context.role = ROLE_DLT_CONNECTOR
+ } else {
+ // TODO - load from database dynamically & admin - maybe encode this in the token to prevent many database requests
+ // TODO this implementation is bullshit - two database queries cause our user identifiers are not aligned and vary between email, id and pubKey
+ try {
+ const user = await User.findOneOrFail({
+ where: { gradidoID: decoded.gradidoID },
+ withDeleted: true,
+ relations: ['emailContact', 'userRoles'],
+ })
+ context.user = user
+ context.role = ROLE_USER
+ if (user.userRoles?.length > 0) {
+ switch (user.userRoles[0].role) {
+ case RoleNames.ADMIN:
+ context.role = ROLE_ADMIN
+ break
+ case RoleNames.MODERATOR:
+ context.role = ROLE_MODERATOR
+ break
+ case RoleNames.MODERATOR_AI:
+ context.role = ROLE_MODERATOR_AI
+ break
+ default:
+ context.role = ROLE_USER
+ }
}
+ } catch {
+ // in case the database query fails (user deleted)
+ throw new LogError('401 Unauthorized')
}
- } catch {
- // in case the database query fails (user deleted)
- throw new LogError('401 Unauthorized')
}
// check for correct rights
diff --git a/backend/src/graphql/enum/GmsPublishNameType.ts b/backend/src/graphql/enum/GmsPublishNameType.ts
deleted file mode 100644
index 08aaaf8ef..000000000
--- a/backend/src/graphql/enum/GmsPublishNameType.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { registerEnumType } from 'type-graphql'
-
-export enum GmsPublishNameType {
- GMS_PUBLISH_NAME_ALIAS_OR_INITALS = 0,
- GMS_PUBLISH_NAME_INITIALS = 1,
- GMS_PUBLISH_NAME_FIRST = 2,
- GMS_PUBLISH_NAME_FIRST_INITIAL = 3,
- GMS_PUBLISH_NAME_FULL = 4,
-}
-
-registerEnumType(GmsPublishNameType, {
- name: 'GmsPublishNameType', // this one is mandatory
- description: 'Type of name publishing', // this one is optional
-})
diff --git a/backend/src/graphql/enum/PublishNameType.ts b/backend/src/graphql/enum/PublishNameType.ts
new file mode 100644
index 000000000..a60be9f50
--- /dev/null
+++ b/backend/src/graphql/enum/PublishNameType.ts
@@ -0,0 +1,14 @@
+import { registerEnumType } from 'type-graphql'
+
+export enum PublishNameType {
+ PUBLISH_NAME_ALIAS_OR_INITALS = 0,
+ PUBLISH_NAME_INITIALS = 1,
+ PUBLISH_NAME_FIRST = 2,
+ PUBLISH_NAME_FIRST_INITIAL = 3,
+ PUBLISH_NAME_FULL = 4,
+}
+
+registerEnumType(PublishNameType, {
+ name: 'PublishNameType', // this one is mandatory
+ description: 'Type of name publishing', // this one is optional
+})
diff --git a/backend/src/graphql/enum/RoleNames.ts b/backend/src/graphql/enum/RoleNames.ts
index c4a9b25cc..8ba8e1441 100644
--- a/backend/src/graphql/enum/RoleNames.ts
+++ b/backend/src/graphql/enum/RoleNames.ts
@@ -4,7 +4,9 @@ export enum RoleNames {
UNAUTHORIZED = 'UNAUTHORIZED',
USER = 'USER',
MODERATOR = 'MODERATOR',
+ MODERATOR_AI = 'MODERATOR_AI',
ADMIN = 'ADMIN',
+ DLT_CONNECTOR = 'DLT_CONNECTOR_ROLE',
}
registerEnumType(RoleNames, {
diff --git a/backend/src/graphql/input/EditCommunityInput.ts b/backend/src/graphql/input/EditCommunityInput.ts
new file mode 100644
index 000000000..487221920
--- /dev/null
+++ b/backend/src/graphql/input/EditCommunityInput.ts
@@ -0,0 +1,21 @@
+import { IsString, IsUUID } from 'class-validator'
+import { ArgsType, Field, InputType } from 'type-graphql'
+
+import { Location } from '@/graphql/model/Location'
+import { isValidLocation } from '@/graphql/validator/Location'
+
+@ArgsType()
+@InputType()
+export class EditCommunityInput {
+ @Field(() => String)
+ @IsUUID('4')
+ uuid: string
+
+ @Field(() => String, { nullable: true })
+ @IsString()
+ gmsApiKey?: string | null
+
+ @Field(() => Location, { nullable: true })
+ @isValidLocation()
+ location?: Location | null
+}
diff --git a/backend/src/graphql/input/OpenaiMessage.ts b/backend/src/graphql/input/OpenaiMessage.ts
new file mode 100644
index 000000000..2dab7dadc
--- /dev/null
+++ b/backend/src/graphql/input/OpenaiMessage.ts
@@ -0,0 +1,14 @@
+import { IsOptional, IsString } from 'class-validator'
+import { Field, InputType } from 'type-graphql'
+
+@InputType()
+export class OpenaiMessage {
+ @Field()
+ @IsString()
+ message: string
+
+ @Field(() => String, { nullable: true })
+ @IsOptional()
+ @IsString()
+ threadId?: string | null
+}
diff --git a/backend/src/graphql/input/ProjectBrandingInput.ts b/backend/src/graphql/input/ProjectBrandingInput.ts
new file mode 100644
index 000000000..16585c858
--- /dev/null
+++ b/backend/src/graphql/input/ProjectBrandingInput.ts
@@ -0,0 +1,44 @@
+import { IsString, IsOptional, MaxLength, IsNumber, IsBoolean, IsUrl } from 'class-validator'
+import { InputType, Field, Int } from 'type-graphql'
+
+@InputType()
+export class ProjectBrandingInput {
+ @Field(() => Int, { nullable: true })
+ @IsOptional()
+ id: number | null | undefined
+
+ @Field(() => String)
+ @IsString()
+ name: string
+
+ @Field(() => String)
+ @IsString()
+ @MaxLength(32)
+ alias: string
+
+ @Field(() => String, { nullable: true })
+ @IsOptional()
+ @IsString()
+ description: string | null | undefined
+
+ @Field(() => Int, { nullable: true })
+ @IsNumber()
+ @IsOptional()
+ spaceId: number | null | undefined
+
+ @Field(() => String, { nullable: true })
+ @IsOptional()
+ @IsString()
+ @IsUrl()
+ spaceUrl: string | null | undefined
+
+ @Field(() => Boolean)
+ @IsBoolean()
+ newUserToSpace: boolean
+
+ @Field(() => String, { nullable: true })
+ @IsOptional()
+ @IsString()
+ @IsUrl()
+ logoUrl: string | null | undefined
+}
diff --git a/backend/src/graphql/model/AdminCommunityView.ts b/backend/src/graphql/model/AdminCommunityView.ts
new file mode 100644
index 000000000..b4a1664a7
--- /dev/null
+++ b/backend/src/graphql/model/AdminCommunityView.ts
@@ -0,0 +1,86 @@
+import { Point } from '@dbTools/typeorm'
+import { Community as DbCommunity } from '@entity/Community'
+import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
+import { ObjectType, Field } from 'type-graphql'
+
+import { Point2Location } from '@/graphql/resolver/util/Location2Point'
+
+import { FederatedCommunity } from './FederatedCommunity'
+import { Location } from './Location'
+
+@ObjectType()
+export class AdminCommunityView {
+ constructor(dbCom: DbCommunity) {
+ if (dbCom.federatedCommunities && dbCom.federatedCommunities.length > 0) {
+ const federatedCommunity = dbCom.federatedCommunities[0]
+ this.foreign = federatedCommunity.foreign
+ const url = new URL(federatedCommunity.endPoint)
+ // use only the host part
+ this.url = url.protocol + '//' + url.host
+ this.publicKey = federatedCommunity.publicKey.toString('hex')
+ this.federatedCommunities = dbCom.federatedCommunities.map(
+ (federatedCom: DbFederatedCommunity) => new FederatedCommunity(federatedCom),
+ )
+ }
+ if (dbCom.foreign !== undefined) {
+ this.foreign = dbCom.foreign
+ }
+ this.name = dbCom.name
+ this.description = dbCom.description
+ this.gmsApiKey = dbCom.gmsApiKey
+ if (dbCom.url) {
+ this.url = dbCom.url
+ }
+ if (dbCom.publicKey && dbCom.publicKey.length === 32) {
+ this.publicKey = dbCom.publicKey.toString('hex')
+ }
+ this.creationDate = dbCom.creationDate
+ this.createdAt = dbCom.createdAt
+ this.updatedAt = dbCom.updatedAt
+ this.uuid = dbCom.communityUuid
+ this.authenticatedAt = dbCom.authenticatedAt
+ this.gmsApiKey = dbCom.gmsApiKey
+ if (dbCom.location) {
+ this.location = Point2Location(dbCom.location as Point)
+ }
+ }
+
+ @Field(() => Boolean)
+ foreign: boolean
+
+ @Field(() => String)
+ url: string
+
+ @Field(() => String)
+ publicKey: string
+
+ @Field(() => String, { nullable: true })
+ uuid: string | null
+
+ @Field(() => Date, { nullable: true })
+ authenticatedAt: Date | null
+
+ @Field(() => String, { nullable: true })
+ name: string | null
+
+ @Field(() => String, { nullable: true })
+ description: string | null
+
+ @Field(() => String, { nullable: true })
+ gmsApiKey: string | null
+
+ @Field(() => Location, { nullable: true })
+ location: Location | null
+
+ @Field(() => Date, { nullable: true })
+ creationDate: Date | null
+
+ @Field(() => Date, { nullable: true })
+ createdAt: Date | null
+
+ @Field(() => Date, { nullable: true })
+ updatedAt: Date | null
+
+ @Field(() => [FederatedCommunity], { nullable: true })
+ federatedCommunities: FederatedCommunity[] | null
+}
diff --git a/backend/src/graphql/model/ChatGptMessage.ts b/backend/src/graphql/model/ChatGptMessage.ts
new file mode 100644
index 000000000..fd77dd7d8
--- /dev/null
+++ b/backend/src/graphql/model/ChatGptMessage.ts
@@ -0,0 +1,19 @@
+import { ObjectType, Field } from 'type-graphql'
+
+import { Message } from '@/apis/openai/model/Message'
+
+@ObjectType()
+export class ChatGptMessage {
+ @Field()
+ content: string
+
+ @Field()
+ role: string
+
+ @Field()
+ threadId: string
+
+ public constructor(data: Partial) {
+ Object.assign(this, data)
+ }
+}
diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index a0e7e4366..dc4d65e63 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -1,14 +1,16 @@
import { Contribution as dbContribution } from '@entity/Contribution'
-import { User } from '@entity/User'
+import { User as DbUser } from '@entity/User'
import { Decimal } from 'decimal.js-light'
import { ObjectType, Field, Int } from 'type-graphql'
+import { User } from './User'
+
@ObjectType()
export class Contribution {
- constructor(contribution: dbContribution, user?: User | null) {
+ constructor(contribution: dbContribution, user?: DbUser | null) {
this.id = contribution.id
- this.firstName = user ? user.firstName : null
- this.lastName = user ? user.lastName : null
+ this.firstName = user?.firstName ?? null
+ this.lastName = user?.lastName ?? null
this.amount = contribution.amount
this.memo = contribution.memo
this.createdAt = contribution.createdAt
@@ -26,11 +28,20 @@ export class Contribution {
this.moderatorId = contribution.moderatorId
this.userId = contribution.userId
this.resubmissionAt = contribution.resubmissionAt
+ if (user) {
+ this.user = new User(user)
+ }
}
@Field(() => Int)
id: number
+ @Field(() => Int, { nullable: true })
+ userId: number | null
+
+ @Field(() => User, { nullable: true })
+ user: User | null
+
@Field(() => String, { nullable: true })
firstName: string | null
@@ -82,9 +93,6 @@ export class Contribution {
@Field(() => Int, { nullable: true })
moderatorId: number | null
- @Field(() => Int, { nullable: true })
- userId: number | null
-
@Field(() => Date, { nullable: true })
resubmissionAt: Date | null
}
diff --git a/backend/src/graphql/model/ContributionLink.ts b/backend/src/graphql/model/ContributionLink.ts
index 1576fc97a..3d02953b3 100644
--- a/backend/src/graphql/model/ContributionLink.ts
+++ b/backend/src/graphql/model/ContributionLink.ts
@@ -19,7 +19,7 @@ export class ContributionLink {
this.cycle = contributionLink.cycle
this.maxPerCycle = contributionLink.maxPerCycle
this.code = contributionLink.code
- this.link = CONFIG.COMMUNITY_REDEEM_CONTRIBUTION_URL.replace(/{code}/g, this.code)
+ this.link = CONFIG.COMMUNITY_REDEEM_CONTRIBUTION_URL + this.code
}
@Field(() => Int)
diff --git a/backend/src/graphql/model/FederatedCommunity.ts b/backend/src/graphql/model/FederatedCommunity.ts
index 61ffd8f5b..01a3996ce 100644
--- a/backend/src/graphql/model/FederatedCommunity.ts
+++ b/backend/src/graphql/model/FederatedCommunity.ts
@@ -1,14 +1,16 @@
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { ObjectType, Field, Int } from 'type-graphql'
+import { ensureUrlEndsWithSlash } from '@/util/utilities'
+
@ObjectType()
export class FederatedCommunity {
constructor(dbCom: DbFederatedCommunity) {
this.id = dbCom.id
this.foreign = dbCom.foreign
this.publicKey = dbCom.publicKey.toString('hex')
- this.url =
- (dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/') + dbCom.apiVersion
+ this.apiVersion = dbCom.apiVersion
+ this.endPoint = ensureUrlEndsWithSlash(dbCom.endPoint)
this.lastAnnouncedAt = dbCom.lastAnnouncedAt
this.verifiedAt = dbCom.verifiedAt
this.lastErrorAt = dbCom.lastErrorAt
@@ -26,7 +28,10 @@ export class FederatedCommunity {
publicKey: string
@Field(() => String)
- url: string
+ apiVersion: string
+
+ @Field(() => String)
+ endPoint: string
@Field(() => Date, { nullable: true })
lastAnnouncedAt: Date | null
diff --git a/backend/src/graphql/model/GmsUserAuthenticationResult.ts b/backend/src/graphql/model/GmsUserAuthenticationResult.ts
new file mode 100644
index 000000000..b1fb2c246
--- /dev/null
+++ b/backend/src/graphql/model/GmsUserAuthenticationResult.ts
@@ -0,0 +1,10 @@
+import { Field, ObjectType } from 'type-graphql'
+
+@ObjectType()
+export class GmsUserAuthenticationResult {
+ @Field(() => String)
+ url: string
+
+ @Field(() => String)
+ token: string
+}
diff --git a/backend/src/graphql/model/Pagination.ts b/backend/src/graphql/model/Pagination.ts
new file mode 100644
index 000000000..761b57699
--- /dev/null
+++ b/backend/src/graphql/model/Pagination.ts
@@ -0,0 +1,19 @@
+import { ObjectType, Field, Int } from 'type-graphql'
+
+@ObjectType()
+export class Pagination {
+ @Field(() => Int)
+ total: number
+
+ @Field(() => Int)
+ page: number
+
+ @Field(() => Int)
+ pages: number
+
+ constructor(total: number, page: number, pages: number) {
+ this.total = total
+ this.page = page
+ this.pages = pages
+ }
+}
diff --git a/backend/src/graphql/model/ProjectBranding.ts b/backend/src/graphql/model/ProjectBranding.ts
new file mode 100644
index 000000000..c76289405
--- /dev/null
+++ b/backend/src/graphql/model/ProjectBranding.ts
@@ -0,0 +1,33 @@
+import { ProjectBranding as dbProjectBranding } from '@entity/ProjectBranding'
+import { ObjectType, Field, Int } from 'type-graphql'
+
+@ObjectType()
+export class ProjectBranding {
+ constructor(projectBranding: dbProjectBranding) {
+ Object.assign(this, projectBranding)
+ }
+
+ @Field(() => Int)
+ id: number
+
+ @Field(() => String)
+ name: string
+
+ @Field(() => String)
+ alias: string
+
+ @Field(() => String, { nullable: true })
+ description: string | null
+
+ @Field(() => Int, { nullable: true })
+ spaceId: number | null
+
+ @Field(() => String, { nullable: true })
+ spaceUrl: string | null
+
+ @Field(() => Boolean)
+ newUserToSpace: boolean
+
+ @Field(() => String, { nullable: true })
+ logoUrl: string | null
+}
diff --git a/backend/src/graphql/model/Space.ts b/backend/src/graphql/model/Space.ts
new file mode 100644
index 000000000..6f3a3cdfa
--- /dev/null
+++ b/backend/src/graphql/model/Space.ts
@@ -0,0 +1,25 @@
+import { ObjectType, Field, Int } from 'type-graphql'
+
+import { Space as HumhubSpace } from '@/apis/humhub/model/Space'
+
+@ObjectType()
+export class Space {
+ @Field(() => Int)
+ id: number
+
+ @Field(() => String)
+ guid: string
+
+ @Field(() => String)
+ name: string
+
+ @Field(() => String)
+ description: string
+
+ @Field(() => String)
+ url: string
+
+ constructor(data: HumhubSpace) {
+ Object.assign(this, data)
+ }
+}
diff --git a/backend/src/graphql/model/SpaceList.ts b/backend/src/graphql/model/SpaceList.ts
new file mode 100644
index 000000000..311af84d7
--- /dev/null
+++ b/backend/src/graphql/model/SpaceList.ts
@@ -0,0 +1,20 @@
+import { ObjectType, Field } from 'type-graphql'
+
+import { SpacesResponse } from '@/apis/humhub/model/SpacesResponse'
+
+import { Pagination } from './Pagination'
+import { Space } from './Space'
+
+@ObjectType()
+export class SpaceList {
+ @Field(() => Pagination)
+ pagination: Pagination
+
+ @Field(() => [Space])
+ results: Space[]
+
+ constructor(data: SpacesResponse) {
+ this.pagination = new Pagination(data.total, data.page, data.pages)
+ this.results = data.results
+ }
+}
diff --git a/backend/src/graphql/model/TransactionLink.ts b/backend/src/graphql/model/TransactionLink.ts
index 74178610c..995fe5d50 100644
--- a/backend/src/graphql/model/TransactionLink.ts
+++ b/backend/src/graphql/model/TransactionLink.ts
@@ -20,7 +20,7 @@ export class TransactionLink {
this.deletedAt = transactionLink.deletedAt
this.redeemedAt = transactionLink.redeemedAt
this.redeemedBy = redeemedBy
- this.link = CONFIG.COMMUNITY_REDEEM_URL.replace(/{code}/g, this.code)
+ this.link = CONFIG.COMMUNITY_REDEEM_URL + this.code
}
@Field(() => Int)
diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts
index d24a717c4..b665bde98 100644
--- a/backend/src/graphql/model/User.ts
+++ b/backend/src/graphql/model/User.ts
@@ -1,7 +1,16 @@
+import { Point } from '@dbTools/typeorm'
import { User as dbUser } from '@entity/User'
import { ObjectType, Field, Int } from 'type-graphql'
+import { GmsPublishLocationType } from '@enum/GmsPublishLocationType'
+import { PublishNameType } from '@enum/PublishNameType'
+
+import { PublishNameLogic } from '@/data/PublishName.logic'
+import { Point2Location } from '@/graphql/resolver/util/Location2Point'
+
import { KlickTipp } from './KlickTipp'
+import { Location } from './Location'
+import { UserContact } from './UserContact'
@ObjectType()
export class User {
@@ -15,8 +24,13 @@ export class User {
}
this.gradidoID = user.gradidoID
this.alias = user.alias
+
+ const publishNameLogic = new PublishNameLogic(user)
+ this.humhubUsername = publishNameLogic.getUsername(user.humhubPublishName as PublishNameType)
+
if (user.emailContact) {
this.emailChecked = user.emailContact.emailChecked
+ this.emailContact = new UserContact(user.emailContact)
}
this.firstName = user.firstName
this.lastName = user.lastName
@@ -29,6 +43,12 @@ export class User {
this.hasElopage = null
this.hideAmountGDD = user.hideAmountGDD
this.hideAmountGDT = user.hideAmountGDT
+ this.humhubAllowed = user.humhubAllowed
+ this.gmsAllowed = user.gmsAllowed
+ this.gmsPublishName = user.gmsPublishName
+ this.humhubPublishName = user.humhubPublishName
+ this.gmsPublishLocation = user.gmsPublishLocation
+ this.userLocation = user.location ? Point2Location(user.location as Point) : null
}
}
@@ -50,6 +70,9 @@ export class User {
@Field(() => String, { nullable: true })
alias: string | null
+ @Field(() => String, { nullable: true })
+ humhubUsername: string | null
+
@Field(() => String, { nullable: true })
firstName: string | null
@@ -74,6 +97,21 @@ export class User {
@Field(() => Boolean)
hideAmountGDT: boolean
+ @Field(() => Boolean)
+ humhubAllowed: boolean
+
+ @Field(() => Boolean)
+ gmsAllowed: boolean
+
+ @Field(() => PublishNameType, { nullable: true })
+ gmsPublishName: PublishNameType | null
+
+ @Field(() => PublishNameType, { nullable: true })
+ humhubPublishName: PublishNameType | null
+
+ @Field(() => GmsPublishLocationType, { nullable: true })
+ gmsPublishLocation: GmsPublishLocationType | null
+
// This is not the users publisherId, but the one of the users who recommend him
@Field(() => Int, { nullable: true })
publisherId: number | null
@@ -86,4 +124,10 @@ export class User {
@Field(() => [String])
roles: string[]
+
+ @Field(() => UserContact, { nullable: true })
+ emailContact: UserContact | null
+
+ @Field(() => Location, { nullable: true })
+ userLocation: Location | null
}
diff --git a/backend/src/graphql/model/UserContact.ts b/backend/src/graphql/model/UserContact.ts
new file mode 100644
index 000000000..3c32229f2
--- /dev/null
+++ b/backend/src/graphql/model/UserContact.ts
@@ -0,0 +1,42 @@
+import { UserContact as DbUserContact } from '@entity/UserContact'
+import { ObjectType, Field, Int } from 'type-graphql'
+
+@ObjectType()
+export class UserContact {
+ constructor(userContact: DbUserContact) {
+ Object.assign(this, userContact)
+ }
+
+ @Field(() => Int)
+ id: number
+
+ @Field(() => Int)
+ userId: number
+
+ @Field(() => String)
+ email: string
+
+ @Field(() => Boolean)
+ gmsPublishEmail: boolean
+
+ @Field(() => Boolean)
+ emailChecked: boolean
+
+ @Field(() => String, { nullable: true })
+ countryCode: string | null
+
+ @Field(() => String, { nullable: true })
+ phone: string | null
+
+ @Field(() => Int)
+ gmsPublishPhone: number
+
+ @Field(() => Date)
+ createdAt: Date
+
+ @Field(() => Date, { nullable: true })
+ updatedAt: Date | null
+
+ @Field(() => Date, { nullable: true })
+ deletedAt: Date | null
+}
diff --git a/backend/src/graphql/model/UserLocationResult.ts b/backend/src/graphql/model/UserLocationResult.ts
new file mode 100644
index 000000000..5f51b53ab
--- /dev/null
+++ b/backend/src/graphql/model/UserLocationResult.ts
@@ -0,0 +1,12 @@
+import { Field, ObjectType } from 'type-graphql'
+
+import { Location } from './Location'
+
+@ObjectType()
+export class UserLocationResult {
+ @Field(() => Location)
+ userLocation: Location
+
+ @Field(() => Location)
+ communityLocation: Location
+}
diff --git a/backend/src/graphql/resolver/AiChatResolver.ts b/backend/src/graphql/resolver/AiChatResolver.ts
new file mode 100644
index 000000000..7c1acba73
--- /dev/null
+++ b/backend/src/graphql/resolver/AiChatResolver.ts
@@ -0,0 +1,60 @@
+import { Resolver, Mutation, Authorized, Ctx, Arg, Query } from 'type-graphql'
+
+import { OpenaiMessage } from '@input/OpenaiMessage'
+import { ChatGptMessage } from '@model/ChatGptMessage'
+
+import { Message } from '@/apis/openai/model/Message'
+import { OpenaiClient } from '@/apis/openai/OpenaiClient'
+import { RIGHTS } from '@/auth/RIGHTS'
+import { Context } from '@/server/context'
+
+@Resolver()
+export class AiChatResolver {
+ @Authorized([RIGHTS.AI_SEND_MESSAGE])
+ @Query(() => [ChatGptMessage])
+ async resumeChat(@Ctx() context: Context): Promise {
+ const openaiClient = OpenaiClient.getInstance()
+ if (!openaiClient) {
+ return Promise.resolve([new ChatGptMessage({ content: 'OpenAI API is not enabled' })])
+ }
+ if (!context.user) {
+ return Promise.resolve([new ChatGptMessage({ content: 'User not found' })])
+ }
+ const messages = await openaiClient.resumeThread(context.user)
+ return messages.map((message) => new ChatGptMessage(message))
+ }
+
+ @Authorized([RIGHTS.AI_SEND_MESSAGE])
+ @Mutation(() => Boolean)
+ async deleteThread(@Arg('threadId') threadId: string): Promise {
+ const openaiClient = OpenaiClient.getInstance()
+ if (!openaiClient) {
+ return false
+ }
+ return openaiClient.deleteThread(threadId)
+ }
+
+ @Authorized([RIGHTS.AI_SEND_MESSAGE])
+ @Mutation(() => ChatGptMessage)
+ async sendMessage(
+ @Arg('input') { message, threadId = null }: OpenaiMessage,
+ @Ctx() context: Context,
+ ): Promise {
+ const openaiClient = OpenaiClient.getInstance()
+ if (!openaiClient) {
+ return Promise.resolve(new ChatGptMessage({ content: 'OpenAI API is not enabled' }))
+ }
+ if (!context.user) {
+ return Promise.resolve(new ChatGptMessage({ content: 'User not found' }))
+ }
+ const messageObj = new Message(message)
+ if (!threadId || threadId.length === 0) {
+ threadId = await openaiClient.createThread(messageObj, context.user)
+ } else {
+ await openaiClient.addMessage(messageObj, threadId)
+ }
+ const resultMessage = new ChatGptMessage(await openaiClient.runAndGetLastNewMessage(threadId))
+ resultMessage.threadId = threadId
+ return resultMessage
+ }
+}
diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts
index 87de0e0f7..c023e3510 100644
--- a/backend/src/graphql/resolver/BalanceResolver.ts
+++ b/backend/src/graphql/resolver/BalanceResolver.ts
@@ -8,6 +8,8 @@ import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
import { Balance } from '@model/Balance'
import { RIGHTS } from '@/auth/RIGHTS'
+import { BalanceLoggingView } from '@/logging/BalanceLogging.view'
+import { DecayLoggingView } from '@/logging/DecayLogging.view'
import { Context, getUser } from '@/server/context'
import { backendLogger as logger } from '@/server/logger'
import { calculateDecay } from '@/util/decay'
@@ -27,9 +29,15 @@ export class BalanceResolver {
logger.addContext('user', user.id)
logger.info(`balance(userId=${user.id})...`)
- const gdtResolver = new GdtResolver()
- const balanceGDT = await gdtResolver.gdtBalance(context)
- logger.debug(`balanceGDT=${balanceGDT}`)
+ let balanceGDT
+ if (!context.balanceGDT) {
+ const gdtResolver = new GdtResolver()
+ balanceGDT = await gdtResolver.gdtBalance(context)
+ } else {
+ balanceGDT = context.balanceGDT
+ }
+
+ logger.debug(`balanceGDT=${context.balanceGDT}`)
const lastTransaction = context.lastTransaction
? context.lastTransaction
@@ -52,6 +60,7 @@ export class BalanceResolver {
context.transactionCount || context.transactionCount === 0
? context.transactionCount
: await dbTransaction.count({ where: { userId: user.id } })
+
logger.debug(`transactionCount=${count}`)
const linkCount = await dbTransactionLink.count({
@@ -71,9 +80,9 @@ export class BalanceResolver {
)
logger.info(
'calculatedDecay',
- lastTransaction.balance,
- lastTransaction.balanceDate,
- calculatedDecay,
+ lastTransaction.balance.toString(),
+ lastTransaction.balanceDate.toISOString(),
+ new DecayLoggingView(calculatedDecay),
)
// The final balance is reduced by the link amount withheld
@@ -98,7 +107,14 @@ export class BalanceResolver {
count,
linkCount,
})
- logger.info('new Balance', balance, balanceGDT, count, linkCount, newBalance)
+ logger.info(
+ 'new Balance',
+ balance.toString(),
+ balanceGDT?.toString(),
+ count,
+ linkCount,
+ new BalanceLoggingView(newBalance),
+ )
return newBalance
}
diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts
index e720eb716..f9e6aa9ac 100644
--- a/backend/src/graphql/resolver/CommunityResolver.test.ts
+++ b/backend/src/graphql/resolver/CommunityResolver.test.ts
@@ -10,17 +10,26 @@ import { Community as DbCommunity } from '@entity/Community'
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { ApolloServerTestClient } from 'apollo-server-testing'
import { GraphQLError } from 'graphql/error/GraphQLError'
+import { v4 as uuidv4 } from 'uuid'
import { cleanDB, testEnvironment } from '@test/helpers'
import { logger, i18n as localization } from '@test/testSetup'
import { userFactory } from '@/seeds/factory/user'
import { login, updateHomeCommunityQuery } from '@/seeds/graphql/mutations'
-import { getCommunities, communitiesQuery, getCommunityByUuidQuery } from '@/seeds/graphql/queries'
+import {
+ allCommunities,
+ getCommunities,
+ communitiesQuery,
+ getHomeCommunityQuery,
+ getCommunityByIdentifierQuery,
+} from '@/seeds/graphql/queries'
import { peterLustig } from '@/seeds/users/peter-lustig'
import { getCommunityByUuid } from './util/communities'
+jest.mock('@/password/EncryptorUtils')
+
// to do: We need a setup for the tests that closes the connection
let mutate: ApolloServerTestClient['mutate'],
query: ApolloServerTestClient['query'],
@@ -164,7 +173,8 @@ describe('CommunityResolver', () => {
id: 3,
foreign: homeCom3.foreign,
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[2].public),
- url: expect.stringMatching('http://localhost/api/2_0'),
+ endPoint: expect.stringMatching('http://localhost/api/'),
+ apiVersion: '2_0',
lastAnnouncedAt: null,
verifiedAt: null,
lastErrorAt: null,
@@ -175,7 +185,8 @@ describe('CommunityResolver', () => {
id: 2,
foreign: homeCom2.foreign,
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[1].public),
- url: expect.stringMatching('http://localhost/api/1_1'),
+ endPoint: expect.stringMatching('http://localhost/api/'),
+ apiVersion: '1_1',
lastAnnouncedAt: null,
verifiedAt: null,
lastErrorAt: null,
@@ -186,7 +197,8 @@ describe('CommunityResolver', () => {
id: 1,
foreign: homeCom1.foreign,
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[0].public),
- url: expect.stringMatching('http://localhost/api/1_0'),
+ endPoint: expect.stringMatching('http://localhost/api/'),
+ apiVersion: '1_0',
lastAnnouncedAt: null,
verifiedAt: null,
lastErrorAt: null,
@@ -222,7 +234,7 @@ describe('CommunityResolver', () => {
foreignCom3 = DbFederatedCommunity.create()
foreignCom3.foreign = true
foreignCom3.publicKey = Buffer.from(ed25519KeyPairStaticHex[5].public, 'hex')
- foreignCom3.apiVersion = '1_2'
+ foreignCom3.apiVersion = '2_0'
foreignCom3.endPoint = 'http://remotehost/api'
foreignCom3.createdAt = new Date()
await DbFederatedCommunity.insert(foreignCom3)
@@ -236,7 +248,8 @@ describe('CommunityResolver', () => {
id: 3,
foreign: homeCom3.foreign,
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[2].public),
- url: expect.stringMatching('http://localhost/api/2_0'),
+ endPoint: expect.stringMatching('http://localhost/api/'),
+ apiVersion: '2_0',
lastAnnouncedAt: null,
verifiedAt: null,
lastErrorAt: null,
@@ -247,7 +260,8 @@ describe('CommunityResolver', () => {
id: 2,
foreign: homeCom2.foreign,
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[1].public),
- url: expect.stringMatching('http://localhost/api/1_1'),
+ endPoint: expect.stringMatching('http://localhost/api/'),
+ apiVersion: '1_1',
lastAnnouncedAt: null,
verifiedAt: null,
lastErrorAt: null,
@@ -258,7 +272,8 @@ describe('CommunityResolver', () => {
id: 1,
foreign: homeCom1.foreign,
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[0].public),
- url: expect.stringMatching('http://localhost/api/1_0'),
+ endPoint: expect.stringMatching('http://localhost/api/'),
+ apiVersion: '1_0',
lastAnnouncedAt: null,
verifiedAt: null,
lastErrorAt: null,
@@ -269,7 +284,8 @@ describe('CommunityResolver', () => {
id: 6,
foreign: foreignCom3.foreign,
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[5].public),
- url: expect.stringMatching('http://remotehost/api/1_2'),
+ endPoint: expect.stringMatching('http://remotehost/api/'),
+ apiVersion: '2_0',
lastAnnouncedAt: null,
verifiedAt: null,
lastErrorAt: null,
@@ -280,7 +296,8 @@ describe('CommunityResolver', () => {
id: 5,
foreign: foreignCom2.foreign,
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[4].public),
- url: expect.stringMatching('http://remotehost/api/1_1'),
+ endPoint: expect.stringMatching('http://remotehost/api/'),
+ apiVersion: '1_1',
lastAnnouncedAt: null,
verifiedAt: null,
lastErrorAt: null,
@@ -291,7 +308,8 @@ describe('CommunityResolver', () => {
id: 4,
foreign: foreignCom1.foreign,
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[3].public),
- url: expect.stringMatching('http://remotehost/api/1_0'),
+ endPoint: expect.stringMatching('http://remotehost/api/'),
+ apiVersion: '1_0',
lastAnnouncedAt: null,
verifiedAt: null,
lastErrorAt: null,
@@ -303,6 +321,229 @@ describe('CommunityResolver', () => {
})
})
})
+
+ describe('with 6 federated community entries', () => {
+ let comHomeCom1: DbCommunity
+ let comForeignCom1: DbCommunity
+ let comForeignCom2: DbCommunity
+ let foreignCom4: DbFederatedCommunity
+
+ beforeEach(async () => {
+ jest.clearAllMocks()
+ comHomeCom1 = DbCommunity.create()
+ comHomeCom1.foreign = false
+ comHomeCom1.url = 'http://localhost'
+ comHomeCom1.publicKey = Buffer.from(ed25519KeyPairStaticHex[0].public, 'hex')
+ comHomeCom1.privateKey = Buffer.from(ed25519KeyPairStaticHex[0].private, 'hex')
+ comHomeCom1.communityUuid = 'HomeCom-UUID'
+ comHomeCom1.authenticatedAt = new Date()
+ comHomeCom1.name = 'HomeCommunity-name'
+ comHomeCom1.description = 'HomeCommunity-description'
+ comHomeCom1.creationDate = new Date()
+ await DbCommunity.insert(comHomeCom1)
+
+ comForeignCom1 = DbCommunity.create()
+ comForeignCom1.foreign = true
+ comForeignCom1.url = 'http://stage-2.gradido.net'
+ comForeignCom1.publicKey = Buffer.from(ed25519KeyPairStaticHex[3].public, 'hex')
+ comForeignCom1.privateKey = Buffer.from(ed25519KeyPairStaticHex[3].private, 'hex')
+ // foreignCom1.communityUuid = 'Stage2-Com-UUID'
+ // foreignCom1.authenticatedAt = new Date()
+ comForeignCom1.name = 'Stage-2_Community-name'
+ comForeignCom1.description = 'Stage-2_Community-description'
+ comForeignCom1.creationDate = new Date()
+ await DbCommunity.insert(comForeignCom1)
+
+ comForeignCom2 = DbCommunity.create()
+ comForeignCom2.foreign = true
+ comForeignCom2.url = 'http://stage-3.gradido.net'
+ comForeignCom2.publicKey = Buffer.from(ed25519KeyPairStaticHex[4].public, 'hex')
+ comForeignCom2.privateKey = Buffer.from(ed25519KeyPairStaticHex[4].private, 'hex')
+ comForeignCom2.communityUuid = 'Stage3-Com-UUID'
+ comForeignCom2.authenticatedAt = new Date()
+ comForeignCom2.name = 'Stage-3_Community-name'
+ comForeignCom2.description = 'Stage-3_Community-description'
+ comForeignCom2.creationDate = new Date()
+ await DbCommunity.insert(comForeignCom2)
+
+ foreignCom4 = DbFederatedCommunity.create()
+ foreignCom4.foreign = true
+ foreignCom4.publicKey = Buffer.from(ed25519KeyPairStaticHex[5].public, 'hex')
+ foreignCom4.apiVersion = '1_0'
+ foreignCom4.endPoint = 'http://remotehost/api'
+ foreignCom4.createdAt = new Date()
+ await DbFederatedCommunity.insert(foreignCom4)
+ })
+
+ it('return communities structured for admin ', async () => {
+ await expect(query({ query: allCommunities })).resolves.toMatchObject({
+ data: {
+ allCommunities: [
+ {
+ foreign: false,
+ url: 'http://localhost',
+ publicKey: expect.stringMatching(ed25519KeyPairStaticHex[2].public),
+ authenticatedAt: null,
+ createdAt: null,
+ creationDate: null,
+ description: null,
+ gmsApiKey: null,
+ name: null,
+ updatedAt: null,
+ uuid: null,
+ federatedCommunities: [
+ {
+ id: 3,
+ apiVersion: '2_0',
+ endPoint: 'http://localhost/api/',
+ createdAt: homeCom3.createdAt.toISOString(),
+ lastAnnouncedAt: null,
+ lastErrorAt: null,
+ updatedAt: null,
+ verifiedAt: null,
+ },
+ ],
+ },
+ {
+ foreign: false,
+ url: 'http://localhost',
+ publicKey: expect.stringMatching(ed25519KeyPairStaticHex[1].public),
+ authenticatedAt: null,
+ createdAt: null,
+ creationDate: null,
+ description: null,
+ gmsApiKey: null,
+ name: null,
+ updatedAt: null,
+ uuid: null,
+ federatedCommunities: [
+ {
+ id: 2,
+ apiVersion: '1_1',
+ endPoint: 'http://localhost/api/',
+ createdAt: homeCom2.createdAt.toISOString(),
+ lastAnnouncedAt: null,
+ lastErrorAt: null,
+ updatedAt: null,
+ verifiedAt: null,
+ },
+ ],
+ },
+ {
+ foreign: false,
+ url: 'http://localhost',
+ publicKey: expect.stringMatching(ed25519KeyPairStaticHex[0].public),
+ authenticatedAt: comHomeCom1.authenticatedAt?.toISOString(),
+ createdAt: comHomeCom1.createdAt.toISOString(),
+ creationDate: comHomeCom1.creationDate?.toISOString(),
+ description: comHomeCom1.description,
+ gmsApiKey: null,
+ name: comHomeCom1.name,
+ updatedAt: null,
+ uuid: comHomeCom1.communityUuid,
+ federatedCommunities: [
+ {
+ id: 1,
+ apiVersion: '1_0',
+ endPoint: 'http://localhost/api/',
+ createdAt: homeCom1.createdAt.toISOString(),
+ lastAnnouncedAt: null,
+ lastErrorAt: null,
+ updatedAt: null,
+ verifiedAt: null,
+ },
+ ],
+ },
+ {
+ foreign: true,
+ url: 'http://remotehost',
+ publicKey: expect.stringMatching(ed25519KeyPairStaticHex[5].public),
+ authenticatedAt: null,
+ createdAt: null,
+ creationDate: null,
+ description: null,
+ gmsApiKey: null,
+ name: null,
+ updatedAt: null,
+ uuid: null,
+ federatedCommunities: [
+ {
+ id: 7,
+ apiVersion: '1_0',
+ endPoint: 'http://remotehost/api/',
+ createdAt: foreignCom4.createdAt.toISOString(),
+ lastAnnouncedAt: null,
+ lastErrorAt: null,
+ updatedAt: null,
+ verifiedAt: null,
+ },
+ {
+ id: 6,
+ apiVersion: '2_0',
+ endPoint: 'http://remotehost/api/',
+ createdAt: foreignCom3.createdAt.toISOString(),
+ lastAnnouncedAt: null,
+ lastErrorAt: null,
+ updatedAt: null,
+ verifiedAt: null,
+ },
+ ],
+ },
+ {
+ foreign: true,
+ url: 'http://stage-3.gradido.net',
+ publicKey: expect.stringMatching(ed25519KeyPairStaticHex[4].public),
+ authenticatedAt: comForeignCom2.authenticatedAt?.toISOString(),
+ createdAt: comForeignCom2.createdAt.toISOString(),
+ creationDate: comForeignCom2.creationDate?.toISOString(),
+ description: comForeignCom2.description,
+ gmsApiKey: null,
+ name: comForeignCom2.name,
+ updatedAt: null,
+ uuid: comForeignCom2.communityUuid,
+ federatedCommunities: [
+ {
+ id: 5,
+ apiVersion: '1_1',
+ endPoint: 'http://remotehost/api/',
+ createdAt: foreignCom2.createdAt.toISOString(),
+ lastAnnouncedAt: null,
+ lastErrorAt: null,
+ updatedAt: null,
+ verifiedAt: null,
+ },
+ ],
+ },
+ {
+ foreign: true,
+ url: 'http://stage-2.gradido.net',
+ publicKey: expect.stringMatching(ed25519KeyPairStaticHex[3].public),
+ authenticatedAt: null,
+ createdAt: comForeignCom1.createdAt.toISOString(),
+ creationDate: comForeignCom1.creationDate?.toISOString(),
+ description: comForeignCom1.description,
+ gmsApiKey: null,
+ name: comForeignCom1.name,
+ updatedAt: null,
+ uuid: null,
+ federatedCommunities: [
+ {
+ id: 4,
+ apiVersion: '1_0',
+ endPoint: 'http://remotehost/api/',
+ createdAt: foreignCom1.createdAt.toISOString(),
+ lastAnnouncedAt: null,
+ lastErrorAt: null,
+ updatedAt: null,
+ verifiedAt: null,
+ },
+ ],
+ },
+ ],
+ },
+ })
+ })
+ })
})
describe('communities', () => {
@@ -464,8 +705,14 @@ describe('CommunityResolver', () => {
foreignCom1 = DbCommunity.create()
foreignCom1.foreign = true
foreignCom1.url = 'http://stage-2.gradido.net/api'
- foreignCom1.publicKey = Buffer.from('publicKey-stage-2_Community')
- foreignCom1.privateKey = Buffer.from('privateKey-stage-2_Community')
+ foreignCom1.publicKey = Buffer.from(
+ '8a1f9374b99c30d827b85dcd23f7e50328430d64ef65ef35bf375ea8eb9a2e1d',
+ 'hex',
+ )
+ foreignCom1.privateKey = Buffer.from(
+ 'f6c2a9d78e20a3c910f35b8ffcf824aa7b37f0d3d81bfc4c0e65e17a194b3a4a',
+ 'hex',
+ )
// foreignCom1.communityUuid = 'Stage2-Com-UUID'
// foreignCom1.authenticatedAt = new Date()
foreignCom1.name = 'Stage-2_Community-name'
@@ -476,9 +723,15 @@ describe('CommunityResolver', () => {
foreignCom2 = DbCommunity.create()
foreignCom2.foreign = true
foreignCom2.url = 'http://stage-3.gradido.net/api'
- foreignCom2.publicKey = Buffer.from('publicKey-stage-3_Community')
- foreignCom2.privateKey = Buffer.from('privateKey-stage-3_Community')
- foreignCom2.communityUuid = 'Stage3-Com-UUID'
+ foreignCom2.publicKey = Buffer.from(
+ 'e047365a54082e8a7e9273da61b55c8134a2a0c836799ba12b78b9b0c52bc85f',
+ 'hex',
+ )
+ foreignCom2.privateKey = Buffer.from(
+ 'e047365a54082e8a7e9273da61b55c8134a2a0c836799ba12b78b9b0c52bc85f',
+ 'hex',
+ )
+ foreignCom2.communityUuid = uuidv4()
foreignCom2.authenticatedAt = new Date()
foreignCom2.name = 'Stage-3_Community-name'
foreignCom2.description = 'Stage-3_Community-description'
@@ -486,15 +739,36 @@ describe('CommunityResolver', () => {
await DbCommunity.insert(foreignCom2)
})
- it('finds the home-community', async () => {
+ it('finds the home-community by uuid', async () => {
await expect(
query({
- query: getCommunityByUuidQuery,
- variables: { communityUuid: homeCom?.communityUuid },
+ query: getCommunityByIdentifierQuery,
+ variables: { communityIdentifier: homeCom?.communityUuid },
}),
).resolves.toMatchObject({
data: {
- community: {
+ communityByIdentifier: {
+ id: homeCom?.id,
+ foreign: homeCom?.foreign,
+ name: homeCom?.name,
+ description: homeCom?.description,
+ url: homeCom?.url,
+ creationDate: homeCom?.creationDate?.toISOString(),
+ uuid: homeCom?.communityUuid,
+ authenticatedAt: homeCom?.authenticatedAt,
+ },
+ },
+ })
+ })
+
+ it('finds the home-community', async () => {
+ await expect(
+ query({
+ query: getHomeCommunityQuery,
+ }),
+ ).resolves.toMatchObject({
+ data: {
+ homeCommunity: {
id: homeCom?.id,
foreign: homeCom?.foreign,
name: homeCom?.name,
@@ -563,7 +837,7 @@ describe('CommunityResolver', () => {
expect(
await mutate({
mutation: updateHomeCommunityQuery,
- variables: { uuid: 'unknownUuid', gmsApiKey: 'gmsApiKey' },
+ variables: { uuid: uuidv4(), gmsApiKey: 'gmsApiKey' },
}),
).toEqual(
expect.objectContaining({
diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts
index 760b982cc..8a6d2992b 100644
--- a/backend/src/graphql/resolver/CommunityResolver.ts
+++ b/backend/src/graphql/resolver/CommunityResolver.ts
@@ -1,16 +1,24 @@
import { IsNull, Not } from '@dbTools/typeorm'
import { Community as DbCommunity } from '@entity/Community'
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
-import { Resolver, Query, Authorized, Arg, Mutation, Args } from 'type-graphql'
+import { Resolver, Query, Authorized, Mutation, Args, Arg } from 'type-graphql'
-import { CommunityArgs } from '@arg//CommunityArgs'
+import { Paginated } from '@arg/Paginated'
+import { EditCommunityInput } from '@input/EditCommunityInput'
+import { AdminCommunityView } from '@model/AdminCommunityView'
import { Community } from '@model/Community'
import { FederatedCommunity } from '@model/FederatedCommunity'
import { RIGHTS } from '@/auth/RIGHTS'
import { LogError } from '@/server/LogError'
-import { getCommunityByUuid } from './util/communities'
+import {
+ getAllCommunities,
+ getCommunityByIdentifier,
+ getCommunityByUuid,
+ getHomeCommunity,
+} from './util/communities'
+import { Location2Point } from './util/Location2Point'
@Resolver()
export class CommunityResolver {
@@ -29,6 +37,12 @@ export class CommunityResolver {
)
}
+ @Authorized([RIGHTS.COMMUNITIES])
+ @Query(() => [AdminCommunityView])
+ async allCommunities(@Args() paginated: Paginated): Promise {
+ return (await getAllCommunities(paginated)).map((dbCom) => new AdminCommunityView(dbCom))
+ }
+
@Authorized([RIGHTS.COMMUNITIES])
@Query(() => [Community])
async communities(): Promise {
@@ -41,41 +55,47 @@ export class CommunityResolver {
return dbCommunities.map((dbCom: DbCommunity) => new Community(dbCom))
}
- @Authorized([RIGHTS.COMMUNITY_BY_UUID])
+ @Authorized([RIGHTS.COMMUNITY_BY_IDENTIFIER])
@Query(() => Community)
- async community(@Arg('communityUuid') communityUuid: string): Promise {
- const com: DbCommunity | null = await getCommunityByUuid(communityUuid)
- if (!com) {
- throw new LogError('community not found', communityUuid)
+ async communityByIdentifier(
+ @Arg('communityIdentifier') communityIdentifier: string,
+ ): Promise {
+ const community = await getCommunityByIdentifier(communityIdentifier)
+ if (!community) {
+ throw new LogError('community not found', communityIdentifier)
}
- return new Community(com)
+ return new Community(community)
+ }
+
+ @Authorized([RIGHTS.HOME_COMMUNITY])
+ @Query(() => Community)
+ async homeCommunity(): Promise {
+ const community = await getHomeCommunity()
+ if (!community) {
+ throw new LogError('no home community exist')
+ }
+ return new Community(community)
}
@Authorized([RIGHTS.COMMUNITY_UPDATE])
@Mutation(() => Community)
- async updateHomeCommunity(@Args() { uuid, gmsApiKey }: CommunityArgs): Promise {
- let homeCom: DbCommunity | null
- let com: Community
- if (uuid) {
- let toUpdate = false
- homeCom = await getCommunityByUuid(uuid)
- if (!homeCom) {
- throw new LogError('HomeCommunity with uuid not found: ', uuid)
- }
- if (homeCom.foreign) {
- throw new LogError('Error: Only the HomeCommunity could be modified!')
- }
- if (homeCom.gmsApiKey !== gmsApiKey) {
- homeCom.gmsApiKey = gmsApiKey
- toUpdate = true
- }
- if (toUpdate) {
- await DbCommunity.save(homeCom)
- }
- com = new Community(homeCom)
- } else {
- throw new LogError(`HomeCommunity without an uuid can't be modified!`)
+ async updateHomeCommunity(
+ @Args() { uuid, gmsApiKey, location }: EditCommunityInput,
+ ): Promise {
+ const homeCom = await getCommunityByUuid(uuid)
+ if (!homeCom) {
+ throw new LogError('HomeCommunity with uuid not found: ', uuid)
}
- return com
+ if (homeCom.foreign) {
+ throw new LogError('Error: Only the HomeCommunity could be modified!')
+ }
+ if (homeCom.gmsApiKey !== gmsApiKey || homeCom.location !== location) {
+ homeCom.gmsApiKey = gmsApiKey ?? null
+ if (location) {
+ homeCom.location = Location2Point(location)
+ }
+ await DbCommunity.save(homeCom)
+ }
+ return new Community(homeCom)
}
}
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
index 23be529d3..3a3196c85 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
@@ -22,6 +22,8 @@ import { listContributionLinks } from '@/seeds/graphql/queries'
import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
import { peterLustig } from '@/seeds/users/peter-lustig'
+jest.mock('@/password/EncryptorUtils')
+
let mutate: ApolloServerTestClient['mutate'],
query: ApolloServerTestClient['query'],
con: Connection
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index 88d79d5c6..ac3800703 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -27,6 +27,7 @@ import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
import { bobBaumeister } from '@/seeds/users/bob-baumeister'
import { peterLustig } from '@/seeds/users/peter-lustig'
+jest.mock('@/password/EncryptorUtils')
jest.mock('@/emails/sendEmailVariants', () => {
const originalModule = jest.requireActual('@/emails/sendEmailVariants')
return {
@@ -152,9 +153,9 @@ describe('ContributionMessageResolver', () => {
message: 'Test',
},
})
- expect(logger.debug).toBeCalledTimes(4)
+ expect(logger.debug).toBeCalledTimes(5)
expect(logger.debug).toHaveBeenNthCalledWith(
- 4,
+ 5,
'use UnconfirmedContributionUserAddMessageRole',
)
expect(mutationResult).toEqual(
@@ -350,9 +351,9 @@ describe('ContributionMessageResolver', () => {
},
})
- expect(logger.debug).toBeCalledTimes(4)
+ expect(logger.debug).toBeCalledTimes(5)
expect(logger.debug).toHaveBeenNthCalledWith(
- 4,
+ 5,
'use UnconfirmedContributionAdminAddMessageRole',
)
@@ -385,9 +386,9 @@ describe('ContributionMessageResolver', () => {
},
})
- expect(logger.debug).toBeCalledTimes(4)
+ expect(logger.debug).toBeCalledTimes(5)
expect(logger.debug).toHaveBeenNthCalledWith(
- 4,
+ 5,
'use UnconfirmedContributionAdminAddMessageRole',
)
@@ -403,7 +404,7 @@ describe('ContributionMessageResolver', () => {
})
it('logs the error "ContributionMessage was not sent successfully: Error: missing right ADMIN_CREATE_CONTRIBUTION_MESSAGE for user"', () => {
- expect(logger.debug).toBeCalledTimes(4)
+ expect(logger.debug).toBeCalledTimes(5)
expect(logger.error).toHaveBeenNthCalledWith(
1,
'missing right ADMIN_CREATE_CONTRIBUTION_MESSAGE for user',
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index a188c5d2c..134b378dc 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -56,8 +56,10 @@ import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
import { peterLustig } from '@/seeds/users/peter-lustig'
import { raeuberHotzenplotz } from '@/seeds/users/raeuber-hotzenplotz'
import { stephenHawking } from '@/seeds/users/stephen-hawking'
+import { getFirstDayOfPreviousNMonth } from '@/util/utilities'
jest.mock('@/emails/sendEmailVariants')
+jest.mock('@/password/EncryptorUtils')
let mutate: ApolloServerTestClient['mutate'],
query: ApolloServerTestClient['query'],
@@ -290,8 +292,7 @@ describe('ContributionResolver', () => {
it('throws error when creationDate 3 month behind', async () => {
jest.clearAllMocks()
- const date = new Date()
- date.setMonth(date.getMonth() - 3)
+ const date = getFirstDayOfPreviousNMonth(new Date(), 3)
const { errors: errorObjects } = await mutate({
mutation: createContribution,
variables: {
@@ -584,8 +585,7 @@ describe('ContributionResolver', () => {
describe('update creation to a date that is older than 3 months', () => {
it('throws an error', async () => {
jest.clearAllMocks()
- const date = new Date()
- date.setMonth(date.getMonth() - 3)
+ const date = getFirstDayOfPreviousNMonth(new Date(), 3)
const { errors: errorObjects } = await mutate({
mutation: updateContribution,
variables: {
@@ -2782,13 +2782,15 @@ describe('ContributionResolver', () => {
const { errors: errorObjects } = await query({
query: adminListContributions,
variables: {
- statusFilter: ['INVALID_STATUS'],
+ filter: {
+ statusFilter: ['INVALID_STATUS'],
+ },
},
})
expect(errorObjects).toMatchObject([
{
message:
- 'Variable "$statusFilter" got invalid value "INVALID_STATUS" at "statusFilter[0]"; Value "INVALID_STATUS" does not exist in "ContributionStatus" enum.',
+ 'Variable "$filter" got invalid value "INVALID_STATUS" at "filter.statusFilter[0]"; Value "INVALID_STATUS" does not exist in "ContributionStatus" enum.',
extensions: {
code: 'BAD_USER_INPUT',
},
@@ -2801,6 +2803,7 @@ describe('ContributionResolver', () => {
data: { adminListContributions: contributionListObject },
} = await query({
query: adminListContributions,
+ variables: { paginated: { pageSize: 20 } },
})
expect(contributionListObject.contributionList).toHaveLength(18)
@@ -2809,165 +2812,255 @@ describe('ContributionResolver', () => {
contributionList: expect.arrayContaining([
expect.objectContaining({
amount: expect.decimalEqual(100),
- firstName: 'Peter',
id: expect.any(Number),
- lastName: 'Lustig',
memo: '#firefighters',
messagesCount: 0,
status: 'PENDING',
+ user: expect.objectContaining({
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ emailContact: expect.objectContaining({
+ email: 'peter@lustig.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(50),
- firstName: 'Bibi',
id: expect.any(Number),
- lastName: 'Bloxberg',
memo: 'Herzlich Willkommen bei Gradido liebe Bibi!',
messagesCount: 0,
status: 'CONFIRMED',
+ user: expect.objectContaining({
+ firstName: 'Bibi',
+ lastName: 'Bloxberg',
+ emailContact: expect.objectContaining({
+ email: 'bibi@bloxberg.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(50),
- firstName: 'Bibi',
id: expect.any(Number),
- lastName: 'Bloxberg',
memo: 'Herzlich Willkommen bei Gradido liebe Bibi!',
messagesCount: 0,
status: 'CONFIRMED',
+ user: expect.objectContaining({
+ firstName: 'Bibi',
+ lastName: 'Bloxberg',
+ emailContact: expect.objectContaining({
+ email: 'bibi@bloxberg.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(450),
- firstName: 'Bibi',
id: expect.any(Number),
- lastName: 'Bloxberg',
memo: 'Herzlich Willkommen bei Gradido liebe Bibi!',
messagesCount: 0,
status: 'CONFIRMED',
+ user: expect.objectContaining({
+ firstName: 'Bibi',
+ lastName: 'Bloxberg',
+ emailContact: expect.objectContaining({
+ email: 'bibi@bloxberg.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(400),
- firstName: 'Peter',
id: expect.any(Number),
- lastName: 'Lustig',
memo: 'Herzlich Willkommen bei Gradido!',
messagesCount: 0,
status: 'PENDING',
+ user: expect.objectContaining({
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ emailContact: expect.objectContaining({
+ email: 'peter@lustig.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
- firstName: 'Bob',
id: expect.any(Number),
- lastName: 'der Baumeister',
memo: 'Confirmed Contribution',
messagesCount: 0,
status: 'CONFIRMED',
+ user: expect.objectContaining({
+ firstName: 'Bob',
+ lastName: 'der Baumeister',
+ emailContact: expect.objectContaining({
+ email: 'bob@baumeister.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
- firstName: 'Peter',
id: expect.any(Number),
- lastName: 'Lustig',
memo: 'Test env contribution',
messagesCount: 0,
status: 'PENDING',
+ user: expect.objectContaining({
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ emailContact: expect.objectContaining({
+ email: 'peter@lustig.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(200),
- firstName: 'Bibi',
id: expect.any(Number),
- lastName: 'Bloxberg',
memo: 'Aktives Grundeinkommen',
messagesCount: 0,
status: 'PENDING',
+ user: expect.objectContaining({
+ firstName: 'Bibi',
+ lastName: 'Bloxberg',
+ emailContact: expect.objectContaining({
+ email: 'bibi@bloxberg.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(200),
- firstName: 'Peter',
id: expect.any(Number),
- lastName: 'Lustig',
memo: 'Das war leider zu Viel!',
messagesCount: 1,
status: 'DELETED',
+ user: expect.objectContaining({
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ emailContact: expect.objectContaining({
+ email: 'peter@lustig.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(166),
- firstName: 'Räuber',
id: expect.any(Number),
- lastName: 'Hotzenplotz',
memo: 'Whatever contribution',
messagesCount: 0,
status: 'DENIED',
+ user: expect.objectContaining({
+ firstName: 'Räuber',
+ lastName: 'Hotzenplotz',
+ emailContact: expect.objectContaining({
+ email: 'raeuber@hotzenplotz.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(166),
- firstName: 'Räuber',
id: expect.any(Number),
- lastName: 'Hotzenplotz',
memo: 'Whatever contribution',
messagesCount: 0,
status: 'DELETED',
+ user: expect.objectContaining({
+ firstName: 'Räuber',
+ lastName: 'Hotzenplotz',
+ emailContact: expect.objectContaining({
+ email: 'raeuber@hotzenplotz.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(166),
- firstName: 'Räuber',
id: expect.any(Number),
- lastName: 'Hotzenplotz',
memo: 'Whatever contribution',
messagesCount: 0,
status: 'CONFIRMED',
+ user: expect.objectContaining({
+ firstName: 'Räuber',
+ lastName: 'Hotzenplotz',
+ emailContact: expect.objectContaining({
+ email: 'raeuber@hotzenplotz.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
- firstName: 'Bibi',
id: expect.any(Number),
- lastName: 'Bloxberg',
memo: 'Test contribution to delete',
messagesCount: 0,
status: 'DELETED',
+ user: expect.objectContaining({
+ firstName: 'Bibi',
+ lastName: 'Bloxberg',
+ emailContact: expect.objectContaining({
+ email: 'bibi@bloxberg.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
- firstName: 'Bibi',
id: expect.any(Number),
- lastName: 'Bloxberg',
memo: 'Test contribution to deny',
messagesCount: 0,
status: 'DENIED',
+ user: expect.objectContaining({
+ firstName: 'Bibi',
+ lastName: 'Bloxberg',
+ emailContact: expect.objectContaining({
+ email: 'bibi@bloxberg.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
- firstName: 'Bibi',
id: expect.any(Number),
- lastName: 'Bloxberg',
memo: 'Test contribution to confirm',
messagesCount: 0,
status: 'CONFIRMED',
+ user: expect.objectContaining({
+ firstName: 'Bibi',
+ lastName: 'Bloxberg',
+ emailContact: expect.objectContaining({
+ email: 'bibi@bloxberg.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
- firstName: 'Bibi',
id: expect.any(Number),
- lastName: 'Bloxberg',
memo: 'Test IN_PROGRESS contribution',
messagesCount: 1,
status: 'IN_PROGRESS',
+ user: expect.objectContaining({
+ firstName: 'Bibi',
+ lastName: 'Bloxberg',
+ emailContact: expect.objectContaining({
+ email: 'bibi@bloxberg.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(10),
- firstName: 'Bibi',
id: expect.any(Number),
- lastName: 'Bloxberg',
memo: 'Test PENDING contribution update',
messagesCount: 2,
status: 'PENDING',
+ user: expect.objectContaining({
+ firstName: 'Bibi',
+ lastName: 'Bloxberg',
+ emailContact: expect.objectContaining({
+ email: 'bibi@bloxberg.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(1000),
- firstName: 'Bibi',
id: expect.any(Number),
- lastName: 'Bloxberg',
memo: 'Herzlich Willkommen bei Gradido!',
messagesCount: 0,
status: 'CONFIRMED',
+ user: expect.objectContaining({
+ firstName: 'Bibi',
+ lastName: 'Bloxberg',
+ emailContact: expect.objectContaining({
+ email: 'bibi@bloxberg.de',
+ }),
+ }),
}),
]),
})
@@ -2979,10 +3072,14 @@ describe('ContributionResolver', () => {
} = await query({
query: adminListContributions,
variables: {
- currentPage: 1,
- pageSize: 2,
- order: Order.DESC,
- statusFilter: ['PENDING'],
+ paginated: {
+ currentPage: 1,
+ pageSize: 2,
+ order: Order.DESC,
+ },
+ filter: {
+ statusFilter: ['PENDING'],
+ },
},
})
expect(contributionListObject.contributionList).toHaveLength(2)
@@ -2991,21 +3088,31 @@ describe('ContributionResolver', () => {
contributionList: expect.arrayContaining([
expect.objectContaining({
amount: '100',
- firstName: 'Peter',
id: expect.any(Number),
- lastName: 'Lustig',
memo: '#firefighters',
messagesCount: 0,
status: 'PENDING',
+ user: expect.objectContaining({
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ emailContact: expect.objectContaining({
+ email: 'peter@lustig.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: '400',
- firstName: 'Peter',
id: expect.any(Number),
- lastName: 'Lustig',
memo: 'Herzlich Willkommen bei Gradido!',
messagesCount: 0,
status: 'PENDING',
+ user: expect.objectContaining({
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ emailContact: expect.objectContaining({
+ email: 'peter@lustig.de',
+ }),
+ }),
}),
expect.not.objectContaining({
status: 'DENIED',
@@ -3030,7 +3137,10 @@ describe('ContributionResolver', () => {
} = await query({
query: adminListContributions,
variables: {
- query: 'Peter',
+ filter: {
+ query: 'Peter',
+ },
+ paginated: { pageSize: 20 },
},
})
expect(contributionListObject.contributionList).toHaveLength(4)
@@ -3039,39 +3149,59 @@ describe('ContributionResolver', () => {
contributionList: expect.arrayContaining([
expect.objectContaining({
amount: expect.decimalEqual(100),
- firstName: 'Peter',
id: expect.any(Number),
- lastName: 'Lustig',
memo: '#firefighters',
messagesCount: 0,
status: 'PENDING',
+ user: expect.objectContaining({
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ emailContact: expect.objectContaining({
+ email: 'peter@lustig.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(400),
- firstName: 'Peter',
id: expect.any(Number),
- lastName: 'Lustig',
memo: 'Herzlich Willkommen bei Gradido!',
messagesCount: 0,
status: 'PENDING',
+ user: expect.objectContaining({
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ emailContact: expect.objectContaining({
+ email: 'peter@lustig.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
- firstName: 'Peter',
id: expect.any(Number),
- lastName: 'Lustig',
memo: 'Test env contribution',
messagesCount: 0,
status: 'PENDING',
+ user: expect.objectContaining({
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ emailContact: expect.objectContaining({
+ email: 'peter@lustig.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(200),
- firstName: 'Peter',
id: expect.any(Number),
- lastName: 'Lustig',
memo: 'Das war leider zu Viel!',
messagesCount: 1,
status: 'DELETED',
+ user: expect.objectContaining({
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ emailContact: expect.objectContaining({
+ email: 'peter@lustig.de',
+ }),
+ }),
}),
]),
})
@@ -3083,8 +3213,11 @@ describe('ContributionResolver', () => {
} = await query({
query: adminListContributions,
variables: {
- query: 'Peter',
- noHashtag: true,
+ filter: {
+ query: 'Peter',
+ noHashtag: true,
+ },
+ paginated: { pageSize: 20 },
},
})
expect(contributionListObject.contributionList).toHaveLength(3)
@@ -3093,30 +3226,45 @@ describe('ContributionResolver', () => {
contributionList: expect.arrayContaining([
expect.objectContaining({
amount: expect.decimalEqual(400),
- firstName: 'Peter',
id: expect.any(Number),
- lastName: 'Lustig',
memo: 'Herzlich Willkommen bei Gradido!',
messagesCount: 0,
status: 'PENDING',
+ user: expect.objectContaining({
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ emailContact: expect.objectContaining({
+ email: 'peter@lustig.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
- firstName: 'Peter',
id: expect.any(Number),
- lastName: 'Lustig',
memo: 'Test env contribution',
messagesCount: 0,
status: 'PENDING',
+ user: expect.objectContaining({
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ emailContact: expect.objectContaining({
+ email: 'peter@lustig.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(200),
- firstName: 'Peter',
id: expect.any(Number),
- lastName: 'Lustig',
memo: 'Das war leider zu Viel!',
messagesCount: 1,
status: 'DELETED',
+ user: expect.objectContaining({
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ emailContact: expect.objectContaining({
+ email: 'peter@lustig.de',
+ }),
+ }),
}),
]),
})
@@ -3128,7 +3276,9 @@ describe('ContributionResolver', () => {
} = await query({
query: adminListContributions,
variables: {
- query: '#firefighter',
+ filter: {
+ query: '#firefighter',
+ },
},
})
expect(contributionListObject.contributionList).toHaveLength(1)
@@ -3137,12 +3287,17 @@ describe('ContributionResolver', () => {
contributionList: expect.arrayContaining([
expect.objectContaining({
amount: expect.decimalEqual(100),
- firstName: 'Peter',
id: expect.any(Number),
- lastName: 'Lustig',
memo: '#firefighters',
messagesCount: 0,
status: 'PENDING',
+ user: expect.objectContaining({
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ emailContact: expect.objectContaining({
+ email: 'peter@lustig.de',
+ }),
+ }),
}),
]),
})
@@ -3154,8 +3309,10 @@ describe('ContributionResolver', () => {
} = await query({
query: adminListContributions,
variables: {
- query: '#firefighter',
- noHashtag: true,
+ filter: {
+ query: '#firefighter',
+ noHashtag: true,
+ },
},
})
expect(contributionListObject.contributionList).toHaveLength(0)
@@ -3171,7 +3328,10 @@ describe('ContributionResolver', () => {
} = await query({
query: adminListContributions,
variables: {
- query: 'RAEUBER', // only found in lowercase in the email
+ filter: {
+ query: 'RAEUBER', // only found in lowercase in the email
+ },
+ paginated: { pageSize: 20 },
},
})
expect(contributionListObject.contributionList).toHaveLength(3)
@@ -3180,30 +3340,45 @@ describe('ContributionResolver', () => {
contributionList: expect.arrayContaining([
expect.objectContaining({
amount: expect.decimalEqual(166),
- firstName: 'Räuber',
id: expect.any(Number),
- lastName: 'Hotzenplotz',
memo: 'Whatever contribution',
messagesCount: 0,
status: 'DENIED',
+ user: expect.objectContaining({
+ firstName: 'Räuber',
+ lastName: 'Hotzenplotz',
+ emailContact: expect.objectContaining({
+ email: 'raeuber@hotzenplotz.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(166),
- firstName: 'Räuber',
id: expect.any(Number),
- lastName: 'Hotzenplotz',
memo: 'Whatever contribution',
messagesCount: 0,
status: 'DELETED',
+ user: expect.objectContaining({
+ firstName: 'Räuber',
+ lastName: 'Hotzenplotz',
+ emailContact: expect.objectContaining({
+ email: 'raeuber@hotzenplotz.de',
+ }),
+ }),
}),
expect.objectContaining({
amount: expect.decimalEqual(166),
- firstName: 'Räuber',
id: expect.any(Number),
- lastName: 'Hotzenplotz',
memo: 'Whatever contribution',
messagesCount: 0,
status: 'CONFIRMED',
+ user: expect.objectContaining({
+ firstName: 'Räuber',
+ lastName: 'Hotzenplotz',
+ emailContact: expect.objectContaining({
+ email: 'raeuber@hotzenplotz.de',
+ }),
+ }),
}),
]),
})
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 5684835e4..4c1dbe488 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -4,7 +4,20 @@ import { Transaction as DbTransaction } from '@entity/Transaction'
import { User as DbUser } from '@entity/User'
import { UserContact } from '@entity/UserContact'
import { Decimal } from 'decimal.js-light'
-import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
+import { GraphQLResolveInfo } from 'graphql'
+import {
+ Arg,
+ Args,
+ Authorized,
+ Ctx,
+ FieldResolver,
+ Info,
+ Int,
+ Mutation,
+ Query,
+ Resolver,
+ Root,
+} from 'type-graphql'
import { AdminCreateContributionArgs } from '@arg/AdminCreateContributionArgs'
import { AdminUpdateContributionArgs } from '@arg/AdminUpdateContributionArgs'
@@ -20,6 +33,7 @@ import { Contribution, ContributionListResult } from '@model/Contribution'
import { Decay } from '@model/Decay'
import { OpenCreation } from '@model/OpenCreation'
import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
+import { User } from '@model/User'
import { RIGHTS } from '@/auth/RIGHTS'
import {
@@ -48,11 +62,12 @@ import { fullName } from '@/util/utilities'
import { findContribution } from './util/contributions'
import { getUserCreation, validateContribution, getOpenCreations } from './util/creations'
+import { extractGraphQLFields, extractGraphQLFieldsForSelect } from './util/extractGraphQLFields'
import { findContributions } from './util/findContributions'
import { getLastTransaction } from './util/getLastTransaction'
import { sendTransactionsToDltConnector } from './util/sendTransactionsToDltConnector'
-@Resolver()
+@Resolver(() => Contribution)
export class ContributionResolver {
@Authorized([RIGHTS.ADMIN_LIST_CONTRIBUTIONS])
@Query(() => Contribution)
@@ -144,7 +159,7 @@ export class ContributionResolver {
dbContributions.map((contribution) => {
// filter out moderator messages for this call
contribution.messages = contribution.messages?.filter(
- (m) => m.type !== ContributionMessageType.MODERATOR,
+ (m) => (m.type as ContributionMessageType) !== ContributionMessageType.MODERATOR,
)
return new Contribution(contribution, user)
}),
@@ -321,15 +336,37 @@ export class ContributionResolver {
@Authorized([RIGHTS.ADMIN_LIST_CONTRIBUTIONS])
@Query(() => ContributionListResult)
async adminListContributions(
- @Args() paginated: Paginated,
- @Args() filter: SearchContributionsFilterArgs,
- ): Promise {
- const [dbContributions, count] = await findContributions(paginated, filter, true, {
- user: {
- emailContact: true,
- },
- messages: true,
+ @Arg('filter', () => SearchContributionsFilterArgs, {
+ defaultValue: new SearchContributionsFilterArgs(),
})
+ filter: SearchContributionsFilterArgs,
+ @Arg('paginated', () => Paginated, { defaultValue: new Paginated() }) paginated: Paginated,
+ @Info() info: GraphQLResolveInfo,
+ ): Promise {
+ // Check if only count was requested (without contributionList)
+ const fields = Object.keys(extractGraphQLFields(info))
+ const countOnly: boolean = fields.includes('contributionCount') && fields.length === 1
+ // check if related user was requested
+ const userRequested =
+ fields.includes('user') || filter.userId !== undefined || filter.query !== undefined
+ // check if related emailContact was requested
+ const emailContactRequested = fields.includes('user.emailContact') || filter.query !== undefined
+ // check if related messages were requested
+ const messagesRequested = ['messagesCount', 'messages'].some((field) => fields.includes(field))
+ const [dbContributions, count] = await findContributions(
+ paginated,
+ filter,
+ true,
+ {
+ user: userRequested
+ ? {
+ emailContact: emailContactRequested,
+ }
+ : false,
+ messages: messagesRequested,
+ },
+ countOnly,
+ )
return new ContributionListResult(
count,
@@ -352,7 +389,7 @@ export class ContributionResolver {
}
const moderator = getUser(context)
if (
- contribution.contributionType === ContributionType.USER &&
+ (contribution.contributionType as ContributionType) === ContributionType.USER &&
contribution.userId === moderator.id
) {
throw new LogError('Own contribution can not be deleted as admin')
@@ -532,8 +569,9 @@ export class ContributionResolver {
throw new LogError('Contribution not found', id)
}
if (
- contributionToUpdate.contributionStatus !== ContributionStatus.IN_PROGRESS &&
- contributionToUpdate.contributionStatus !== ContributionStatus.PENDING
+ (contributionToUpdate.contributionStatus as ContributionStatus) !==
+ ContributionStatus.IN_PROGRESS &&
+ (contributionToUpdate.contributionStatus as ContributionStatus) !== ContributionStatus.PENDING
) {
throw new LogError(
'Status of the contribution is not allowed',
@@ -572,4 +610,21 @@ export class ContributionResolver {
return !!res
}
+
+ // Field resolvers
+ @Authorized([RIGHTS.USER])
+ @FieldResolver(() => User)
+ async user(
+ @Root() contribution: DbContribution,
+ @Info() info: GraphQLResolveInfo,
+ ): Promise {
+ let user = contribution.user
+ if (!user) {
+ const queryBuilder = DbUser.createQueryBuilder('user')
+ queryBuilder.where('user.id = :userId', { userId: contribution.userId })
+ extractGraphQLFieldsForSelect(info, queryBuilder, 'user')
+ user = await queryBuilder.getOneOrFail()
+ }
+ return new User(user)
+ }
}
diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts
index 74cd81f01..2703be8ed 100644
--- a/backend/src/graphql/resolver/GdtResolver.ts
+++ b/backend/src/graphql/resolver/GdtResolver.ts
@@ -24,6 +24,16 @@ export class GdtResolver {
{ currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
@Ctx() context: Context,
): Promise {
+ if (!CONFIG.GDT_ACTIVE) {
+ return new GdtEntryList(
+ 'disabled',
+ 0,
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-explicit-any
+ [],
+ 0,
+ 0,
+ )
+ }
const userEntity = getUser(context)
try {
@@ -51,6 +61,9 @@ export class GdtResolver {
@Authorized([RIGHTS.GDT_BALANCE])
@Query(() => Float, { nullable: true })
async gdtBalance(@Ctx() context: Context): Promise {
+ if (!CONFIG.GDT_ACTIVE) {
+ return null
+ }
const user = getUser(context)
try {
const resultGDTSum = await apiPost(`${CONFIG.GDT_API_URL}/GdtEntries/sumPerEmailApi`, {
@@ -71,6 +84,9 @@ export class GdtResolver {
@Query(() => Int)
// eslint-disable-next-line @typescript-eslint/no-explicit-any
async existPid(@Arg('pid', () => Int) pid: number): Promise {
+ if (!CONFIG.GDT_ACTIVE) {
+ return 0
+ }
// load user
const resultPID = await apiGet(`${CONFIG.GDT_API_URL}/publishers/checkPidApi/${pid}`)
if (!resultPID.success) {
diff --git a/backend/src/graphql/resolver/KlicktippResolver.test.ts b/backend/src/graphql/resolver/KlicktippResolver.test.ts
index 2c819f070..06430c620 100644
--- a/backend/src/graphql/resolver/KlicktippResolver.test.ts
+++ b/backend/src/graphql/resolver/KlicktippResolver.test.ts
@@ -15,6 +15,8 @@ import { userFactory } from '@/seeds/factory/user'
import { login, subscribeNewsletter, unsubscribeNewsletter } from '@/seeds/graphql/mutations'
import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
+jest.mock('@/password/EncryptorUtils')
+
let testEnv: any, mutate: any, con: any
beforeAll(async () => {
diff --git a/backend/src/graphql/resolver/ProjectBrandingResolver.ts b/backend/src/graphql/resolver/ProjectBrandingResolver.ts
new file mode 100644
index 000000000..80180f58c
--- /dev/null
+++ b/backend/src/graphql/resolver/ProjectBrandingResolver.ts
@@ -0,0 +1,105 @@
+import { ProjectBranding as DbProjectBranding } from '@entity/ProjectBranding'
+import { Resolver, Query, Mutation, Arg, Int, Authorized, ID } from 'type-graphql'
+
+import { ProjectBrandingInput } from '@input/ProjectBrandingInput'
+import { ProjectBranding } from '@model/ProjectBranding'
+import { Space } from '@model/Space'
+import { SpaceList } from '@model/SpaceList'
+
+import { HumHubClient } from '@/apis/humhub/HumHubClient'
+import { RIGHTS } from '@/auth/RIGHTS'
+import { LogError } from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
+
+@Resolver(() => ProjectBranding)
+export class ProjectBrandingResolver {
+ @Query(() => [ProjectBranding])
+ @Authorized([RIGHTS.PROJECT_BRANDING_VIEW])
+ async projectBrandings(): Promise {
+ return (await DbProjectBranding.find()).map(
+ (entity: DbProjectBranding) => new ProjectBranding(entity),
+ )
+ }
+
+ @Query(() => ProjectBranding)
+ @Authorized([RIGHTS.PROJECT_BRANDING_VIEW])
+ async projectBranding(@Arg('id', () => Int) id: number): Promise {
+ const projectBrandingEntity = await DbProjectBranding.findOneBy({ id })
+ if (!projectBrandingEntity) {
+ throw new LogError(`Project Branding with id: ${id} not found`)
+ }
+ return new ProjectBranding(projectBrandingEntity)
+ }
+
+ @Query(() => String, { nullable: true })
+ @Authorized([RIGHTS.PROJECT_BRANDING_BANNER])
+ async projectBrandingBanner(@Arg('alias', () => String) alias: string): Promise {
+ const projectBrandingEntity = await DbProjectBranding.findOne({
+ where: { alias },
+ select: { id: true, logoUrl: true },
+ })
+ if (!projectBrandingEntity) {
+ throw new LogError(`Project Branding with alias: ${alias} not found`)
+ }
+ return projectBrandingEntity.logoUrl
+ }
+
+ @Mutation(() => ProjectBranding, { nullable: true })
+ @Authorized([RIGHTS.PROJECT_BRANDING_MUTATE])
+ async upsertProjectBranding(
+ @Arg('input') input: ProjectBrandingInput,
+ ): Promise {
+ const projectBranding = input.id
+ ? await DbProjectBranding.findOneOrFail({ where: { id: input.id } })
+ : new DbProjectBranding()
+
+ Object.assign(projectBranding, input)
+ await projectBranding.save()
+
+ return new ProjectBranding(projectBranding)
+ }
+
+ @Mutation(() => Boolean)
+ @Authorized([RIGHTS.PROJECT_BRANDING_MUTATE])
+ async deleteProjectBranding(@Arg('id', () => ID) id: number): Promise {
+ try {
+ await DbProjectBranding.delete({ id })
+ return true
+ } catch (err) {
+ logger.error(err)
+ return false
+ }
+ }
+
+ @Query(() => Space)
+ @Authorized([RIGHTS.LIST_HUMHUB_SPACES])
+ async space(@Arg('id', () => ID) id: number): Promise {
+ const humhub = HumHubClient.getInstance()
+ if (!humhub) {
+ throw new LogError('HumHub client not initialized')
+ }
+
+ const space = await humhub.space(id)
+ if (!space) {
+ throw new LogError(`Error requesting space with id: ${id} from HumHub`)
+ }
+ return new Space(space)
+ }
+
+ @Query(() => SpaceList)
+ @Authorized([RIGHTS.LIST_HUMHUB_SPACES])
+ async spaces(
+ @Arg('page', () => Int, { defaultValue: 1 }) page: number,
+ @Arg('limit', () => Int, { defaultValue: 20 }) limit: number,
+ ): Promise {
+ const humhub = HumHubClient.getInstance()
+ if (!humhub) {
+ throw new LogError('HumHub client not initialized')
+ }
+ const spaces = await humhub.spaces(page, limit)
+ if (!spaces) {
+ throw new LogError('Error requesting spaces from HumHub')
+ }
+ return new SpaceList(spaces)
+ }
+}
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
index fe047b35a..bcea43416 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
@@ -38,6 +38,8 @@ import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
import { transactionLinkCode } from './TransactionLinkResolver'
+jest.mock('@/password/EncryptorUtils')
+
// mock semaphore to allow use fake timers
jest.mock('@/util/TRANSACTIONS_LOCK')
TRANSACTIONS_LOCK.acquire = jest.fn().mockResolvedValue(jest.fn())
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index 1bb4a86f7..7cc6143e6 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -15,8 +15,6 @@ import { ApolloServerTestClient } from 'apollo-server-testing'
import { GraphQLError } from 'graphql'
import { v4 as uuidv4 } from 'uuid'
-import { GmsPublishLocationType } from '@enum/GmsPublishLocationType'
-import { GmsPublishNameType } from '@enum/GmsPublishNameType'
import { cleanDB, testEnvironment } from '@test/helpers'
import { logger } from '@test/testSetup'
@@ -39,6 +37,8 @@ import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
import { peterLustig } from '@/seeds/users/peter-lustig'
import { stephenHawking } from '@/seeds/users/stephen-hawking'
+jest.mock('@/password/EncryptorUtils')
+
let mutate: ApolloServerTestClient['mutate'], con: Connection
let query: ApolloServerTestClient['query']
@@ -530,13 +530,12 @@ describe('send coins', () => {
describe('send coins via alias', () => {
beforeAll(async () => {
+ // first set alias to null, because updating alias isn't allowed
+ await User.update({ alias: 'MeisterBob' }, { alias: () => 'NULL' })
await mutate({
mutation: updateUserInfos,
variables: {
alias: 'bob',
- gmsAllowed: true,
- gmsPublishName: GmsPublishNameType.GMS_PUBLISH_NAME_ALIAS_OR_INITALS,
- gmsPublishLocation: GmsPublishLocationType.GMS_LOCATION_TYPE_RANDOM,
},
})
await mutate({
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index ce1ba43da..3989cb175 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -38,7 +38,8 @@ import { calculateBalance } from '@/util/validate'
import { virtualLinkTransaction, virtualDecayTransaction } from '@/util/virtualTransactions'
import { BalanceResolver } from './BalanceResolver'
-import { getCommunityByUuid, getCommunityName, isHomeCommunity } from './util/communities'
+import { GdtResolver } from './GdtResolver'
+import { getCommunityByIdentifier, getCommunityName, isHomeCommunity } from './util/communities'
import { findUserByIdentifier } from './util/findUserByIdentifier'
import { getLastTransaction } from './util/getLastTransaction'
import { getTransactionList } from './util/getTransactionList'
@@ -189,6 +190,7 @@ export const executeTransaction = async (
lastName: recipient.lastName,
email: recipient.emailContact.email,
language: recipient.language,
+ memo,
senderFirstName: sender.firstName,
senderLastName: sender.lastName,
senderEmail: sender.emailContact.email,
@@ -229,8 +231,14 @@ export class TransactionResolver {
logger.addContext('user', user.id)
logger.info(`transactionList(user=${user.firstName}.${user.lastName}, ${user.emailId})`)
+ let balanceGDTPromise: Promise = Promise.resolve(null)
+ if (CONFIG.GDT_ACTIVE) {
+ const gdtResolver = new GdtResolver()
+ balanceGDTPromise = gdtResolver.gdtBalance(context)
+ }
+
// find current balance
- const lastTransaction = await getLastTransaction(user.id, ['contribution'])
+ const lastTransaction = await getLastTransaction(user.id)
logger.debug(`lastTransaction=${lastTransaction}`)
const balanceResolver = new BalanceResolver()
@@ -258,7 +266,7 @@ export class TransactionResolver {
// userTransactions.forEach((transaction: dbTransaction) => {
// use normal for loop because of timing problems with await in forEach-loop
for (const transaction of userTransactions) {
- if (transaction.typeId === TransactionTypeId.CREATION) {
+ if ((transaction.typeId as TransactionTypeId) === TransactionTypeId.CREATION) {
continue
}
if (transaction.linkedUserId && !involvedUserIds.includes(transaction.linkedUserId)) {
@@ -319,6 +327,7 @@ export class TransactionResolver {
const { sumHoldAvailableAmount, sumAmount, lastDate, firstDate, transactionLinkcount } =
await transactionLinkSummary(user.id, now)
+
context.linkCount = transactionLinkcount
logger.debug(`transactionLinkcount=${transactionLinkcount}`)
context.sumHoldAvailableAmount = sumHoldAvailableAmount
@@ -389,7 +398,7 @@ export class TransactionResolver {
: involvedUsers.find((u) => u.id === userTransaction.linkedUserId)
*/
let linkedUser: User | undefined
- if (userTransaction.typeId === TransactionTypeId.CREATION) {
+ if ((userTransaction.typeId as TransactionTypeId) === TransactionTypeId.CREATION) {
linkedUser = communityUser
logger.debug('CREATION-linkedUser=', linkedUser)
} else if (userTransaction.linkedUserId) {
@@ -413,6 +422,10 @@ export class TransactionResolver {
).toDecimalPlaces(2, Decimal.ROUND_HALF_UP)
}
})
+ if (CONFIG.GDT_ACTIVE) {
+ const balanceGDT = await balanceGDTPromise
+ context.balanceGDT = balanceGDT
+ }
// Construct Result
return new TransactionList(await balanceResolver.balance(context), transactions)
@@ -452,7 +465,7 @@ export class TransactionResolver {
if (!CONFIG.FEDERATION_XCOM_SENDCOINS_ENABLED) {
throw new LogError('X-Community sendCoins disabled per configuration!')
}
- const recipCom = await getCommunityByUuid(recipientCommunityIdentifier)
+ const recipCom = await getCommunityByIdentifier(recipientCommunityIdentifier)
logger.debug('recipient commuity: ', recipCom)
if (recipCom === null) {
throw new LogError(
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index c570dbd9f..4fcf9944a 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -17,7 +17,6 @@ import { GraphQLError } from 'graphql'
import { v4 as uuidv4, validate as validateUUID, version as versionUUID } from 'uuid'
import { GmsPublishLocationType } from '@enum/GmsPublishLocationType'
-import { GmsPublishNameType } from '@enum/GmsPublishNameType'
import { OptInType } from '@enum/OptInType'
import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
import { RoleNames } from '@enum/RoleNames'
@@ -35,6 +34,7 @@ import {
sendResetPasswordEmail,
} from '@/emails/sendEmailVariants'
import { EventType } from '@/event/Events'
+import { PublishNameType } from '@/graphql/enum/PublishNameType'
import { SecretKeyCryptographyCreateKey } from '@/password/EncryptorUtils'
import { encryptPassword } from '@/password/PasswordEncryptor'
import { writeHomeCommunityEntry } from '@/seeds/community'
@@ -73,6 +73,9 @@ import { objectValuesToArray } from '@/util/utilities'
import { Location2Point } from './util/Location2Point'
+jest.mock('@/apis/humhub/HumHubClient')
+jest.mock('@/password/EncryptorUtils')
+
jest.mock('@/emails/sendEmailVariants', () => {
const originalModule = jest.requireActual('@/emails/sendEmailVariants')
return {
@@ -94,6 +97,8 @@ jest.mock('@/apis/KlicktippController', () => {
}
})
+CONFIG.EMAIL_CODE_REQUEST_TIME = 10
+
let admin: User
let user: User
let mutate: ApolloServerTestClient['mutate'],
@@ -110,6 +115,7 @@ beforeAll(async () => {
mutate = testEnv.mutate
query = testEnv.query
con = testEnv.con
+ CONFIG.HUMHUB_ACTIVE = false
await cleanDB()
})
@@ -183,7 +189,9 @@ describe('UserResolver', () => {
communityUuid: homeCom.communityUuid,
foreign: false,
gmsAllowed: true,
+ humhubAllowed: true,
gmsPublishName: 0,
+ humhubPublishName: 0,
gmsPublishLocation: 2,
location: null,
gmsRegistered: false,
@@ -236,10 +244,10 @@ describe('UserResolver', () => {
describe('account activation email', () => {
it('sends an account activation email', () => {
- const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(
- /{optin}/g,
- emailVerificationCode,
- ).replace(/{code}/g, '')
+ const activationLink = `${
+ CONFIG.EMAIL_LINK_VERIFICATION
+ }${emailVerificationCode.toString()}`
+
expect(sendAccountActivationEmail).toBeCalledWith({
firstName: 'Peter',
lastName: 'Lustig',
@@ -477,7 +485,6 @@ describe('UserResolver', () => {
})
transactionLink = await TransactionLink.findOneOrFail({ where: { userId: bob.id } })
-
resetToken()
// create new user using transaction link of bob
@@ -496,7 +503,7 @@ describe('UserResolver', () => {
UserContact.findOne({ where: { email: 'which@ever.de' }, relations: ['user'] }),
).resolves.toEqual(
expect.objectContaining({
- user: expect.objectContaining({ referrerId: bob.data.login.id }),
+ user: expect.objectContaining({ referrerId: transactionLink.userId }), // bob.data.login.id }),
}),
)
})
@@ -583,8 +590,8 @@ describe('UserResolver', () => {
expect(newUser.emailContact.emailChecked).toBeTruthy()
})
- it('updates the password', () => {
- const encryptedPass = encryptPassword(newUser, 'Aa12345_')
+ it('updates the password', async () => {
+ const encryptedPass = await encryptPassword(newUser, 'Aa12345_')
expect(newUser.password.toString()).toEqual(encryptedPass.toString())
})
@@ -713,9 +720,17 @@ describe('UserResolver', () => {
expect.objectContaining({
data: {
login: {
+ alias: 'BBB',
firstName: 'Bibi',
+ gmsAllowed: true,
+ gmsPublishLocation: 'GMS_LOCATION_TYPE_RANDOM',
+ gmsPublishName: 'PUBLISH_NAME_ALIAS_OR_INITALS',
+ gradidoID: expect.any(String),
hasElopage: false,
- id: expect.any(Number),
+ hideAmountGDD: false,
+ hideAmountGDT: false,
+ humhubAllowed: true,
+ humhubPublishName: 'PUBLISH_NAME_ALIAS_OR_INITALS',
klickTipp: {
newsletterState: false,
},
@@ -723,6 +738,7 @@ describe('UserResolver', () => {
lastName: 'Bloxberg',
publisherId: 1234,
roles: [],
+ userLocation: null,
},
},
}),
@@ -1230,7 +1246,7 @@ describe('UserResolver', () => {
lastName: 'Blümchen',
language: 'en',
gmsAllowed: true,
- gmsPublishName: GmsPublishNameType.GMS_PUBLISH_NAME_ALIAS_OR_INITALS,
+ gmsPublishName: PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS,
gmsPublishLocation: GmsPublishLocationType.GMS_LOCATION_TYPE_RANDOM,
}),
])
@@ -1258,6 +1274,8 @@ describe('UserResolver', () => {
describe('valid alias', () => {
it('updates the user in DB', async () => {
+ // first empty alias, because currently updating alias isn't allowed
+ await User.update({ alias: 'BBB' }, { alias: () => 'NULL' })
await mutate({
mutation: updateUserInfos,
variables: {
@@ -1268,7 +1286,7 @@ describe('UserResolver', () => {
expect.objectContaining({
alias: 'bibi_Bloxberg',
gmsAllowed: true,
- gmsPublishName: GmsPublishNameType.GMS_PUBLISH_NAME_ALIAS_OR_INITALS,
+ gmsPublishName: PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS,
gmsPublishLocation: GmsPublishLocationType.GMS_LOCATION_TYPE_RANDOM,
}),
])
@@ -1290,7 +1308,7 @@ describe('UserResolver', () => {
await expect(User.find()).resolves.toEqual([
expect.objectContaining({
gmsAllowed: true,
- gmsPublishName: GmsPublishNameType.GMS_PUBLISH_NAME_ALIAS_OR_INITALS,
+ gmsPublishName: PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS,
gmsPublishLocation: GmsPublishLocationType.GMS_LOCATION_TYPE_RANDOM,
}),
])
@@ -1303,14 +1321,15 @@ describe('UserResolver', () => {
mutation: updateUserInfos,
variables: {
gmsAllowed: false,
- gmsPublishName: GmsPublishNameType.GMS_PUBLISH_NAME_FIRST_INITIAL,
- gmsPublishLocation: GmsPublishLocationType.GMS_LOCATION_TYPE_APPROXIMATE,
+ gmsPublishName: PublishNameType[PublishNameType.PUBLISH_NAME_FIRST_INITIAL],
+ gmsPublishLocation:
+ GmsPublishLocationType[GmsPublishLocationType.GMS_LOCATION_TYPE_APPROXIMATE],
},
})
await expect(User.find()).resolves.toEqual([
expect.objectContaining({
gmsAllowed: false,
- gmsPublishName: GmsPublishNameType.GMS_PUBLISH_NAME_FIRST_INITIAL,
+ gmsPublishName: PublishNameType.PUBLISH_NAME_FIRST_INITIAL,
gmsPublishLocation: GmsPublishLocationType.GMS_LOCATION_TYPE_APPROXIMATE,
}),
])
@@ -1326,15 +1345,16 @@ describe('UserResolver', () => {
mutation: updateUserInfos,
variables: {
gmsAllowed: true,
- gmsPublishName: GmsPublishNameType.GMS_PUBLISH_NAME_ALIAS_OR_INITALS,
+ gmsPublishName: PublishNameType[PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS],
gmsLocation: loc,
- gmsPublishLocation: GmsPublishLocationType.GMS_LOCATION_TYPE_RANDOM,
+ gmsPublishLocation:
+ GmsPublishLocationType[GmsPublishLocationType.GMS_LOCATION_TYPE_RANDOM],
},
})
await expect(User.find()).resolves.toEqual([
expect.objectContaining({
gmsAllowed: true,
- gmsPublishName: GmsPublishNameType.GMS_PUBLISH_NAME_ALIAS_OR_INITALS,
+ gmsPublishName: PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS,
location: Location2Point(loc),
gmsPublishLocation: GmsPublishLocationType.GMS_LOCATION_TYPE_RANDOM,
}),
@@ -1538,9 +1558,9 @@ describe('UserResolver', () => {
expect(bibi).toEqual(
expect.objectContaining({
- password: SecretKeyCryptographyCreateKey(bibi.gradidoID.toString(), 'Aa12345_')[0]
- .readBigUInt64LE()
- .toString(),
+ password: (
+ await SecretKeyCryptographyCreateKey(bibi.gradidoID.toString(), 'Aa12345_')
+ ).toString(),
passwordEncryptionType: PasswordEncryptionType.GRADIDO_ID,
}),
)
@@ -1562,10 +1582,7 @@ describe('UserResolver', () => {
})
bibi = usercontact.user
bibi.passwordEncryptionType = PasswordEncryptionType.EMAIL
- bibi.password = SecretKeyCryptographyCreateKey(
- 'bibi@bloxberg.de',
- 'Aa12345_',
- )[0].readBigUInt64LE()
+ bibi.password = await SecretKeyCryptographyCreateKey('bibi@bloxberg.de', 'Aa12345_')
await bibi.save()
})
@@ -1582,9 +1599,9 @@ describe('UserResolver', () => {
expect(bibi).toEqual(
expect.objectContaining({
firstName: 'Bibi',
- password: SecretKeyCryptographyCreateKey(bibi.gradidoID.toString(), 'Aa12345_')[0]
- .readBigUInt64LE()
- .toString(),
+ password: (
+ await SecretKeyCryptographyCreateKey(bibi.gradidoID.toString(), 'Aa12345_')
+ ).toString(),
passwordEncryptionType: PasswordEncryptionType.GRADIDO_ID,
}),
)
@@ -1596,9 +1613,17 @@ describe('UserResolver', () => {
expect.objectContaining({
data: {
login: {
+ alias: 'BBB',
firstName: 'Bibi',
+ gmsAllowed: true,
+ gmsPublishLocation: 'GMS_LOCATION_TYPE_RANDOM',
+ gmsPublishName: 'PUBLISH_NAME_ALIAS_OR_INITALS',
+ gradidoID: expect.any(String),
hasElopage: false,
- id: expect.any(Number),
+ hideAmountGDD: false,
+ hideAmountGDT: false,
+ humhubAllowed: true,
+ humhubPublishName: 'PUBLISH_NAME_ALIAS_OR_INITALS',
klickTipp: {
newsletterState: false,
},
@@ -1606,6 +1631,7 @@ describe('UserResolver', () => {
lastName: 'Bloxberg',
publisherId: 1234,
roles: [],
+ userLocation: null,
},
},
}),
@@ -2221,14 +2247,13 @@ describe('UserResolver', () => {
})
it('sends an account activation email', async () => {
- const userConatct = await UserContact.findOneOrFail({
+ const userContact = await UserContact.findOneOrFail({
where: { email: 'bibi@bloxberg.de' },
relations: ['user'],
})
- const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(
- /{optin}/g,
- userConatct.emailVerificationCode.toString(),
- ).replace(/{code}/g, '')
+ const activationLink = `${
+ CONFIG.EMAIL_LINK_VERIFICATION
+ }${userContact.emailVerificationCode.toString()}`
expect(sendAccountActivationEmail).toBeCalledWith({
firstName: 'Bibi',
lastName: 'Bloxberg',
@@ -2243,14 +2268,14 @@ describe('UserResolver', () => {
})
it('stores the EMAIL_ADMIN_CONFIRMATION event in the database', async () => {
- const userConatct = await UserContact.findOneOrFail({
+ const userContact = await UserContact.findOneOrFail({
where: { email: 'bibi@bloxberg.de' },
relations: ['user'],
})
await expect(DbEvent.find()).resolves.toContainEqual(
expect.objectContaining({
type: EventType.EMAIL_ADMIN_CONFIRMATION,
- affectedUserId: userConatct.user.id,
+ affectedUserId: userContact.user.id,
actingUserId: admin.id,
}),
)
@@ -2459,6 +2484,7 @@ describe('UserResolver', () => {
}
beforeAll(async () => {
+ jest.clearAllMocks()
admin = await userFactory(testEnv, peterLustig)
await mutate({
mutation: login,
@@ -2670,13 +2696,12 @@ describe('UserResolver', () => {
mutation: login,
variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
})
+ // first set alias to null, because updating alias isn't currently allowed
+ await User.update({ alias: 'BBB' }, { alias: () => 'NULL' })
await mutate({
mutation: updateUserInfos,
variables: {
alias: 'bibi',
- gmsAllowed: true,
- gmsPublishName: GmsPublishNameType.GMS_PUBLISH_NAME_ALIAS_OR_INITALS,
- gmsPublishLocation: GmsPublishLocationType.GMS_LOCATION_TYPE_RANDOM,
},
})
})
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 3f70ce112..5e8843650 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -2,14 +2,28 @@
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/restrict-template-expressions */
-import { getConnection, In } from '@dbTools/typeorm'
+import { getConnection, In, Point } from '@dbTools/typeorm'
import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+import { ProjectBranding } from '@entity/ProjectBranding'
import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
import { User as DbUser } from '@entity/User'
import { UserContact as DbUserContact } from '@entity/UserContact'
-import { UserRole } from '@entity/UserRole'
+import { GraphQLResolveInfo } from 'graphql'
import i18n from 'i18n'
-import { Resolver, Query, Args, Arg, Authorized, Ctx, Mutation, Int } from 'type-graphql'
+import {
+ Resolver,
+ Query,
+ Args,
+ Arg,
+ Authorized,
+ Ctx,
+ Mutation,
+ Int,
+ Root,
+ FieldResolver,
+ Info,
+} from 'type-graphql'
+import { IRestResponse } from 'typed-rest-client'
import { v4 as uuidv4 } from 'uuid'
import { UserArgs } from '@arg//UserArgs'
@@ -19,21 +33,26 @@ import { SearchUsersFilters } from '@arg/SearchUsersFilters'
import { SetUserRoleArgs } from '@arg/SetUserRoleArgs'
import { UnsecureLoginArgs } from '@arg/UnsecureLoginArgs'
import { UpdateUserInfosArgs } from '@arg/UpdateUserInfosArgs'
-import { GmsPublishLocationType } from '@enum/GmsPublishLocationType'
-import { GmsPublishNameType } from '@enum/GmsPublishNameType'
import { OptInType } from '@enum/OptInType'
import { Order } from '@enum/Order'
import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
import { UserContactType } from '@enum/UserContactType'
import { SearchAdminUsersResult } from '@model/AdminUser'
// import { Location } from '@model/Location'
+import { GmsUserAuthenticationResult } from '@model/GmsUserAuthenticationResult'
import { User } from '@model/User'
import { UserAdmin, SearchUsersResult } from '@model/UserAdmin'
+import { UserContact } from '@model/UserContact'
+import { UserLocationResult } from '@model/UserLocationResult'
+import { HumHubClient } from '@/apis/humhub/HumHubClient'
+import { GetUser } from '@/apis/humhub/model/GetUser'
+import { PostUser } from '@/apis/humhub/model/PostUser'
import { subscribe } from '@/apis/KlicktippController'
import { encode } from '@/auth/JWT'
import { RIGHTS } from '@/auth/RIGHTS'
import { CONFIG } from '@/config'
+import { PublishNameLogic } from '@/data/PublishName.logic'
import {
sendAccountActivationEmail,
sendAccountMultiRegistrationEmail,
@@ -55,6 +74,7 @@ import {
EVENT_ADMIN_USER_DELETE,
EVENT_ADMIN_USER_UNDELETE,
} from '@/event/Events'
+import { PublishNameType } from '@/graphql/enum/PublishNameType'
import { isValidPassword } from '@/password/EncryptorUtils'
import { encryptPassword, verifyPassword } from '@/password/PasswordEncryptor'
import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
@@ -63,19 +83,24 @@ import { backendLogger as logger } from '@/server/logger'
import { communityDbUser } from '@/util/communityUser'
import { hasElopageBuys } from '@/util/hasElopageBuys'
import { getTimeDurationObject, printTimeDuration } from '@/util/time'
+import { delay } from '@/util/utilities'
import random from 'random-bigint'
import { randombytes_random } from 'sodium-native'
import { FULL_CREATION_AVAILABLE } from './const/const'
+import { authenticateGmsUserPlayground } from './util/authenticateGmsUserPlayground'
import { getHomeCommunity } from './util/communities'
+import { compareGmsRelevantUserSettings } from './util/compareGmsRelevantUserSettings'
import { getUserCreations } from './util/creations'
+import { extractGraphQLFieldsForSelect } from './util/extractGraphQLFields'
import { findUserByIdentifier } from './util/findUserByIdentifier'
import { findUsers } from './util/findUsers'
import { getKlicktippState } from './util/getKlicktippState'
-import { Location2Point } from './util/Location2Point'
+import { Location2Point, Point2Location } from './util/Location2Point'
import { setUserRole, deleteUserRole } from './util/modifyUserRole'
import { sendUserToGms } from './util/sendUserToGms'
+import { syncHumhub } from './util/syncHumhub'
import { validateAlias } from './util/validateAlias'
const LANGUAGES = ['de', 'en', 'es', 'fr', 'nl']
@@ -100,7 +125,7 @@ const newEmailContact = (email: string, userId: number): DbUserContact => {
// eslint-disable-next-line @typescript-eslint/ban-types
export const activationLink = (verificationCode: string): string => {
logger.debug(`activationLink(${verificationCode})...`)
- return CONFIG.EMAIL_LINK_SETPASSWORD.replace(/{optin}/g, verificationCode.toString())
+ return CONFIG.EMAIL_LINK_SETPASSWORD + verificationCode.toString()
}
const newGradidoID = async (): Promise => {
@@ -116,7 +141,7 @@ const newGradidoID = async (): Promise => {
return gradidoId
}
-@Resolver()
+@Resolver(() => User)
export class UserResolver {
@Authorized([RIGHTS.VERIFY_LOGIN])
@Query(() => User)
@@ -136,12 +161,21 @@ export class UserResolver {
@Authorized([RIGHTS.LOGIN])
@Mutation(() => User)
async login(
- @Args() { email, password, publisherId }: UnsecureLoginArgs,
+ @Args() { email, password, publisherId, project }: UnsecureLoginArgs,
@Ctx() context: Context,
): Promise {
- logger.info(`login with ${email}, ***, ${publisherId} ...`)
+ logger.info(`login with ${email}, ***, ${publisherId}, project=${project} ...`)
email = email.trim().toLowerCase()
- const dbUser = await findUserByEmail(email)
+ let dbUser: DbUser
+
+ try {
+ dbUser = await findUserByEmail(email)
+ } catch (e) {
+ // simulate delay which occur on password encryption 650 ms +- 50 rnd
+ await delay(650 + Math.floor(Math.random() * 101) - 50)
+ throw e
+ }
+
if (dbUser.deletedAt) {
throw new LogError('This user was permanently deleted. Contact support for questions', dbUser)
}
@@ -153,14 +187,33 @@ export class UserResolver {
// TODO we want to catch this on the frontend and ask the user to check his emails or resend code
throw new LogError('The User has not set a password yet', dbUser)
}
-
- if (!verifyPassword(dbUser, password)) {
+ if (!(await verifyPassword(dbUser, password))) {
throw new LogError('No user with this credentials', dbUser)
}
- if (dbUser.passwordEncryptionType !== PasswordEncryptionType.GRADIDO_ID) {
+ // request to humhub and klicktipp run in parallel
+ let humhubUserPromise: Promise> | undefined
+ let projectBrandingPromise: Promise | undefined
+ const klicktippStatePromise = getKlicktippState(dbUser.emailContact.email)
+ if (CONFIG.HUMHUB_ACTIVE && dbUser.humhubAllowed) {
+ const getHumhubUser = new PostUser(dbUser)
+ humhubUserPromise = HumHubClient.getInstance()?.userByUsernameAsync(
+ getHumhubUser.account.username,
+ )
+ }
+ if (project) {
+ projectBrandingPromise = ProjectBranding.findOne({
+ where: { alias: project },
+ select: { spaceId: true },
+ })
+ }
+
+ if (
+ (dbUser.passwordEncryptionType as PasswordEncryptionType) !==
+ PasswordEncryptionType.GRADIDO_ID
+ ) {
dbUser.passwordEncryptionType = PasswordEncryptionType.GRADIDO_ID
- dbUser.password = encryptPassword(dbUser, password)
+ dbUser.password = await encryptPassword(dbUser, password)
await dbUser.save()
}
// add pubKey in logger-context for layout-pattern X{user} to print it in each logging message
@@ -179,7 +232,6 @@ export class UserResolver {
dbUser.publisherId = publisherId
await DbUser.save(dbUser)
}
- user.klickTipp = await getKlicktippState(dbUser.emailContact.email)
context.setHeaders.push({
key: 'token',
@@ -187,6 +239,26 @@ export class UserResolver {
})
await EVENT_USER_LOGIN(dbUser)
+ const projectBranding = await projectBrandingPromise
+ logger.debug('project branding: ', projectBranding)
+ // load humhub state
+ if (humhubUserPromise) {
+ try {
+ const result = await humhubUserPromise
+ user.humhubAllowed = result?.result?.account.status === 1
+ if (user.humhubAllowed) {
+ let spaceId = null
+ if (projectBranding) {
+ spaceId = projectBranding.spaceId
+ }
+ void syncHumhub(null, dbUser, spaceId)
+ }
+ } catch (e) {
+ logger.error("couldn't reach out to humhub, disable for now", e)
+ user.humhubAllowed = false
+ }
+ }
+ user.klickTipp = await klicktippStatePromise
logger.info(`successful Login: ${JSON.stringify(user, null, 2)}`)
return user
}
@@ -212,11 +284,12 @@ export class UserResolver {
language,
publisherId = null,
redeemCode = null,
+ project = null,
}: CreateUserArgs,
): Promise {
logger.addContext('user', 'unknown')
logger.info(
- `createUser(email=${email}, firstName=${firstName}, lastName=${lastName}, language=${language}, publisherId=${publisherId}, redeemCode =${redeemCode})`,
+ `createUser(email=${email}, firstName=${firstName}, lastName=${lastName}, language=${language}, publisherId=${publisherId}, redeemCode=${redeemCode}, project=${project})`,
)
// TODO: wrong default value (should be null), how does graphql work here? Is it an required field?
// default int publisher_id = 0;
@@ -271,7 +344,13 @@ export class UserResolver {
return user
}
}
-
+ let projectBrandingPromise: Promise | undefined
+ if (project) {
+ projectBrandingPromise = ProjectBranding.findOne({
+ where: { alias: project },
+ select: { logoUrl: true, spaceId: true },
+ })
+ }
const gradidoID = await newGradidoID()
const eventRegisterRedeem = Event(
@@ -288,6 +367,8 @@ export class UserResolver {
dbUser.firstName = firstName
dbUser.lastName = lastName
dbUser.language = language
+ // enable humhub from now on for new user
+ dbUser.humhubAllowed = true
if (alias && (await validateAlias(alias))) {
dbUser.alias = alias
}
@@ -317,6 +398,7 @@ export class UserResolver {
const queryRunner = getConnection().createQueryRunner()
await queryRunner.connect()
await queryRunner.startTransaction('REPEATABLE READ')
+ let projectBranding: ProjectBranding | null | undefined
try {
dbUser = await queryRunner.manager.save(dbUser).catch((error) => {
throw new LogError('Error while saving dbUser', error)
@@ -332,11 +414,13 @@ export class UserResolver {
throw new LogError('Error while updating dbUser', error)
})
- const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(
- /{optin}/g,
- emailContact.emailVerificationCode.toString(),
- ).replace(/{code}/g, redeemCode ? '/' + redeemCode : '')
+ const activationLink = `${
+ CONFIG.EMAIL_LINK_VERIFICATION
+ }${emailContact.emailVerificationCode.toString()}${redeemCode ? `/${redeemCode}` : ''}${
+ project ? `?project=` + project : ''
+ }`
+ projectBranding = projectBrandingPromise ? await projectBrandingPromise : undefined
void sendAccountActivationEmail({
firstName,
lastName,
@@ -344,6 +428,7 @@ export class UserResolver {
language,
activationLink,
timeDurationObject: getTimeDurationObject(CONFIG.EMAIL_CODE_VALID_TIME),
+ logoUrl: projectBranding?.logoUrl,
})
logger.info(`sendAccountActivationEmail of ${firstName}.${lastName} to ${email}`)
@@ -358,6 +443,13 @@ export class UserResolver {
await queryRunner.release()
}
logger.info('createUser() successful...')
+ if (CONFIG.HUMHUB_ACTIVE) {
+ let spaceId: number | null = null
+ if (projectBranding) {
+ spaceId = projectBranding.spaceId
+ }
+ void syncHumhub(null, dbUser, spaceId)
+ }
if (redeemCode) {
eventRegisterRedeem.affectedUser = dbUser
@@ -375,7 +467,11 @@ export class UserResolver {
await sendUserToGms(dbUser, homeCom)
}
} catch (err) {
- logger.error('Error publishing new created user to GMS:', err)
+ if (CONFIG.GMS_CREATE_USER_THROW_ERRORS) {
+ throw new LogError('Error publishing new created user to GMS:', err)
+ } else {
+ logger.error('Error publishing new created user to GMS:', err)
+ }
}
}
return new User(dbUser)
@@ -387,15 +483,14 @@ export class UserResolver {
logger.addContext('user', 'unknown')
logger.info(`forgotPassword(${email})...`)
email = email.trim().toLowerCase()
- const user = await findUserByEmail(email).catch(() => {
- logger.warn(`fail on find UserContact per ${email}`)
+ const user = await findUserByEmail(email).catch((error) => {
+ logger.warn(`fail on find UserContact per ${email} because: ${error}`)
})
if (!user || user.deletedAt) {
logger.warn(`no user found with ${email}`)
return true
}
-
if (!canEmailResend(user.emailContact.updatedAt || user.emailContact.createdAt)) {
throw new LogError(
`Email already sent less than ${printTimeDuration(CONFIG.EMAIL_CODE_REQUEST_TIME)} ago`,
@@ -440,7 +535,6 @@ export class UserResolver {
'Please enter a valid password with at least 8 characters, upper and lower case letters, at least one number and one special character!',
)
}
-
// load code
const userContact = await DbUserContact.findOneOrFail({
where: { emailVerificationCode: code },
@@ -466,7 +560,7 @@ export class UserResolver {
// Update Password
user.passwordEncryptionType = PasswordEncryptionType.GRADIDO_ID
- user.password = encryptPassword(user, password)
+ user.password = await encryptPassword(user, password)
logger.debug('User credentials updated ...')
const queryRunner = getConnection().createQueryRunner()
@@ -494,7 +588,7 @@ export class UserResolver {
// Sign into Klicktipp
// TODO do we always signUp the user? How to handle things with old users?
- if (userContact.emailOptInTypeId === OptInType.EMAIL_OPT_IN_REGISTER) {
+ if ((userContact.emailOptInTypeId as OptInType) === OptInType.EMAIL_OPT_IN_REGISTER) {
try {
await subscribe(userContact.email, user.language, user.firstName, user.lastName)
logger.debug(
@@ -541,8 +635,10 @@ export class UserResolver {
@Authorized([RIGHTS.UPDATE_USER_INFOS])
@Mutation(() => Boolean)
async updateUserInfos(
- @Args()
- {
+ @Args() updateUserInfosArgs: UpdateUserInfosArgs,
+ @Ctx() context: Context,
+ ): Promise {
+ const {
firstName,
lastName,
alias,
@@ -551,28 +647,19 @@ export class UserResolver {
passwordNew,
hideAmountGDD,
hideAmountGDT,
+ humhubAllowed,
gmsAllowed,
gmsPublishName,
+ humhubPublishName,
gmsLocation,
gmsPublishLocation,
- }: UpdateUserInfosArgs,
- @Ctx() context: Context,
- ): Promise {
+ } = updateUserInfosArgs
logger.info(
`updateUserInfos(${firstName}, ${lastName}, ${alias}, ${language}, ***, ***, ${hideAmountGDD}, ${hideAmountGDT}, ${gmsAllowed}, ${gmsPublishName}, ${gmsLocation}, ${gmsPublishLocation})...`,
)
- // check default arg settings
- if (gmsAllowed === null || gmsAllowed === undefined) {
- gmsAllowed = true
- }
- if (!gmsPublishName) {
- gmsPublishName = GmsPublishNameType.GMS_PUBLISH_NAME_ALIAS_OR_INITALS
- }
- if (!gmsPublishLocation) {
- gmsPublishLocation = GmsPublishLocationType.GMS_LOCATION_TYPE_RANDOM
- }
-
const user = getUser(context)
+ const updateUserInGMS = compareGmsRelevantUserSettings(user, updateUserInfosArgs)
+
// try {
if (firstName) {
user.firstName = firstName
@@ -582,7 +669,8 @@ export class UserResolver {
user.lastName = lastName
}
- if (alias && (await validateAlias(alias))) {
+ // currently alias can only be set, not updated
+ if (alias && !user.alias && (await validateAlias(alias))) {
user.alias = alias
}
@@ -602,13 +690,13 @@ export class UserResolver {
)
}
- if (!verifyPassword(user, password)) {
+ if (!(await verifyPassword(user, password))) {
throw new LogError(`Old password is invalid`)
}
// Save new password hash and newly encrypted private key
user.passwordEncryptionType = PasswordEncryptionType.GRADIDO_ID
- user.password = encryptPassword(user, passwordNew)
+ user.password = await encryptPassword(user, passwordNew)
}
// Save hideAmountGDD value
@@ -619,13 +707,24 @@ export class UserResolver {
if (hideAmountGDT !== undefined) {
user.hideAmountGDT = hideAmountGDT
}
-
- user.gmsAllowed = gmsAllowed
- user.gmsPublishName = gmsPublishName
+ if (humhubAllowed !== undefined) {
+ user.humhubAllowed = humhubAllowed
+ }
+ if (gmsAllowed !== undefined) {
+ user.gmsAllowed = gmsAllowed
+ }
+ if (gmsPublishName !== null && gmsPublishName !== undefined) {
+ user.gmsPublishName = gmsPublishName
+ }
+ if (humhubPublishName !== null && humhubPublishName !== undefined) {
+ user.humhubPublishName = humhubPublishName
+ }
if (gmsLocation) {
user.location = Location2Point(gmsLocation)
}
- user.gmsPublishLocation = gmsPublishLocation
+ if (gmsPublishLocation !== null && gmsPublishLocation !== undefined) {
+ user.gmsPublishLocation = gmsPublishLocation
+ }
// } catch (err) {
// console.log('error:', err)
// }
@@ -649,6 +748,28 @@ export class UserResolver {
logger.info('updateUserInfos() successfully finished...')
await EVENT_USER_INFO_UPDATE(user)
+ // validate if user settings are changed with relevance to update gms-user
+ try {
+ if (CONFIG.GMS_ACTIVE && updateUserInGMS) {
+ logger.debug(`changed user-settings relevant for gms-user update...`)
+ const homeCom = await getHomeCommunity()
+ if (homeCom.gmsApiKey !== null) {
+ logger.debug(`send User to Gms...`, user)
+ await sendUserToGms(user, homeCom)
+ logger.debug(`sendUserToGms successfully.`)
+ }
+ }
+ } catch (e) {
+ logger.error('error sync user with gms', e)
+ }
+ try {
+ if (CONFIG.HUMHUB_ACTIVE) {
+ await syncHumhub(updateUserInfosArgs, user)
+ }
+ } catch (e) {
+ logger.error('error sync user with humhub', e)
+ }
+
return true
}
@@ -662,6 +783,69 @@ export class UserResolver {
return elopageBuys
}
+ @Authorized([RIGHTS.GMS_USER_PLAYGROUND])
+ @Query(() => GmsUserAuthenticationResult)
+ async authenticateGmsUserSearch(@Ctx() context: Context): Promise {
+ logger.info(`authenticateGmsUserSearch()...`)
+ const dbUser = getUser(context)
+ let result = new GmsUserAuthenticationResult()
+ if (context.token) {
+ const homeCom = await getHomeCommunity()
+ if (!homeCom.gmsApiKey) {
+ throw new LogError('authenticateGmsUserSearch missing HomeCommunity GmsApiKey')
+ }
+ result = await authenticateGmsUserPlayground(homeCom.gmsApiKey, context.token, dbUser)
+ logger.info('authenticateGmsUserSearch=', result)
+ } else {
+ throw new LogError('authenticateGmsUserSearch missing valid user login-token')
+ }
+ return result
+ }
+
+ @Authorized([RIGHTS.GMS_USER_PLAYGROUND])
+ @Query(() => UserLocationResult)
+ async userLocation(@Ctx() context: Context): Promise {
+ logger.info(`userLocation()...`)
+ const dbUser = getUser(context)
+ const result = new UserLocationResult()
+ if (context.token) {
+ const homeCom = await getHomeCommunity()
+ result.communityLocation = Point2Location(homeCom.location as Point)
+ result.userLocation = Point2Location(dbUser.location as Point)
+ logger.info('userLocation=', result)
+ } else {
+ throw new LogError('userLocation missing valid user login-token')
+ }
+ return result
+ }
+
+ @Authorized([RIGHTS.HUMHUB_AUTO_LOGIN])
+ @Query(() => String)
+ async authenticateHumhubAutoLogin(
+ @Ctx() context: Context,
+ @Arg('project', () => String, { nullable: true }) project?: string | null,
+ ): Promise {
+ logger.info(`authenticateHumhubAutoLogin()...`)
+ const dbUser = getUser(context)
+ const humhubClient = HumHubClient.getInstance()
+ if (!humhubClient) {
+ throw new LogError('cannot create humhub client')
+ }
+ const userNameLogic = new PublishNameLogic(dbUser)
+ const username = userNameLogic.getUsername(dbUser.humhubPublishName as PublishNameType)
+ let humhubUser = await humhubClient.userByUsername(username)
+ if (!humhubUser) {
+ humhubUser = await humhubClient.userByEmail(dbUser.emailContact.email)
+ }
+ if (!humhubUser) {
+ throw new LogError("user don't exist (any longer) on humhub")
+ }
+ if (humhubUser.account.status !== 1) {
+ throw new LogError('user status is not 1', humhubUser.account.status)
+ }
+ return await humhubClient.createAutoLoginUrl(humhubUser.account.username, project)
+ }
+
@Authorized([RIGHTS.SEARCH_ADMIN_USERS])
@Query(() => SearchAdminUsersResult)
async searchAdminUsers(
@@ -866,19 +1050,42 @@ export class UserResolver {
const modelUser = new User(foundDbUser)
return modelUser
}
+
+ // FIELD RESOLVERS
+ @FieldResolver(() => UserContact)
+ async emailContact(
+ @Root() user: DbUser,
+ @Ctx() context: Context,
+ @Info() info: GraphQLResolveInfo,
+ ): Promise {
+ // Check if user has the necessary permissions to view user contact
+ // Either they need VIEW_USER_CONTACT right, or they need VIEW_OWN_USER_CONTACT and must be viewing their own contact
+ if (!context.role?.hasRight(RIGHTS.VIEW_USER_CONTACT)) {
+ if (!context.role?.hasRight(RIGHTS.VIEW_OWN_USER_CONTACT) || context.user?.id !== user.id) {
+ throw new LogError('User does not have permission to view this user contact', user.id)
+ }
+ }
+ let userContact = user.emailContact
+ if (!userContact) {
+ const queryBuilder = DbUserContact.createQueryBuilder('userContact')
+ queryBuilder.where('userContact.userId = :userId', { userId: user.id })
+ extractGraphQLFieldsForSelect(info, queryBuilder, 'userContact')
+ userContact = await queryBuilder.getOneOrFail()
+ }
+ return new UserContact(userContact)
+ }
}
export async function findUserByEmail(email: string): Promise {
- const dbUserContact = await DbUserContact.findOneOrFail({
- where: { email },
+ const dbUser = await DbUser.findOneOrFail({
+ where: {
+ emailContact: { email },
+ },
withDeleted: true,
- relations: ['user'],
+ relations: { userRoles: true, emailContact: true },
}).catch(() => {
throw new LogError('No user with this credentials', email)
})
- const dbUser = dbUserContact.user
- dbUser.emailContact = dbUserContact
- dbUser.userRoles = await UserRole.find({ where: { userId: dbUser.id } })
return dbUser
}
diff --git a/backend/src/graphql/resolver/semaphore.test.ts b/backend/src/graphql/resolver/semaphore.test.ts
index ed58d55ec..f3dcce6f6 100644
--- a/backend/src/graphql/resolver/semaphore.test.ts
+++ b/backend/src/graphql/resolver/semaphore.test.ts
@@ -25,6 +25,8 @@ import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
import { bobBaumeister } from '@/seeds/users/bob-baumeister'
import { peterLustig } from '@/seeds/users/peter-lustig'
+jest.mock('@/password/EncryptorUtils')
+
let mutate: ApolloServerTestClient['mutate'], con: Connection
let testEnv: {
mutate: ApolloServerTestClient['mutate']
diff --git a/backend/src/graphql/resolver/util/Location2Point.ts b/backend/src/graphql/resolver/util/Location2Point.ts
index df40c034a..7552ea495 100644
--- a/backend/src/graphql/resolver/util/Location2Point.ts
+++ b/backend/src/graphql/resolver/util/Location2Point.ts
@@ -19,7 +19,7 @@ export function Location2Point(location: Location): Point {
export function Point2Location(point: Point): Location {
const location = new Location()
- if (point.type === 'Point' && point.coordinates.length === 2) {
+ if (point?.type === 'Point' && point?.coordinates.length === 2) {
location.longitude = point.coordinates[0]
location.latitude = point.coordinates[1]
}
diff --git a/backend/src/graphql/resolver/util/authenticateGmsUserPlayground.ts b/backend/src/graphql/resolver/util/authenticateGmsUserPlayground.ts
new file mode 100644
index 000000000..11e92ce53
--- /dev/null
+++ b/backend/src/graphql/resolver/util/authenticateGmsUserPlayground.ts
@@ -0,0 +1,21 @@
+import { User as DbUser } from '@entity/User'
+
+import { verifyAuthToken } from '@/apis/gms/GmsClient'
+import { CONFIG } from '@/config'
+import { GmsUserAuthenticationResult } from '@/graphql/model/GmsUserAuthenticationResult'
+import { backendLogger as logger } from '@/server/logger'
+import { ensureUrlEndsWithSlash } from '@/util/utilities'
+
+export async function authenticateGmsUserPlayground(
+ apiKey: string,
+ token: string,
+ dbUser: DbUser,
+): Promise {
+ const result = new GmsUserAuthenticationResult()
+ const dashboardUrl = ensureUrlEndsWithSlash(CONFIG.GMS_DASHBOARD_URL)
+
+ result.url = dashboardUrl.concat('usersearch-playground')
+ result.token = await verifyAuthToken(dbUser.communityUuid, token)
+ logger.info('GmsUserAuthenticationResult:', result)
+ return result
+}
diff --git a/backend/src/graphql/resolver/util/communities.ts b/backend/src/graphql/resolver/util/communities.ts
index e506548c5..87cf31610 100644
--- a/backend/src/graphql/resolver/util/communities.ts
+++ b/backend/src/graphql/resolver/util/communities.ts
@@ -1,65 +1,146 @@
+import { FindOneOptions } from '@dbTools/typeorm'
import { Community as DbCommunity } from '@entity/Community'
+import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
+import { Paginated } from '@arg/Paginated'
+
+import { LogError } from '@/server/LogError'
+import { Connection } from '@/typeorm/connection'
+
+function findWithCommunityIdentifier(communityIdentifier: string): FindOneOptions {
+ return {
+ where: [
+ { communityUuid: communityIdentifier },
+ { name: communityIdentifier },
+ { url: communityIdentifier },
+ ],
+ }
+}
+
+/**
+ * Checks if a community with the given identifier exists and is not foreign.
+ * @param communityIdentifier The identifier (URL, UUID, or name) of the community.
+ * @returns A promise that resolves to true if a non-foreign community exists with the given identifier, otherwise false.
+ */
export async function isHomeCommunity(communityIdentifier: string): Promise {
- const homeCommunity = await DbCommunity.findOne({
+ // The !! operator in JavaScript or TypeScript is a shorthand for converting a value to a boolean.
+ // It essentially converts any truthy value to true and any falsy value to false.
+ return !!(await DbCommunity.findOne({
where: [
{ foreign: false, communityUuid: communityIdentifier },
{ foreign: false, name: communityIdentifier },
{ foreign: false, url: communityIdentifier },
],
- })
- if (homeCommunity) {
- return true
- } else {
- return false
- }
+ }))
}
+/**
+ * Retrieves the home community, i.e., a community that is not foreign.
+ * @returns A promise that resolves to the home community, or throw if no home community was found
+ */
export async function getHomeCommunity(): Promise {
return await DbCommunity.findOneOrFail({
where: [{ foreign: false }],
})
}
+/**
+ * TODO: Check if it is needed, because currently it isn't used at all
+ * Retrieves the URL of the community with the given identifier.
+ * @param communityIdentifier The identifier (URL, UUID, or name) of the community.
+ * @returns A promise that resolves to the URL of the community or throw if no community with this identifier was found
+ */
export async function getCommunityUrl(communityIdentifier: string): Promise {
- const community = await DbCommunity.findOneOrFail({
- where: [
- { communityUuid: communityIdentifier },
- { name: communityIdentifier },
- { url: communityIdentifier },
- ],
- })
- return community.url
+ return (await DbCommunity.findOneOrFail(findWithCommunityIdentifier(communityIdentifier))).url
}
+/**
+ * TODO: Check if it is needed, because currently it isn't used at all
+ * Checks if a community with the given identifier exists and has an authenticatedAt property set.
+ * @param communityIdentifier The identifier (URL, UUID, or name) of the community.
+ * @returns A promise that resolves to true if a community with an authenticatedAt property exists with the given identifier,
+ * otherwise false.
+ */
export async function isCommunityAuthenticated(communityIdentifier: string): Promise {
- const community = await DbCommunity.findOne({
- where: [
- { communityUuid: communityIdentifier },
- { name: communityIdentifier },
- { url: communityIdentifier },
- ],
- })
- if (community?.authenticatedAt) {
- return true
- } else {
- return false
- }
+ // The !! operator in JavaScript or TypeScript is a shorthand for converting a value to a boolean.
+ // It essentially converts any truthy value to true and any falsy value to false.
+ return !!(await DbCommunity.findOne(findWithCommunityIdentifier(communityIdentifier)))
+ ?.authenticatedAt
}
+/**
+ * Retrieves the name of the community with the given identifier.
+ * @param communityIdentifier The identifier (URL, UUID) of the community.
+ * @returns A promise that resolves to the name of the community. If the community does not exist or has no name,
+ * an empty string is returned.
+ */
export async function getCommunityName(communityIdentifier: string): Promise {
const community = await DbCommunity.findOne({
where: [{ communityUuid: communityIdentifier }, { url: communityIdentifier }],
})
- if (community?.name) {
- return community.name
- } else {
- return ''
- }
-}
+ return community?.name ? community.name : ''
+}
export async function getCommunityByUuid(communityUuid: string): Promise {
return await DbCommunity.findOne({
where: [{ communityUuid }],
})
}
+
+export async function getCommunityByIdentifier(
+ communityIdentifier: string,
+): Promise {
+ return await DbCommunity.findOne(findWithCommunityIdentifier(communityIdentifier))
+}
+
+/**
+ * Simulate RIGHT Join between Communities and Federated Communities
+ * select *
+ * Community as c
+ * RIGHT JOIN FederatedCommunity as f
+ * ON(c.public_key = f.public_key)
+ * Typeorm don't has right joins
+ * @returns
+ */
+export async function getAllCommunities({
+ pageSize = 25,
+ currentPage = 1,
+}: Paginated): Promise {
+ const connection = await Connection.getInstance()
+ if (!connection) {
+ throw new LogError('Cannot connect to db')
+ }
+ // foreign: 'ASC',
+ // createdAt: 'DESC',
+ // lastAnnouncedAt: 'DESC',
+ const result = await connection
+ .getRepository(DbFederatedCommunity)
+ .createQueryBuilder('federatedCommunity')
+ .leftJoinAndSelect('federatedCommunity.community', 'community')
+ .orderBy('federatedCommunity.foreign', 'ASC')
+ .addOrderBy('federatedCommunity.createdAt', 'DESC')
+ .addOrderBy('federatedCommunity.lastAnnouncedAt', 'DESC')
+ .skip((currentPage - 1) * pageSize * 3)
+ .take(pageSize * 3)
+ .getManyAndCount()
+ const communityMap = new Map()
+ result[0].forEach((value: DbFederatedCommunity) => {
+ const publicKeyHex = value.publicKey.toString('hex')
+ if (!communityMap.has(value.publicKey.toString('hex'))) {
+ let community: DbCommunity = DbCommunity.create()
+ if (value.community) {
+ community = value.community
+ }
+ if (!community.federatedCommunities) {
+ community.federatedCommunities = []
+ }
+ communityMap.set(publicKeyHex, community)
+ }
+ const community = communityMap.get(publicKeyHex)
+ if (!community?.federatedCommunities) {
+ throw new LogError('missing community after set it into map', publicKeyHex)
+ }
+ community.federatedCommunities.push(value)
+ })
+ return Array.from(communityMap.values())
+}
diff --git a/backend/src/graphql/resolver/util/compareGmsRelevantUserSettings.ts b/backend/src/graphql/resolver/util/compareGmsRelevantUserSettings.ts
new file mode 100644
index 000000000..2144c9833
--- /dev/null
+++ b/backend/src/graphql/resolver/util/compareGmsRelevantUserSettings.ts
@@ -0,0 +1,91 @@
+import { Point } from '@dbTools/typeorm'
+import { User as DbUser } from '@entity/User'
+
+import { UpdateUserInfosArgs } from '@/graphql/arg/UpdateUserInfosArgs'
+import { GmsPublishLocationType } from '@/graphql/enum/GmsPublishLocationType'
+import { PublishNameType } from '@/graphql/enum/PublishNameType'
+import { LogError } from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
+
+import { Point2Location } from './Location2Point'
+
+export function compareGmsRelevantUserSettings(
+ orgUser: DbUser,
+ updateUserInfosArgs: UpdateUserInfosArgs,
+): boolean {
+ if (!orgUser) {
+ throw new LogError('comparison without any user is impossible')
+ }
+ logger.debug('compareGmsRelevantUserSettings:', orgUser, updateUserInfosArgs)
+ // nach GMS updaten, wenn alias gesetzt wird oder ist und PublishLevel die alias-Übermittlung erlaubt
+ if (
+ updateUserInfosArgs.alias &&
+ orgUser.alias !== updateUserInfosArgs.alias &&
+ ((updateUserInfosArgs.gmsPublishName &&
+ updateUserInfosArgs.gmsPublishName.valueOf ===
+ PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS.valueOf) ||
+ (!updateUserInfosArgs.gmsPublishName &&
+ orgUser.gmsPublishName &&
+ orgUser.gmsPublishName.valueOf === PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS.valueOf))
+ ) {
+ return true
+ }
+ if (
+ (updateUserInfosArgs.firstName && orgUser.firstName !== updateUserInfosArgs.firstName) ||
+ (updateUserInfosArgs.lastName && orgUser.lastName !== updateUserInfosArgs.lastName)
+ ) {
+ return true
+ }
+ if (
+ updateUserInfosArgs.gmsAllowed !== undefined &&
+ updateUserInfosArgs.gmsAllowed &&
+ orgUser.gmsAllowed !== updateUserInfosArgs.gmsAllowed
+ ) {
+ return true
+ }
+ if (
+ updateUserInfosArgs.gmsPublishLocation &&
+ (orgUser.gmsPublishLocation as GmsPublishLocationType) !==
+ updateUserInfosArgs.gmsPublishLocation
+ ) {
+ return true
+ }
+ if (
+ updateUserInfosArgs.gmsPublishName &&
+ (orgUser.gmsPublishName as PublishNameType) !== updateUserInfosArgs.gmsPublishName
+ ) {
+ return true
+ }
+ if (updateUserInfosArgs.language && orgUser.language !== updateUserInfosArgs.language) {
+ return true
+ }
+ if (
+ updateUserInfosArgs.gmsLocation &&
+ orgUser.location === null &&
+ updateUserInfosArgs.gmsLocation !== null
+ ) {
+ return true
+ }
+ if (
+ updateUserInfosArgs.gmsLocation &&
+ orgUser.location !== null &&
+ updateUserInfosArgs.gmsLocation === null
+ ) {
+ return true
+ }
+ if (
+ updateUserInfosArgs.gmsLocation &&
+ orgUser.location !== null &&
+ updateUserInfosArgs.gmsLocation !== null
+ ) {
+ const orgLocation = Point2Location(orgUser.location as Point)
+ const changedLocation = updateUserInfosArgs.gmsLocation
+ if (
+ orgLocation.latitude !== changedLocation.latitude ||
+ orgLocation.longitude !== changedLocation.longitude
+ ) {
+ return true
+ }
+ }
+ return false
+}
diff --git a/backend/src/graphql/resolver/util/creations.test.ts b/backend/src/graphql/resolver/util/creations.test.ts
index 25d8a45c2..154520b85 100644
--- a/backend/src/graphql/resolver/util/creations.test.ts
+++ b/backend/src/graphql/resolver/util/creations.test.ts
@@ -5,12 +5,17 @@ import { ApolloServerTestClient } from 'apollo-server-testing'
import { testEnvironment, cleanDB, contributionDateFormatter } from '@test/helpers'
+import { CONFIG } from '@/config'
import { userFactory } from '@/seeds/factory/user'
import { login, createContribution, adminCreateContribution } from '@/seeds/graphql/mutations'
import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
import { peterLustig } from '@/seeds/users/peter-lustig'
-import { getUserCreation } from './creations'
+import { getOpenCreations, getUserCreation } from './creations'
+
+jest.mock('@/password/EncryptorUtils')
+
+CONFIG.HUMHUB_ACTIVE = false
let mutate: ApolloServerTestClient['mutate'], con: Connection
let testEnv: {
@@ -270,4 +275,50 @@ describe('util/creation', () => {
})
})
})
+
+ describe('getOpenCreations', () => {
+ beforeAll(() => {
+ // enable Fake timers
+ jest.useFakeTimers()
+ // jest.setSystemTime(new Date('2022-01-01T00:00:00Z'))
+ })
+
+ afterAll(() => {
+ // disable Fake timers and set time back to system time
+ jest.useRealTimers()
+ })
+ it('test default case', async () => {
+ jest.setSystemTime(new Date('2022-01-10T00:00:00Z'))
+ const creationDates = await getOpenCreations(user.id, 0)
+ expect(creationDates).toEqual(
+ expect.arrayContaining([
+ expect.objectContaining({ month: 10 }),
+ expect.objectContaining({ month: 11 }),
+ expect.objectContaining({ month: 0 }),
+ ]),
+ )
+ })
+ it('test edge case with february', async () => {
+ jest.setSystemTime(new Date('2022-05-31T00:00:00Z'))
+ const creationDates = await getOpenCreations(user.id, 0)
+ expect(creationDates).toEqual(
+ expect.arrayContaining([
+ expect.objectContaining({ month: 2 }),
+ expect.objectContaining({ month: 3 }),
+ expect.objectContaining({ month: 4 }),
+ ]),
+ )
+ })
+ it('test edge case with july', async () => {
+ jest.setSystemTime(new Date('2022-07-31T00:00:00Z'))
+ const creationDates = await getOpenCreations(user.id, 0)
+ expect(creationDates).toEqual(
+ expect.arrayContaining([
+ expect.objectContaining({ month: 4 }),
+ expect.objectContaining({ month: 5 }),
+ expect.objectContaining({ month: 6 }),
+ ]),
+ )
+ })
+ })
})
diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index d6f0e9af4..6bb7214b1 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -10,6 +10,7 @@ import { OpenCreation } from '@model/OpenCreation'
import { FULL_CREATION_AVAILABLE, MAX_CREATION_AMOUNT } from '@/graphql/resolver/const/const'
import { LogError } from '@/server/LogError'
import { backendLogger as logger } from '@/server/logger'
+import { getFirstDayOfPreviousNMonth } from '@/util/utilities'
interface CreationMap {
id: number
@@ -115,8 +116,8 @@ const getCreationDates = (timezoneOffset: number): Date[] => {
`getCreationMonths -- offset: ${timezoneOffset} -- clientNow: ${clientNow.toISOString()}`,
)
return [
- new Date(clientNow.getFullYear(), clientNow.getMonth() - 2, 1),
- new Date(clientNow.getFullYear(), clientNow.getMonth() - 1, 1),
+ getFirstDayOfPreviousNMonth(clientNow, 2),
+ getFirstDayOfPreviousNMonth(clientNow, 1),
clientNow,
]
}
diff --git a/backend/src/graphql/resolver/util/extractGraphQLFields.ts b/backend/src/graphql/resolver/util/extractGraphQLFields.ts
new file mode 100644
index 000000000..082028ff1
--- /dev/null
+++ b/backend/src/graphql/resolver/util/extractGraphQLFields.ts
@@ -0,0 +1,48 @@
+import { ObjectLiteral, SelectQueryBuilder } from '@dbTools/typeorm'
+import { GraphQLResolveInfo } from 'graphql'
+import {
+ parseResolveInfo,
+ ResolveTree,
+ simplifyParsedResolveInfoFragmentWithType,
+} from 'graphql-parse-resolve-info'
+
+/**
+ * Extracts the requested fields from GraphQL
+ * @param info GraphQLResolveInfo
+ */
+export function extractGraphQLFields(info: GraphQLResolveInfo): object {
+ const parsedInfo = parseResolveInfo(info)
+ if (!parsedInfo) {
+ throw new Error('Could not parse resolve info')
+ }
+
+ return simplifyParsedResolveInfoFragmentWithType(parsedInfo as ResolveTree, info.returnType)
+ .fields
+}
+
+/**
+ * Extracts the requested fields from GraphQL and applies them to a TypeORM query.
+ * @param info GraphQLResolveInfo
+ * @param queryBuilder TypeORM QueryBuilder
+ * @param alias the table alias for select
+ */
+export function extractGraphQLFieldsForSelect(
+ info: GraphQLResolveInfo,
+ queryBuilder: SelectQueryBuilder,
+ alias: string,
+) {
+ const requestedFields = Object.keys(extractGraphQLFields(info))
+
+ if (requestedFields.length > 0) {
+ // Filter out fields that don't exist in the entity type T
+ const entityName = queryBuilder.alias.charAt(0).toUpperCase() + queryBuilder.alias.slice(1)
+ const metadata = queryBuilder.connection.getMetadata(entityName)
+ const validFields = requestedFields.filter(
+ (field) => metadata.findColumnWithPropertyName(field) !== undefined,
+ )
+
+ if (requestedFields.length > 0) {
+ queryBuilder.select(validFields.map((field) => `${alias}.${field}`))
+ }
+ }
+}
diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts
index e929cdc10..07cc5dc14 100644
--- a/backend/src/graphql/resolver/util/findContributions.ts
+++ b/backend/src/graphql/resolver/util/findContributions.ts
@@ -14,7 +14,6 @@ import { Paginated } from '@arg/Paginated'
import { SearchContributionsFilterArgs } from '@arg/SearchContributionsFilterArgs'
import { Connection } from '@typeorm/connection'
-import { Order } from '@/graphql/enum/Order'
import { LogError } from '@/server/LogError'
interface Relations {
@@ -36,10 +35,11 @@ function joinRelationsRecursive(
}
export const findContributions = async (
- { pageSize = 3, currentPage = 1, order = Order.DESC }: Paginated,
+ { pageSize, currentPage, order }: Paginated,
filter: SearchContributionsFilterArgs,
withDeleted = false,
relations: Relations | undefined = undefined,
+ countOnly = false,
): Promise<[DbContribution[], number]> => {
const connection = await Connection.getInstance()
if (!connection) {
@@ -76,6 +76,9 @@ export const findContributions = async (
}),
)
}
+ if (countOnly) {
+ return [[], await queryBuilder.getCount()]
+ }
return queryBuilder
.orderBy('Contribution.createdAt', order)
.addOrderBy('Contribution.id', order)
diff --git a/backend/src/graphql/resolver/util/findUserByIdentifier.ts b/backend/src/graphql/resolver/util/findUserByIdentifier.ts
index 7e52327d3..435dc3d04 100644
--- a/backend/src/graphql/resolver/util/findUserByIdentifier.ts
+++ b/backend/src/graphql/resolver/util/findUserByIdentifier.ts
@@ -2,9 +2,11 @@ import { FindOptionsWhere } from '@dbTools/typeorm'
import { Community } from '@entity/Community'
import { User as DbUser } from '@entity/User'
import { UserContact as DbUserContact } from '@entity/UserContact'
+import { isURL } from 'class-validator'
import { validate, version } from 'uuid'
import { LogError } from '@/server/LogError'
+import { isEMail, isUUID4 } from '@/util/validate'
import { VALID_ALIAS_REGEX } from './validateAlias'
@@ -19,10 +21,11 @@ export const findUserByIdentifier = async (
communityIdentifier: string,
): Promise => {
let user: DbUser | null
- const communityWhere: FindOptionsWhere =
- validate(communityIdentifier) && version(communityIdentifier) === 4
- ? { communityUuid: communityIdentifier }
- : { name: communityIdentifier }
+ const communityWhere: FindOptionsWhere = isURL(communityIdentifier)
+ ? { url: communityIdentifier }
+ : isUUID4(communityIdentifier)
+ ? { communityUuid: communityIdentifier }
+ : { name: communityIdentifier }
if (validate(identifier) && version(identifier) === 4) {
user = await DbUser.findOne({
@@ -32,7 +35,7 @@ export const findUserByIdentifier = async (
if (!user) {
throw new LogError('No user found to given identifier(s)', identifier, communityIdentifier)
}
- } else if (/^.{2,}@.{2,}\..{2,}$/.exec(identifier)) {
+ } else if (isEMail(identifier)) {
const userContact = await DbUserContact.findOne({
where: {
email: identifier,
diff --git a/backend/src/graphql/resolver/util/findUserByIdentifiers.test.ts b/backend/src/graphql/resolver/util/findUserByIdentifiers.test.ts
index cfdbce8f2..1cdca8429 100644
--- a/backend/src/graphql/resolver/util/findUserByIdentifiers.test.ts
+++ b/backend/src/graphql/resolver/util/findUserByIdentifiers.test.ts
@@ -16,6 +16,8 @@ import { peterLustig } from '@/seeds/users/peter-lustig'
import { findUserByIdentifier } from './findUserByIdentifier'
+jest.mock('@/password/EncryptorUtils')
+
let con: Connection
let testEnv: {
mutate: ApolloServerTestClient['mutate']
diff --git a/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.test.ts b/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.test.ts
index 0d85a35af..064184a9d 100644
--- a/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.test.ts
+++ b/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.test.ts
@@ -32,6 +32,8 @@ import { raeuberHotzenplotz } from '@/seeds/users/raeuber-hotzenplotz'
import { sendTransactionsToDltConnector } from './sendTransactionsToDltConnector'
+jest.mock('@/password/EncryptorUtils')
+
/*
// Mock the GraphQLClient
jest.mock('graphql-request', () => {
diff --git a/backend/src/graphql/resolver/util/sendUserToGms.ts b/backend/src/graphql/resolver/util/sendUserToGms.ts
index 335141ffe..22af795d4 100644
--- a/backend/src/graphql/resolver/util/sendUserToGms.ts
+++ b/backend/src/graphql/resolver/util/sendUserToGms.ts
@@ -1,8 +1,9 @@
import { Community as DbCommunity } from '@entity/Community'
import { User as DbUser } from '@entity/User'
-import { createGmsUser } from '@/apis/gms/GmsClient'
+import { createGmsUser, updateGmsUser } from '@/apis/gms/GmsClient'
import { GmsUser } from '@/apis/gms/model/GmsUser'
+import { CONFIG } from '@/config'
import { LogError } from '@/server/LogError'
import { backendLogger as logger } from '@/server/logger'
@@ -13,15 +14,34 @@ export async function sendUserToGms(user: DbUser, homeCom: DbCommunity): Promise
logger.debug('User send to GMS:', user)
const gmsUser = new GmsUser(user)
try {
- // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
- if (await createGmsUser(homeCom.gmsApiKey, gmsUser)) {
- logger.debug('GMS user published successfully:', gmsUser)
- user.gmsRegistered = true
- user.gmsRegisteredAt = new Date()
- await DbUser.save(user)
- logger.debug('mark user as gms published:', user)
+ if (!user.gmsRegistered && user.gmsRegisteredAt === null) {
+ logger.debug('create user in gms:', gmsUser)
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+ if (await createGmsUser(homeCom.gmsApiKey, gmsUser)) {
+ logger.debug('GMS user published successfully:', gmsUser)
+ await updateUserGmsStatus(user)
+ }
+ } else {
+ logger.debug('update user in gms:', gmsUser)
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+ if (await updateGmsUser(homeCom.gmsApiKey, gmsUser)) {
+ logger.debug('GMS user published successfully:', gmsUser)
+ await updateUserGmsStatus(user)
+ }
}
} catch (err) {
- logger.warn('publishing user fails with ', err)
+ if (CONFIG.GMS_CREATE_USER_THROW_ERRORS) {
+ throw new LogError('publishing user fails with ', err)
+ } else {
+ logger.warn('publishing user fails with ', err)
+ }
}
}
+
+async function updateUserGmsStatus(user: DbUser) {
+ logger.debug('updateUserGmsStatus:', user)
+ user.gmsRegistered = true
+ user.gmsRegisteredAt = new Date()
+ await DbUser.save(user)
+ logger.debug('mark user as gms published:', user)
+}
diff --git a/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts b/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts
index b9c7d8b36..0e293c56c 100644
--- a/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts
+++ b/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts
@@ -119,6 +119,7 @@ export async function settlePendingSenderTransaction(
lastName: recipient.lastName,
email: recipient.emailContact.email,
language: recipient.language,
+ memo,
senderFirstName: sender.firstName,
senderLastName: sender.lastName,
senderEmail: sender.emailContact.email,
diff --git a/backend/src/graphql/resolver/util/syncHumhub.test.ts b/backend/src/graphql/resolver/util/syncHumhub.test.ts
new file mode 100644
index 000000000..c25eb52a8
--- /dev/null
+++ b/backend/src/graphql/resolver/util/syncHumhub.test.ts
@@ -0,0 +1,55 @@
+import { User } from '@entity/User'
+import { UserContact } from '@entity/UserContact'
+
+import { HumHubClient } from '@/apis/humhub/HumHubClient'
+import { GetUser } from '@/apis/humhub/model/GetUser'
+import { UpdateUserInfosArgs } from '@/graphql/arg/UpdateUserInfosArgs'
+import { PublishNameType } from '@/graphql/enum/PublishNameType'
+import { backendLogger as logger } from '@/server/logger'
+
+import { syncHumhub } from './syncHumhub'
+
+jest.mock('@/apis/humhub/HumHubClient')
+jest.mock('@/apis/humhub/syncUser')
+
+const mockUser = new User()
+mockUser.humhubAllowed = true
+mockUser.emailContact = new UserContact()
+mockUser.emailContact.email = 'email@gmail.com'
+mockUser.humhubPublishName = PublishNameType.PUBLISH_NAME_FULL
+const mockUpdateUserInfosArg = new UpdateUserInfosArgs()
+const mockHumHubUser = new GetUser(mockUser, 1)
+
+describe('syncHumhub', () => {
+ beforeEach(() => {
+ jest.spyOn(logger, 'debug').mockImplementation()
+ jest.spyOn(logger, 'info').mockImplementation()
+ jest.spyOn(HumHubClient, 'getInstance')
+ })
+
+ afterAll(() => {
+ jest.resetAllMocks()
+ })
+
+ it('Should not sync if no relevant changes', async () => {
+ await syncHumhub(mockUpdateUserInfosArg, new User())
+ expect(HumHubClient.getInstance).not.toBeCalled()
+ // language logging from some other place
+ expect(logger.debug).toBeCalledTimes(5)
+ expect(logger.info).toBeCalledTimes(0)
+ })
+
+ it('Should retrieve user from humhub and sync if relevant changes', async () => {
+ mockUpdateUserInfosArg.firstName = 'New' // Relevant changes
+ mockUser.firstName = 'New'
+ await syncHumhub(mockUpdateUserInfosArg, mockUser)
+ expect(logger.debug).toHaveBeenCalledTimes(8) // Four language logging calls, two debug calls in function, one for not syncing
+ expect(logger.info).toHaveBeenLastCalledWith('finished sync user with humhub', {
+ localId: mockUser.id,
+ externId: mockHumHubUser.id,
+ result: 'UPDATE',
+ })
+ })
+
+ // Add more test cases as needed...
+})
diff --git a/backend/src/graphql/resolver/util/syncHumhub.ts b/backend/src/graphql/resolver/util/syncHumhub.ts
new file mode 100644
index 000000000..b8becd8a2
--- /dev/null
+++ b/backend/src/graphql/resolver/util/syncHumhub.ts
@@ -0,0 +1,62 @@
+import { User } from '@entity/User'
+
+import { HumHubClient } from '@/apis/humhub/HumHubClient'
+import { GetUser } from '@/apis/humhub/model/GetUser'
+import { ExecutedHumhubAction, syncUser } from '@/apis/humhub/syncUser'
+import { UpdateUserInfosArgs } from '@/graphql/arg/UpdateUserInfosArgs'
+import { backendLogger as logger } from '@/server/logger'
+
+/**
+ * Syncs the user with humhub
+ * @param updateUserInfosArg
+ * @param user
+ * @returns humhub user id or undefined
+ */
+export async function syncHumhub(
+ updateUserInfosArg: UpdateUserInfosArgs | null,
+ user: User,
+ spaceId?: number | null,
+): Promise {
+ // check for humhub relevant changes
+ if (
+ updateUserInfosArg &&
+ updateUserInfosArg.alias === undefined &&
+ updateUserInfosArg.firstName === undefined &&
+ updateUserInfosArg.lastName === undefined &&
+ updateUserInfosArg.humhubAllowed === undefined &&
+ updateUserInfosArg.humhubPublishName === undefined &&
+ updateUserInfosArg.language === undefined
+ ) {
+ logger.debug('no relevant changes')
+ return
+ }
+ logger.debug('changed user-settings relevant for humhub-user update...')
+ const humhubClient = HumHubClient.getInstance()
+ if (!humhubClient) {
+ return
+ }
+ logger.debug('retrieve user from humhub')
+ let humhubUser = await humhubClient.userByUsername(user.alias ?? user.gradidoID)
+ if (!humhubUser) {
+ humhubUser = await humhubClient.userByEmail(user.emailContact.email)
+ }
+ const humhubUsers = new Map()
+ if (humhubUser) {
+ humhubUsers.set(user.emailContact.email, humhubUser)
+ }
+ logger.debug('update user at humhub')
+ const result = await syncUser(user, humhubUsers)
+ logger.info('finished sync user with humhub', {
+ localId: user.id,
+ externId: humhubUser?.id,
+ // for preventing this warning https://github.com/eslint-community/eslint-plugin-security/blob/main/docs/rules/detect-object-injection.md
+ // and possible danger coming with it
+ // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+ result: ExecutedHumhubAction[result as ExecutedHumhubAction],
+ })
+ if (spaceId && humhubUser) {
+ await humhubClient.addUserToSpace(humhubUser.id, spaceId)
+ logger.debug(`user added to space ${spaceId}`)
+ }
+ return user.id
+}
diff --git a/backend/src/graphql/scalar/Point.ts b/backend/src/graphql/scalar/Point.ts
deleted file mode 100644
index 06af56bfc..000000000
--- a/backend/src/graphql/scalar/Point.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-import { Point as DbPoint } from '@dbTools/typeorm'
-import { GraphQLScalarType, Kind } from 'graphql'
-
-export const PointScalar = new GraphQLScalarType({
- name: 'Point',
- description:
- 'The `Point` scalar type to represent longitude and latitude values of a geo location',
-
- serialize(value: DbPoint) {
- // Check type of value
- if (value.type !== 'Point') {
- throw new Error(`PointScalar can only serialize Geometry type 'Point' values`)
- }
- return value
- },
-
- parseValue(value): DbPoint {
- const point = JSON.parse(value) as DbPoint
- return point
- },
-
- parseLiteral(ast) {
- if (ast.kind !== Kind.STRING) {
- throw new TypeError(`${String(ast)} is not a valid Geometry value.`)
- }
-
- const point = JSON.parse(ast.value) as DbPoint
- return point
- },
-})
diff --git a/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts b/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts
index d14a63004..620751f9c 100644
--- a/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts
+++ b/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts
@@ -38,7 +38,7 @@ export abstract class AbstractUnconfirmedContributionRole {
throw new LogError('Month of contribution can not be changed')
}
- if (this.self.contributionStatus === ContributionStatus.CONFIRMED) {
+ if ((this.self.contributionStatus as ContributionStatus) === ContributionStatus.CONFIRMED) {
throw new LogError('the contribution is already confirmed, cannot be changed anymore')
}
diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts
index 671756cf7..a3ffefeb3 100644
--- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts
+++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts
@@ -35,9 +35,10 @@ export class UnconfirmedContributionUserRole extends AbstractUnconfirmedContribu
throw new LogError('Can not update contribution of another user', this.self, user.id)
}
// only admins and moderators can update it when status is other than progress or pending
+ const contributionStatus = this.self.contributionStatus as ContributionStatus
if (
- this.self.contributionStatus !== ContributionStatus.IN_PROGRESS &&
- this.self.contributionStatus !== ContributionStatus.PENDING
+ contributionStatus !== ContributionStatus.IN_PROGRESS &&
+ contributionStatus !== ContributionStatus.PENDING
) {
throw new LogError(
'Contribution can not be updated due to status',
diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts
index e33dea71e..36a4d4e05 100644
--- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts
+++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts
@@ -22,7 +22,7 @@ export class UnconfirmedContributionUserAddMessageRole extends AbstractUnconfirm
protected update(): void {
if (
- this.self.contributionStatus === ContributionStatus.IN_PROGRESS ||
+ (this.self.contributionStatus as ContributionStatus) === ContributionStatus.IN_PROGRESS ||
this.self.resubmissionAt !== null
) {
this.self.contributionStatus = ContributionStatus.PENDING
@@ -38,9 +38,10 @@ export class UnconfirmedContributionUserAddMessageRole extends AbstractUnconfirm
}
// only admins and moderators can update it when status is other than progress or pending
// but we are in the user add message role.. we are currently not admin or moderator
+ const contributionStatus = this.self.contributionStatus as ContributionStatus
if (
- this.self.contributionStatus !== ContributionStatus.IN_PROGRESS &&
- this.self.contributionStatus !== ContributionStatus.PENDING
+ contributionStatus !== ContributionStatus.IN_PROGRESS &&
+ contributionStatus !== ContributionStatus.PENDING
) {
throw new LogError(
'Contribution can not be updated due to status',
diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json
index c99e1657e..8c0c8ff0c 100644
--- a/backend/src/locales/de.json
+++ b/backend/src/locales/de.json
@@ -56,6 +56,7 @@
},
"general": {
"amountGDD": "Betrag: {amountGDD} GDD",
+ "answerNow": "Jetzt antworten",
"completeRegistration": "Registrierung abschließen",
"contribution": "Gemeinwohl-Beitrag: {contributionMemo}",
"contributionDetails": "Beitragsdetails",
@@ -63,6 +64,7 @@
"helloName": "Hallo {firstName} {lastName},",
"linkValidity": "Der Link hat eine Gültigkeit von {hours} Stunden.\nSollte die Gültigkeit des Links bereits abgelaufen sein, kannst du dir hier einen neuen Link schicken lassen.",
"linkValidityWithMinutes": "Der Link hat eine Gültigkeit von {hours} Stunden und {minutes} Minuten.\nSollte die Gültigkeit des Links bereits abgelaufen sein, kannst du dir hier einen neuen Link schicken lassen.",
+ "message": "Nachricht",
"newLink": "Neuer Link",
"orCopyLink": "Oder kopiere den Link in dein Browserfenster.",
"pleaseDoNotReply": "Bitte antworte nicht auf diese E-Mail.",
@@ -86,8 +88,9 @@
"title": "{senderFirstName} {senderLastName} hat deinen Gradido-Link eingelöst"
},
"transactionReceived": {
- "haveReceivedAmountGDDFrom": "du hast soeben {transactionAmount} GDD von {senderFirstName} {senderLastName} ({senderEmail}) erhalten.",
+ "haveReceivedAmountGDDFrom": "du hast soeben {transactionAmount} GDD erhalten von {senderFirstName} {senderLastName}",
"subject": "{senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet",
+ "replySubject": "Re: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet",
"title": "{senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet"
}
},
diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json
index 15a56577c..9b6b2a4cf 100644
--- a/backend/src/locales/en.json
+++ b/backend/src/locales/en.json
@@ -56,6 +56,7 @@
},
"general": {
"amountGDD": "Amount: {amountGDD} GDD",
+ "answerNow": "Reply",
"completeRegistration": "Complete registration",
"contribution": "Contribution: : {contributionMemo}",
"contributionDetails": "Contribution details",
@@ -63,6 +64,7 @@
"helloName": "Hello {firstName} {lastName},",
"linkValidity": "The link has a validity of {hours} hours.\nIf the validity of the link has already expired, you can have a new link sent to you here.",
"linkValidityWithMinutes": "The link has a validity of {hours} hours and {minutes} minutes.\nIf the validity of the link has already expired, you can have a new link sent to you here.",
+ "message": "Message",
"newLink": "New link",
"orCopyLink": "Or copy the link into your browser window.",
"pleaseDoNotReply": "Please do not reply to this email.",
@@ -86,7 +88,8 @@
"title": "{senderFirstName} {senderLastName} has redeemed your Gradido link"
},
"transactionReceived": {
- "haveReceivedAmountGDDFrom": "You have just received {transactionAmount} GDD from {senderFirstName} {senderLastName} ({senderEmail}).",
+ "haveReceivedAmountGDDFrom": "You have just received {transactionAmount} GDD from {senderFirstName} {senderLastName}",
+ "replySubject": "RE: {senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido",
"subject": "{senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido",
"title": "{senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido"
}
diff --git a/backend/src/logging/BalanceLogging.view.ts b/backend/src/logging/BalanceLogging.view.ts
new file mode 100644
index 000000000..0fa73baf1
--- /dev/null
+++ b/backend/src/logging/BalanceLogging.view.ts
@@ -0,0 +1,19 @@
+import { AbstractLoggingView } from '@logging/AbstractLogging.view'
+
+import { Balance } from '@/graphql/model/Balance'
+
+export class BalanceLoggingView extends AbstractLoggingView {
+ public constructor(private self: Balance) {
+ super()
+ }
+
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ public toJSON(): any {
+ return {
+ balance: this.decimalToString(this.self.balance),
+ balanceGDT: this.self.balanceGDT,
+ count: this.self.count,
+ linkCount: this.self.linkCount,
+ }
+ }
+}
diff --git a/backend/src/logging/DecayLogging.view.ts b/backend/src/logging/DecayLogging.view.ts
new file mode 100644
index 000000000..44fd392f9
--- /dev/null
+++ b/backend/src/logging/DecayLogging.view.ts
@@ -0,0 +1,21 @@
+import { AbstractLoggingView } from '@logging/AbstractLogging.view'
+
+import { Decay } from '@/graphql/model/Decay'
+
+export class DecayLoggingView extends AbstractLoggingView {
+ public constructor(private self: Decay) {
+ super()
+ }
+
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ public toJSON(): any {
+ return {
+ balance: this.decimalToString(this.self.balance),
+ decay: this.decimalToString(this.self.decay),
+ roundedDecay: this.decimalToString(this.self.roundedDecay),
+ start: this.dateToString(this.self.start),
+ end: this.dateToString(this.self.end),
+ duration: this.self.duration,
+ }
+ }
+}
diff --git a/backend/src/password/EncryptionWorker.ts b/backend/src/password/EncryptionWorker.ts
new file mode 100644
index 000000000..36c08f1b6
--- /dev/null
+++ b/backend/src/password/EncryptionWorker.ts
@@ -0,0 +1,53 @@
+import { worker } from 'workerpool'
+
+import { CONFIG } from '@/config'
+
+import {
+ crypto_box_SEEDBYTES,
+ crypto_hash_sha512_init,
+ crypto_hash_sha512_update,
+ crypto_hash_sha512_final,
+ crypto_hash_sha512_BYTES,
+ crypto_hash_sha512_STATEBYTES,
+ crypto_shorthash_BYTES,
+ crypto_pwhash_SALTBYTES,
+ crypto_pwhash,
+ crypto_shorthash,
+} from 'sodium-native'
+
+export const SecretKeyCryptographyCreateKey = (
+ salt: string,
+ password: string,
+ configLoginAppSecret: Buffer,
+ configLoginServerKey: Buffer,
+): bigint => {
+ const state = Buffer.alloc(crypto_hash_sha512_STATEBYTES)
+ crypto_hash_sha512_init(state)
+ crypto_hash_sha512_update(state, Buffer.from(salt))
+ crypto_hash_sha512_update(state, configLoginAppSecret)
+ const hash = Buffer.alloc(crypto_hash_sha512_BYTES)
+ crypto_hash_sha512_final(state, hash)
+
+ const encryptionKey = Buffer.alloc(crypto_box_SEEDBYTES)
+ const opsLimit = 10
+ const memLimit = 33554432
+ const algo = 2
+ crypto_pwhash(
+ encryptionKey,
+ Buffer.from(password),
+ hash.slice(0, crypto_pwhash_SALTBYTES),
+ opsLimit,
+ memLimit,
+ algo,
+ )
+
+ const encryptionKeyHash = Buffer.alloc(crypto_shorthash_BYTES)
+ crypto_shorthash(encryptionKeyHash, encryptionKey, configLoginServerKey)
+ return encryptionKeyHash.readBigUInt64LE()
+}
+
+if (CONFIG.USE_CRYPTO_WORKER === true && typeof process.send === 'function') {
+ worker({
+ SecretKeyCryptographyCreateKey,
+ })
+}
diff --git a/backend/src/password/EncryptorUtils.ts b/backend/src/password/EncryptorUtils.ts
index 64dcb2289..f4dc00b6c 100644
--- a/backend/src/password/EncryptorUtils.ts
+++ b/backend/src/password/EncryptorUtils.ts
@@ -2,7 +2,11 @@
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
/* eslint-disable @typescript-eslint/no-unsafe-argument */
+import { cpus } from 'os'
+import path from 'path'
+
import { User } from '@entity/User'
+import { Pool, pool } from 'workerpool'
import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
@@ -10,61 +14,73 @@ import { CONFIG } from '@/config'
import { LogError } from '@/server/LogError'
import { backendLogger as logger } from '@/server/logger'
-import {
- crypto_shorthash_KEYBYTES,
- crypto_box_SEEDBYTES,
- crypto_hash_sha512_init,
- crypto_hash_sha512_update,
- crypto_hash_sha512_final,
- crypto_hash_sha512_BYTES,
- crypto_hash_sha512_STATEBYTES,
- crypto_shorthash_BYTES,
- crypto_pwhash_SALTBYTES,
- crypto_pwhash,
- crypto_shorthash,
-} from 'sodium-native'
+import { crypto_shorthash_KEYBYTES } from 'sodium-native'
+
+import { SecretKeyCryptographyCreateKey as SecretKeyCryptographyCreateKeySync } from './EncryptionWorker'
+
+const configLoginAppSecret = Buffer.from(CONFIG.LOGIN_APP_SECRET, 'hex')
+const configLoginServerKey = Buffer.from(CONFIG.LOGIN_SERVER_KEY, 'hex')
+
+let encryptionWorkerPool: Pool | undefined
+
+if (CONFIG.USE_CRYPTO_WORKER === true) {
+ encryptionWorkerPool = pool(
+ path.join(__dirname, '..', '..', 'build', 'src', 'password', '/EncryptionWorker.js'),
+ {
+ // TODO: put maxQueueSize into config
+ maxQueueSize: 30 * cpus().length,
+ },
+ )
+}
// We will reuse this for changePassword
export const isValidPassword = (password: string): boolean => {
return !!password.match(/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[^a-zA-Z0-9 \\t\\n\\r]).{8,}$/)
}
-export const SecretKeyCryptographyCreateKey = (salt: string, password: string): Buffer[] => {
- logger.trace('SecretKeyCryptographyCreateKey...')
- const configLoginAppSecret = Buffer.from(CONFIG.LOGIN_APP_SECRET, 'hex')
- const configLoginServerKey = Buffer.from(CONFIG.LOGIN_SERVER_KEY, 'hex')
- if (configLoginServerKey.length !== crypto_shorthash_KEYBYTES) {
- throw new LogError(
- 'ServerKey has an invalid size',
- configLoginServerKey.length,
- crypto_shorthash_KEYBYTES,
- )
+/**
+ * @param salt
+ * @param password
+ * @returns can throw an exception if worker pool is full, if more than 30 * cpu core count logins happen in a time range of 30 seconds
+ */
+export const SecretKeyCryptographyCreateKey = async (
+ salt: string,
+ password: string,
+): Promise => {
+ try {
+ logger.trace('call worker for: SecretKeyCryptographyCreateKey')
+ if (configLoginServerKey.length !== crypto_shorthash_KEYBYTES) {
+ throw new LogError(
+ 'ServerKey has an invalid size',
+ configLoginServerKey.length,
+ crypto_shorthash_KEYBYTES,
+ )
+ }
+ let result: Promise
+ if (encryptionWorkerPool) {
+ result = (await encryptionWorkerPool.exec('SecretKeyCryptographyCreateKey', [
+ salt,
+ password,
+ configLoginAppSecret,
+ configLoginServerKey,
+ ])) as Promise
+ } else {
+ result = Promise.resolve(
+ SecretKeyCryptographyCreateKeySync(
+ salt,
+ password,
+ configLoginAppSecret,
+ configLoginServerKey,
+ ),
+ )
+ }
+ return result
+ } catch (e) {
+ // pool is throwing this error
+ // throw new Error('Max queue size of ' + this.maxQueueSize + ' reached');
+ // will be shown in frontend to user
+ throw new LogError('Server is full, please try again in 10 minutes.', e)
}
-
- const state = Buffer.alloc(crypto_hash_sha512_STATEBYTES)
- crypto_hash_sha512_init(state)
- crypto_hash_sha512_update(state, Buffer.from(salt))
- crypto_hash_sha512_update(state, configLoginAppSecret)
- const hash = Buffer.alloc(crypto_hash_sha512_BYTES)
- crypto_hash_sha512_final(state, hash)
-
- const encryptionKey = Buffer.alloc(crypto_box_SEEDBYTES)
- const opsLimit = 10
- const memLimit = 33554432
- const algo = 2
- crypto_pwhash(
- encryptionKey,
- Buffer.from(password),
- hash.slice(0, crypto_pwhash_SALTBYTES),
- opsLimit,
- memLimit,
- algo,
- )
-
- const encryptionKeyHash = Buffer.alloc(crypto_shorthash_BYTES)
- crypto_shorthash(encryptionKeyHash, encryptionKey, configLoginServerKey)
-
- return [encryptionKeyHash, encryptionKey]
}
export const getUserCryptographicSalt = (dbUser: User): string => {
diff --git a/backend/src/password/PasswordEncryptor.ts b/backend/src/password/PasswordEncryptor.ts
index 1c7457a40..a97c29e7f 100644
--- a/backend/src/password/PasswordEncryptor.ts
+++ b/backend/src/password/PasswordEncryptor.ts
@@ -3,13 +3,12 @@ import { User } from '@entity/User'
// import { logger } from '@test/testSetup' getting error "jest is not defined"
import { getUserCryptographicSalt, SecretKeyCryptographyCreateKey } from './EncryptorUtils'
-export const encryptPassword = (dbUser: User, password: string): bigint => {
+export const encryptPassword = async (dbUser: User, password: string): Promise => {
const salt = getUserCryptographicSalt(dbUser)
- const keyBuffer = SecretKeyCryptographyCreateKey(salt, password) // return short and long hash
- const passwordHash = keyBuffer[0].readBigUInt64LE()
- return passwordHash
+ return SecretKeyCryptographyCreateKey(salt, password)
}
-export const verifyPassword = (dbUser: User, password: string): boolean => {
- return dbUser.password.toString() === encryptPassword(dbUser, password).toString()
+export const verifyPassword = async (dbUser: User, password: string): Promise => {
+ const encryptedPassword = await encryptPassword(dbUser, password)
+ return dbUser.password.toString() === encryptedPassword.toString()
}
diff --git a/backend/src/password/__mocks__/EncryptorUtils.ts b/backend/src/password/__mocks__/EncryptorUtils.ts
new file mode 100644
index 000000000..2bc20f951
--- /dev/null
+++ b/backend/src/password/__mocks__/EncryptorUtils.ts
@@ -0,0 +1,114 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+import { User } from '@entity/User'
+
+import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
+
+import { CONFIG } from '@/config'
+import { LogError } from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
+
+import {
+ crypto_shorthash_KEYBYTES,
+ crypto_box_SEEDBYTES,
+ crypto_hash_sha512_init,
+ crypto_hash_sha512_update,
+ crypto_hash_sha512_final,
+ crypto_hash_sha512_BYTES,
+ crypto_hash_sha512_STATEBYTES,
+ crypto_shorthash_BYTES,
+ crypto_pwhash_SALTBYTES,
+ crypto_pwhash,
+ crypto_shorthash,
+ crypto_pwhash_OPSLIMIT_MIN,
+ crypto_pwhash_MEMLIMIT_MIN,
+} from 'sodium-native'
+
+const SecretKeyCryptographyCreateKeyMock = (
+ salt: string,
+ password: string,
+ configLoginAppSecret: Buffer,
+ configLoginServerKey: Buffer,
+): bigint => {
+ const state = Buffer.alloc(crypto_hash_sha512_STATEBYTES)
+ crypto_hash_sha512_init(state)
+ crypto_hash_sha512_update(state, Buffer.from(salt))
+ crypto_hash_sha512_update(state, configLoginAppSecret)
+ const hash = Buffer.alloc(crypto_hash_sha512_BYTES)
+ crypto_hash_sha512_final(state, hash)
+
+ const encryptionKey = Buffer.alloc(crypto_box_SEEDBYTES)
+ const opsLimit = crypto_pwhash_OPSLIMIT_MIN
+ const memLimit = crypto_pwhash_MEMLIMIT_MIN
+ const algo = 2
+ crypto_pwhash(
+ encryptionKey,
+ Buffer.from(password),
+ hash.slice(0, crypto_pwhash_SALTBYTES),
+ opsLimit,
+ memLimit,
+ algo,
+ )
+
+ const encryptionKeyHash = Buffer.alloc(crypto_shorthash_BYTES)
+ crypto_shorthash(encryptionKeyHash, encryptionKey, configLoginServerKey)
+
+ return encryptionKeyHash.readBigUInt64LE()
+}
+
+const configLoginAppSecret = Buffer.from(CONFIG.LOGIN_APP_SECRET, 'hex')
+const configLoginServerKey = Buffer.from(CONFIG.LOGIN_SERVER_KEY, 'hex')
+
+// We will reuse this for changePassword
+export const isValidPassword = (password: string): boolean => {
+ return !!password.match(/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[^a-zA-Z0-9 \\t\\n\\r]).{8,}$/)
+}
+
+/**
+ * @param salt
+ * @param password
+ * @returns can throw an exception if worker pool is full, if more than 30 * cpu core count logins happen in a time range of 30 seconds
+ */
+export const SecretKeyCryptographyCreateKey = async (
+ salt: string,
+ password: string,
+): Promise => {
+ try {
+ logger.trace('call worker for: SecretKeyCryptographyCreateKey')
+ if (configLoginServerKey.length !== crypto_shorthash_KEYBYTES) {
+ throw new LogError(
+ 'ServerKey has an invalid size',
+ configLoginServerKey.length,
+ crypto_shorthash_KEYBYTES,
+ )
+ }
+ return Promise.resolve(
+ SecretKeyCryptographyCreateKeyMock(
+ salt,
+ password,
+ configLoginAppSecret,
+ configLoginServerKey,
+ ),
+ )
+ } catch (e) {
+ // pool is throwing this error
+ // throw new Error('Max queue size of ' + this.maxQueueSize + ' reached');
+ // will be shown in frontend to user
+ throw new LogError('Server is full, please try again in 10 minutes.', e)
+ }
+}
+
+export const getUserCryptographicSalt = (dbUser: User): string => {
+ switch (dbUser.passwordEncryptionType) {
+ case PasswordEncryptionType.NO_PASSWORD:
+ throw new LogError('User has no password set', dbUser.id)
+ case PasswordEncryptionType.EMAIL:
+ return dbUser.emailContact.email
+ case PasswordEncryptionType.GRADIDO_ID:
+ return dbUser.gradidoID
+ default:
+ throw new LogError('Unknown password encryption type', dbUser.passwordEncryptionType)
+ }
+}
diff --git a/backend/src/seeds/factory/creation.ts b/backend/src/seeds/factory/creation.ts
index 5ad1b2e4e..5e6e058f9 100644
--- a/backend/src/seeds/factory/creation.ts
+++ b/backend/src/seeds/factory/creation.ts
@@ -23,7 +23,6 @@ export const creationFactory = async (
mutation: login,
variables: { email: creation.email, password: 'Aa12345_' },
})
-
const {
data: { createContribution: contribution },
} = await mutate({ mutation: createContribution, variables: { ...creation } })
diff --git a/backend/src/seeds/factory/user.ts b/backend/src/seeds/factory/user.ts
index 3ddddf336..067a6476f 100644
--- a/backend/src/seeds/factory/user.ts
+++ b/backend/src/seeds/factory/user.ts
@@ -18,11 +18,18 @@ export const userFactory = async (
const homeCom = await writeHomeCommunityEntry()
+ const response = await mutate({ mutation: createUser, variables: user })
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+ if (!response?.data?.createUser) {
+ // eslint-disable-next-line no-console
+ console.log(response)
+ throw new Error('createUser mutation returned unexpected response')
+ }
const {
data: {
createUser: { id },
},
- } = await mutate({ mutation: createUser, variables: user })
+ } = response
// get user from database
let dbUser = await User.findOneOrFail({ where: { id }, relations: ['emailContact', 'userRoles'] })
@@ -39,9 +46,14 @@ export const userFactory = async (
dbUser = await User.findOneOrFail({ where: { id }, relations: ['userRoles'] })
if (user.createdAt || user.deletedAt || user.role) {
- if (user.createdAt) dbUser.createdAt = user.createdAt
- if (user.deletedAt) dbUser.deletedAt = user.deletedAt
- if (user.role && (user.role === RoleNames.ADMIN || user.role === RoleNames.MODERATOR)) {
+ if (user.createdAt) {
+ dbUser.createdAt = user.createdAt
+ }
+ if (user.deletedAt) {
+ dbUser.deletedAt = user.deletedAt
+ }
+ const userRole = user.role as RoleNames
+ if (userRole && (userRole === RoleNames.ADMIN || userRole === RoleNames.MODERATOR)) {
await setUserRole(dbUser, user.role)
}
await dbUser.save()
diff --git a/backend/src/seeds/gmsUsers.ts b/backend/src/seeds/gmsUsers.ts
index 46a8998e1..6f059697d 100644
--- a/backend/src/seeds/gmsUsers.ts
+++ b/backend/src/seeds/gmsUsers.ts
@@ -59,8 +59,8 @@ const run = async () => {
const userIds = await DbUser.createQueryBuilder()
.select('id')
.where({ foreign: false })
- .andWhere('deleted_at is null')
- .andWhere({ gmsRegistered: false })
+ // .andWhere('deleted_at is null')
+ // .andWhere({ gmsRegistered: false })
.getRawMany()
logger.debug('userIds:', userIds)
diff --git a/backend/src/seeds/graphql/mutations.ts b/backend/src/seeds/graphql/mutations.ts
index b10bb4b4e..f41c47e90 100644
--- a/backend/src/seeds/graphql/mutations.ts
+++ b/backend/src/seeds/graphql/mutations.ts
@@ -35,9 +35,9 @@ export const updateUserInfos = gql`
$hideAmountGDD: Boolean
$hideAmountGDT: Boolean
$gmsAllowed: Boolean
- $gmsPublishName: Int
+ $gmsPublishName: PublishNameType
$gmsLocation: Location
- $gmsPublishLocation: Int
+ $gmsPublishLocation: GmsPublishLocationType
) {
updateUserInfos(
firstName: $firstName
@@ -343,16 +343,25 @@ export const redeemTransactionLink = gql`
export const login = gql`
mutation ($email: String!, $password: String!, $publisherId: Int) {
login(email: $email, password: $password, publisherId: $publisherId) {
- id
+ gradidoID
+ alias
firstName
lastName
language
klickTipp {
newsletterState
}
+ gmsAllowed
+ humhubAllowed
+ gmsPublishName
+ humhubPublishName
+ gmsPublishLocation
+ userLocation
hasElopage
publisherId
roles
+ hideAmountGDD
+ hideAmountGDT
}
}
`
diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts
index 6bd106174..e242a6083 100644
--- a/backend/src/seeds/graphql/queries.ts
+++ b/backend/src/seeds/graphql/queries.ts
@@ -15,6 +15,23 @@ export const verifyLogin = gql`
}
}
`
+export const authenticateGmsUserSearch = gql`
+ query {
+ authenticateGmsUserSearch {
+ url
+ token
+ }
+ }
+`
+
+export const userLocationQuery = gql`
+ query {
+ userLocation {
+ userLocation
+ communityLocation
+ }
+ }
+`
export const queryOptIn = gql`
query ($optIn: String!) {
@@ -134,9 +151,25 @@ export const communitiesQuery = gql`
}
`
-export const getCommunityByUuidQuery = gql`
- query ($communityUuid: String!) {
- community(communityUuid: $communityUuid) {
+export const getCommunityByIdentifierQuery = gql`
+ query ($communityIdentifier: String!) {
+ communityByIdentifier(communityIdentifier: $communityIdentifier) {
+ id
+ foreign
+ name
+ description
+ url
+ creationDate
+ uuid
+ authenticatedAt
+ gmsApiKey
+ }
+ }
+`
+
+export const getHomeCommunityQuery = gql`
+ query {
+ homeCommunity {
id
foreign
name
@@ -156,7 +189,8 @@ export const getCommunities = gql`
id
foreign
publicKey
- url
+ endPoint
+ apiVersion
lastAnnouncedAt
verifiedAt
lastErrorAt
@@ -166,6 +200,34 @@ export const getCommunities = gql`
}
`
+export const allCommunities = gql`
+ query {
+ allCommunities {
+ foreign
+ url
+ publicKey
+ uuid
+ authenticatedAt
+ name
+ description
+ gmsApiKey
+ creationDate
+ createdAt
+ updatedAt
+ federatedCommunities {
+ id
+ apiVersion
+ endPoint
+ lastAnnouncedAt
+ verifiedAt
+ lastErrorAt
+ createdAt
+ updatedAt
+ }
+ }
+ }
+`
+
export const queryTransactionLink = gql`
query ($code: String!) {
queryTransactionLink(code: $code) {
@@ -238,29 +300,18 @@ query ($currentPage: Int = 1, $pageSize: Int = 5, $order: Order = DESC, $statusF
// from admin interface
export const adminListContributions = gql`
- query (
- $currentPage: Int = 1
- $pageSize: Int = 25
- $order: Order = DESC
- $statusFilter: [ContributionStatus!]
- $userId: Int
- $query: String
- $noHashtag: Boolean
- ) {
- adminListContributions(
- currentPage: $currentPage
- pageSize: $pageSize
- order: $order
- statusFilter: $statusFilter
- userId: $userId
- query: $query
- noHashtag: $noHashtag
- ) {
+ query ($filter: SearchContributionsFilterArgs, $paginated: Paginated) {
+ adminListContributions(filter: $filter, paginated: $paginated) {
contributionCount
contributionList {
id
- firstName
- lastName
+ user {
+ emailContact {
+ email
+ }
+ firstName
+ lastName
+ }
amount
memo
createdAt
diff --git a/backend/src/server/context.ts b/backend/src/server/context.ts
index 45f0a6c1f..a6038271c 100644
--- a/backend/src/server/context.ts
+++ b/backend/src/server/context.ts
@@ -16,6 +16,7 @@ export interface Context {
gradidoID?: string
// hack to use less DB calls for Balance Resolver
lastTransaction?: dbTransaction | null
+ balanceGDT?: number | null
transactionCount?: number
linkCount?: number
sumHoldAvailableAmount?: Decimal
diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts
index 3f02b0afc..a901d8763 100644
--- a/backend/src/server/createServer.ts
+++ b/backend/src/server/createServer.ts
@@ -13,6 +13,7 @@ import { schema } from '@/graphql/schema'
import { Connection } from '@/typeorm/connection'
import { checkDBVersion } from '@/typeorm/DBVersion'
import { elopageWebhook } from '@/webhook/elopage'
+import { gmsWebhook } from '@/webhook/gms'
import { context as serverContext } from './context'
import { cors } from './cors'
@@ -94,6 +95,10 @@ export const createServer = async (
// eslint-disable-next-line @typescript-eslint/no-misused-promises
app.post('/hook/elopage/' + CONFIG.WEBHOOK_ELOPAGE_SECRET, elopageWebhook)
+ // GMS Webhook
+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
+ app.get('/hook/gms/' + CONFIG.GMS_WEBHOOK_SECRET, gmsWebhook)
+
// Apollo Server
const apollo = new ApolloServer({
schema: await schema(),
diff --git a/backend/src/server/plugins.ts b/backend/src/server/plugins.ts
index 3e0fc50e1..c4ffa4f3f 100644
--- a/backend/src/server/plugins.ts
+++ b/backend/src/server/plugins.ts
@@ -37,6 +37,7 @@ const logPlugin = {
const { logger } = requestContext
const { query, mutation, variables, operationName } = requestContext.request
if (operationName !== 'IntrospectionQuery') {
+ logger.debug('requestDidStart:', requestContext)
logger.info(`Request:
${mutation || query}variables: ${JSON.stringify(filterVariables(variables), null, 2)}`)
}
diff --git a/backend/src/util/communityUser.ts b/backend/src/util/communityUser.ts
index 732c585d0..45a142ce8 100644
--- a/backend/src/util/communityUser.ts
+++ b/backend/src/util/communityUser.ts
@@ -52,7 +52,9 @@ const communityDbUser: dbUser = {
communityUuid: '55555555-4444-4333-2222-11111111',
community: null,
gmsPublishName: 0,
+ humhubPublishName: 0,
gmsAllowed: false,
+ humhubAllowed: false,
location: null,
gmsPublishLocation: 2,
gmsRegistered: false,
diff --git a/backend/src/util/klicktipp.test.ts b/backend/src/util/klicktipp.test.ts
index 6639a0aa4..a88e8f21a 100644
--- a/backend/src/util/klicktipp.test.ts
+++ b/backend/src/util/klicktipp.test.ts
@@ -19,6 +19,7 @@ import { peterLustig } from '@/seeds/users/peter-lustig'
import { exportEventDataToKlickTipp } from './klicktipp'
jest.mock('@/apis/KlicktippController')
+jest.mock('@/password/EncryptorUtils')
let mutate: ApolloServerTestClient['mutate'], con: Connection
let testEnv: {
diff --git a/backend/src/util/utilities.test.ts b/backend/src/util/utilities.test.ts
new file mode 100644
index 000000000..abd7604a8
--- /dev/null
+++ b/backend/src/util/utilities.test.ts
@@ -0,0 +1,59 @@
+import { getFirstDayOfPreviousNMonth } from './utilities' // Adjust the path as necessary
+
+describe('getFirstDayOfPreviousNMonth', () => {
+ test('should calculate 3 months prior to March 31, 2024', () => {
+ const startDate = new Date(2024, 2, 31) // March 31, 2024 (month is 0-indexed)
+ const monthsAgo = 3
+ const result = getFirstDayOfPreviousNMonth(startDate, monthsAgo)
+ expect(result).toEqual(new Date(2023, 11, 1)) // December 1, 2023
+ })
+
+ test('should handle end of month correctly, January 31, 2024', () => {
+ const startDate = new Date(2024, 0, 31) // January 31, 2024
+ const monthsAgo = 1
+ const result = getFirstDayOfPreviousNMonth(startDate, monthsAgo)
+ expect(result).toEqual(new Date(2023, 11, 1)) // December 1, 2023
+ })
+
+ test('should handle leap year, March 1, 2024', () => {
+ const startDate = new Date(2024, 2, 1) // March 1, 2024
+ const monthsAgo = 1
+ const result = getFirstDayOfPreviousNMonth(startDate, monthsAgo)
+ expect(result).toEqual(new Date(2024, 1, 1)) // February 1, 2024
+ })
+
+ test('should handle leap year, February 29, 2024', () => {
+ const startDate = new Date(2024, 1, 29) // February 29, 2024 (leap year)
+ const monthsAgo = 12
+ const result = getFirstDayOfPreviousNMonth(startDate, monthsAgo)
+ expect(result).toEqual(new Date(2023, 1, 1)) // February 1, 2023
+ })
+
+ test('should handle end of year transition, January 1, 2024', () => {
+ const startDate = new Date(2024, 0, 1) // January 1, 2024
+ const monthsAgo = 1
+ const result = getFirstDayOfPreviousNMonth(startDate, monthsAgo)
+ expect(result).toEqual(new Date(2023, 11, 1)) // December 1, 2023
+ })
+
+ test('should handle a large number of months ago, December 15, 2024', () => {
+ const startDate = new Date(2024, 11, 15) // December 15, 2024
+ const monthsAgo = 24
+ const result = getFirstDayOfPreviousNMonth(startDate, monthsAgo)
+ expect(result).toEqual(new Date(2022, 11, 1)) // December 1, 2022
+ })
+
+ test('should handle start of month correctly, February 1, 2024', () => {
+ const startDate = new Date(2024, 1, 1) // February 1, 2024
+ const monthsAgo = 1
+ const result = getFirstDayOfPreviousNMonth(startDate, monthsAgo)
+ expect(result).toEqual(new Date(2024, 0, 1)) // January 1, 2024
+ })
+
+ test('should handle middle of month correctly, February 14, 2024', () => {
+ const startDate = new Date(2024, 1, 14) // February 14, 2024
+ const monthsAgo = 3
+ const result = getFirstDayOfPreviousNMonth(startDate, monthsAgo)
+ expect(result).toEqual(new Date(2023, 10, 1)) // November 1, 2023
+ })
+})
diff --git a/backend/src/util/utilities.ts b/backend/src/util/utilities.ts
index c3895cb9e..4f45af023 100644
--- a/backend/src/util/utilities.ts
+++ b/backend/src/util/utilities.ts
@@ -1,3 +1,5 @@
+import { promisify } from 'util'
+
import { Decimal } from 'decimal.js-light'
import i18n from 'i18n'
@@ -29,3 +31,28 @@ export function resetInterface>(obj: T): T {
}
return obj
}
+
+export const delay = promisify(setTimeout)
+
+export const ensureUrlEndsWithSlash = (url: string): string => {
+ return url.endsWith('/') ? url : url.concat('/')
+}
+/**
+ * Calculates the date representing the first day of the month, a specified number of months prior to a given date.
+ *
+ * This function was created to address an issue with using `Date.prototype.setMonth`.
+ * When calculating previous months, `setMonth` can produce incorrect results at the end of months.
+ * For example, subtracting 3 months from May 31st using `setMonth` would result in March instead of February.
+ * This function ensures the correct month is calculated by setting the day to the 1st before performing the month subtraction.
+ *
+ * @param {Date} startDate - The starting date from which to calculate the previous months.
+ * @param {number} monthsAgo - The number of months to go back from the startDate.
+ * @returns {Date} A new Date object set to the first day of the month, `monthsAgo` months before the `startDate`.
+ *
+ * @example
+ * // Calculate the date for the first day of the month, 3 months prior to March 15, 2024
+ * const date = getFirstDayOfPreviousNMonth(new Date(2024, 4, 31), 3);
+ * console.log(date); // Output: Fri Feb 01 2024 00:00:00 GMT+0000 (Coordinated Universal Time)
+ */
+export const getFirstDayOfPreviousNMonth = (startDate: Date, monthsAgo: number): Date =>
+ new Date(startDate.getFullYear(), startDate.getMonth() - monthsAgo, 1)
diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts
index 4780c94e8..ab0c8a12a 100644
--- a/backend/src/util/validate.ts
+++ b/backend/src/util/validate.ts
@@ -1,5 +1,6 @@
import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
import { Decimal } from 'decimal.js-light'
+import { validate, version } from 'uuid'
import { Decay } from '@model/Decay'
@@ -16,6 +17,14 @@ function isStringBoolean(value: string): boolean {
return false
}
+function isUUID4(value: string): boolean {
+ return validate(value) && version(value) === 4
+}
+
+function isEMail(value: string): boolean {
+ return /^.{2,}@.{2,}\..{2,}$/.exec(value) !== null
+}
+
async function calculateBalance(
userId: number,
amount: Decimal,
@@ -42,4 +51,4 @@ async function calculateBalance(
return { balance, lastTransactionId: lastTransaction.id, decay }
}
-export { calculateBalance, isStringBoolean }
+export { calculateBalance, isStringBoolean, isUUID4, isEMail }
diff --git a/backend/src/webhook/gms.ts b/backend/src/webhook/gms.ts
new file mode 100644
index 000000000..3a4e9c3f3
--- /dev/null
+++ b/backend/src/webhook/gms.ts
@@ -0,0 +1,36 @@
+/* eslint-disable no-console */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+import { User as DbUser } from '@entity/User'
+
+import { decode } from '@/auth/JWT'
+
+export const gmsWebhook = async (req: any, res: any): Promise => {
+ console.log('GMS Hook received', req.query)
+ const { token } = req.query
+
+ if (!token) {
+ console.log('gmsWebhook: missing token')
+ res.status(400).json({ message: 'false' })
+ return
+ }
+ const payload = await decode(token)
+ console.log('gmsWebhook: decoded token=', payload)
+ if (!payload) {
+ console.log('gmsWebhook: invalid token')
+ res.status(400).json({ message: 'false' })
+ return
+ }
+ const user = await DbUser.findOne({ where: { gradidoID: payload.gradidoID } })
+ if (!user) {
+ console.log('gmsWebhook: missing user')
+ res.status(400).json({ message: 'false' })
+ return
+ }
+ console.log('gmsWebhook: authenticate user=', user.gradidoID, user.firstName, user.lastName)
+ console.log('gmsWebhook: authentication successful')
+ res.status(200).json({ userUuid: user.gradidoID })
+}
diff --git a/backend/test/testSetup.ts b/backend/test/testSetup.ts
index a61556798..8cf4ff084 100644
--- a/backend/test/testSetup.ts
+++ b/backend/test/testSetup.ts
@@ -1,3 +1,5 @@
+// eslint-disable-next-line import/no-unassigned-import
+import 'openai/shims/node'
import { CONFIG } from '@/config'
import { i18n } from '@/server/localization'
import { backendLogger as logger } from '@/server/logger'
diff --git a/backend/tsconfig.json b/backend/tsconfig.json
index 28ddf1c38..cd310e8a3 100644
--- a/backend/tsconfig.json
+++ b/backend/tsconfig.json
@@ -15,6 +15,7 @@
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "./build", /* Redirect output structure to the directory. */
+ // "rootDir" : ".",
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
@@ -49,6 +50,7 @@
"paths": { /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
"@/*": ["src/*"],
"@arg/*": ["src/graphql/arg/*"],
+ "@input/*": ["src/graphql/input/*"],
"@dltConnector/*": ["src/apis/dltConnector/*"],
"@enum/*": ["src/graphql/enum/*"],
"@model/*": ["src/graphql/model/*"],
@@ -59,7 +61,8 @@
/* external */
"@dbTools/*": ["../database/src/*", "../../database/build/src/*"],
"@entity/*": ["../database/entity/*", "../../database/build/entity/*"],
- "@logging/*": ["../database/logging/*", "../../database/build/logging/*"]
+ "@logging/*": ["../database/logging/*", "../../database/build/logging/*"],
+ "@config/*": ["../config/src/*", "../../config/build/src/*"]
},
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
"typeRoots": ["@types", "node_modules/@types"], /* List of folders to include type definitions from. */
@@ -85,9 +88,12 @@
},
"references": [
{
- "path": "../database/tsconfig.json",
+ "path": "../database/tsconfig.json"
// add 'prepend' if you want to include the referenced project in your output file
// "prepend": true
+ },
+ {
+ "path": "../config/tsconfig.json"
}
]
}
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 91186187b..f7a2a27b1 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -2,6 +2,14 @@
# yarn lockfile v1
+"@ampproject/remapping@^2.2.0":
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
+ integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
+ dependencies:
+ "@jridgewell/gen-mapping" "^0.3.5"
+ "@jridgewell/trace-mapping" "^0.3.24"
+
"@apollo/protobufjs@1.2.2":
version "1.2.2"
resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.2.tgz#4bd92cd7701ccaef6d517cdb75af2755f049f87c"
@@ -22,9 +30,9 @@
long "^4.0.0"
"@apollographql/apollo-tools@^0.5.0":
- version "0.5.1"
- resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.5.1.tgz#f0baef739ff7e2fafcb8b98ad29f6ac817e53e32"
- integrity sha512-ZII+/xUFfb9ezDU2gad114+zScxVFMVlZ91f8fGApMzlS1kkqoyLnC4AJaQ1Ya/X+b63I20B4Gd+eCL8QuB4sA==
+ version "0.5.4"
+ resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.5.4.tgz#cb3998c6cf12e494b90c733f44dd9935e2d8196c"
+ integrity sha512-shM3q7rUbNyXVVRkQJQseXv6bnYM3BUma/eZhwXR4xsuM+bqWnJKvW7SAfRjP7LuSCocrexa5AXhjjawNHrIlw==
"@apollographql/graphql-playground-html@1.6.27":
version "1.6.27"
@@ -33,205 +41,127 @@
dependencies:
xss "^1.0.8"
-"@apollographql/graphql-upload-8-fork@^8.1.3":
- version "8.1.3"
- resolved "https://registry.yarnpkg.com/@apollographql/graphql-upload-8-fork/-/graphql-upload-8-fork-8.1.3.tgz#a0d4e0d5cec8e126d78bd915c264d6b90f5784bc"
- integrity sha512-ssOPUT7euLqDXcdVv3Qs4LoL4BPtfermW1IOouaqEmj36TpHYDmYDIbKoSQxikd9vtMumFnP87OybH7sC9fJ6g==
+"@apollographql/graphql-upload-8-fork@^8.1.4":
+ version "8.1.4"
+ resolved "https://registry.yarnpkg.com/@apollographql/graphql-upload-8-fork/-/graphql-upload-8-fork-8.1.4.tgz#898a6826cf53b13e42161884b0090d3bb8c8b2f3"
+ integrity sha512-lHAj/PUegYu02zza9Pg0bQQYH5I0ah1nyIzu2YIqOv41P0vu3GCBISAmQCfFHThK7N3dy7dLFPhoKcXlXRLPoQ==
dependencies:
"@types/express" "*"
- "@types/fs-capacitor" "*"
+ "@types/fs-capacitor" "^2.0.0"
"@types/koa" "*"
busboy "^0.3.1"
fs-capacitor "^2.0.4"
http-errors "^1.7.3"
object-path "^0.11.4"
-"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8":
- version "7.15.8"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503"
- integrity sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.26.2":
+ version "7.26.2"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
+ integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
dependencies:
- "@babel/highlight" "^7.14.5"
+ "@babel/helper-validator-identifier" "^7.25.9"
+ js-tokens "^4.0.0"
+ picocolors "^1.0.0"
-"@babel/compat-data@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
- integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
+"@babel/compat-data@^7.26.5":
+ version "7.26.8"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.8.tgz#821c1d35641c355284d4a870b8a4a7b0c141e367"
+ integrity sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==
-"@babel/core@^7.1.0", "@babel/core@^7.7.2", "@babel/core@^7.7.5":
- version "7.15.8"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.8.tgz#195b9f2bffe995d2c6c159e72fe525b4114e8c10"
- integrity sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==
+"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.2", "@babel/core@^7.8.0":
+ version "7.26.10"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.10.tgz#5c876f83c8c4dcb233ee4b670c0606f2ac3000f9"
+ integrity sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==
dependencies:
- "@babel/code-frame" "^7.15.8"
- "@babel/generator" "^7.15.8"
- "@babel/helper-compilation-targets" "^7.15.4"
- "@babel/helper-module-transforms" "^7.15.8"
- "@babel/helpers" "^7.15.4"
- "@babel/parser" "^7.15.8"
- "@babel/template" "^7.15.4"
- "@babel/traverse" "^7.15.4"
- "@babel/types" "^7.15.6"
- convert-source-map "^1.7.0"
+ "@ampproject/remapping" "^2.2.0"
+ "@babel/code-frame" "^7.26.2"
+ "@babel/generator" "^7.26.10"
+ "@babel/helper-compilation-targets" "^7.26.5"
+ "@babel/helper-module-transforms" "^7.26.0"
+ "@babel/helpers" "^7.26.10"
+ "@babel/parser" "^7.26.10"
+ "@babel/template" "^7.26.9"
+ "@babel/traverse" "^7.26.10"
+ "@babel/types" "^7.26.10"
+ convert-source-map "^2.0.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
- json5 "^2.1.2"
- semver "^6.3.0"
- source-map "^0.5.0"
+ json5 "^2.2.3"
+ semver "^6.3.1"
-"@babel/generator@^7.15.4", "@babel/generator@^7.15.8", "@babel/generator@^7.7.2":
- version "7.15.8"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.8.tgz#fa56be6b596952ceb231048cf84ee499a19c0cd1"
- integrity sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==
+"@babel/generator@^7.26.10", "@babel/generator@^7.7.2":
+ version "7.26.10"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.10.tgz#a60d9de49caca16744e6340c3658dfef6138c3f7"
+ integrity sha512-rRHT8siFIXQrAYOYqZQVsAr8vJ+cBNqcVAY6m5V8/4QqzaPl+zDBe6cLEPRDuNOUf3ww8RfJVlOyQMoSI+5Ang==
dependencies:
- "@babel/types" "^7.15.6"
- jsesc "^2.5.1"
- source-map "^0.5.0"
+ "@babel/parser" "^7.26.10"
+ "@babel/types" "^7.26.10"
+ "@jridgewell/gen-mapping" "^0.3.5"
+ "@jridgewell/trace-mapping" "^0.3.25"
+ jsesc "^3.0.2"
-"@babel/helper-compilation-targets@^7.15.4":
- version "7.15.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
- integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
+"@babel/helper-compilation-targets@^7.26.5":
+ version "7.26.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz#75d92bb8d8d51301c0d49e52a65c9a7fe94514d8"
+ integrity sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==
dependencies:
- "@babel/compat-data" "^7.15.0"
- "@babel/helper-validator-option" "^7.14.5"
- browserslist "^4.16.6"
- semver "^6.3.0"
+ "@babel/compat-data" "^7.26.5"
+ "@babel/helper-validator-option" "^7.25.9"
+ browserslist "^4.24.0"
+ lru-cache "^5.1.1"
+ semver "^6.3.1"
-"@babel/helper-function-name@^7.15.4":
- version "7.15.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc"
- integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==
+"@babel/helper-module-imports@^7.25.9":
+ version "7.25.9"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz#e7f8d20602ebdbf9ebbea0a0751fb0f2a4141715"
+ integrity sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==
dependencies:
- "@babel/helper-get-function-arity" "^7.15.4"
- "@babel/template" "^7.15.4"
- "@babel/types" "^7.15.4"
+ "@babel/traverse" "^7.25.9"
+ "@babel/types" "^7.25.9"
-"@babel/helper-get-function-arity@^7.15.4":
- version "7.15.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b"
- integrity sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==
+"@babel/helper-module-transforms@^7.26.0":
+ version "7.26.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz#8ce54ec9d592695e58d84cd884b7b5c6a2fdeeae"
+ integrity sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==
dependencies:
- "@babel/types" "^7.15.4"
+ "@babel/helper-module-imports" "^7.25.9"
+ "@babel/helper-validator-identifier" "^7.25.9"
+ "@babel/traverse" "^7.25.9"
-"@babel/helper-hoist-variables@^7.15.4":
- version "7.15.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df"
- integrity sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.25.9", "@babel/helper-plugin-utils@^7.8.0":
+ version "7.26.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz#18580d00c9934117ad719392c4f6585c9333cc35"
+ integrity sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==
+
+"@babel/helper-string-parser@^7.25.9":
+ version "7.25.9"
+ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c"
+ integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==
+
+"@babel/helper-validator-identifier@^7.25.9":
+ version "7.25.9"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7"
+ integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
+
+"@babel/helper-validator-option@^7.25.9":
+ version "7.25.9"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72"
+ integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==
+
+"@babel/helpers@^7.26.10":
+ version "7.26.10"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.10.tgz#6baea3cd62ec2d0c1068778d63cb1314f6637384"
+ integrity sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==
dependencies:
- "@babel/types" "^7.15.4"
+ "@babel/template" "^7.26.9"
+ "@babel/types" "^7.26.10"
-"@babel/helper-member-expression-to-functions@^7.15.4":
- version "7.15.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
- integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.26.10", "@babel/parser@^7.26.9", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6":
+ version "7.26.10"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.10.tgz#e9bdb82f14b97df6569b0b038edd436839c57749"
+ integrity sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==
dependencies:
- "@babel/types" "^7.15.4"
-
-"@babel/helper-module-imports@^7.15.4":
- version "7.15.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f"
- integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==
- dependencies:
- "@babel/types" "^7.15.4"
-
-"@babel/helper-module-transforms@^7.15.8":
- version "7.15.8"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz#d8c0e75a87a52e374a8f25f855174786a09498b2"
- integrity sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==
- dependencies:
- "@babel/helper-module-imports" "^7.15.4"
- "@babel/helper-replace-supers" "^7.15.4"
- "@babel/helper-simple-access" "^7.15.4"
- "@babel/helper-split-export-declaration" "^7.15.4"
- "@babel/helper-validator-identifier" "^7.15.7"
- "@babel/template" "^7.15.4"
- "@babel/traverse" "^7.15.4"
- "@babel/types" "^7.15.6"
-
-"@babel/helper-optimise-call-expression@^7.15.4":
- version "7.15.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171"
- integrity sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==
- dependencies:
- "@babel/types" "^7.15.4"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
- integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
-
-"@babel/helper-replace-supers@^7.15.4":
- version "7.15.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
- integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
- dependencies:
- "@babel/helper-member-expression-to-functions" "^7.15.4"
- "@babel/helper-optimise-call-expression" "^7.15.4"
- "@babel/traverse" "^7.15.4"
- "@babel/types" "^7.15.4"
-
-"@babel/helper-simple-access@^7.15.4":
- version "7.15.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b"
- integrity sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==
- dependencies:
- "@babel/types" "^7.15.4"
-
-"@babel/helper-split-export-declaration@^7.15.4":
- version "7.15.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257"
- integrity sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==
- dependencies:
- "@babel/types" "^7.15.4"
-
-"@babel/helper-string-parser@^7.18.10":
- version "7.18.10"
- resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
- integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
-
-"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.15.7":
- version "7.15.7"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
- integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
-
-"@babel/helper-validator-identifier@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
- integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
-
-"@babel/helper-validator-option@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
- integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
-
-"@babel/helpers@^7.15.4":
- version "7.15.4"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43"
- integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==
- dependencies:
- "@babel/template" "^7.15.4"
- "@babel/traverse" "^7.15.4"
- "@babel/types" "^7.15.4"
-
-"@babel/highlight@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
- integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
- dependencies:
- "@babel/helper-validator-identifier" "^7.14.5"
- chalk "^2.0.0"
- js-tokens "^4.0.0"
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.15.4", "@babel/parser@^7.15.8", "@babel/parser@^7.7.2":
- version "7.15.8"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.8.tgz#7bacdcbe71bdc3ff936d510c15dcea7cf0b99016"
- integrity sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==
-
-"@babel/parser@^7.6.0", "@babel/parser@^7.9.6":
- version "7.18.13"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4"
- integrity sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==
+ "@babel/types" "^7.26.10"
"@babel/plugin-syntax-async-generators@^7.8.4":
version "7.8.4"
@@ -247,14 +177,28 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.0"
-"@babel/plugin-syntax-class-properties@^7.8.3":
+"@babel/plugin-syntax-class-properties@^7.12.13":
version "7.12.13"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
dependencies:
"@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-syntax-import-meta@^7.8.3":
+"@babel/plugin-syntax-class-static-block@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+ integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-import-attributes@^7.24.7":
+ version "7.26.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz#3b1412847699eea739b4f2602c74ce36f6b0b0f7"
+ integrity sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-syntax-import-meta@^7.10.4":
version "7.10.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
@@ -268,7 +212,7 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.0"
-"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
version "7.10.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
@@ -282,7 +226,7 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.0"
-"@babel/plugin-syntax-numeric-separator@^7.8.3":
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
version "7.10.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
@@ -310,7 +254,14 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.0"
-"@babel/plugin-syntax-top-level-await@^7.8.3":
+"@babel/plugin-syntax-private-property-in-object@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+ integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-top-level-await@^7.14.5":
version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
@@ -318,76 +269,83 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-typescript@^7.7.2":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716"
- integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==
+ version "7.25.9"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz#67dda2b74da43727cf21d46cf9afef23f4365399"
+ integrity sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.25.9"
-"@babel/runtime@^7.21.0":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
- integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
+"@babel/runtime-corejs3@^7.26.9":
+ version "7.26.10"
+ resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.26.10.tgz#5a3185ca2813f8de8ae68622572086edf5cf51f2"
+ integrity sha512-uITFQYO68pMEYR46AHgQoyBg7KPPJDAbGn4jUTIRgCFJIp88MIBUianVOplhZDEec07bp9zIyr4Kp0FCyQzmWg==
dependencies:
- regenerator-runtime "^0.13.11"
+ core-js-pure "^3.30.2"
+ regenerator-runtime "^0.14.0"
-"@babel/template@^7.15.4", "@babel/template@^7.3.3":
- version "7.15.4"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
- integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
+"@babel/template@^7.26.9", "@babel/template@^7.3.3":
+ version "7.26.9"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.26.9.tgz#4577ad3ddf43d194528cff4e1fa6b232fa609bb2"
+ integrity sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==
dependencies:
- "@babel/code-frame" "^7.14.5"
- "@babel/parser" "^7.15.4"
- "@babel/types" "^7.15.4"
+ "@babel/code-frame" "^7.26.2"
+ "@babel/parser" "^7.26.9"
+ "@babel/types" "^7.26.9"
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.7.2":
- version "7.15.4"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d"
- integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==
+"@babel/traverse@^7.25.9", "@babel/traverse@^7.26.10", "@babel/traverse@^7.7.2":
+ version "7.26.10"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.10.tgz#43cca33d76005dbaa93024fae536cc1946a4c380"
+ integrity sha512-k8NuDrxr0WrPH5Aupqb2LCVURP/S0vBEn5mK6iH+GIYob66U5EtoZvcdudR2jQ4cmTwhEwW1DLB+Yyas9zjF6A==
dependencies:
- "@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.15.4"
- "@babel/helper-function-name" "^7.15.4"
- "@babel/helper-hoist-variables" "^7.15.4"
- "@babel/helper-split-export-declaration" "^7.15.4"
- "@babel/parser" "^7.15.4"
- "@babel/types" "^7.15.4"
- debug "^4.1.0"
+ "@babel/code-frame" "^7.26.2"
+ "@babel/generator" "^7.26.10"
+ "@babel/parser" "^7.26.10"
+ "@babel/template" "^7.26.9"
+ "@babel/types" "^7.26.10"
+ debug "^4.3.1"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
- version "7.15.6"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f"
- integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.25.9", "@babel/types@^7.26.10", "@babel/types@^7.26.9", "@babel/types@^7.3.3", "@babel/types@^7.6.1", "@babel/types@^7.9.6":
+ version "7.26.10"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.10.tgz#396382f6335bd4feb65741eacfc808218f859259"
+ integrity sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==
dependencies:
- "@babel/helper-validator-identifier" "^7.14.9"
- to-fast-properties "^2.0.0"
-
-"@babel/types@^7.6.1", "@babel/types@^7.9.6":
- version "7.18.13"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.13.tgz#30aeb9e514f4100f7c1cb6e5ba472b30e48f519a"
- integrity sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==
- dependencies:
- "@babel/helper-string-parser" "^7.18.10"
- "@babel/helper-validator-identifier" "^7.18.6"
- to-fast-properties "^2.0.0"
+ "@babel/helper-string-parser" "^7.25.9"
+ "@babel/helper-validator-identifier" "^7.25.9"
"@bcoe/v8-coverage@^0.2.3":
version "0.2.3"
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
-"@cspotcode/source-map-consumer@0.8.0":
- version "0.8.0"
- resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b"
- integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==
-
-"@cspotcode/source-map-support@0.6.1":
- version "0.6.1"
- resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.6.1.tgz#118511f316e2e87ee4294761868e254d3da47960"
- integrity sha512-DX3Z+T5dt1ockmPdobJS/FAsQPW4V4SrWEhD2iYQT2Cb2tQsiMnYxrcUH9By/Z3B+v0S5LMBkQtV/XOBbpLEOg==
+"@cspotcode/source-map-support@^0.8.0":
+ version "0.8.1"
+ resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+ integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
dependencies:
- "@cspotcode/source-map-consumer" "0.8.0"
+ "@jridgewell/trace-mapping" "0.3.9"
+
+"@emnapi/core@^1.3.1":
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.3.1.tgz#9c62d185372d1bddc94682b87f376e03dfac3f16"
+ integrity sha512-pVGjBIt1Y6gg3EJN8jTcfpP/+uuRksIo055oE/OBkDNcjZqVbfkWCksG1Jp4yZnj3iKWyWX8fdG/j6UDYPbFog==
+ dependencies:
+ "@emnapi/wasi-threads" "1.0.1"
+ tslib "^2.4.0"
+
+"@emnapi/runtime@^1.3.1":
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.3.1.tgz#0fcaa575afc31f455fd33534c19381cfce6c6f60"
+ integrity sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==
+ dependencies:
+ tslib "^2.4.0"
+
+"@emnapi/wasi-threads@1.0.1":
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.0.1.tgz#d7ae71fd2166b1c916c6cd2d0df2ef565a2e1a5b"
+ integrity sha512-iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==
+ dependencies:
+ tslib "^2.4.0"
"@eslint-community/eslint-plugin-eslint-comments@^3.2.1":
version "3.2.1"
@@ -398,25 +356,25 @@
ignore "^5.2.4"
"@eslint-community/eslint-utils@^4.2.0":
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz#a831e6e468b4b2b5ae42bf658bea015bf10bc518"
- integrity sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==
+ version "4.5.1"
+ resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz#b0fc7e06d0c94f801537fd4237edc2706d3b8e4c"
+ integrity sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==
dependencies:
- eslint-visitor-keys "^3.3.0"
+ eslint-visitor-keys "^3.4.3"
-"@eslint-community/regexpp@^4.4.0":
- version "4.4.0"
- resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.4.0.tgz#3e61c564fcd6b921cb789838631c5ee44df09403"
- integrity sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==
+"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1":
+ version "4.12.1"
+ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
+ integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
-"@eslint/eslintrc@^2.0.2":
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.2.tgz#01575e38707add677cf73ca1589abba8da899a02"
- integrity sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==
+"@eslint/eslintrc@^2.1.4":
+ version "2.1.4"
+ resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+ integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
dependencies:
ajv "^6.12.4"
debug "^4.3.2"
- espree "^9.5.1"
+ espree "^9.6.0"
globals "^13.19.0"
ignore "^5.2.0"
import-fresh "^3.2.1"
@@ -424,35 +382,47 @@
minimatch "^3.1.2"
strip-json-comments "^3.1.1"
-"@eslint/js@8.37.0":
- version "8.37.0"
- resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.37.0.tgz#cf1b5fa24217fe007f6487a26d765274925efa7d"
- integrity sha512-x5vzdtOOGgFVDCUs81QRB2+liax8rFg3+7hqM+QhBG0/G3F1ZsoYl97UrqgHgQ9KKT7G6c4V+aTUCgu/n22v1A==
+"@eslint/js@8.57.1":
+ version "8.57.1"
+ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
+ integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
"@graphql-typed-document-node/core@^3.1.1":
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.1.1.tgz#076d78ce99822258cf813ecc1e7fa460fa74d052"
- integrity sha512-NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg==
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861"
+ integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==
"@hapi/boom@^10.0.0":
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-10.0.0.tgz#3624831d0a26b3378423b246f50eacea16e04a08"
- integrity sha512-1YVs9tLHhypBqqinKQRqh7FUERIolarQApO37OWkzD+z6y6USi871Sv746zBPKcIOBuI6g6y4FrwX87mmJ90Gg==
- dependencies:
- "@hapi/hoek" "10.x.x"
-
-"@hapi/hoek@10.x.x":
version "10.0.1"
- resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-10.0.1.tgz#ee9da297fabc557e1c040a0f44ee89c266ccc306"
- integrity sha512-CvlW7jmOhWzuqOqiJQ3rQVLMcREh0eel4IBnxDx2FAcK8g7qoJRQK4L1CPBASoCY6y8e6zuCy3f2g+HWdkzcMw==
-
-"@humanwhocodes/config-array@^0.11.8":
- version "0.11.8"
- resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
- integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
+ resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-10.0.1.tgz#ebb14688275ae150aa6af788dbe482e6a6062685"
+ integrity sha512-ERcCZaEjdH3OgSJlyjVk8pHIFeus91CjKP3v+MpgBNp5IvGzP2l/bRiD78nqYcKPaZdbKkK5vDBVPd2ohHBlsA==
dependencies:
- "@humanwhocodes/object-schema" "^1.2.1"
- debug "^4.1.1"
+ "@hapi/hoek" "^11.0.2"
+
+"@hapi/hoek@^11.0.2":
+ version "11.0.7"
+ resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-11.0.7.tgz#56a920793e0a42d10e530da9a64cc0d3919c4002"
+ integrity sha512-HV5undWkKzcB4RZUusqOpcgxOaq6VOAH7zhhIr2g3G8NF/MlFO75SjOr2NfuSx0Mh40+1FqCkagKLJRykUWoFQ==
+
+"@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0":
+ version "9.3.0"
+ resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
+ integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==
+
+"@hapi/topo@^5.1.0":
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012"
+ integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==
+ dependencies:
+ "@hapi/hoek" "^9.0.0"
+
+"@humanwhocodes/config-array@^0.13.0":
+ version "0.13.0"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
+ integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==
+ dependencies:
+ "@humanwhocodes/object-schema" "^2.0.3"
+ debug "^4.3.1"
minimatch "^3.0.5"
"@humanwhocodes/module-importer@^1.0.1":
@@ -460,10 +430,22 @@
resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
-"@humanwhocodes/object-schema@^1.2.1":
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
- integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+"@humanwhocodes/object-schema@^2.0.3":
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+ integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+
+"@isaacs/cliui@^8.0.2":
+ version "8.0.2"
+ resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+ integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+ dependencies:
+ string-width "^5.1.2"
+ string-width-cjs "npm:string-width@^4.2.0"
+ strip-ansi "^7.0.1"
+ strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+ wrap-ansi "^8.1.0"
+ wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
"@istanbuljs/load-nyc-config@^1.0.0":
version "1.1.0"
@@ -481,168 +463,168 @@
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
-"@jest/console@^27.2.5":
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.2.5.tgz#bddbf8d41c191f17b52bf0c9e6c0d18605e35d6e"
- integrity sha512-smtlRF9vNKorRMCUtJ+yllIoiY8oFmfFG7xlzsAE76nKEwXNhjPOJIsc7Dv+AUitVt76t+KjIpUP9m98Crn2LQ==
+"@jest/console@^27.5.1":
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.1.tgz#260fe7239602fe5130a94f1aa386eff54b014bba"
+ integrity sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==
dependencies:
- "@jest/types" "^27.2.5"
+ "@jest/types" "^27.5.1"
"@types/node" "*"
chalk "^4.0.0"
- jest-message-util "^27.2.5"
- jest-util "^27.2.5"
+ jest-message-util "^27.5.1"
+ jest-util "^27.5.1"
slash "^3.0.0"
-"@jest/core@^27.2.5":
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.2.5.tgz#854c314708cee0d892ac4f531b9129f00a21ee69"
- integrity sha512-VR7mQ+jykHN4WO3OvusRJMk4xCa2MFLipMS+43fpcRGaYrN1KwMATfVEXif7ccgFKYGy5D1TVXTNE4mGq/KMMA==
+"@jest/core@^27.5.1":
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.1.tgz#267ac5f704e09dc52de2922cbf3af9edcd64b626"
+ integrity sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==
dependencies:
- "@jest/console" "^27.2.5"
- "@jest/reporters" "^27.2.5"
- "@jest/test-result" "^27.2.5"
- "@jest/transform" "^27.2.5"
- "@jest/types" "^27.2.5"
+ "@jest/console" "^27.5.1"
+ "@jest/reporters" "^27.5.1"
+ "@jest/test-result" "^27.5.1"
+ "@jest/transform" "^27.5.1"
+ "@jest/types" "^27.5.1"
"@types/node" "*"
ansi-escapes "^4.2.1"
chalk "^4.0.0"
emittery "^0.8.1"
exit "^0.1.2"
- graceful-fs "^4.2.4"
- jest-changed-files "^27.2.5"
- jest-config "^27.2.5"
- jest-haste-map "^27.2.5"
- jest-message-util "^27.2.5"
- jest-regex-util "^27.0.6"
- jest-resolve "^27.2.5"
- jest-resolve-dependencies "^27.2.5"
- jest-runner "^27.2.5"
- jest-runtime "^27.2.5"
- jest-snapshot "^27.2.5"
- jest-util "^27.2.5"
- jest-validate "^27.2.5"
- jest-watcher "^27.2.5"
+ graceful-fs "^4.2.9"
+ jest-changed-files "^27.5.1"
+ jest-config "^27.5.1"
+ jest-haste-map "^27.5.1"
+ jest-message-util "^27.5.1"
+ jest-regex-util "^27.5.1"
+ jest-resolve "^27.5.1"
+ jest-resolve-dependencies "^27.5.1"
+ jest-runner "^27.5.1"
+ jest-runtime "^27.5.1"
+ jest-snapshot "^27.5.1"
+ jest-util "^27.5.1"
+ jest-validate "^27.5.1"
+ jest-watcher "^27.5.1"
micromatch "^4.0.4"
rimraf "^3.0.0"
slash "^3.0.0"
strip-ansi "^6.0.0"
-"@jest/environment@^27.2.5":
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.2.5.tgz#b85517ccfcec55690c82c56f5a01a3b30c5e3c84"
- integrity sha512-XvUW3q6OUF+54SYFCgbbfCd/BKTwm5b2MGLoc2jINXQLKQDTCS2P2IrpPOtQ08WWZDGzbhAzVhOYta3J2arubg==
+"@jest/environment@^27.5.1":
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.1.tgz#d7425820511fe7158abbecc010140c3fd3be9c74"
+ integrity sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==
dependencies:
- "@jest/fake-timers" "^27.2.5"
- "@jest/types" "^27.2.5"
+ "@jest/fake-timers" "^27.5.1"
+ "@jest/types" "^27.5.1"
"@types/node" "*"
- jest-mock "^27.2.5"
+ jest-mock "^27.5.1"
-"@jest/fake-timers@^27.2.5":
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.2.5.tgz#0c7e5762d7bfe6e269e7b49279b097a52a42f0a0"
- integrity sha512-ZGUb6jg7BgwY+nmO0TW10bc7z7Hl2G/UTAvmxEyZ/GgNFoa31tY9/cgXmqcxnnZ7o5Xs7RAOz3G1SKIj8IVDlg==
+"@jest/fake-timers@^27.5.1":
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz#76979745ce0579c8a94a4678af7a748eda8ada74"
+ integrity sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==
dependencies:
- "@jest/types" "^27.2.5"
+ "@jest/types" "^27.5.1"
"@sinonjs/fake-timers" "^8.0.1"
"@types/node" "*"
- jest-message-util "^27.2.5"
- jest-mock "^27.2.5"
- jest-util "^27.2.5"
+ jest-message-util "^27.5.1"
+ jest-mock "^27.5.1"
+ jest-util "^27.5.1"
-"@jest/globals@^27.2.5":
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.2.5.tgz#4115538f98ed6cee4051a90fdbd0854062902099"
- integrity sha512-naRI537GM+enFVJQs6DcwGYPn/0vgJNb06zGVbzXfDfe/epDPV73hP1vqO37PqSKDeOXM2KInr6ymYbL1HTP7g==
+"@jest/globals@^27.5.1":
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.1.tgz#7ac06ce57ab966566c7963431cef458434601b2b"
+ integrity sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==
dependencies:
- "@jest/environment" "^27.2.5"
- "@jest/types" "^27.2.5"
- expect "^27.2.5"
+ "@jest/environment" "^27.5.1"
+ "@jest/types" "^27.5.1"
+ expect "^27.5.1"
-"@jest/reporters@^27.2.5":
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.2.5.tgz#65198ed1f3f4449e3f656129764dc6c5bb27ebe3"
- integrity sha512-zYuR9fap3Q3mxQ454VWF8I6jYHErh368NwcKHWO2uy2fwByqBzRHkf9j2ekMDM7PaSTWcLBSZyd7NNxR1iHxzQ==
+"@jest/reporters@^27.5.1":
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.1.tgz#ceda7be96170b03c923c37987b64015812ffec04"
+ integrity sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==
dependencies:
"@bcoe/v8-coverage" "^0.2.3"
- "@jest/console" "^27.2.5"
- "@jest/test-result" "^27.2.5"
- "@jest/transform" "^27.2.5"
- "@jest/types" "^27.2.5"
+ "@jest/console" "^27.5.1"
+ "@jest/test-result" "^27.5.1"
+ "@jest/transform" "^27.5.1"
+ "@jest/types" "^27.5.1"
"@types/node" "*"
chalk "^4.0.0"
collect-v8-coverage "^1.0.0"
exit "^0.1.2"
glob "^7.1.2"
- graceful-fs "^4.2.4"
+ graceful-fs "^4.2.9"
istanbul-lib-coverage "^3.0.0"
- istanbul-lib-instrument "^4.0.3"
+ istanbul-lib-instrument "^5.1.0"
istanbul-lib-report "^3.0.0"
istanbul-lib-source-maps "^4.0.0"
- istanbul-reports "^3.0.2"
- jest-haste-map "^27.2.5"
- jest-resolve "^27.2.5"
- jest-util "^27.2.5"
- jest-worker "^27.2.5"
+ istanbul-reports "^3.1.3"
+ jest-haste-map "^27.5.1"
+ jest-resolve "^27.5.1"
+ jest-util "^27.5.1"
+ jest-worker "^27.5.1"
slash "^3.0.0"
source-map "^0.6.0"
string-length "^4.0.1"
terminal-link "^2.0.0"
v8-to-istanbul "^8.1.0"
-"@jest/source-map@^27.0.6":
- version "27.0.6"
- resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.6.tgz#be9e9b93565d49b0548b86e232092491fb60551f"
- integrity sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g==
+"@jest/source-map@^27.5.1":
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.1.tgz#6608391e465add4205eae073b55e7f279e04e8cf"
+ integrity sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==
dependencies:
callsites "^3.0.0"
- graceful-fs "^4.2.4"
+ graceful-fs "^4.2.9"
source-map "^0.6.0"
-"@jest/test-result@^27.2.5":
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.2.5.tgz#e9f73cf6cd5e2cc6eb3105339248dea211f9320e"
- integrity sha512-ub7j3BrddxZ0BdSnM5JCF6cRZJ/7j3wgdX0+Dtwhw2Po+HKsELCiXUTvh+mgS4/89mpnU1CPhZxe2mTvuLPJJg==
+"@jest/test-result@^27.5.1":
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.1.tgz#56a6585fa80f7cdab72b8c5fc2e871d03832f5bb"
+ integrity sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==
dependencies:
- "@jest/console" "^27.2.5"
- "@jest/types" "^27.2.5"
+ "@jest/console" "^27.5.1"
+ "@jest/types" "^27.5.1"
"@types/istanbul-lib-coverage" "^2.0.0"
collect-v8-coverage "^1.0.0"
-"@jest/test-sequencer@^27.2.5":
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.2.5.tgz#ed5ae91c00e623fb719111d58e380395e16cefbb"
- integrity sha512-8j8fHZRfnjbbdMitMAGFKaBZ6YqvFRFJlMJzcy3v75edTOqc7RY65S9JpMY6wT260zAcL2sTQRga/P4PglCu3Q==
+"@jest/test-sequencer@^27.5.1":
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz#4057e0e9cea4439e544c6353c6affe58d095745b"
+ integrity sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==
dependencies:
- "@jest/test-result" "^27.2.5"
- graceful-fs "^4.2.4"
- jest-haste-map "^27.2.5"
- jest-runtime "^27.2.5"
+ "@jest/test-result" "^27.5.1"
+ graceful-fs "^4.2.9"
+ jest-haste-map "^27.5.1"
+ jest-runtime "^27.5.1"
-"@jest/transform@^27.2.5":
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.2.5.tgz#02b08862a56dbedddf0ba3c2eae41e049a250e29"
- integrity sha512-29lRtAHHYGALbZOx343v0zKmdOg4Sb0rsA1uSv0818bvwRhs3TyElOmTVXlrw0v1ZTqXJCAH/cmoDXimBhQOJQ==
+"@jest/transform@^27.5.1":
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.5.1.tgz#6c3501dcc00c4c08915f292a600ece5ecfe1f409"
+ integrity sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==
dependencies:
"@babel/core" "^7.1.0"
- "@jest/types" "^27.2.5"
- babel-plugin-istanbul "^6.0.0"
+ "@jest/types" "^27.5.1"
+ babel-plugin-istanbul "^6.1.1"
chalk "^4.0.0"
convert-source-map "^1.4.0"
fast-json-stable-stringify "^2.0.0"
- graceful-fs "^4.2.4"
- jest-haste-map "^27.2.5"
- jest-regex-util "^27.0.6"
- jest-util "^27.2.5"
+ graceful-fs "^4.2.9"
+ jest-haste-map "^27.5.1"
+ jest-regex-util "^27.5.1"
+ jest-util "^27.5.1"
micromatch "^4.0.4"
- pirates "^4.0.1"
+ pirates "^4.0.4"
slash "^3.0.0"
source-map "^0.6.1"
write-file-atomic "^3.0.0"
-"@jest/types@^27.2.5":
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.2.5.tgz#420765c052605e75686982d24b061b4cbba22132"
- integrity sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==
+"@jest/types@^27.5.1":
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
+ integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==
dependencies:
"@types/istanbul-lib-coverage" "^2.0.0"
"@types/istanbul-reports" "^3.0.0"
@@ -655,6 +637,46 @@
resolved "https://registry.yarnpkg.com/@josephg/resolvable/-/resolvable-1.0.1.tgz#69bc4db754d79e1a2f17a650d3466e038d94a5eb"
integrity sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg==
+"@jridgewell/gen-mapping@^0.3.5":
+ version "0.3.8"
+ resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz#4f0e06362e01362f823d348f1872b08f666d8142"
+ integrity sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==
+ dependencies:
+ "@jridgewell/set-array" "^1.2.1"
+ "@jridgewell/sourcemap-codec" "^1.4.10"
+ "@jridgewell/trace-mapping" "^0.3.24"
+
+"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0":
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+ integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+
+"@jridgewell/set-array@^1.2.1":
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
+ integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
+
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
+ integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
+
+"@jridgewell/trace-mapping@0.3.9":
+ version "0.3.9"
+ resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+ integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
+ dependencies:
+ "@jridgewell/resolve-uri" "^3.0.3"
+ "@jridgewell/sourcemap-codec" "^1.4.10"
+
+"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+ version "0.3.25"
+ resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+ integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
+ dependencies:
+ "@jridgewell/resolve-uri" "^3.1.0"
+ "@jridgewell/sourcemap-codec" "^1.4.14"
+
"@ladjs/country-language@^0.2.1":
version "0.2.1"
resolved "https://registry.yarnpkg.com/@ladjs/country-language/-/country-language-0.2.1.tgz#553f776fa1eb295d0344ed06525a945f94cdafaa"
@@ -664,14 +686,14 @@
underscore.deep "~0.5.1"
"@ladjs/country-language@^1.0.1":
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/@ladjs/country-language/-/country-language-1.0.2.tgz#438facd9ca5312381dccfd0bbd565103d8471e4c"
- integrity sha512-hqexlNFTu0NN4TGu17rO/k2l8XRMLgqLwcY9i3Rabls946vnqee8TT2qbhUJ+CiiaE0ShC9yKPdcKJ1veNMmJA==
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/@ladjs/country-language/-/country-language-1.0.3.tgz#1131b524c6242567dfc4ce61401ff7a62e91b155"
+ integrity sha512-FJROu9/hh4eqVAGDyfL8vpv6Vb0qKHX1ozYLRZ+beUzD5xFf+3r0J+SVIWKviEa7W524Qvqou+ta1WrsRgzxGw==
"@ladjs/i18n@^8.0.1":
- version "8.0.1"
- resolved "https://registry.yarnpkg.com/@ladjs/i18n/-/i18n-8.0.1.tgz#fb6ae221b627e7a4d499f336a09f03ded2ab523b"
- integrity sha512-7+C6IIf/THrrAhSPPlmd3DIl6Ias7YFr37MeIUxXaipLxNcMnQ7oHIRnznwJ78ZwnhcViTa27rfshbtaH9uD5g==
+ version "8.0.3"
+ resolved "https://registry.yarnpkg.com/@ladjs/i18n/-/i18n-8.0.3.tgz#e2abb0726ff24fd9a8d6e37d5ca351b079974069"
+ integrity sha512-QYeYGz6uJaH41ZVyNoI2Lt2NyfcpKwpDIBMx3psaE1NBJn8P+jk1m0EIjphfYvnRMnl/QyBpn98FfcTUjTkuBw==
dependencies:
"@hapi/boom" "^10.0.0"
"@ladjs/country-language" "^1.0.1"
@@ -686,31 +708,31 @@
tlds "^1.231.0"
"@messageformat/core@^3.0.0":
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/@messageformat/core/-/core-3.0.1.tgz#191e12cf9643704d1fd32e592a3fbdc194dd588e"
- integrity sha512-yxj2+0e46hcZqJfNf0ZYbC2q6WlcGoh4g11mCyRtTueR0AD8F9z4JMYAS1aOiFG8Vl1LZg/h5hZHKmWTAyZq8g==
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/@messageformat/core/-/core-3.4.0.tgz#2814c23383dec7bddf535d54f2a03e410165ca9f"
+ integrity sha512-NgCFubFFIdMWJGN5WuQhHCNmzk7QgiVfrViFxcS99j7F5dDS5EP6raR54I+2ydhe4+5/XTn/YIEppFaqqVWHsw==
dependencies:
"@messageformat/date-skeleton" "^1.0.0"
"@messageformat/number-skeleton" "^1.0.0"
- "@messageformat/parser" "^5.0.0"
+ "@messageformat/parser" "^5.1.0"
"@messageformat/runtime" "^3.0.1"
make-plural "^7.0.0"
safe-identifier "^0.4.1"
"@messageformat/date-skeleton@^1.0.0":
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/@messageformat/date-skeleton/-/date-skeleton-1.0.1.tgz#980b8babe21a11433b6e1e8f6dc8c4cae4f5f56b"
- integrity sha512-jPXy8fg+WMPIgmGjxSlnGJn68h/2InfT0TNSkVx0IGXgp4ynnvYkbZ51dGWmGySEK+pBiYUttbQdu5XEqX5CRg==
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/@messageformat/date-skeleton/-/date-skeleton-1.1.0.tgz#3bad068cbf5873d14592cfc7a73dd4d8615e2739"
+ integrity sha512-rmGAfB1tIPER+gh3p/RgA+PVeRE/gxuQ2w4snFWPF5xtb5mbWR7Cbw7wCOftcUypbD6HVoxrVdyyghPm3WzP5A==
"@messageformat/number-skeleton@^1.0.0":
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/@messageformat/number-skeleton/-/number-skeleton-1.1.0.tgz#eb636738da8abbd35ccbeb84f7d84d63302aeb61"
- integrity sha512-F0Io+GOSvFFxvp9Ze3L5kAoZ2NnOAT0Mr/jpGNd3fqo8A0t4NxNIAcCdggtl2B/gN2ErkIKSBVPrF7xcW1IGvA==
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@messageformat/number-skeleton/-/number-skeleton-1.2.0.tgz#e7c245c41a1b2722bc59dad68f4d454f761bc9b4"
+ integrity sha512-xsgwcL7J7WhlHJ3RNbaVgssaIwcEyFkBqxHdcdaiJzwTZAWEOD8BuUFxnxV9k5S0qHN3v/KzUpq0IUpjH1seRg==
-"@messageformat/parser@^5.0.0":
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/@messageformat/parser/-/parser-5.0.0.tgz#5737e69d7d4a469998b527710f1891174fc1b262"
- integrity sha512-WiDKhi8F0zQaFU8cXgqq69eYFarCnTVxKcvhAONufKf0oUxbqLMW6JX6rV4Hqh+BEQWGyKKKHY4g1XA6bCLylA==
+"@messageformat/parser@^5.1.0":
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/@messageformat/parser/-/parser-5.1.1.tgz#ca7d6c18e9f3f6b6bc984a465dac16da00106055"
+ integrity sha512-3p0YRGCcTUCYvBKLIxtDDyrJ0YijGIwrTRu1DT8gIviIDZru8H23+FkY6MJBzM1n9n20CiM4VeDYuBsrrwnLjg==
dependencies:
moo "^0.5.1"
@@ -721,6 +743,15 @@
dependencies:
make-plural "^7.0.0"
+"@napi-rs/wasm-runtime@^0.2.7":
+ version "0.2.7"
+ resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.7.tgz#288f03812a408bc53c2c3686c65f38fe90f295eb"
+ integrity sha512-5yximcFK5FNompXfJFoWanu5l8v1hNGqNHh9du1xETp9HWk/B/PzvchX55WYOPaIeNglG8++68AAiauBAtbnzw==
+ dependencies:
+ "@emnapi/core" "^1.3.1"
+ "@emnapi/runtime" "^1.3.1"
+ "@tybys/wasm-util" "^0.9.0"
+
"@nodelib/fs.scandir@2.1.5":
version "2.1.5"
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -742,22 +773,77 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"
-"@pkgr/utils@^2.3.1":
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.3.1.tgz#0a9b06ffddee364d6642b3cd562ca76f55b34a03"
- integrity sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==
+"@nolyfill/is-core-module@1.0.39":
+ version "1.0.39"
+ resolved "https://registry.yarnpkg.com/@nolyfill/is-core-module/-/is-core-module-1.0.39.tgz#3dc35ba0f1e66b403c00b39344f870298ebb1c8e"
+ integrity sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==
+
+"@oxc-resolver/binding-darwin-arm64@5.0.0":
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-5.0.0.tgz#c99057f297954f197217e75d63ff92d4514e354a"
+ integrity sha512-zwHAf+owoxSWTDD4dFuwW+FkpaDzbaL30H5Ltocb+RmLyg4WKuteusRLKh5Y8b/cyu7UzhxM0haIqQjyqA1iuA==
+
+"@oxc-resolver/binding-darwin-x64@5.0.0":
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-5.0.0.tgz#530cf02f3a3833a3932fc22d732d757cdc7e3cbf"
+ integrity sha512-1lS3aBNVjVQKBvZdHm13+8tSjvu2Tl1Cv4FnUyMYxqx6+rsom2YaOylS5LhDUwfZu0zAgpLMwK6kGpF/UPncNg==
+
+"@oxc-resolver/binding-freebsd-x64@5.0.0":
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-5.0.0.tgz#4a10430b9375f17ea5c5f8a4439aa2901dcaa5c2"
+ integrity sha512-q9sRd68wC1/AJ0eu6ClhxlklVfe8gH4wrUkSyEbIYTZ8zY5yjsLY3fpqqsaCvWJUx65nW+XtnAxCGCi5AXr1Mw==
+
+"@oxc-resolver/binding-linux-arm-gnueabihf@5.0.0":
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-5.0.0.tgz#f082550d0ff62e772657ebccea8d2f7751d2130b"
+ integrity sha512-catYavWsvqViYnCveQjhrK6yVYDEPFvIOgGLxnz5r2dcgrjpmquzREoyss0L2QG/J5HTTbwqwZ1kk+g56hE/1A==
+
+"@oxc-resolver/binding-linux-arm64-gnu@5.0.0":
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-5.0.0.tgz#d016b164f46548759454e58a42289d4e45030e69"
+ integrity sha512-l/0pWoQM5kVmJLg4frQ1mKZOXgi0ex/hzvFt8E4WK2ifXr5JgKFUokxsb/oat7f5YzdJJh5r9p+qS/t3dA26Aw==
+
+"@oxc-resolver/binding-linux-arm64-musl@5.0.0":
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-5.0.0.tgz#c9ce09343c877e1000a8e2b2b04694d94ae5a918"
+ integrity sha512-bx0oz/oaAW4FGYqpIIxJCnmgb906YfMhTEWCJvYkxjpEI8VKLJEL3PQevYiqDq36SA0yRLJ/sQK2fqry8AFBfA==
+
+"@oxc-resolver/binding-linux-x64-gnu@5.0.0":
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-5.0.0.tgz#10476acfa3e8e46331820a629914d351df0ccf8c"
+ integrity sha512-4PH++qbSIhlRsFYdN1P9neDov4OGhTGo5nbQ1D7AL6gWFLo3gdZTc00FM2y8JjeTcPWEXkViZuwpuc0w5i6qHg==
+
+"@oxc-resolver/binding-linux-x64-musl@5.0.0":
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-5.0.0.tgz#5b9383bc12c2c394f228b7771469c8aac3cb7bff"
+ integrity sha512-mLfQFpX3/5y9oWi0b+9FbWDkL2hM0Y29653beCHiHxAdGyVgb2DsJbK74WkMTwtSz9by8vyBh8jGPZcg1yLZbQ==
+
+"@oxc-resolver/binding-wasm32-wasi@5.0.0":
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-5.0.0.tgz#cb7ad0e966b3d746f2c8ea98660a2558d2db9057"
+ integrity sha512-uEhsAZSo65qsRi6+IfBTEUUFbjg7T2yruJeLYpFfEATpm3ory5Mgo5vx3L0c2/Cz1OUZXBgp3A8x6VMUB2jT2A==
dependencies:
- cross-spawn "^7.0.3"
- is-glob "^4.0.3"
- open "^8.4.0"
- picocolors "^1.0.0"
- tiny-glob "^0.2.9"
- tslib "^2.4.0"
+ "@napi-rs/wasm-runtime" "^0.2.7"
+
+"@oxc-resolver/binding-win32-arm64-msvc@5.0.0":
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-5.0.0.tgz#44422b316f744dbd904254ee4fbdd2cd0444f613"
+ integrity sha512-8DbSso9Jp1ns8AYuZFXdRfAcdJrzZwkFm/RjPuvAPTENsm685dosBF8G6gTHQlHvULnk6o3sa9ygZaTGC/UoEw==
+
+"@oxc-resolver/binding-win32-x64-msvc@5.0.0":
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-5.0.0.tgz#1575b4aaf6f46faf5b95003be2a5dfd8ea1e10e0"
+ integrity sha512-ylppfPEg63NuRXOPNsXFlgyl37JrtRn0QMO26X3K3Ytp5HtLrMreQMGVtgr30e1l2YmAWqhvmKlCryOqzGPD/g==
+
+"@pkgjs/parseargs@^0.11.0":
+ version "0.11.0"
+ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+ integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
- integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78=
+ integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==
"@protobufjs/base64@^1.1.2":
version "1.1.2"
@@ -772,12 +858,12 @@
"@protobufjs/eventemitter@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
- integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A=
+ integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==
"@protobufjs/fetch@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
- integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=
+ integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==
dependencies:
"@protobufjs/aspromise" "^1.1.1"
"@protobufjs/inquire" "^1.1.0"
@@ -785,27 +871,40 @@
"@protobufjs/float@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
- integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=
+ integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==
"@protobufjs/inquire@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
- integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=
+ integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==
"@protobufjs/path@^1.1.2":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
- integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=
+ integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==
"@protobufjs/pool@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
- integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=
+ integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==
"@protobufjs/utf8@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
- integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
+ integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
+
+"@rtsao/scc@^1.1.0":
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
+ integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
+
+"@selderee/plugin-htmlparser2@^0.11.0":
+ version "0.11.0"
+ resolved "https://registry.yarnpkg.com/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.11.0.tgz#d5b5e29a7ba6d3958a1972c7be16f4b2c188c517"
+ integrity sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==
+ dependencies:
+ domhandler "^5.0.3"
+ selderee "^0.11.0"
"@selderee/plugin-htmlparser2@^0.6.0":
version "0.6.0"
@@ -815,22 +914,34 @@
domhandler "^4.2.0"
selderee "^0.6.0"
-"@sindresorhus/is@^0.14.0":
- version "0.14.0"
- resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
- integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+"@sideway/address@^4.1.5":
+ version "4.1.5"
+ resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5"
+ integrity sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==
+ dependencies:
+ "@hapi/hoek" "^9.0.0"
+
+"@sideway/formula@^3.0.1":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
+ integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
+
+"@sideway/pinpoint@^2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
+ integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
"@sinonjs/commons@^1.7.0":
- version "1.8.3"
- resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
- integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
+ version "1.8.6"
+ resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9"
+ integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==
dependencies:
type-detect "4.0.8"
"@sinonjs/fake-timers@^8.0.1":
- version "8.0.1"
- resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.0.1.tgz#1c1c9a91419f804e59ae8df316a07dd1c3a76b94"
- integrity sha512-AU7kwFxreVd6OAXcAFlKSmZquiRUU0FvYm44k1Y1QbK7Co4m0aqfGMhjykIeQp/H6rcl+nFmj0zfdUcGVs9Dew==
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7"
+ integrity sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==
dependencies:
"@sinonjs/commons" "^1.7.0"
@@ -839,82 +950,82 @@
resolved "https://registry.yarnpkg.com/@sqltools/formatter/-/formatter-1.2.5.tgz#3abc203c79b8c3e90fd6c156a0c62d5403520e12"
integrity sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==
-"@szmarczak/http-timer@^1.1.2":
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
- integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
- dependencies:
- defer-to-connect "^1.0.1"
-
"@tootallnate/once@1":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
"@tsconfig/node10@^1.0.7":
- version "1.0.8"
- resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9"
- integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
+ integrity sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==
"@tsconfig/node12@^1.0.7":
- version "1.0.9"
- resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c"
- integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+ integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
"@tsconfig/node14@^1.0.0":
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2"
- integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+ integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
"@tsconfig/node16@^1.0.2":
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
- integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
+ integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
+
+"@tybys/wasm-util@^0.9.0":
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.9.0.tgz#3e75eb00604c8d6db470bf18c37b7d984a0e3355"
+ integrity sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==
+ dependencies:
+ tslib "^2.4.0"
"@types/accepts@*", "@types/accepts@^1.3.5":
- version "1.3.5"
- resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575"
- integrity sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==
+ version "1.3.7"
+ resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.7.tgz#3b98b1889d2b2386604c2bbbe62e4fb51e95b265"
+ integrity sha512-Pay9fq2lM2wXPWbteBsRAGiWH2hig4ZE2asK+mm7kUzlxRTfL961rj89I6zV/E3PcIkDqyuBEcMxFT7rccugeQ==
dependencies:
"@types/node" "*"
"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14":
- version "7.1.16"
- resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.16.tgz#bc12c74b7d65e82d29876b5d0baf5c625ac58702"
- integrity sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==
+ version "7.20.5"
+ resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
+ integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==
dependencies:
- "@babel/parser" "^7.1.0"
- "@babel/types" "^7.0.0"
+ "@babel/parser" "^7.20.7"
+ "@babel/types" "^7.20.7"
"@types/babel__generator" "*"
"@types/babel__template" "*"
"@types/babel__traverse" "*"
"@types/babel__generator@*":
- version "7.6.3"
- resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz#f456b4b2ce79137f768aa130d2423d2f0ccfaba5"
- integrity sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==
+ version "7.6.8"
+ resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.8.tgz#f836c61f48b1346e7d2b0d93c6dacc5b9535d3ab"
+ integrity sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==
dependencies:
"@babel/types" "^7.0.0"
"@types/babel__template@*":
- version "7.4.1"
- resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
- integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.4.tgz#5672513701c1b2199bc6dad636a9d7491586766f"
+ integrity sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==
dependencies:
"@babel/parser" "^7.1.0"
"@babel/types" "^7.0.0"
"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
- version "7.14.2"
- resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43"
- integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==
+ version "7.20.6"
+ resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.6.tgz#8dc9f0ae0f202c08d8d4dab648912c8d6038e3f7"
+ integrity sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==
dependencies:
- "@babel/types" "^7.3.0"
+ "@babel/types" "^7.20.7"
"@types/body-parser@*":
- version "1.19.1"
- resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz#0c0174c42a7d017b818303d4b5d969cb0b75929c"
- integrity sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg==
+ version "1.19.5"
+ resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4"
+ integrity sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==
dependencies:
"@types/connect" "*"
"@types/node" "*"
@@ -928,21 +1039,21 @@
"@types/node" "*"
"@types/connect@*":
- version "3.4.35"
- resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
- integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
+ version "3.4.38"
+ resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.38.tgz#5ba7f3bc4fbbdeaff8dded952e5ff2cc53f8d858"
+ integrity sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==
dependencies:
"@types/node" "*"
"@types/content-disposition@*":
- version "0.5.4"
- resolved "https://registry.yarnpkg.com/@types/content-disposition/-/content-disposition-0.5.4.tgz#de48cf01c79c9f1560bcfd8ae43217ab028657f8"
- integrity sha512-0mPF08jn9zYI0n0Q/Pnz7C4kThdSt+6LD4amsrYDDpgBfrVWa3TcCOxKX1zkGgYniGagRv8heN2cbh+CAn+uuQ==
+ version "0.5.8"
+ resolved "https://registry.yarnpkg.com/@types/content-disposition/-/content-disposition-0.5.8.tgz#6742a5971f490dc41e59d277eee71361fea0b537"
+ integrity sha512-QVSSvno3dE0MgO76pJhmv4Qyi/j0Yk9pBp0Y7TJ2Tlj+KCgJWY6qX7nnxCOLkZ3VYRSIk1WTxCvwUSdx6CCLdg==
"@types/cookies@*":
- version "0.7.7"
- resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.7.tgz#7a92453d1d16389c05a5301eef566f34946cfd81"
- integrity sha512-h7BcvPUogWbKCzBR2lY4oqaZbO3jXZksexYJVFvkrFeLgbZjQkU4x8pRq6eg2MHXQhY0McQdqmmsxRWlVAHooA==
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.9.0.tgz#a2290cfb325f75f0f28720939bee854d4142aee2"
+ integrity sha512-40Zk8qR147RABiQ7NQnBzWzDcjKzNrntB5BAmeGCb2p/MIyOE+4BVvc17wumsUqUw00bJYqoXFHYygQnEFh4/Q==
dependencies:
"@types/connect" "*"
"@types/express" "*"
@@ -955,30 +1066,51 @@
integrity sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==
"@types/email-templates@^10.0.1":
- version "10.0.1"
- resolved "https://registry.yarnpkg.com/@types/email-templates/-/email-templates-10.0.1.tgz#88f218564a6341092f447fbe110047f6bf3e955a"
- integrity sha512-IHdgtoOUfMB4t5y5wgm8G0i2/U90GeJPxIEAViMaLlJPCJzaYSlVHXI8bx3qbgbD6gxyOsSRyrFvBSTgNEQc+g==
+ version "10.0.4"
+ resolved "https://registry.yarnpkg.com/@types/email-templates/-/email-templates-10.0.4.tgz#3181fd540e76e6b90b8b3e0a5a1afbc803ef7797"
+ integrity sha512-8O2bdGPO6RYgH2DrnFAcuV++s+8KNA5e2Erjl6UxgKRVsBH9zXu2YLrLyOBRMn2VyEYmzgF+6QQUslpVhj0y/g==
dependencies:
"@types/html-to-text" "*"
"@types/nodemailer" "*"
juice "^8.0.0"
-"@types/express-serve-static-core@^4.17.18", "@types/express-serve-static-core@^4.17.21":
- version "4.17.24"
- resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07"
- integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA==
+"@types/express-serve-static-core@^4.17.21", "@types/express-serve-static-core@^4.17.33":
+ version "4.19.6"
+ resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz#e01324c2a024ff367d92c66f48553ced0ab50267"
+ integrity sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==
dependencies:
"@types/node" "*"
"@types/qs" "*"
"@types/range-parser" "*"
+ "@types/send" "*"
-"@types/express@*", "@types/express@^4.17.12":
- version "4.17.13"
- resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
- integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
+"@types/express-serve-static-core@^5.0.0":
+ version "5.0.6"
+ resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-5.0.6.tgz#41fec4ea20e9c7b22f024ab88a95c6bb288f51b8"
+ integrity sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==
+ dependencies:
+ "@types/node" "*"
+ "@types/qs" "*"
+ "@types/range-parser" "*"
+ "@types/send" "*"
+
+"@types/express@*":
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/@types/express/-/express-5.0.0.tgz#13a7d1f75295e90d19ed6e74cab3678488eaa96c"
+ integrity sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ==
dependencies:
"@types/body-parser" "*"
- "@types/express-serve-static-core" "^4.17.18"
+ "@types/express-serve-static-core" "^5.0.0"
+ "@types/qs" "*"
+ "@types/serve-static" "*"
+
+"@types/express@^4.17.12":
+ version "4.17.21"
+ resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
+ integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
+ dependencies:
+ "@types/body-parser" "*"
+ "@types/express-serve-static-core" "^4.17.33"
"@types/qs" "*"
"@types/serve-static" "*"
@@ -987,7 +1119,7 @@
resolved "https://registry.yarnpkg.com/@types/faker/-/faker-5.5.9.tgz#588ede92186dc557bff8341d294335d50d255f0c"
integrity sha512-uCx6mP3UY5SIO14XlspxsGjgaemrxpssJI0Ol+GfhxtcKpv9pgRZYsS4eeKeHVLje6Qtc8lGszuBI461+gVZBA==
-"@types/fs-capacitor@*":
+"@types/fs-capacitor@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@types/fs-capacitor/-/fs-capacitor-2.0.0.tgz#17113e25817f584f58100fb7a08eed288b81956e"
integrity sha512-FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ==
@@ -995,93 +1127,100 @@
"@types/node" "*"
"@types/glob@^7.1.3":
- version "7.1.4"
- resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672"
- integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+ integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
dependencies:
"@types/minimatch" "*"
"@types/node" "*"
"@types/graceful-fs@^4.1.2":
- version "4.1.5"
- resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
- integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
+ version "4.1.9"
+ resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.9.tgz#2a06bc0f68a20ab37b3e36aa238be6abdf49e8b4"
+ integrity sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==
dependencies:
"@types/node" "*"
"@types/html-to-text@*":
- version "8.1.1"
- resolved "https://registry.yarnpkg.com/@types/html-to-text/-/html-to-text-8.1.1.tgz#0c5573207c14f618f24da5a2910c510285573094"
- integrity sha512-QFcqfc7TiVbvIX8Fc2kWUxakruI1Ay6uitaGCYHzI5M0WHQROV5D2XeSaVrK0FmvssivXum4yERVnJsiuH61Ww==
+ version "9.0.4"
+ resolved "https://registry.yarnpkg.com/@types/html-to-text/-/html-to-text-9.0.4.tgz#4a83dd8ae8bfa91457d0b1ffc26f4d0537eff58c"
+ integrity sha512-pUY3cKH/Nm2yYrEmDlPR1mR7yszjGx4DrwPjQ702C4/D5CwHuZTgZdIdwPkRbcuhs7BAh2L5rg3CL5cbRiGTCQ==
"@types/http-assert@*":
- version "1.5.3"
- resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.3.tgz#ef8e3d1a8d46c387f04ab0f2e8ab8cb0c5078661"
- integrity sha512-FyAOrDuQmBi8/or3ns4rwPno7/9tJTijVW6aQQjK02+kOQ8zmoNg2XJtAuQhvQcy1ASJq38wirX5//9J1EqoUA==
+ version "1.5.6"
+ resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.6.tgz#b6b657c38a2350d21ce213139f33b03b2b5fa431"
+ integrity sha512-TTEwmtjgVbYAzZYWyeHPrrtWnfVkm8tQkP8P21uQifPgMRgjrow3XDEYqucuC8SKZJT7pUnhU/JymvjggxO9vw==
"@types/http-errors@*":
- version "1.8.1"
- resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.1.tgz#e81ad28a60bee0328c6d2384e029aec626f1ae67"
- integrity sha512-e+2rjEwK6KDaNOm5Aa9wNGgyS9oSZU/4pfSMMPYNOfjvFI0WVXm29+ITRFr6aKDvvKo7uU1jV68MW4ScsfDi7Q==
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f"
+ integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==
"@types/i18n@^0.13.4":
- version "0.13.4"
- resolved "https://registry.yarnpkg.com/@types/i18n/-/i18n-0.13.4.tgz#fe3d27d08337f9d4a972d1f460d1471d6f79e163"
- integrity sha512-PN4ZsplbpHZ2eaYixFNWkZKN51pcB02K2UKvqHVbrzq2jTO0sChPMuKKYAW1ZbElyHUvPgFeYsz9rqktChGyMw==
+ version "0.13.12"
+ resolved "https://registry.yarnpkg.com/@types/i18n/-/i18n-0.13.12.tgz#b457715766c63d8ffdfc51dd4fc1f72728e9d38f"
+ integrity sha512-iAd2QjKh+0ToBXocmCS3m38GskiaGzmSV1MTQz2GaOraqSqBiLf46J7u3EGINl+st+Uk4lO3OL7QyIjTJlrWIg==
"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
- integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
+ integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
"@types/istanbul-lib-report@*":
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
- integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz#53047614ae72e19fc0401d872de3ae2b4ce350bf"
+ integrity sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==
dependencies:
"@types/istanbul-lib-coverage" "*"
"@types/istanbul-reports@^3.0.0":
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
- integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54"
+ integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==
dependencies:
"@types/istanbul-lib-report" "*"
"@types/jest@^27.0.2":
- version "27.0.2"
- resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.0.2.tgz#ac383c4d4aaddd29bbf2b916d8d105c304a5fcd7"
- integrity sha512-4dRxkS/AFX0c5XW6IPMNOydLn2tEhNhJV7DnYK+0bjoJZ+QTmfucBlihX7aoEsh/ocYtkLC73UbnBXBXIxsULA==
+ version "27.5.2"
+ resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.5.2.tgz#ec49d29d926500ffb9fd22b84262e862049c026c"
+ integrity sha512-mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA==
dependencies:
- jest-diff "^27.0.0"
+ jest-matcher-utils "^27.0.0"
pretty-format "^27.0.0"
+"@types/joi@^17.2.3":
+ version "17.2.3"
+ resolved "https://registry.yarnpkg.com/@types/joi/-/joi-17.2.3.tgz#b7768ed9d84f1ebd393328b9f97c1cf3d2b94798"
+ integrity sha512-dGjs/lhrWOa+eO0HwgxCSnDm5eMGCsXuvLglMghJq32F6q5LyyNuXb41DHzrg501CKNOSSAHmfB7FDGeUnDmzw==
+ dependencies:
+ joi "*"
+
"@types/json-schema@^7.0.9":
- version "7.0.11"
- resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
- integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+ version "7.0.15"
+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+ integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
"@types/json5@^0.0.29":
version "0.0.29"
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
- integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+ integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
"@types/keygrip@*":
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/@types/keygrip/-/keygrip-1.0.2.tgz#513abfd256d7ad0bf1ee1873606317b33b1b2a72"
- integrity sha512-GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw==
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/@types/keygrip/-/keygrip-1.0.6.tgz#1749535181a2a9b02ac04a797550a8787345b740"
+ integrity sha512-lZuNAY9xeJt7Bx4t4dx0rYCDqGPW8RXhQZK1td7d4H6E9zYbLoOtjBvfwdTKpsyxQI/2jv+armjX/RW+ZNpXOQ==
"@types/koa-compose@*":
- version "3.2.5"
- resolved "https://registry.yarnpkg.com/@types/koa-compose/-/koa-compose-3.2.5.tgz#85eb2e80ac50be95f37ccf8c407c09bbe3468e9d"
- integrity sha512-B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ==
+ version "3.2.8"
+ resolved "https://registry.yarnpkg.com/@types/koa-compose/-/koa-compose-3.2.8.tgz#dec48de1f6b3d87f87320097686a915f1e954b57"
+ integrity sha512-4Olc63RY+MKvxMwVknCUDhRQX1pFQoBZ/lXcRLP69PQkEpze/0cr8LNqJQe5NFb/b19DWi2a5bTi2VAlQzhJuA==
dependencies:
"@types/koa" "*"
"@types/koa@*":
- version "2.13.4"
- resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.4.tgz#10620b3f24a8027ef5cbae88b393d1b31205726b"
- integrity sha512-dfHYMfU+z/vKtQB7NUrthdAEiSvnLebvBjwHtfFmpZmB7em2N3WVQdHgnFq+xvyVgxW5jKDmjWfLD3lw4g4uTw==
+ version "2.15.0"
+ resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.15.0.tgz#eca43d76f527c803b491731f95df575636e7b6f2"
+ integrity sha512-7QFsywoE5URbuVnG3loe03QXuGajrnotr3gQkXcEBShORai23MePfFYdhz90FEtBBpkyIYQbVD+evKtloCgX3g==
dependencies:
"@types/accepts" "*"
"@types/content-disposition" "*"
@@ -1093,43 +1232,58 @@
"@types/node" "*"
"@types/lodash.clonedeep@^4.5.6":
- version "4.5.6"
- resolved "https://registry.yarnpkg.com/@types/lodash.clonedeep/-/lodash.clonedeep-4.5.6.tgz#3b6c40a0affe0799a2ce823b440a6cf33571d32b"
- integrity sha512-cE1jYr2dEg1wBImvXlNtp0xDoS79rfEdGozQVgliDZj1uERH4k+rmEMTudP9b4VQ8O6nRb5gPqft0QzEQGMQgA==
+ version "4.5.9"
+ resolved "https://registry.yarnpkg.com/@types/lodash.clonedeep/-/lodash.clonedeep-4.5.9.tgz#ea48276c7cc18d080e00bb56cf965bcceb3f0fc1"
+ integrity sha512-19429mWC+FyaAhOLzsS8kZUsI+/GmBAQ0HFiCPsKGU+7pBXOQWhyrY6xNNDwUSX8SMZMJvuFVMF9O5dQOlQK9Q==
dependencies:
"@types/lodash" "*"
"@types/lodash@*":
- version "4.14.178"
- resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8"
- integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==
+ version "4.17.16"
+ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.16.tgz#94ae78fab4a38d73086e962d0b65c30d816bfb0a"
+ integrity sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==
"@types/long@^4.0.0":
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"
- integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
+ integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
"@types/mime@^1":
- version "1.3.2"
- resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
- integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
+ version "1.3.5"
+ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690"
+ integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==
-"@types/minimatch@*", "@types/minimatch@^3.0.3":
+"@types/minimatch@*":
+ version "5.1.2"
+ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
+ integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
+
+"@types/minimatch@^3.0.3":
version "3.0.5"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
"@types/mysql@^2.15.8":
- version "2.15.21"
- resolved "https://registry.yarnpkg.com/@types/mysql/-/mysql-2.15.21.tgz#7516cba7f9d077f980100c85fd500c8210bd5e45"
- integrity sha512-NPotx5CVful7yB+qZbWtXL2fA4e7aEHkihHLjklc6ID8aq7bhguHgeIoC1EmSNTAuCgI6ZXrjt2ZSaXnYX0EUg==
+ version "2.15.26"
+ resolved "https://registry.yarnpkg.com/@types/mysql/-/mysql-2.15.26.tgz#f0de1484b9e2354d587e7d2bd17a873cc8300836"
+ integrity sha512-DSLCOXhkvfS5WNNPbfn2KdICAmk8lLc+/PNvnPnF7gOdMZCxopXduqv0OQ13y/yA/zXTSikZZqVgybUxOEg6YQ==
dependencies:
"@types/node" "*"
-"@types/node@*", "@types/node@^16.10.3":
- version "16.10.3"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.3.tgz#7a8f2838603ea314d1d22bb3171d899e15c57bd5"
- integrity sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ==
+"@types/node-fetch@^2.6.4":
+ version "2.6.12"
+ resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.12.tgz#8ab5c3ef8330f13100a7479e2cd56d3386830a03"
+ integrity sha512-8nneRWKCg3rMtF69nLQJnOYUcbafYeFSjqkw3jCRLsqkWFlHaoQrr5mXmofFGOx3DKn7UfmBMyov8ySvLRVldA==
+ dependencies:
+ "@types/node" "*"
+ form-data "^4.0.0"
+
+"@types/node@*":
+ version "22.13.10"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-22.13.10.tgz#df9ea358c5ed991266becc3109dc2dc9125d77e4"
+ integrity sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==
+ dependencies:
+ undici-types "~6.20.0"
"@types/node@^10.1.0":
version "10.17.60"
@@ -1137,79 +1291,83 @@
integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
"@types/node@^14.11.2":
- version "14.17.21"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.21.tgz#6359d8cf73481e312a43886fa50afc70ce5592c6"
- integrity sha512-zv8ukKci1mrILYiQOwGSV4FpkZhyxQtuFWGya2GujWg+zVAeRQ4qbaMmWp9vb9889CFA8JECH7lkwCL6Ygg8kA==
+ version "14.18.63"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b"
+ integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
-"@types/nodemailer@*":
- version "6.4.6"
- resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.6.tgz#ce21b4b474a08f672f182e15982b7945dde1f288"
- integrity sha512-pD6fL5GQtUKvD2WnPmg5bC2e8kWCAPDwMPmHe/ohQbW+Dy0EcHgZ2oCSuPlWNqk74LS5BVMig1SymQbFMPPK3w==
+"@types/node@^17.0.21":
+ version "17.0.45"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
+ integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
+
+"@types/node@^18.11.18":
+ version "18.19.80"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.80.tgz#6d6008e8920dddcd23f9dd33da24684ef57d487c"
+ integrity sha512-kEWeMwMeIvxYkeg1gTc01awpwLbfMRZXdIhwRcakd/KlK53jmRC26LqcbIt7fnAQTu5GzlnWmzA3H6+l1u6xxQ==
dependencies:
- "@types/node" "*"
+ undici-types "~5.26.4"
-"@types/nodemailer@^6.4.4":
- version "6.4.4"
- resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.4.tgz#c265f7e7a51df587597b3a49a023acaf0c741f4b"
- integrity sha512-Ksw4t7iliXeYGvIQcSIgWQ5BLuC/mljIEbjf615svhZL10PE9t+ei8O9gDaD3FPCasUJn9KTLwz2JFJyiiyuqw==
+"@types/nodemailer@*", "@types/nodemailer@^6.4.4":
+ version "6.4.17"
+ resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.17.tgz#5c82a42aee16a3dd6ea31446a1bd6a447f1ac1a4"
+ integrity sha512-I9CCaIp6DTldEg7vyUTZi8+9Vo0hi1/T8gv3C89yk1rSAAzoKQ8H8ki/jBYJSFoH/BisgLP8tkZMlQ91CIquww==
dependencies:
"@types/node" "*"
"@types/prettier@^2.1.5":
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.1.tgz#e1303048d5389563e130f5bdd89d37a99acb75eb"
- integrity sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==
+ version "2.7.3"
+ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f"
+ integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==
"@types/qs@*":
- version "6.9.7"
- resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
- integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
+ version "6.9.18"
+ resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.18.tgz#877292caa91f7c1b213032b34626505b746624c2"
+ integrity sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==
"@types/range-parser@*":
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
- integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
+ version "1.2.7"
+ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb"
+ integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
-"@types/semver@^7.3.12":
- version "7.3.13"
- resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
- integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
+"@types/semver@^7.3.12", "@types/semver@^7.3.3":
+ version "7.5.8"
+ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
+ integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
-"@types/semver@^7.3.3":
- version "7.3.8"
- resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.8.tgz#508a27995498d7586dcecd77c25e289bfaf90c59"
- integrity sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now==
-
-"@types/serve-static@*":
- version "1.13.10"
- resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
- integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
+"@types/send@*":
+ version "0.17.4"
+ resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a"
+ integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==
dependencies:
"@types/mime" "^1"
"@types/node" "*"
+"@types/serve-static@*":
+ version "1.15.7"
+ resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.7.tgz#22174bbd74fb97fe303109738e9b5c2f3064f714"
+ integrity sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==
+ dependencies:
+ "@types/http-errors" "*"
+ "@types/node" "*"
+ "@types/send" "*"
+
"@types/sodium-native@^2.3.5":
- version "2.3.5"
- resolved "https://registry.yarnpkg.com/@types/sodium-native/-/sodium-native-2.3.5.tgz#5d2681e7b6b67bcbdc63cfb133e303ec9e942e43"
- integrity sha512-a3DAIpW8+36XAY8aIR36JBQQsfOabxHuJwx11DL/PTvnbwEWPAXW66b8QbMi0r2vUnkOfREsketxdvjBmQxqDQ==
+ version "2.3.9"
+ resolved "https://registry.yarnpkg.com/@types/sodium-native/-/sodium-native-2.3.9.tgz#50b790bd837aaf20c3880cb31b45244142ff00d4"
+ integrity sha512-jZIg5ltGH1okmnH3FrLQsgwjcjOVozMSHwSiEm1/LpMekhOMHbQqp21P4H24mizh1BjwI6Q8qmphmD/HJuAqWg==
dependencies:
"@types/node" "*"
"@types/stack-utils@^2.0.0":
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
- integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
+ integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
"@types/uuid@^8.3.4":
version "8.3.4"
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
-"@types/validator@^13.1.3":
- version "13.6.3"
- resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.6.3.tgz#31ca2e997bf13a0fffca30a25747d5b9f7dbb7de"
- integrity sha512-fWG42pMJOL4jKsDDZZREnXLjc3UE0R8LOJfARWYg6U966rxDT7TYejYzLnUF5cvSObGg34nd0+H2wHHU5Omdfw==
-
"@types/ws@^7.0.0":
version "7.4.7"
resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.7.tgz#f7c390a36f7a0679aa69de2d501319f4f8d9b702"
@@ -1218,203 +1376,112 @@
"@types/node" "*"
"@types/yargs-parser@*":
- version "20.2.1"
- resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129"
- integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==
+ version "21.0.3"
+ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
+ integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
"@types/yargs@^16.0.0":
- version "16.0.4"
- resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977"
- integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==
+ version "16.0.9"
+ resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.9.tgz#ba506215e45f7707e6cbcaf386981155b7ab956e"
+ integrity sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==
dependencies:
"@types/yargs-parser" "*"
-"@typescript-eslint/eslint-plugin@^5.57.1":
- version "5.57.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.57.1.tgz#d1ab162a3cd2671b8a1c9ddf6e2db73b14439735"
- integrity sha512-1MeobQkQ9tztuleT3v72XmY0XuKXVXusAhryoLuU5YZ+mXoYKZP9SQ7Flulh1NX4DTjpGTc2b/eMu4u7M7dhnQ==
+"@typescript-eslint/eslint-plugin@^5.62.0":
+ version "5.62.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"
+ integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
dependencies:
"@eslint-community/regexpp" "^4.4.0"
- "@typescript-eslint/scope-manager" "5.57.1"
- "@typescript-eslint/type-utils" "5.57.1"
- "@typescript-eslint/utils" "5.57.1"
+ "@typescript-eslint/scope-manager" "5.62.0"
+ "@typescript-eslint/type-utils" "5.62.0"
+ "@typescript-eslint/utils" "5.62.0"
debug "^4.3.4"
- grapheme-splitter "^1.0.4"
+ graphemer "^1.4.0"
ignore "^5.2.0"
natural-compare-lite "^1.4.0"
semver "^7.3.7"
tsutils "^3.21.0"
"@typescript-eslint/experimental-utils@^5.9.0":
- version "5.53.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.53.0.tgz#e249e3a47ace290ea3d83a5a08c8d90cd7fe2a53"
- integrity sha512-4SklZEwRn0jqkhtW+pPZpbKFXprwGneBndRM0TGzJu/LWdb9QV2hBgFIVU9AREo02BzqFvyG/ypd+xAW5YGhXw==
+ version "5.62.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz#14559bf73383a308026b427a4a6129bae2146741"
+ integrity sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==
dependencies:
- "@typescript-eslint/utils" "5.53.0"
+ "@typescript-eslint/utils" "5.62.0"
-"@typescript-eslint/parser@^5.57.1":
- version "5.57.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.57.1.tgz#af911234bd4401d09668c5faf708a0570a17a748"
- integrity sha512-hlA0BLeVSA/wBPKdPGxoVr9Pp6GutGoY380FEhbVi0Ph4WNe8kLvqIRx76RSQt1lynZKfrXKs0/XeEk4zZycuA==
+"@typescript-eslint/parser@^5.62.0":
+ version "5.62.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7"
+ integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==
dependencies:
- "@typescript-eslint/scope-manager" "5.57.1"
- "@typescript-eslint/types" "5.57.1"
- "@typescript-eslint/typescript-estree" "5.57.1"
+ "@typescript-eslint/scope-manager" "5.62.0"
+ "@typescript-eslint/types" "5.62.0"
+ "@typescript-eslint/typescript-estree" "5.62.0"
debug "^4.3.4"
-"@typescript-eslint/scope-manager@5.53.0":
- version "5.53.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.53.0.tgz#42b54f280e33c82939275a42649701024f3fafef"
- integrity sha512-Opy3dqNsp/9kBBeCPhkCNR7fmdSQqA+47r21hr9a14Bx0xnkElEQmhoHga+VoaoQ6uDHjDKmQPIYcUcKJifS7w==
+"@typescript-eslint/scope-manager@5.62.0":
+ version "5.62.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
+ integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
dependencies:
- "@typescript-eslint/types" "5.53.0"
- "@typescript-eslint/visitor-keys" "5.53.0"
+ "@typescript-eslint/types" "5.62.0"
+ "@typescript-eslint/visitor-keys" "5.62.0"
-"@typescript-eslint/scope-manager@5.54.1":
- version "5.54.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.54.1.tgz#6d864b4915741c608a58ce9912edf5a02bb58735"
- integrity sha512-zWKuGliXxvuxyM71UA/EcPxaviw39dB2504LqAmFDjmkpO8qNLHcmzlh6pbHs1h/7YQ9bnsO8CCcYCSA8sykUg==
+"@typescript-eslint/type-utils@5.62.0":
+ version "5.62.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
+ integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
dependencies:
- "@typescript-eslint/types" "5.54.1"
- "@typescript-eslint/visitor-keys" "5.54.1"
-
-"@typescript-eslint/scope-manager@5.57.1":
- version "5.57.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.57.1.tgz#5d28799c0fc8b501a29ba1749d827800ef22d710"
- integrity sha512-N/RrBwEUKMIYxSKl0oDK5sFVHd6VI7p9K5MyUlVYAY6dyNb/wHUqndkTd3XhpGlXgnQsBkRZuu4f9kAHghvgPw==
- dependencies:
- "@typescript-eslint/types" "5.57.1"
- "@typescript-eslint/visitor-keys" "5.57.1"
-
-"@typescript-eslint/type-utils@5.57.1":
- version "5.57.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.57.1.tgz#235daba621d3f882b8488040597b33777c74bbe9"
- integrity sha512-/RIPQyx60Pt6ga86hKXesXkJ2WOS4UemFrmmq/7eOyiYjYv/MUSHPlkhU6k9T9W1ytnTJueqASW+wOmW4KrViw==
- dependencies:
- "@typescript-eslint/typescript-estree" "5.57.1"
- "@typescript-eslint/utils" "5.57.1"
+ "@typescript-eslint/typescript-estree" "5.62.0"
+ "@typescript-eslint/utils" "5.62.0"
debug "^4.3.4"
tsutils "^3.21.0"
-"@typescript-eslint/types@5.53.0":
- version "5.53.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.53.0.tgz#f79eca62b97e518ee124086a21a24f3be267026f"
- integrity sha512-5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A==
+"@typescript-eslint/types@5.62.0":
+ version "5.62.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
+ integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
-"@typescript-eslint/types@5.54.1":
- version "5.54.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.54.1.tgz#29fbac29a716d0f08c62fe5de70c9b6735de215c"
- integrity sha512-G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw==
-
-"@typescript-eslint/types@5.57.1":
- version "5.57.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.57.1.tgz#d9989c7a9025897ea6f0550b7036027f69e8a603"
- integrity sha512-bSs4LOgyV3bJ08F5RDqO2KXqg3WAdwHCu06zOqcQ6vqbTJizyBhuh1o1ImC69X4bV2g1OJxbH71PJqiO7Y1RuA==
-
-"@typescript-eslint/typescript-estree@5.53.0":
- version "5.53.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.53.0.tgz#bc651dc28cf18ab248ecd18a4c886c744aebd690"
- integrity sha512-eKmipH7QyScpHSkhbptBBYh9v8FxtngLquq292YTEQ1pxVs39yFBlLC1xeIZcPPz1RWGqb7YgERJRGkjw8ZV7w==
+"@typescript-eslint/typescript-estree@5.62.0":
+ version "5.62.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
+ integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
dependencies:
- "@typescript-eslint/types" "5.53.0"
- "@typescript-eslint/visitor-keys" "5.53.0"
+ "@typescript-eslint/types" "5.62.0"
+ "@typescript-eslint/visitor-keys" "5.62.0"
debug "^4.3.4"
globby "^11.1.0"
is-glob "^4.0.3"
semver "^7.3.7"
tsutils "^3.21.0"
-"@typescript-eslint/typescript-estree@5.54.1":
- version "5.54.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.1.tgz#df7b6ae05fd8fef724a87afa7e2f57fa4a599be1"
- integrity sha512-bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg==
- dependencies:
- "@typescript-eslint/types" "5.54.1"
- "@typescript-eslint/visitor-keys" "5.54.1"
- debug "^4.3.4"
- globby "^11.1.0"
- is-glob "^4.0.3"
- semver "^7.3.7"
- tsutils "^3.21.0"
-
-"@typescript-eslint/typescript-estree@5.57.1":
- version "5.57.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.1.tgz#10d9643e503afc1ca4f5553d9bbe672ea4050b71"
- integrity sha512-A2MZqD8gNT0qHKbk2wRspg7cHbCDCk2tcqt6ScCFLr5Ru8cn+TCfM786DjPhqwseiS+PrYwcXht5ztpEQ6TFTw==
- dependencies:
- "@typescript-eslint/types" "5.57.1"
- "@typescript-eslint/visitor-keys" "5.57.1"
- debug "^4.3.4"
- globby "^11.1.0"
- is-glob "^4.0.3"
- semver "^7.3.7"
- tsutils "^3.21.0"
-
-"@typescript-eslint/utils@5.53.0":
- version "5.53.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.53.0.tgz#e55eaad9d6fffa120575ffaa530c7e802f13bce8"
- integrity sha512-VUOOtPv27UNWLxFwQK/8+7kvxVC+hPHNsJjzlJyotlaHjLSIgOCKj9I0DBUjwOOA64qjBwx5afAPjksqOxMO0g==
- dependencies:
- "@types/json-schema" "^7.0.9"
- "@types/semver" "^7.3.12"
- "@typescript-eslint/scope-manager" "5.53.0"
- "@typescript-eslint/types" "5.53.0"
- "@typescript-eslint/typescript-estree" "5.53.0"
- eslint-scope "^5.1.1"
- eslint-utils "^3.0.0"
- semver "^7.3.7"
-
-"@typescript-eslint/utils@5.57.1":
- version "5.57.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.57.1.tgz#0f97b0bbd88c2d5e2036869f26466be5f4c69475"
- integrity sha512-kN6vzzf9NkEtawECqze6v99LtmDiUJCVpvieTFA1uL7/jDghiJGubGZ5csicYHU1Xoqb3oH/R5cN5df6W41Nfg==
+"@typescript-eslint/utils@5.62.0", "@typescript-eslint/utils@^5.10.0":
+ version "5.62.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
+ integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
dependencies:
"@eslint-community/eslint-utils" "^4.2.0"
"@types/json-schema" "^7.0.9"
"@types/semver" "^7.3.12"
- "@typescript-eslint/scope-manager" "5.57.1"
- "@typescript-eslint/types" "5.57.1"
- "@typescript-eslint/typescript-estree" "5.57.1"
+ "@typescript-eslint/scope-manager" "5.62.0"
+ "@typescript-eslint/types" "5.62.0"
+ "@typescript-eslint/typescript-estree" "5.62.0"
eslint-scope "^5.1.1"
semver "^7.3.7"
-"@typescript-eslint/utils@^5.10.0":
- version "5.54.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.54.1.tgz#7a3ee47409285387b9d4609ea7e1020d1797ec34"
- integrity sha512-IY5dyQM8XD1zfDe5X8jegX6r2EVU5o/WJnLu/znLPWCBF7KNGC+adacXnt5jEYS9JixDcoccI6CvE4RCjHMzCQ==
+"@typescript-eslint/visitor-keys@5.62.0":
+ version "5.62.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
+ integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
dependencies:
- "@types/json-schema" "^7.0.9"
- "@types/semver" "^7.3.12"
- "@typescript-eslint/scope-manager" "5.54.1"
- "@typescript-eslint/types" "5.54.1"
- "@typescript-eslint/typescript-estree" "5.54.1"
- eslint-scope "^5.1.1"
- eslint-utils "^3.0.0"
- semver "^7.3.7"
-
-"@typescript-eslint/visitor-keys@5.53.0":
- version "5.53.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.53.0.tgz#8a5126623937cdd909c30d8fa72f79fa56cc1a9f"
- integrity sha512-JqNLnX3leaHFZEN0gCh81sIvgrp/2GOACZNgO4+Tkf64u51kTpAyWFOY8XHx8XuXr3N2C9zgPPHtcpMg6z1g0w==
- dependencies:
- "@typescript-eslint/types" "5.53.0"
+ "@typescript-eslint/types" "5.62.0"
eslint-visitor-keys "^3.3.0"
-"@typescript-eslint/visitor-keys@5.54.1":
- version "5.54.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.1.tgz#d7a8a0f7181d6ac748f4d47b2306e0513b98bf8b"
- integrity sha512-q8iSoHTgwCfgcRJ2l2x+xCbu8nBlRAlsQ33k24Adj8eoVBE0f8dUeI+bAa8F84Mv05UGbAx57g2zrRsYIooqQg==
- dependencies:
- "@typescript-eslint/types" "5.54.1"
- eslint-visitor-keys "^3.3.0"
-
-"@typescript-eslint/visitor-keys@5.57.1":
- version "5.57.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.1.tgz#585e5fa42a9bbcd9065f334fd7c8a4ddfa7d905e"
- integrity sha512-RjQrAniDU0CEk5r7iphkm731zKlFiUjvcBS2yHAg8WWqFMCaCrD0rKEVOMUyMMcbGPZ0bPp56srkGWrgfZqLRA==
- dependencies:
- "@typescript-eslint/types" "5.57.1"
- eslint-visitor-keys "^3.3.0"
+"@ungap/structured-clone@^1.2.0":
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"
+ integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==
"@wry/equality@^0.1.2":
version "0.1.11"
@@ -1424,22 +1491,24 @@
tslib "^1.9.3"
abab@^2.0.3, abab@^2.0.5:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
- integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
+ integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
-abbrev@1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
- integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
-accepts@^1.3.5, accepts@~1.3.7:
- version "1.3.7"
- resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
- integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+abort-controller@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+ integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
dependencies:
- mime-types "~2.1.24"
- negotiator "0.6.2"
+ event-target-shim "^5.0.0"
+
+accepts@^1.3.5, accepts@~1.3.8:
+ version "1.3.8"
+ resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
+ integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
+ dependencies:
+ mime-types "~2.1.34"
+ negotiator "0.6.3"
acorn-globals@^6.0.0:
version "6.0.0"
@@ -1460,24 +1529,21 @@ acorn-walk@^7.1.1:
integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
acorn-walk@^8.1.1:
- version "8.2.0"
- resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
- integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+ version "8.3.4"
+ resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.4.tgz#794dd169c3977edf4ba4ea47583587c5866236b7"
+ integrity sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==
+ dependencies:
+ acorn "^8.11.0"
acorn@^7.1.1:
version "7.4.1"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-acorn@^8.2.4, acorn@^8.4.1:
- version "8.5.0"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
- integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
-
-acorn@^8.8.0:
- version "8.8.2"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
- integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
+acorn@^8.11.0, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.9.0:
+ version "8.14.1"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.1.tgz#721d5dc10f7d5b5609a891773d47731796935dfb"
+ integrity sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==
agent-base@6:
version "6.0.2"
@@ -1486,7 +1552,14 @@ agent-base@6:
dependencies:
debug "4"
-ajv@^6.10.0, ajv@^6.12.4:
+agentkeepalive@^4.2.1:
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.6.0.tgz#35f73e94b3f40bf65f105219c623ad19c136ea6a"
+ integrity sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==
+ dependencies:
+ humanize-ms "^1.2.1"
+
+ajv@^6.12.4:
version "6.12.6"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -1496,17 +1569,18 @@ ajv@^6.10.0, ajv@^6.12.4:
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
-ansi-align@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59"
- integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==
+alce@1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/alce/-/alce-1.2.0.tgz#a8be2dacaac42494612f18dc09db691f3dea4aab"
+ integrity sha512-XppPf2S42nO2WhvKzlwzlfcApcXHzjlod30pKmcWjRgLOtqoe5DMuqdiYoM6AgyXksc6A6pV4v1L/WW217e57w==
dependencies:
- string-width "^4.1.0"
+ esprima "^1.2.0"
+ estraverse "^1.5.0"
ansi-colors@^4.1.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
- integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+ version "4.1.3"
+ resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
+ integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
ansi-escapes@^4.2.1:
version "4.3.2"
@@ -1520,12 +1594,10 @@ ansi-regex@^5.0.1:
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-ansi-styles@^3.2.1:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
- integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
- dependencies:
- color-convert "^1.9.0"
+ansi-regex@^6.0.1:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.1.0.tgz#95ec409c69619d6cb1b8b34f14b660ef28ebd654"
+ integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==
ansi-styles@^4.0.0, ansi-styles@^4.1.0:
version "4.3.0"
@@ -1539,39 +1611,44 @@ ansi-styles@^5.0.0:
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
-any-promise@^1.0.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
- integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
+ansi-styles@^6.1.0:
+ version "6.2.1"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+ integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
+ansis@^3.9.0:
+ version "3.17.0"
+ resolved "https://registry.yarnpkg.com/ansis/-/ansis-3.17.0.tgz#fa8d9c2a93fe7d1177e0c17f9eeb562a58a832d7"
+ integrity sha512-0qWUglt9JEqLFr3w1I1pbrChn1grhaiAR2ocX1PP/flRmxgtwTzPFFFnfIlD6aMOLQZgSuCRlidD70lvx8yhzg==
anymatch@^3.0.3, anymatch@~3.1.2:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
- integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+ integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
dependencies:
normalize-path "^3.0.0"
picomatch "^2.0.4"
-apollo-cache-control@^0.14.0:
- version "0.14.0"
- resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.14.0.tgz#95f20c3e03e7994e0d1bd48c59aeaeb575ed0ce7"
- integrity sha512-qN4BCq90egQrgNnTRMUHikLZZAprf3gbm8rC5Vwmc6ZdLolQ7bFsa769Hqi6Tq/lS31KLsXBLTOsRbfPHph12w==
+apollo-cache-control@^0.15.0:
+ version "0.15.0"
+ resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.15.0.tgz#45897ed318b883bf964960e6fcd7516a50b4e4d4"
+ integrity sha512-U2uYvHZsWmR6s6CD5zlq3PepfbUAM8953CeVM2Y2QYMtJ8i4CYplEPbIWb3zTIXSPbIPeWGddM56pChI6Iz3zA==
dependencies:
- apollo-server-env "^3.1.0"
- apollo-server-plugin-base "^0.13.0"
+ apollo-server-env "^3.2.0"
+ apollo-server-plugin-base "^0.14.0"
-apollo-datasource@^0.9.0:
- version "0.9.0"
- resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.9.0.tgz#b0b2913257a6103a5f4c03cb56d78a30e9d850db"
- integrity sha512-y8H99NExU1Sk4TvcaUxTdzfq2SZo6uSj5dyh75XSQvbpH6gdAXIW9MaBcvlNC7n0cVPsidHmOcHOWxJ/pTXGjA==
+apollo-datasource@^0.10.0:
+ version "0.10.0"
+ resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.10.0.tgz#5450fc88f23f73b36ba04b4f7a6d00ef2f5364a9"
+ integrity sha512-wrLhuoM2MtA0KA0+3qyioe0H2FjAxjTvuFOlNCk6WberA887m0MQlWULZImCWTkKuN+zEAMerHfxN+F+W8+lBA==
dependencies:
apollo-server-caching "^0.7.0"
- apollo-server-env "^3.1.0"
+ apollo-server-env "^3.2.0"
apollo-graphql@^0.9.0:
- version "0.9.3"
- resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.9.3.tgz#1ca6f625322ae10a66f57a39642849a07a7a5dc9"
- integrity sha512-rcAl2E841Iko4kSzj4Pt3PRBitmyq1MvoEmpl04TQSpGnoVgl1E/ZXuLBYxMTSnEAm7umn2IsoY+c6Ll9U/10A==
+ version "0.9.7"
+ resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.9.7.tgz#33185093b497a578f2df61ab8ecc6447d700ae64"
+ integrity sha512-bezL9ItUWUGHTm1bI/XzIgiiZbhXpsC7uxk4UxFPmcVJwJsDc3ayZ99oXxAaK+3Rbg/IoqrHckA6CwmkCsbaSA==
dependencies:
core-js-pure "^3.10.2"
lodash.sortby "^4.7.0"
@@ -1601,29 +1678,29 @@ apollo-server-caching@^0.7.0:
dependencies:
lru-cache "^6.0.0"
-apollo-server-core@^2.25.2:
- version "2.25.2"
- resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.25.2.tgz#ff65da5e512d9b5ca54c8e5e8c78ee28b5987247"
- integrity sha512-lrohEjde2TmmDTO7FlOs8x5QQbAS0Sd3/t0TaK2TWaodfzi92QAvIsq321Mol6p6oEqmjm8POIDHW1EuJd7XMA==
+apollo-server-core@^2.25.3, apollo-server-core@^2.26.2:
+ version "2.26.2"
+ resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.26.2.tgz#5391bb93654194a5d6b83cf1855f229c94d5b3b1"
+ integrity sha512-r8jOhf1jElaxsNsALFMy/MLiJCqSa1ZiwxkerVYbsEkyWrpD1Khy0extDkTBrfa6uK8CatX7xK9U413bYNhJFA==
dependencies:
"@apollographql/apollo-tools" "^0.5.0"
"@apollographql/graphql-playground-html" "1.6.27"
- "@apollographql/graphql-upload-8-fork" "^8.1.3"
+ "@apollographql/graphql-upload-8-fork" "^8.1.4"
"@josephg/resolvable" "^1.0.0"
"@types/ws" "^7.0.0"
- apollo-cache-control "^0.14.0"
- apollo-datasource "^0.9.0"
+ apollo-cache-control "^0.15.0"
+ apollo-datasource "^0.10.0"
apollo-graphql "^0.9.0"
apollo-reporting-protobuf "^0.8.0"
apollo-server-caching "^0.7.0"
- apollo-server-env "^3.1.0"
+ apollo-server-env "^3.2.0"
apollo-server-errors "^2.5.0"
- apollo-server-plugin-base "^0.13.0"
- apollo-server-types "^0.9.0"
- apollo-tracing "^0.15.0"
+ apollo-server-plugin-base "^0.14.0"
+ apollo-server-types "^0.10.0"
+ apollo-tracing "^0.16.0"
async-retry "^1.2.1"
fast-json-stable-stringify "^2.0.0"
- graphql-extensions "^0.15.0"
+ graphql-extensions "^0.16.0"
graphql-tag "^2.11.0"
graphql-tools "^4.0.8"
loglevel "^1.6.7"
@@ -1632,10 +1709,10 @@ apollo-server-core@^2.25.2:
subscriptions-transport-ws "^0.9.19"
uuid "^8.0.0"
-apollo-server-env@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-3.1.0.tgz#0733c2ef50aea596cc90cf40a53f6ea2ad402cd0"
- integrity sha512-iGdZgEOAuVop3vb0F2J3+kaBVi4caMoxefHosxmgzAbbSpvWehB8Y1QiSyyMeouYC38XNVk5wnZl+jdGSsWsIQ==
+apollo-server-env@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-3.2.0.tgz#0572e307da4784c5d7633a0ade1f45e231da28e3"
+ integrity sha512-V+kO5e6vUo2JwqV1/Ng71ZE3J6x1hCOC+nID2/++bCYl0/fPY9iLChbBNSgN/uoFcjhgmBchOv+m4o0Nie/TFQ==
dependencies:
node-fetch "^2.6.1"
util.promisify "^1.0.0"
@@ -1646,9 +1723,9 @@ apollo-server-errors@^2.5.0:
integrity sha512-lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA==
apollo-server-express@^2.25.2:
- version "2.25.2"
- resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.25.2.tgz#58cd819694ff4c2dec6945a95c5dff6aa2719ef6"
- integrity sha512-A2gF2e85vvDugPlajbhr0A14cDFDIGX0mteNOJ8P3Z3cIM0D4hwrWxJidI+SzobefDIyIHu1dynFedJVhV0euQ==
+ version "2.26.2"
+ resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.26.2.tgz#e1df5cc88e3214b4301e754f1f03addfeb0b33ce"
+ integrity sha512-8KaDwc6/DMK6e5KmP4AGH/NNY7OhEOFxusz3JZ/Du08a+PN8c/JmaEAwQ0aTNpySb5PWpv6xeXRPPwNfaPK9IQ==
dependencies:
"@apollographql/graphql-playground-html" "1.6.27"
"@types/accepts" "^1.3.5"
@@ -1657,8 +1734,8 @@ apollo-server-express@^2.25.2:
"@types/express" "^4.17.12"
"@types/express-serve-static-core" "^4.17.21"
accepts "^1.3.5"
- apollo-server-core "^2.25.2"
- apollo-server-types "^0.9.0"
+ apollo-server-core "^2.26.2"
+ apollo-server-types "^0.10.0"
body-parser "^1.18.3"
cors "^2.8.5"
express "^4.17.1"
@@ -1668,36 +1745,36 @@ apollo-server-express@^2.25.2:
subscriptions-transport-ws "^0.9.19"
type-is "^1.6.16"
-apollo-server-plugin-base@^0.13.0:
- version "0.13.0"
- resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.13.0.tgz#3f85751a420d3c4625355b6cb3fbdd2acbe71f13"
- integrity sha512-L3TMmq2YE6BU6I4Tmgygmd0W55L+6XfD9137k+cWEBFu50vRY4Re+d+fL5WuPkk5xSPKd/PIaqzidu5V/zz8Kg==
+apollo-server-plugin-base@^0.14.0:
+ version "0.14.0"
+ resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.14.0.tgz#f59b6ab7780304162d2e4fd9ee29ed0696b174ef"
+ integrity sha512-nTNSFuBhZURGjtWptdVqwemYUOdsvABj/GSKzeNvepiEubiv4N0rt4Gvy1inHDiMbo98wQTdF/7XohNcB9A77g==
dependencies:
- apollo-server-types "^0.9.0"
+ apollo-server-types "^0.10.0"
apollo-server-testing@^2.25.2:
- version "2.25.2"
- resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.25.2.tgz#0043e98b1a03720352e94b409215fb4782ae2e50"
- integrity sha512-HjQV9wPbi/ZqpRbyyhNwCbaDnfjDM0hTRec5TOoOjurEZ/vh4hTPHwGkDZx3kbcWowhGxe2qoHM6KANSB/SxuA==
+ version "2.25.3"
+ resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.25.3.tgz#abf645d73d4fc3a578f547e2e97f45fe8fb1b764"
+ integrity sha512-EELtuDk1dn//fNxeYELuwwAy8bvhV9d60WhZfs3JrXqpzRDZhJmyyGqlMoHmkvCqK/mCOkc4hL54tM9rrFhU5Q==
dependencies:
- apollo-server-core "^2.25.2"
+ apollo-server-core "^2.25.3"
-apollo-server-types@^0.9.0:
- version "0.9.0"
- resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.9.0.tgz#ccf550b33b07c48c72f104fbe2876232b404848b"
- integrity sha512-qk9tg4Imwpk732JJHBkhW0jzfG0nFsLqK2DY6UhvJf7jLnRePYsPxWfPiNkxni27pLE2tiNlCwoDFSeWqpZyBg==
+apollo-server-types@^0.10.0:
+ version "0.10.0"
+ resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.10.0.tgz#af578bf507151a0e86fbdf188f9673ece3f8f164"
+ integrity sha512-LsB3epw1X3Co/HGiKHCGtzWG35J59gG8Ypx0p22+wgdM9AVDm1ylsNGZy+osNIVJc1lUJf3nF5kZ90vA866K/w==
dependencies:
apollo-reporting-protobuf "^0.8.0"
apollo-server-caching "^0.7.0"
- apollo-server-env "^3.1.0"
+ apollo-server-env "^3.2.0"
-apollo-tracing@^0.15.0:
- version "0.15.0"
- resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.15.0.tgz#237fbbbf669aee4370b7e9081b685eabaa8ce84a"
- integrity sha512-UP0fztFvaZPHDhIB/J+qGuy6hWO4If069MGC98qVs0I8FICIGu4/8ykpX3X3K6RtaQ56EDAWKykCxFv4ScxMeA==
+apollo-tracing@^0.16.0:
+ version "0.16.0"
+ resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.16.0.tgz#8542ca40ae4a3f84f899e749631b65833557ceb1"
+ integrity sha512-Oy8kTggB+fJ/hHXwHyMpuTl5KW7u1XetKFDErZVOobUKc2zjc/NgWiC/s7SGYZCgfLodBjvwfa6rMcvLkz7c0w==
dependencies:
- apollo-server-env "^3.1.0"
- apollo-server-plugin-base "^0.13.0"
+ apollo-server-env "^3.2.0"
+ apollo-server-plugin-base "^0.14.0"
apollo-utilities@^1.0.1, apollo-utilities@^1.3.0:
version "1.3.4"
@@ -1731,6 +1808,14 @@ argparse@^2.0.1:
resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz#384d12a37295aec3769ab022ad323a18a51ccf8b"
+ integrity sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==
+ dependencies:
+ call-bound "^1.0.3"
+ is-array-buffer "^3.0.5"
+
array-differ@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b"
@@ -1739,17 +1824,18 @@ array-differ@^3.0.0:
array-flatten@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
- integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+ integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
-array-includes@^3.1.6:
- version "3.1.6"
- resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
- integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
+array-includes@^3.1.8:
+ version "3.1.8"
+ resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d"
+ integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==
dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.4"
- es-abstract "^1.20.4"
- get-intrinsic "^1.1.3"
+ call-bind "^1.0.7"
+ define-properties "^1.2.1"
+ es-abstract "^1.23.2"
+ es-object-atoms "^1.0.0"
+ get-intrinsic "^1.2.4"
is-string "^1.0.7"
array-union@^2.1.0:
@@ -1757,25 +1843,65 @@ array-union@^2.1.0:
resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-array.prototype.flat@^1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
- integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
+array.prototype.findlastindex@^1.2.5:
+ version "1.2.6"
+ resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz#cfa1065c81dcb64e34557c9b81d012f6a421c564"
+ integrity sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==
dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.4"
- es-abstract "^1.20.4"
- es-shim-unscopables "^1.0.0"
+ call-bind "^1.0.8"
+ call-bound "^1.0.4"
+ define-properties "^1.2.1"
+ es-abstract "^1.23.9"
+ es-errors "^1.3.0"
+ es-object-atoms "^1.1.1"
+ es-shim-unscopables "^1.1.0"
-array.prototype.flatmap@^1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
- integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
+array.prototype.flat@^1.3.2:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz#534aaf9e6e8dd79fb6b9a9917f839ef1ec63afe5"
+ integrity sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==
dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.4"
- es-abstract "^1.20.4"
- es-shim-unscopables "^1.0.0"
+ call-bind "^1.0.8"
+ define-properties "^1.2.1"
+ es-abstract "^1.23.5"
+ es-shim-unscopables "^1.0.2"
+
+array.prototype.flatmap@^1.3.2:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz#712cc792ae70370ae40586264629e33aab5dd38b"
+ integrity sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==
+ dependencies:
+ call-bind "^1.0.8"
+ define-properties "^1.2.1"
+ es-abstract "^1.23.5"
+ es-shim-unscopables "^1.0.2"
+
+array.prototype.reduce@^1.0.6:
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.8.tgz#42f97f5078daedca687d4463fd3c05cbfd83da57"
+ integrity sha512-DwuEqgXFBwbmZSRqt3BpQigWNUoqw9Ml2dTWdF3B2zQlQX4OeUE0zyuzX0fX0IbTvjdkZbcBTU3idgpO78qkTw==
+ dependencies:
+ call-bind "^1.0.8"
+ call-bound "^1.0.4"
+ define-properties "^1.2.1"
+ es-abstract "^1.23.9"
+ es-array-method-boxes-properly "^1.0.0"
+ es-errors "^1.3.0"
+ es-object-atoms "^1.1.1"
+ is-string "^1.1.1"
+
+arraybuffer.prototype.slice@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz#9d760d84dbdd06d0cbf92c8849615a1a7ab3183c"
+ integrity sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==
+ dependencies:
+ array-buffer-byte-length "^1.0.1"
+ call-bind "^1.0.8"
+ define-properties "^1.2.1"
+ es-abstract "^1.23.5"
+ es-errors "^1.3.0"
+ get-intrinsic "^1.2.6"
+ is-array-buffer "^3.0.4"
arrify@^2.0.1:
version "2.0.1"
@@ -1788,9 +1914,14 @@ asap@~2.0.3:
integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
assert-never@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
- integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.4.0.tgz#b0d4988628c87f35eb94716cc54422a63927e175"
+ integrity sha512-5oJg84os6NMQNl27T9LnZkvvqzvAnHu03ShCnoj6bsJwS7L8AO4lf+C/XjK/nvzEqQB744moC6V128RucQd1jA==
+
+async-function@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b"
+ integrity sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==
async-retry@^1.2.1:
version "1.3.3"
@@ -1802,12 +1933,14 @@ async-retry@^1.2.1:
asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
- integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+ integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-available-typed-arrays@^1.0.5:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
- integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+available-typed-arrays@^1.0.7:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
+ integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
+ dependencies:
+ possible-typed-array-names "^1.0.0"
await-semaphore@^0.1.3:
version "0.1.3"
@@ -1821,35 +1954,35 @@ axios@^0.21.1:
dependencies:
follow-redirects "^1.14.0"
-babel-jest@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.2.5.tgz#6bbbc1bb4200fe0bfd1b1fbcbe02fc62ebed16aa"
- integrity sha512-GC9pWCcitBhSuF7H3zl0mftoKizlswaF0E3qi+rPL417wKkCB0d+Sjjb0OfXvxj7gWiBf497ldgRMii68Xz+2g==
+babel-jest@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.1.tgz#a1bf8d61928edfefd21da27eb86a695bfd691444"
+ integrity sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==
dependencies:
- "@jest/transform" "^27.2.5"
- "@jest/types" "^27.2.5"
+ "@jest/transform" "^27.5.1"
+ "@jest/types" "^27.5.1"
"@types/babel__core" "^7.1.14"
- babel-plugin-istanbul "^6.0.0"
- babel-preset-jest "^27.2.0"
+ babel-plugin-istanbul "^6.1.1"
+ babel-preset-jest "^27.5.1"
chalk "^4.0.0"
- graceful-fs "^4.2.4"
+ graceful-fs "^4.2.9"
slash "^3.0.0"
-babel-plugin-istanbul@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
- integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
+babel-plugin-istanbul@^6.1.1:
+ version "6.1.1"
+ resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
+ integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
"@istanbuljs/load-nyc-config" "^1.0.0"
"@istanbuljs/schema" "^0.1.2"
- istanbul-lib-instrument "^4.0.0"
+ istanbul-lib-instrument "^5.0.4"
test-exclude "^6.0.0"
-babel-plugin-jest-hoist@^27.2.0:
- version "27.2.0"
- resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.2.0.tgz#79f37d43f7e5c4fdc4b2ca3e10cc6cf545626277"
- integrity sha512-TOux9khNKdi64mW+0OIhcmbAn75tTlzKhxmiNXevQaPbrBYK7YKjP1jl6NHTJ6XR5UgUrJbCnWlKVnJn29dfjw==
+babel-plugin-jest-hoist@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz#9be98ecf28c331eb9f5df9c72d6f89deb8181c2e"
+ integrity sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==
dependencies:
"@babel/template" "^7.3.3"
"@babel/types" "^7.3.3"
@@ -1857,29 +1990,32 @@ babel-plugin-jest-hoist@^27.2.0:
"@types/babel__traverse" "^7.0.6"
babel-preset-current-node-syntax@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
- integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz#9a929eafece419612ef4ae4f60b1862ebad8ef30"
+ integrity sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==
dependencies:
"@babel/plugin-syntax-async-generators" "^7.8.4"
"@babel/plugin-syntax-bigint" "^7.8.3"
- "@babel/plugin-syntax-class-properties" "^7.8.3"
- "@babel/plugin-syntax-import-meta" "^7.8.3"
+ "@babel/plugin-syntax-class-properties" "^7.12.13"
+ "@babel/plugin-syntax-class-static-block" "^7.14.5"
+ "@babel/plugin-syntax-import-attributes" "^7.24.7"
+ "@babel/plugin-syntax-import-meta" "^7.10.4"
"@babel/plugin-syntax-json-strings" "^7.8.3"
- "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
+ "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
"@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
- "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+ "@babel/plugin-syntax-numeric-separator" "^7.10.4"
"@babel/plugin-syntax-object-rest-spread" "^7.8.3"
"@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
"@babel/plugin-syntax-optional-chaining" "^7.8.3"
- "@babel/plugin-syntax-top-level-await" "^7.8.3"
+ "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+ "@babel/plugin-syntax-top-level-await" "^7.14.5"
-babel-preset-jest@^27.2.0:
- version "27.2.0"
- resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.2.0.tgz#556bbbf340608fed5670ab0ea0c8ef2449fba885"
- integrity sha512-z7MgQ3peBwN5L5aCqBKnF6iqdlvZvFUQynEhu0J+X9nHLU72jO3iY331lcYrg+AssJ8q7xsv5/3AICzVmJ/wvg==
+babel-preset-jest@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz#91f10f58034cb7989cb4f962b69fa6eef6a6bc81"
+ integrity sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==
dependencies:
- babel-plugin-jest-hoist "^27.2.0"
+ babel-plugin-jest-hoist "^27.5.1"
babel-preset-current-node-syntax "^1.0.0"
babel-walk@3.0.0-canary-5:
@@ -1892,7 +2028,7 @@ babel-walk@3.0.0-canary-5:
backo2@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
- integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
+ integrity sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==
balanced-match@^1.0.0:
version "1.0.2"
@@ -1910,55 +2046,43 @@ bignumber.js@9.0.0:
integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==
binary-extensions@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
- integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
+ integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
bluebird@^3.7.2:
version "3.7.2"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-body-parser@1.19.0, body-parser@^1.18.3:
- version "1.19.0"
- resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
- integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+body-parser@1.20.3, body-parser@^1.18.3:
+ version "1.20.3"
+ resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6"
+ integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==
dependencies:
- bytes "3.1.0"
- content-type "~1.0.4"
+ bytes "3.1.2"
+ content-type "~1.0.5"
debug "2.6.9"
- depd "~1.1.2"
- http-errors "1.7.2"
+ depd "2.0.0"
+ destroy "1.2.0"
+ http-errors "2.0.0"
iconv-lite "0.4.24"
- on-finished "~2.3.0"
- qs "6.7.0"
- raw-body "2.4.0"
- type-is "~1.6.17"
+ on-finished "2.4.1"
+ qs "6.13.0"
+ raw-body "2.5.2"
+ type-is "~1.6.18"
+ unpipe "1.0.0"
boolbase@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
-boolean@3.2.0, boolean@^3.1.4:
+boolean@3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==
-boxen@^5.0.0:
- version "5.1.2"
- resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50"
- integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==
- dependencies:
- ansi-align "^3.0.0"
- camelcase "^6.2.0"
- chalk "^4.1.0"
- cli-boxes "^2.2.1"
- string-width "^4.2.2"
- type-fest "^0.20.2"
- widest-line "^3.1.0"
- wrap-ansi "^7.0.0"
-
brace-expansion@^1.1.7:
version "1.1.11"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1974,28 +2098,27 @@ brace-expansion@^2.0.1:
dependencies:
balanced-match "^1.0.0"
-braces@^3.0.1, braces@~3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
- integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+braces@^3.0.3, braces@~3.0.2:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+ integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
dependencies:
- fill-range "^7.0.1"
+ fill-range "^7.1.1"
browser-process-hrtime@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
-browserslist@^4.16.6:
- version "4.17.3"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.3.tgz#2844cd6eebe14d12384b0122d217550160d2d624"
- integrity sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==
+browserslist@^4.24.0:
+ version "4.24.4"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.4.tgz#c6b2865a3f08bcb860a0e827389003b9fe686e4b"
+ integrity sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==
dependencies:
- caniuse-lite "^1.0.30001264"
- electron-to-chromium "^1.3.857"
- escalade "^3.1.1"
- node-releases "^1.1.77"
- picocolors "^0.2.1"
+ caniuse-lite "^1.0.30001688"
+ electron-to-chromium "^1.5.73"
+ node-releases "^2.0.19"
+ update-browserslist-db "^1.1.1"
bs-logger@0.x:
version "0.2.6"
@@ -2025,9 +2148,9 @@ buffer@^6.0.3:
ieee754 "^1.2.1"
builtins@^5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
- integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.1.0.tgz#6d85eeb360c4ebc166c3fdef922a15aa7316a5e8"
+ integrity sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==
dependencies:
semver "^7.0.0"
@@ -2038,31 +2161,36 @@ busboy@^0.3.1:
dependencies:
dicer "0.3.0"
-bytes@3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
- integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+bytes@3.1.2:
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
+ integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
-cacheable-request@^6.0.0:
- version "6.1.0"
- resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
- integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
- dependencies:
- clone-response "^1.0.2"
- get-stream "^5.1.0"
- http-cache-semantics "^4.0.0"
- keyv "^3.0.0"
- lowercase-keys "^2.0.0"
- normalize-url "^4.1.0"
- responselike "^1.0.2"
-
-call-bind@^1.0.0, call-bind@^1.0.2:
+call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
version "1.0.2"
- resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
- integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+ resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
+ integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
dependencies:
- function-bind "^1.1.1"
- get-intrinsic "^1.0.2"
+ es-errors "^1.3.0"
+ function-bind "^1.1.2"
+
+call-bind@^1.0.7, call-bind@^1.0.8:
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
+ integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
+ dependencies:
+ call-bind-apply-helpers "^1.0.0"
+ es-define-property "^1.0.0"
+ get-intrinsic "^1.2.4"
+ set-function-length "^1.2.2"
+
+call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
+ integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
+ dependencies:
+ call-bind-apply-helpers "^1.0.2"
+ get-intrinsic "^1.3.0"
callsites@^3.0.0:
version "3.1.0"
@@ -2075,25 +2203,24 @@ camelcase@^5.3.1:
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
camelcase@^6.2.0:
- version "6.2.0"
- resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
- integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
+ version "6.3.0"
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+ integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
-caniuse-lite@^1.0.30001264:
- version "1.0.30001442"
- resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz"
- integrity sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==
+caniuse-lite@^1.0.30001688:
+ version "1.0.30001705"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001705.tgz#dc3510bcdef261444ca944b7be9c8d0bb7fafeef"
+ integrity sha512-S0uyMMiYvA7CxNgomYBwwwPUnWzFD83f3B1ce5jHUfHTH//QL6hHsreI8RVC5606R4ssqravelYO5TU6t8sEyg==
-chalk@^2.0.0:
- version "2.4.2"
- resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
- integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+chalk@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+ integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
dependencies:
- ansi-styles "^3.2.1"
- escape-string-regexp "^1.0.5"
- supports-color "^5.3.0"
+ ansi-styles "^4.1.0"
+ supports-color "^7.1.0"
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
+chalk@^4.0.0:
version "4.1.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2137,10 +2264,10 @@ cheerio@1.0.0-rc.10:
parse5-htmlparser2-tree-adapter "^6.0.1"
tslib "^2.2.0"
-chokidar@^3.2.2:
- version "3.5.2"
- resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
- integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
+chokidar@^3.5.2:
+ version "3.6.0"
+ resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
+ integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
dependencies:
anymatch "~3.1.2"
braces "~3.0.2"
@@ -2152,51 +2279,23 @@ chokidar@^3.2.2:
optionalDependencies:
fsevents "~2.3.2"
-ci-info@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
- integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-
-ci-info@^3.1.1:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6"
- integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==
-
-ci-info@^3.3.2:
- version "3.3.2"
- resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.2.tgz#6d2967ffa407466481c6c90b6e16b3098f080128"
- integrity sha512-xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg==
+ci-info@^3.2.0, ci-info@^3.8.0:
+ version "3.9.0"
+ resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
+ integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
cjs-module-lexer@^1.0.0:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40"
- integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==
+ version "1.4.3"
+ resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz#0f79731eb8cfe1ec72acd4066efac9d61991b00d"
+ integrity sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==
class-validator@^0.13.1:
- version "0.13.1"
- resolved "https://registry.yarnpkg.com/class-validator/-/class-validator-0.13.1.tgz#381b2001ee6b9e05afd133671fbdf760da7dec67"
- integrity sha512-zWIeYFhUitvAHBwNhDdCRK09hWx+P0HUwFE8US8/CxFpMVzkUK8RJl7yOIE+BVu2lxyPNgeOaFv78tLE47jBIg==
+ version "0.13.2"
+ resolved "https://registry.yarnpkg.com/class-validator/-/class-validator-0.13.2.tgz#64b031e9f3f81a1e1dcd04a5d604734608b24143"
+ integrity sha512-yBUcQy07FPlGzUjoLuUfIOXzgynnQPPruyK1Ge2B74k9ROwnle1E+NxLWnUv5OLU8hA/qL5leAE9XnXq3byaBw==
dependencies:
- "@types/validator" "^13.1.3"
- libphonenumber-js "^1.9.7"
- validator "^13.5.2"
-
-cli-boxes@^2.2.1:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
- integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
-
-cli-highlight@^2.1.11:
- version "2.1.11"
- resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.11.tgz#49736fa452f0aaf4fae580e30acb26828d2dc1bf"
- integrity sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==
- dependencies:
- chalk "^4.0.0"
- highlight.js "^10.7.1"
- mz "^2.4.0"
- parse5 "^5.1.1"
- parse5-htmlparser2-tree-adapter "^6.0.0"
- yargs "^16.0.0"
+ libphonenumber-js "^1.9.43"
+ validator "^13.7.0"
cliui@^7.0.2:
version "7.0.4"
@@ -2216,29 +2315,15 @@ cliui@^8.0.1:
strip-ansi "^6.0.1"
wrap-ansi "^7.0.0"
-clone-response@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
- integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
- dependencies:
- mimic-response "^1.0.0"
-
co@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
- integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
+ integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
collect-v8-coverage@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
- integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
-
-color-convert@^1.9.0:
- version "1.9.3"
- resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
- integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
- dependencies:
- color-name "1.1.3"
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
+ integrity sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==
color-convert@^2.0.1:
version "2.0.1"
@@ -2247,11 +2332,6 @@ color-convert@^2.0.1:
dependencies:
color-name "~1.1.4"
-color-name@1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
- integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
color-name@~1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
@@ -2277,19 +2357,7 @@ commander@^6.1.0:
concat-map@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
- integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-configstore@^5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
- integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
- dependencies:
- dot-prop "^5.2.0"
- graceful-fs "^4.1.2"
- make-dir "^3.0.0"
- unique-string "^2.0.0"
- write-file-atomic "^3.0.0"
- xdg-basedir "^4.0.0"
+ integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
consolidate@^0.16.0:
version "0.16.0"
@@ -2306,39 +2374,42 @@ constantinople@^4.0.1:
"@babel/parser" "^7.6.0"
"@babel/types" "^7.6.1"
-content-disposition@0.5.3:
- version "0.5.3"
- resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
- integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+content-disposition@0.5.4:
+ version "0.5.4"
+ resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
+ integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
dependencies:
- safe-buffer "5.1.2"
+ safe-buffer "5.2.1"
-content-type@~1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
- integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+content-type@~1.0.4, content-type@~1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+ integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
-convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
- version "1.8.0"
- resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
- integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
- dependencies:
- safe-buffer "~5.1.1"
+convert-source-map@^1.4.0, convert-source-map@^1.6.0:
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
+ integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
+
+convert-source-map@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+ integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
cookie-signature@1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
- integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+ integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
-cookie@0.4.0:
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
- integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+cookie@0.7.1:
+ version "0.7.1"
+ resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9"
+ integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==
-core-js-pure@^3.10.2:
- version "3.18.2"
- resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.18.2.tgz#d8cc11d4885ea919f3de776d45e720e4c769d406"
- integrity sha512-4hMMLUlZhKJKOWbbGD1/VDUxGPEhEoN/T01k7bx271WiBKCvCfkgPzy0IeRS4PB50p6/N1q/SZL4B/TRsTE5bA==
+core-js-pure@^3.10.2, core-js-pure@^3.30.2:
+ version "3.41.0"
+ resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.41.0.tgz#349fecad168d60807a31e83c99d73d786fe80811"
+ integrity sha512-71Gzp96T9YPk63aUvE5Q5qP+DryB4ZloUZPSOebGM88VNw8VNfvdA7z6kGA8iGOTEzAomsRidp4jXSmUIJsL+Q==
core-util-is@~1.0.0:
version "1.0.3"
@@ -2366,16 +2437,16 @@ cross-env@^7.0.3:
cross-spawn "^7.0.1"
cross-fetch@^3.1.5:
- version "3.1.5"
- resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
- integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.2.0.tgz#34e9192f53bc757d6614304d9e5e6fb4edb782e3"
+ integrity sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==
dependencies:
- node-fetch "2.6.7"
+ node-fetch "^2.7.0"
cross-spawn@^6.0.0:
- version "6.0.5"
- resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
- integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+ version "6.0.6"
+ resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57"
+ integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==
dependencies:
nice-try "^1.0.4"
path-key "^2.0.1"
@@ -2383,27 +2454,15 @@ cross-spawn@^6.0.0:
shebang-command "^1.2.0"
which "^1.2.9"
-cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
- version "7.0.3"
- resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
- integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
+ version "7.0.6"
+ resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+ integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
dependencies:
path-key "^3.1.0"
shebang-command "^2.0.0"
which "^2.0.1"
-crypto-random-string@3.3.1:
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-3.3.1.tgz#13cee94cac8001e4842501608ef779e0ed08f82d"
- integrity sha512-5j88ECEn6h17UePrLi6pn1JcLtAiANa3KExyr9y9Z5vo2mv56Gh3I4Aja/B9P9uyMwyxNHAHWv+nE72f30T5Dg==
- dependencies:
- type-fest "^0.8.1"
-
-crypto-random-string@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
- integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
-
crypto@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/crypto/-/crypto-1.0.1.tgz#2af1b7cad8175d24c8a1b0778255794a21803037"
@@ -2428,7 +2487,7 @@ css-what@^6.0.1:
cssfilter@0.0.10:
version "0.0.10"
resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae"
- integrity sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4=
+ integrity sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==
cssom@^0.4.4:
version "0.4.4"
@@ -2456,134 +2515,148 @@ data-urls@^2.0.0:
whatwg-mimetype "^2.3.0"
whatwg-url "^8.0.0"
-date-fns@^2.29.3:
- version "2.30.0"
- resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
- integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
+data-view-buffer@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz#211a03ba95ecaf7798a8c7198d79536211f88570"
+ integrity sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==
dependencies:
- "@babel/runtime" "^7.21.0"
+ call-bound "^1.0.3"
+ es-errors "^1.3.0"
+ is-data-view "^1.0.2"
-date-format@^4.0.9:
- version "4.0.9"
- resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.9.tgz#4788015ac56dedebe83b03bc361f00c1ddcf1923"
- integrity sha512-+8J+BOUpSrlKLQLeF8xJJVTxS8QfRSuJgwxSVvslzgO3E6khbI0F5mMEPf5mTYhCCm4h99knYP6H3W9n3BQFrg==
+data-view-byte-length@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz#9e80f7ca52453ce3e93d25a35318767ea7704735"
+ integrity sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==
+ dependencies:
+ call-bound "^1.0.3"
+ es-errors "^1.3.0"
+ is-data-view "^1.0.2"
-debug@2.6.9, debug@^2.2.0:
+data-view-byte-offset@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz#068307f9b71ab76dbbe10291389e020856606191"
+ integrity sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==
+ dependencies:
+ call-bound "^1.0.2"
+ es-errors "^1.3.0"
+ is-data-view "^1.0.1"
+
+date-format@^4.0.14:
+ version "4.0.14"
+ resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.14.tgz#7a8e584434fb169a521c8b7aa481f355810d9400"
+ integrity sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==
+
+dayjs@^1.11.9:
+ version "1.11.13"
+ resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
+ integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
+
+debug@2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
dependencies:
ms "2.0.0"
-debug@4, debug@^4.1.0, debug@^4.1.1:
- version "4.3.2"
- resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
- integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@^4.3.7:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
+ integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
dependencies:
- ms "2.1.2"
+ ms "^2.1.3"
-debug@^3.2.6, debug@^3.2.7:
+debug@^3.2.7:
version "3.2.7"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
dependencies:
ms "^2.1.1"
-debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
- version "4.3.4"
- resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
- integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
- dependencies:
- ms "2.1.2"
-
decimal.js-light@^2.5.1:
version "2.5.1"
resolved "https://registry.yarnpkg.com/decimal.js-light/-/decimal.js-light-2.5.1.tgz#134fd32508f19e208f4fb2f8dac0d2626a867934"
integrity sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==
decimal.js@^10.2.1:
- version "10.3.1"
- resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
- integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
-
-decompress-response@^3.3.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
- integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
- dependencies:
- mimic-response "^1.0.0"
+ version "10.5.0"
+ resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.5.0.tgz#0f371c7cf6c4898ce0afb09836db73cd82010f22"
+ integrity sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==
dedent@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
- integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
+ integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
deep-extend@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-deep-is@^0.1.3, deep-is@~0.1.3:
+deep-is@^0.1.3:
version "0.1.4"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
-deepmerge@^4.2.2:
- version "4.2.2"
- resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
- integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+deepmerge@^4.2.2, deepmerge@^4.3.1:
+ version "4.3.1"
+ resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+ integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
-defer-to-connect@^1.0.1:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
- integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
-
-define-lazy-prop@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
- integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
-
-define-properties@^1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
- integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+define-data-property@^1.0.1, define-data-property@^1.1.4:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
+ integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
dependencies:
- object-keys "^1.0.12"
+ es-define-property "^1.0.0"
+ es-errors "^1.3.0"
+ gopd "^1.0.1"
-define-properties@^1.1.4:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
- integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
+define-properties@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+ integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
dependencies:
+ define-data-property "^1.0.1"
has-property-descriptors "^1.0.0"
object-keys "^1.1.1"
delayed-stream@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
- integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+ integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-denque@^1.4.1:
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf"
- integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==
+denque@^2.0.1:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
+ integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
+
+depd@2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+ integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
depd@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
- integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+ integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
deprecated-decorator@^0.1.6:
version "0.1.6"
resolved "https://registry.yarnpkg.com/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz#00966317b7a12fe92f3cc831f7583af329b86c37"
- integrity sha1-AJZjF7ehL+kvPMgx91g68ym4bDc=
+ integrity sha512-MHidOOnCHGlZDKsI21+mbIIhf4Fff+hhCTB7gtVg4uoIqjcrTZc5v6M+GS2zVI0sV7PqK415rb8XaOSQsQkHOw==
-destroy@~1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
- integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+destroy@1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
+ integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
-detect-newline@^3.0.0:
+detect-indent@^6.0.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
+ integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
+
+detect-newline@^3.0.0, detect-newline@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
@@ -2595,10 +2668,10 @@ dicer@0.3.0:
dependencies:
streamsearch "0.1.2"
-diff-sequences@^27.0.6:
- version "27.0.6"
- resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.6.tgz#3305cb2e55a033924054695cc66019fd7f8e5723"
- integrity sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ==
+diff-sequences@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327"
+ integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==
diff@^4.0.1:
version "4.0.2"
@@ -2653,7 +2726,16 @@ dom-serializer@^1.0.1, dom-serializer@^1.3.2:
domhandler "^4.2.0"
entities "^2.0.0"
-domelementtype@^2.0.1, domelementtype@^2.2.0:
+dom-serializer@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
+ integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
+ dependencies:
+ domelementtype "^2.3.0"
+ domhandler "^5.0.2"
+ entities "^4.2.0"
+
+domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
@@ -2679,6 +2761,13 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
dependencies:
domelementtype "^2.2.0"
+domhandler@^5.0.2, domhandler@^5.0.3:
+ version "5.0.3"
+ resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
+ integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
+ dependencies:
+ domelementtype "^2.3.0"
+
domutils@^2.4.2, domutils@^2.5.2, domutils@^2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
@@ -2688,12 +2777,14 @@ domutils@^2.4.2, domutils@^2.5.2, domutils@^2.8.0:
domelementtype "^2.2.0"
domhandler "^4.2.0"
-dot-prop@^5.2.0:
- version "5.3.0"
- resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
- integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
+domutils@^3.0.1:
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.2.2.tgz#edbfe2b668b0c1d97c24baf0f1062b132221bc78"
+ integrity sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==
dependencies:
- is-obj "^2.0.0"
+ dom-serializer "^2.0.0"
+ domelementtype "^2.3.0"
+ domhandler "^5.0.3"
dotenv@^10.0.0:
version "10.0.0"
@@ -2701,24 +2792,33 @@ dotenv@^10.0.0:
integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
dotenv@^16.0.3:
- version "16.3.1"
- resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
- integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==
+ version "16.4.7"
+ resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.7.tgz#0e20c5b82950140aa99be360a8a5f52335f53c26"
+ integrity sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==
-duplexer3@^0.1.4:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
- integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
+dunder-proto@^1.0.0, dunder-proto@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
+ integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
+ dependencies:
+ call-bind-apply-helpers "^1.0.1"
+ es-errors "^1.3.0"
+ gopd "^1.2.0"
+
+eastasianwidth@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+ integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
- integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+ integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
-electron-to-chromium@^1.3.857:
- version "1.3.864"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.864.tgz#6a993bcc196a2b8b3df84d28d5d4dd912393885f"
- integrity sha512-v4rbad8GO6/yVI92WOeU9Wgxc4NA0n4f6P1FvZTY+jyY7JHEhw3bduYu60v3Q1h81Cg6eo4ApZrFPuycwd5hGw==
+electron-to-chromium@^1.5.73:
+ version "1.5.119"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.119.tgz#4e105e419209b33e1c44b4d1b5fc6fb27fac0209"
+ integrity sha512-Ku4NMzUjz3e3Vweh7PhApPrZSS4fyiCIbcIrG9eKrriYVLmbMepETR/v6SU7xPm98QTqMSYiCwfO89QNjXLkbQ==
email-templates@^10.0.1:
version "10.0.1"
@@ -2744,135 +2844,152 @@ emoji-regex@^8.0.0:
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+emoji-regex@^9.2.2:
+ version "9.2.2"
+ resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+ integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+
encodeurl@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
- integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+ integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
-encoding-japanese@2.0.0:
+encodeurl@~2.0.0:
version "2.0.0"
- resolved "https://registry.yarnpkg.com/encoding-japanese/-/encoding-japanese-2.0.0.tgz#fa0226e5469e7b5b69a04fea7d5481bd1fa56936"
- integrity sha512-++P0RhebUC8MJAwJOsT93dT+5oc5oPImp1HubZpAuCZ5kTLnhuuBhKHj2jJeO/Gj93idPBWmIuQ9QWMe5rX3pQ==
+ resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
+ integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
-end-of-stream@^1.1.0:
- version "1.4.4"
- resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
- integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
- dependencies:
- once "^1.4.0"
-
-enhanced-resolve@^5.12.0:
- version "5.12.0"
- resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
- integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
- dependencies:
- graceful-fs "^4.2.4"
- tapable "^2.2.0"
+encoding-japanese@2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/encoding-japanese/-/encoding-japanese-2.2.0.tgz#0ef2d2351250547f432a2dd155453555c16deb59"
+ integrity sha512-EuJWwlHPZ1LbADuKTClvHtwbaFn4rOD+dRAbWysqEOXRc2Uui0hJInNJrsdH0c+OhJA4nrCBdSkW4DD5YxAo6A==
entities@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
-es-abstract@^1.19.0, es-abstract@^1.19.1:
- version "1.19.1"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
- integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
- dependencies:
- call-bind "^1.0.2"
- es-to-primitive "^1.2.1"
- function-bind "^1.1.1"
- get-intrinsic "^1.1.1"
- get-symbol-description "^1.0.0"
- has "^1.0.3"
- has-symbols "^1.0.2"
- internal-slot "^1.0.3"
- is-callable "^1.2.4"
- is-negative-zero "^2.0.1"
- is-regex "^1.1.4"
- is-shared-array-buffer "^1.0.1"
- is-string "^1.0.7"
- is-weakref "^1.0.1"
- object-inspect "^1.11.0"
- object-keys "^1.1.1"
- object.assign "^4.1.2"
- string.prototype.trimend "^1.0.4"
- string.prototype.trimstart "^1.0.4"
- unbox-primitive "^1.0.1"
+entities@^4.2.0, entities@^4.4.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+ integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
-es-abstract@^1.20.4:
- version "1.21.1"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz#e6105a099967c08377830a0c9cb589d570dd86c6"
- integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==
+error-ex@^1.3.1:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+ integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
dependencies:
- available-typed-arrays "^1.0.5"
- call-bind "^1.0.2"
- es-set-tostringtag "^2.0.1"
- es-to-primitive "^1.2.1"
- function-bind "^1.1.1"
- function.prototype.name "^1.1.5"
- get-intrinsic "^1.1.3"
- get-symbol-description "^1.0.0"
- globalthis "^1.0.3"
- gopd "^1.0.1"
- has "^1.0.3"
- has-property-descriptors "^1.0.0"
- has-proto "^1.0.1"
- has-symbols "^1.0.3"
- internal-slot "^1.0.4"
- is-array-buffer "^3.0.1"
+ is-arrayish "^0.2.1"
+
+es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.9:
+ version "1.23.9"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.9.tgz#5b45994b7de78dada5c1bebf1379646b32b9d606"
+ integrity sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==
+ dependencies:
+ array-buffer-byte-length "^1.0.2"
+ arraybuffer.prototype.slice "^1.0.4"
+ available-typed-arrays "^1.0.7"
+ call-bind "^1.0.8"
+ call-bound "^1.0.3"
+ data-view-buffer "^1.0.2"
+ data-view-byte-length "^1.0.2"
+ data-view-byte-offset "^1.0.1"
+ es-define-property "^1.0.1"
+ es-errors "^1.3.0"
+ es-object-atoms "^1.0.0"
+ es-set-tostringtag "^2.1.0"
+ es-to-primitive "^1.3.0"
+ function.prototype.name "^1.1.8"
+ get-intrinsic "^1.2.7"
+ get-proto "^1.0.0"
+ get-symbol-description "^1.1.0"
+ globalthis "^1.0.4"
+ gopd "^1.2.0"
+ has-property-descriptors "^1.0.2"
+ has-proto "^1.2.0"
+ has-symbols "^1.1.0"
+ hasown "^2.0.2"
+ internal-slot "^1.1.0"
+ is-array-buffer "^3.0.5"
is-callable "^1.2.7"
- is-negative-zero "^2.0.2"
- is-regex "^1.1.4"
- is-shared-array-buffer "^1.0.2"
- is-string "^1.0.7"
- is-typed-array "^1.1.10"
- is-weakref "^1.0.2"
- object-inspect "^1.12.2"
+ is-data-view "^1.0.2"
+ is-regex "^1.2.1"
+ is-shared-array-buffer "^1.0.4"
+ is-string "^1.1.1"
+ is-typed-array "^1.1.15"
+ is-weakref "^1.1.0"
+ math-intrinsics "^1.1.0"
+ object-inspect "^1.13.3"
object-keys "^1.1.1"
- object.assign "^4.1.4"
- regexp.prototype.flags "^1.4.3"
- safe-regex-test "^1.0.0"
- string.prototype.trimend "^1.0.6"
- string.prototype.trimstart "^1.0.6"
- typed-array-length "^1.0.4"
- unbox-primitive "^1.0.2"
- which-typed-array "^1.1.9"
+ object.assign "^4.1.7"
+ own-keys "^1.0.1"
+ regexp.prototype.flags "^1.5.3"
+ safe-array-concat "^1.1.3"
+ safe-push-apply "^1.0.0"
+ safe-regex-test "^1.1.0"
+ set-proto "^1.0.0"
+ string.prototype.trim "^1.2.10"
+ string.prototype.trimend "^1.0.9"
+ string.prototype.trimstart "^1.0.8"
+ typed-array-buffer "^1.0.3"
+ typed-array-byte-length "^1.0.3"
+ typed-array-byte-offset "^1.0.4"
+ typed-array-length "^1.0.7"
+ unbox-primitive "^1.1.0"
+ which-typed-array "^1.1.18"
-es-set-tostringtag@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
- integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
- dependencies:
- get-intrinsic "^1.1.3"
- has "^1.0.3"
- has-tostringtag "^1.0.0"
-
-es-shim-unscopables@^1.0.0:
+es-array-method-boxes-properly@^1.0.0:
version "1.0.0"
- resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
- integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+ resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
+ integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
+
+es-define-property@^1.0.0, es-define-property@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
+ integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
+
+es-errors@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+ integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
+
+es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
+ integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
dependencies:
- has "^1.0.3"
+ es-errors "^1.3.0"
-es-to-primitive@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
- integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+es-set-tostringtag@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
+ integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
dependencies:
- is-callable "^1.1.4"
- is-date-object "^1.0.1"
- is-symbol "^1.0.2"
+ es-errors "^1.3.0"
+ get-intrinsic "^1.2.6"
+ has-tostringtag "^1.0.2"
+ hasown "^2.0.2"
-escalade@^3.1.1:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
- integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+es-shim-unscopables@^1.0.2, es-shim-unscopables@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz#438df35520dac5d105f3943d927549ea3b00f4b5"
+ integrity sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==
+ dependencies:
+ hasown "^2.0.2"
-escape-goat@^2.0.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675"
- integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==
+es-to-primitive@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz#96c89c82cc49fd8794a24835ba3e1ff87f214e18"
+ integrity sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==
+ dependencies:
+ is-callable "^1.2.7"
+ is-date-object "^1.0.5"
+ is-symbol "^1.0.4"
+
+escalade@^3.1.1, escalade@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
+ integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
escape-goat@^3.0.0:
version "3.0.0"
@@ -2882,7 +2999,7 @@ escape-goat@^3.0.0:
escape-html@~1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
- integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+ integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
escape-string-applescript@^1.0.0:
version "1.0.0"
@@ -2892,7 +3009,7 @@ escape-string-applescript@^1.0.0:
escape-string-regexp@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
- integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+ integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
escape-string-regexp@^2.0.0:
version "2.0.0"
@@ -2905,53 +3022,52 @@ escape-string-regexp@^4.0.0:
integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
escodegen@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
- integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17"
+ integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==
dependencies:
esprima "^4.0.1"
estraverse "^5.2.0"
esutils "^2.0.2"
- optionator "^0.8.1"
optionalDependencies:
source-map "~0.6.1"
eslint-config-prettier@^8.8.0:
- version "8.8.0"
- resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348"
- integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==
+ version "8.10.0"
+ resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11"
+ integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==
eslint-config-standard@^17.0.0:
- version "17.0.0"
- resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz#fd5b6cf1dcf6ba8d29f200c461de2e19069888cf"
- integrity sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==
+ version "17.1.0"
+ resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz#40ffb8595d47a6b242e07cbfd49dc211ed128975"
+ integrity sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==
-eslint-import-resolver-node@^0.3.7:
- version "0.3.7"
- resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7"
- integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
+eslint-import-resolver-node@^0.3.9:
+ version "0.3.9"
+ resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+ integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
dependencies:
debug "^3.2.7"
- is-core-module "^2.11.0"
- resolve "^1.22.1"
+ is-core-module "^2.13.0"
+ resolve "^1.22.4"
eslint-import-resolver-typescript@^3.5.4:
- version "3.5.4"
- resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.4.tgz#7370c326c3c08f0c1839c592d79d20b704de15d4"
- integrity sha512-9xUpnedEmSfG57sN1UvWPiEhfJ8bPt0Wg2XysA7Mlc79iFGhmJtRUg9LxtkK81FhMUui0YuR2E8iUsVhePkh4A==
+ version "3.9.0"
+ resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.9.0.tgz#e94219827696f7d17139c343642859d60e277e78"
+ integrity sha512-EUcFmaz0zAa6P2C9jAb5XDymRld8S6TURvWcIW7y+czOW+K8hrjgQgbhBsNE0J/dDZ6HLfcn70LqnIil9W+ICw==
dependencies:
- debug "^4.3.4"
- enhanced-resolve "^5.12.0"
- get-tsconfig "^4.5.0"
- globby "^13.1.3"
- is-core-module "^2.11.0"
- is-glob "^4.0.3"
- synckit "^0.8.5"
+ "@nolyfill/is-core-module" "1.0.39"
+ debug "^4.3.7"
+ get-tsconfig "^4.10.0"
+ is-bun-module "^1.0.2"
+ oxc-resolver "^5.0.0"
+ stable-hash "^0.0.5"
+ tinyglobby "^0.2.12"
-eslint-module-utils@^2.7.4:
- version "2.7.4"
- resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974"
- integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
+eslint-module-utils@^2.12.0:
+ version "2.12.0"
+ resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz#fe4cfb948d61f49203d7b08871982b65b9af0b0b"
+ integrity sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==
dependencies:
debug "^3.2.7"
@@ -2964,30 +3080,34 @@ eslint-plugin-es@^4.1.0:
regexpp "^3.0.0"
eslint-plugin-import@^2.27.5:
- version "2.27.5"
- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
- integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==
+ version "2.31.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz#310ce7e720ca1d9c0bb3f69adfd1c6bdd7d9e0e7"
+ integrity sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==
dependencies:
- array-includes "^3.1.6"
- array.prototype.flat "^1.3.1"
- array.prototype.flatmap "^1.3.1"
+ "@rtsao/scc" "^1.1.0"
+ array-includes "^3.1.8"
+ array.prototype.findlastindex "^1.2.5"
+ array.prototype.flat "^1.3.2"
+ array.prototype.flatmap "^1.3.2"
debug "^3.2.7"
doctrine "^2.1.0"
- eslint-import-resolver-node "^0.3.7"
- eslint-module-utils "^2.7.4"
- has "^1.0.3"
- is-core-module "^2.11.0"
+ eslint-import-resolver-node "^0.3.9"
+ eslint-module-utils "^2.12.0"
+ hasown "^2.0.2"
+ is-core-module "^2.15.1"
is-glob "^4.0.3"
minimatch "^3.1.2"
- object.values "^1.1.6"
- resolve "^1.22.1"
- semver "^6.3.0"
- tsconfig-paths "^3.14.1"
+ object.fromentries "^2.0.8"
+ object.groupby "^1.0.3"
+ object.values "^1.2.0"
+ semver "^6.3.1"
+ string.prototype.trimend "^1.0.8"
+ tsconfig-paths "^3.15.0"
eslint-plugin-jest@^27.2.1:
- version "27.2.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.2.1.tgz#b85b4adf41c682ea29f1f01c8b11ccc39b5c672c"
- integrity sha512-l067Uxx7ZT8cO9NJuf+eJHvt6bqJyz2Z29wykyEdz/OtmcELQl2MQGQLX8J94O1cSJWAwUSEvCjwjA7KEK3Hmg==
+ version "27.9.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.9.0.tgz#7c98a33605e1d8b8442ace092b60e9919730000b"
+ integrity sha512-QIT7FH7fNmd9n4se7FFKHbsLKGQiw885Ds6Y/sxKgCZ6natwCsXdgPOADnYVxN2QrRweF0FZWbJ6S7Rsn7llug==
dependencies:
"@typescript-eslint/utils" "^5.10.0"
@@ -3013,9 +3133,9 @@ eslint-plugin-prettier@^4.2.1:
prettier-linter-helpers "^1.0.0"
eslint-plugin-promise@^6.1.1:
- version "6.1.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz#269a3e2772f62875661220631bd4dafcb4083816"
- integrity sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==
+ version "6.6.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz#acd3fd7d55cead7a10f92cf698f36c0aafcd717a"
+ integrity sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==
eslint-plugin-security@^1.7.1:
version "1.7.1"
@@ -3039,10 +3159,10 @@ eslint-scope@^5.1.1:
esrecurse "^4.3.0"
estraverse "^4.1.1"
-eslint-scope@^7.1.1:
- version "7.1.1"
- resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
- integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+eslint-scope@^7.2.2:
+ version "7.2.2"
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+ integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
dependencies:
esrecurse "^4.3.0"
estraverse "^5.2.0"
@@ -3071,37 +3191,33 @@ eslint-visitor-keys@^2.0.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-eslint-visitor-keys@^3.3.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
- integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+ version "3.4.3"
+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+ integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
-eslint-visitor-keys@^3.4.0:
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz#c7f0f956124ce677047ddbc192a68f999454dedc"
- integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==
-
-eslint@^8.37.0:
- version "8.37.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.37.0.tgz#1f660ef2ce49a0bfdec0b0d698e0b8b627287412"
- integrity sha512-NU3Ps9nI05GUoVMxcZx1J8CNR6xOvUT4jAUMH5+z8lpp3aEdPVCImKw6PWG4PY+Vfkpr+jvMpxs/qoE7wq0sPw==
+eslint@^8.57.1:
+ version "8.57.1"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9"
+ integrity sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==
dependencies:
"@eslint-community/eslint-utils" "^4.2.0"
- "@eslint-community/regexpp" "^4.4.0"
- "@eslint/eslintrc" "^2.0.2"
- "@eslint/js" "8.37.0"
- "@humanwhocodes/config-array" "^0.11.8"
+ "@eslint-community/regexpp" "^4.6.1"
+ "@eslint/eslintrc" "^2.1.4"
+ "@eslint/js" "8.57.1"
+ "@humanwhocodes/config-array" "^0.13.0"
"@humanwhocodes/module-importer" "^1.0.1"
"@nodelib/fs.walk" "^1.2.8"
- ajv "^6.10.0"
+ "@ungap/structured-clone" "^1.2.0"
+ ajv "^6.12.4"
chalk "^4.0.0"
cross-spawn "^7.0.2"
debug "^4.3.2"
doctrine "^3.0.0"
escape-string-regexp "^4.0.0"
- eslint-scope "^7.1.1"
- eslint-visitor-keys "^3.4.0"
- espree "^9.5.1"
+ eslint-scope "^7.2.2"
+ eslint-visitor-keys "^3.4.3"
+ espree "^9.6.1"
esquery "^1.4.2"
esutils "^2.0.2"
fast-deep-equal "^3.1.3"
@@ -3109,32 +3225,34 @@ eslint@^8.37.0:
find-up "^5.0.0"
glob-parent "^6.0.2"
globals "^13.19.0"
- grapheme-splitter "^1.0.4"
+ graphemer "^1.4.0"
ignore "^5.2.0"
- import-fresh "^3.0.0"
imurmurhash "^0.1.4"
is-glob "^4.0.0"
is-path-inside "^3.0.3"
- js-sdsl "^4.1.4"
js-yaml "^4.1.0"
json-stable-stringify-without-jsonify "^1.0.1"
levn "^0.4.1"
lodash.merge "^4.6.2"
minimatch "^3.1.2"
natural-compare "^1.4.0"
- optionator "^0.9.1"
+ optionator "^0.9.3"
strip-ansi "^6.0.1"
- strip-json-comments "^3.1.0"
text-table "^0.2.0"
-espree@^9.5.1:
- version "9.5.1"
- resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.1.tgz#4f26a4d5f18905bf4f2e0bd99002aab807e96dd4"
- integrity sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==
+espree@^9.6.0, espree@^9.6.1:
+ version "9.6.1"
+ resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+ integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
dependencies:
- acorn "^8.8.0"
+ acorn "^8.9.0"
acorn-jsx "^5.3.2"
- eslint-visitor-keys "^3.4.0"
+ eslint-visitor-keys "^3.4.1"
+
+esprima@^1.2.0:
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.2.5.tgz#0993502feaf668138325756f30f9a51feeec11e9"
+ integrity sha512-S9VbPDU0adFErpDai3qDkjq8+G05ONtKzcyNrPKg/ZKa+tf879nX2KexNU95b31UoTJjRLInNBHHHjFPoCd7lQ==
esprima@^4.0.0, esprima@^4.0.1:
version "4.0.1"
@@ -3142,9 +3260,9 @@ esprima@^4.0.0, esprima@^4.0.1:
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
esquery@^1.4.2:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
- integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
+ integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
dependencies:
estraverse "^5.1.0"
@@ -3155,15 +3273,20 @@ esrecurse@^4.3.0:
dependencies:
estraverse "^5.2.0"
+estraverse@^1.5.0:
+ version "1.9.3"
+ resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
+ integrity sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==
+
estraverse@^4.1.1:
version "4.3.0"
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
estraverse@^5.1.0, estraverse@^5.2.0:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
- integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+ version "5.3.0"
+ resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+ integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
esutils@^2.0.2:
version "2.0.3"
@@ -3173,7 +3296,12 @@ esutils@^2.0.2:
etag@~1.8.1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
- integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+ integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
+
+event-target-shim@^5.0.0:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+ integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
eventemitter3@^3.1.0:
version "3.1.2"
@@ -3211,68 +3339,72 @@ execa@^5.0.0:
exit@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
- integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+ integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
-expect@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/expect/-/expect-27.2.5.tgz#16154aaa60b4d9a5b0adacfea3e4d6178f4b93fd"
- integrity sha512-ZrO0w7bo8BgGoP/bLz+HDCI+0Hfei9jUSZs5yI/Wyn9VkG9w8oJ7rHRgYj+MA7yqqFa0IwHA3flJzZtYugShJA==
+expect@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/expect/-/expect-27.5.1.tgz#83ce59f1e5bdf5f9d2b94b61d2050db48f3fef74"
+ integrity sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==
dependencies:
- "@jest/types" "^27.2.5"
- ansi-styles "^5.0.0"
- jest-get-type "^27.0.6"
- jest-matcher-utils "^27.2.5"
- jest-message-util "^27.2.5"
- jest-regex-util "^27.0.6"
+ "@jest/types" "^27.5.1"
+ jest-get-type "^27.5.1"
+ jest-matcher-utils "^27.5.1"
+ jest-message-util "^27.5.1"
express-rate-limit@7:
- version "7.1.5"
- resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-7.1.5.tgz#af4c81143a945ea97f2599d13957440a0ddbfcfe"
- integrity sha512-/iVogxu7ueadrepw1bS0X0kaRC/U0afwiYRSLg68Ts+p4Dc85Q5QKsOnPS/QUjPMHvOJQtBDrZgvkOzf8ejUYw==
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-7.5.0.tgz#6a67990a724b4fbbc69119419feef50c51e8b28f"
+ integrity sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==
express-slow-down@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/express-slow-down/-/express-slow-down-2.0.1.tgz#60c4515467314675d89c54ec608e2d586aa30f87"
- integrity sha512-zRogSZhNXJYKDBekhgFfFXGrOngH7Fub7Mx2g8OQ4RUBwSJP/3TVEKMgSGR/WlneT0mJ6NBUnidHhIELGVPe3w==
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/express-slow-down/-/express-slow-down-2.0.3.tgz#7b953a15c95105386d78370f8d172d88bb225dd6"
+ integrity sha512-vATCiFd8uQHtTeK5/Q0nLUukhZh+RV5zkcHxLQr0X5dEFVEYqzVXEe48nW23Z49fwtR+ApD9zn9sZRisTCR99w==
dependencies:
express-rate-limit "7"
express@^4.17.1:
- version "4.17.1"
- resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
- integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+ version "4.21.2"
+ resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
+ integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
dependencies:
- accepts "~1.3.7"
+ accepts "~1.3.8"
array-flatten "1.1.1"
- body-parser "1.19.0"
- content-disposition "0.5.3"
+ body-parser "1.20.3"
+ content-disposition "0.5.4"
content-type "~1.0.4"
- cookie "0.4.0"
+ cookie "0.7.1"
cookie-signature "1.0.6"
debug "2.6.9"
- depd "~1.1.2"
- encodeurl "~1.0.2"
+ depd "2.0.0"
+ encodeurl "~2.0.0"
escape-html "~1.0.3"
etag "~1.8.1"
- finalhandler "~1.1.2"
+ finalhandler "1.3.1"
fresh "0.5.2"
- merge-descriptors "1.0.1"
+ http-errors "2.0.0"
+ merge-descriptors "1.0.3"
methods "~1.1.2"
- on-finished "~2.3.0"
+ on-finished "2.4.1"
parseurl "~1.3.3"
- path-to-regexp "0.1.7"
- proxy-addr "~2.0.5"
- qs "6.7.0"
+ path-to-regexp "0.1.12"
+ proxy-addr "~2.0.7"
+ qs "6.13.0"
range-parser "~1.2.1"
- safe-buffer "5.1.2"
- send "0.17.1"
- serve-static "1.14.1"
- setprototypeof "1.1.1"
- statuses "~1.5.0"
+ safe-buffer "5.2.1"
+ send "0.19.0"
+ serve-static "1.16.2"
+ setprototypeof "1.2.0"
+ statuses "2.0.1"
type-is "~1.6.18"
utils-merge "1.0.1"
vary "~1.1.2"
+extend-object@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/extend-object/-/extend-object-1.0.0.tgz#42514f84015d1356caf5187969dfb2bc1bda0823"
+ integrity sha512-0dHDIXC7y7LDmCh/lp1oYkmv73K25AMugQI07r8eFopkW6f7Ufn1q+ETMsJjnV9Am14SlElkqy3O92r6xEaxPw==
+
extract-files@^9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-9.0.0.tgz#8a7744f2437f81f5ed3250ed9f1550de902fe54a"
@@ -3289,52 +3421,55 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
fast-diff@^1.1.2:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
- integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
+ integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
-fast-glob@^3.2.11, fast-glob@^3.2.9:
- version "3.2.12"
- resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
- integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+fast-glob@^3.2.9:
+ version "3.3.3"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818"
+ integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==
dependencies:
"@nodelib/fs.stat" "^2.0.2"
"@nodelib/fs.walk" "^1.2.3"
glob-parent "^5.1.2"
merge2 "^1.3.0"
- micromatch "^4.0.4"
+ micromatch "^4.0.8"
fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6:
version "2.0.6"
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
- integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+ integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
fast-printf@^1.6.9:
- version "1.6.9"
- resolved "https://registry.yarnpkg.com/fast-printf/-/fast-printf-1.6.9.tgz#212f56570d2dc8ccdd057ee93d50dd414d07d676"
- integrity sha512-FChq8hbz65WMj4rstcQsFB0O7Cy++nmbNfLYnD9cYv2cRn8EG6k/MGn9kO/tjO66t09DLDugj3yL+V2o6Qftrg==
- dependencies:
- boolean "^3.1.4"
+ version "1.6.10"
+ resolved "https://registry.yarnpkg.com/fast-printf/-/fast-printf-1.6.10.tgz#c44ad871726152159d7a903a5af0d65cf3d75875"
+ integrity sha512-GwTgG9O4FVIdShhbVF3JxOgSBY2+ePGsu2V/UONgoCPzF9VY6ZdBMKsHKCYQHZwNk3qNouUolRDsgVxcVA5G1w==
fastq@^1.6.0:
- version "1.13.0"
- resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
- integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
+ version "1.19.1"
+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.19.1.tgz#d50eaba803c8846a883c16492821ebcd2cda55f5"
+ integrity sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==
dependencies:
reusify "^1.0.4"
fb-watchman@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
- integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
+ integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
dependencies:
bser "2.1.1"
+fdir@^6.4.3:
+ version "6.4.3"
+ resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.3.tgz#011cdacf837eca9b811c89dbb902df714273db72"
+ integrity sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==
+
file-entry-cache@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -3342,24 +3477,24 @@ file-entry-cache@^6.0.1:
dependencies:
flat-cache "^3.0.4"
-fill-range@^7.0.1:
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
- integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+ version "7.1.1"
+ resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+ integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
dependencies:
to-regex-range "^5.0.1"
-finalhandler@~1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
- integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+finalhandler@1.3.1:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019"
+ integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==
dependencies:
debug "2.6.9"
- encodeurl "~1.0.2"
+ encodeurl "~2.0.0"
escape-html "~1.0.3"
- on-finished "~2.3.0"
+ on-finished "2.4.1"
parseurl "~1.3.3"
- statuses "~1.5.0"
+ statuses "2.0.1"
unpipe "~1.0.0"
find-up@^4.0.0, find-up@^4.1.0:
@@ -3378,45 +3513,85 @@ find-up@^5.0.0:
locate-path "^6.0.0"
path-exists "^4.0.0"
-flat-cache@^3.0.4:
- version "3.0.4"
- resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
- integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+fixpack@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/fixpack/-/fixpack-4.0.0.tgz#28b9fb8ca04f89aab382021cfa826b36dc381dfd"
+ integrity sha512-5SM1+H2CcuJ3gGEwTiVo/+nd/hYpNj9Ch3iMDOQ58ndY+VGQ2QdvaUTkd3otjZvYnd/8LF/HkJ5cx7PBq0orCQ==
dependencies:
- flatted "^3.1.0"
+ alce "1.2.0"
+ chalk "^3.0.0"
+ detect-indent "^6.0.0"
+ detect-newline "^3.1.0"
+ extend-object "^1.0.0"
+ rc "^1.2.8"
+
+flat-cache@^3.0.4:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
+ integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
+ dependencies:
+ flatted "^3.2.9"
+ keyv "^4.5.3"
rimraf "^3.0.2"
-flatted@^3.1.0:
- version "3.2.2"
- resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561"
- integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==
-
-flatted@^3.2.5:
- version "3.2.5"
- resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
- integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
+flatted@^3.2.7, flatted@^3.2.9:
+ version "3.3.3"
+ resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.3.tgz#67c8fad95454a7c7abebf74bb78ee74a44023358"
+ integrity sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==
follow-redirects@^1.14.0:
- version "1.14.4"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
- integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
+ version "1.15.9"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
+ integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
-for-each@^0.3.3:
- version "0.3.3"
- resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
- integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+for-each@^0.3.3, for-each@^0.3.5:
+ version "0.3.5"
+ resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.5.tgz#d650688027826920feeb0af747ee7b9421a41d47"
+ integrity sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==
dependencies:
- is-callable "^1.1.3"
+ is-callable "^1.2.7"
+
+foreground-child@^3.1.0:
+ version "3.3.1"
+ resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
+ integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
+ dependencies:
+ cross-spawn "^7.0.6"
+ signal-exit "^4.0.1"
+
+form-data-encoder@1.7.2:
+ version "1.7.2"
+ resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.7.2.tgz#1f1ae3dccf58ed4690b86d87e4f57c654fbab040"
+ integrity sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==
form-data@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
- integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.3.tgz#349c8f2c9d8f8f0c879ee0eb7cc0d300018d6b09"
+ integrity sha512-q5YBMeWy6E2Un0nMGWMgI65MAKtaylxfNJGJxpGh45YDciZB4epbWpaAfImil6CPAPTYB4sh0URQNDRIZG5F2w==
dependencies:
asynckit "^0.4.0"
combined-stream "^1.0.8"
+ es-set-tostringtag "^2.1.0"
+ mime-types "^2.1.35"
+
+form-data@^4.0.0:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.2.tgz#35cabbdd30c3ce73deb2c42d3c8d3ed9ca51794c"
+ integrity sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==
+ dependencies:
+ asynckit "^0.4.0"
+ combined-stream "^1.0.8"
+ es-set-tostringtag "^2.1.0"
mime-types "^2.1.12"
+formdata-node@^4.3.2:
+ version "4.4.1"
+ resolved "https://registry.yarnpkg.com/formdata-node/-/formdata-node-4.4.1.tgz#23f6a5cb9cb55315912cbec4ff7b0f59bbd191e2"
+ integrity sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==
+ dependencies:
+ node-domexception "1.0.0"
+ web-streams-polyfill "4.0.0-beta.3"
+
forwarded@0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -3425,48 +3600,50 @@ forwarded@0.2.0:
fresh@0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
- integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+ integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
fs-capacitor@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/fs-capacitor/-/fs-capacitor-2.0.4.tgz#5a22e72d40ae5078b4fe64fe4d08c0d3fc88ad3c"
integrity sha512-8S4f4WsCryNw2mJJchi46YgB6CR5Ze+4L1h8ewl9tEpL4SJ3ZO+c/bS4BWhB8bK+O3TMqhuZarTitd0S0eh2pA==
-fs-extra@^10.1.0:
- version "10.1.0"
- resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
- integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
+fs-extra@^8.1.0:
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+ integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
dependencies:
graceful-fs "^4.2.0"
- jsonfile "^6.0.1"
- universalify "^2.0.0"
+ jsonfile "^4.0.0"
+ universalify "^0.1.0"
fs.realpath@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
- integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+ integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
fsevents@^2.3.2, fsevents@~2.3.2:
- version "2.3.2"
- resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
- integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+ version "2.3.3"
+ resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+ integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-function-bind@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
- integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+function-bind@^1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+ integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
-function.prototype.name@^1.1.5:
- version "1.1.5"
- resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
- integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:
+ version "1.1.8"
+ resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz#e68e1df7b259a5c949eeef95cdbde53edffabb78"
+ integrity sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==
dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.3"
- es-abstract "^1.19.0"
- functions-have-names "^1.2.2"
+ call-bind "^1.0.8"
+ call-bound "^1.0.3"
+ define-properties "^1.2.1"
+ functions-have-names "^1.2.3"
+ hasown "^2.0.2"
+ is-callable "^1.2.7"
-functions-have-names@^1.2.2:
+functions-have-names@^1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
@@ -3493,23 +3670,21 @@ get-caller-file@^2.0.5:
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
- integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.2.7, get-intrinsic@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
+ integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
dependencies:
- function-bind "^1.1.1"
- has "^1.0.3"
- has-symbols "^1.0.1"
-
-get-intrinsic@^1.1.3, get-intrinsic@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f"
- integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==
- dependencies:
- function-bind "^1.1.1"
- has "^1.0.3"
- has-symbols "^1.0.3"
+ call-bind-apply-helpers "^1.0.2"
+ es-define-property "^1.0.1"
+ es-errors "^1.3.0"
+ es-object-atoms "^1.1.1"
+ function-bind "^1.1.2"
+ get-proto "^1.0.1"
+ gopd "^1.2.0"
+ has-symbols "^1.1.0"
+ hasown "^2.0.2"
+ math-intrinsics "^1.1.0"
get-package-type@^0.1.0:
version "0.1.0"
@@ -3528,42 +3703,39 @@ get-port@5.1.1:
resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
+get-proto@^1.0.0, get-proto@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
+ integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
+ dependencies:
+ dunder-proto "^1.0.1"
+ es-object-atoms "^1.0.0"
+
get-stream@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
integrity sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==
-get-stream@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
- integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
- dependencies:
- pump "^3.0.0"
-
-get-stream@^5.1.0:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
- integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
- dependencies:
- pump "^3.0.0"
-
get-stream@^6.0.0:
version "6.0.1"
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
-get-symbol-description@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
- integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+get-symbol-description@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz#7bdd54e0befe8ffc9f3b4e203220d9f1e881b6ee"
+ integrity sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==
dependencies:
- call-bind "^1.0.2"
- get-intrinsic "^1.1.1"
+ call-bound "^1.0.3"
+ es-errors "^1.3.0"
+ get-intrinsic "^1.2.6"
-get-tsconfig@^4.5.0:
- version "4.5.0"
- resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.5.0.tgz#6d52d1c7b299bd3ee9cd7638561653399ac77b0f"
- integrity sha512-MjhiaIWCJ1sAU4pIQ5i5OfOuHHxVo1oYeNsWTON7jxYkod8pHocXeh+SSbmu5OZZZK73B6cbJ2XADzXehLyovQ==
+get-tsconfig@^4.10.0:
+ version "4.10.0"
+ resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.10.0.tgz#403a682b373a823612475a4c2928c7326fc0f6bb"
+ integrity sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==
+ dependencies:
+ resolve-pkg-maps "^1.0.0"
glob-parent@^5.1.2, glob-parent@~5.1.2:
version "5.1.2"
@@ -3579,59 +3751,49 @@ glob-parent@^6.0.2:
dependencies:
is-glob "^4.0.3"
+glob@^10.4.5:
+ version "10.4.5"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
+ integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
+ dependencies:
+ foreground-child "^3.1.0"
+ jackspeak "^3.1.2"
+ minimatch "^9.0.4"
+ minipass "^7.1.2"
+ package-json-from-dist "^1.0.0"
+ path-scurry "^1.11.1"
+
glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
- version "7.2.0"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
- integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+ version "7.2.3"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+ integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
inherits "2"
- minimatch "^3.0.4"
+ minimatch "^3.1.1"
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@^8.1.0:
- version "8.1.0"
- resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
- integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
- dependencies:
- fs.realpath "^1.0.0"
- inflight "^1.0.4"
- inherits "2"
- minimatch "^5.0.1"
- once "^1.3.0"
-
-global-dirs@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686"
- integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==
- dependencies:
- ini "2.0.0"
-
globals@^11.1.0:
version "11.12.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
globals@^13.19.0:
- version "13.20.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
- integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
+ version "13.24.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+ integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
dependencies:
type-fest "^0.20.2"
-globalthis@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
- integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
+globalthis@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
+ integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
dependencies:
- define-properties "^1.1.3"
-
-globalyzer@0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"
- integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==
+ define-properties "^1.2.1"
+ gopd "^1.0.1"
globby@^11.1.0:
version "11.1.0"
@@ -3645,58 +3807,23 @@ globby@^11.1.0:
merge2 "^1.4.1"
slash "^3.0.0"
-globby@^13.1.3:
- version "13.1.3"
- resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.3.tgz#f62baf5720bcb2c1330c8d4ef222ee12318563ff"
- integrity sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==
+gopd@^1.0.1, gopd@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
+ integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
+
+graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.9:
+ version "4.2.11"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+ integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
+"gradido-config@file:../config":
+ version "1.0.0"
dependencies:
- dir-glob "^3.0.1"
- fast-glob "^3.2.11"
- ignore "^5.2.0"
- merge2 "^1.4.1"
- slash "^4.0.0"
-
-globrex@^0.1.2:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
- integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
-
-gopd@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
- integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
- dependencies:
- get-intrinsic "^1.1.3"
-
-got@^9.6.0:
- version "9.6.0"
- resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
- integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
- dependencies:
- "@sindresorhus/is" "^0.14.0"
- "@szmarczak/http-timer" "^1.1.2"
- cacheable-request "^6.0.0"
- decompress-response "^3.3.0"
- duplexer3 "^0.1.4"
- get-stream "^4.1.0"
- lowercase-keys "^1.0.1"
- mimic-response "^1.0.1"
- p-cancelable "^1.0.0"
- to-readable-stream "^1.0.0"
- url-parse-lax "^3.0.0"
-
-graceful-fs@^4.1.2, graceful-fs@^4.2.4:
- version "4.2.8"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
- integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
-
-graceful-fs@^4.1.6, graceful-fs@^4.2.0:
- version "4.2.10"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
- integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+ joi "^17.13.3"
"gradido-database@file:../database":
- version "2.1.1"
+ version "2.5.1"
dependencies:
"@types/uuid" "^8.3.4"
cross-env "^7.0.3"
@@ -3711,19 +3838,27 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0:
uuid "^8.3.2"
wkx "^0.5.0"
-grapheme-splitter@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
- integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+graphemer@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+ integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
-graphql-extensions@^0.15.0:
- version "0.15.0"
- resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.15.0.tgz#3f291f9274876b0c289fa4061909a12678bd9817"
- integrity sha512-bVddVO8YFJPwuACn+3pgmrEg6I8iBuYLuwvxiE+lcQQ7POotVZxm2rgGw0PvVYmWWf3DT7nTVDZ5ROh/ALp8mA==
+graphql-extensions@^0.16.0:
+ version "0.16.0"
+ resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.16.0.tgz#32669fde0a2f115de60e5dda818ae457c1d71bb8"
+ integrity sha512-rZQc/USoEIw437BGRUwoHoLPR1LA791Ltj6axONqgKIyyx2sqIO3YT9kTbB/eIUdJBrCozp4KuUeZ09xKeQDxg==
dependencies:
"@apollographql/apollo-tools" "^0.5.0"
- apollo-server-env "^3.1.0"
- apollo-server-types "^0.9.0"
+ apollo-server-env "^3.2.0"
+ apollo-server-types "^0.10.0"
+
+graphql-parse-resolve-info@^4.13.0:
+ version "4.13.0"
+ resolved "https://registry.yarnpkg.com/graphql-parse-resolve-info/-/graphql-parse-resolve-info-4.13.0.tgz#03627032e25917bd6f9ed89e768568c61200e6ff"
+ integrity sha512-VVJ1DdHYcR7hwOGQKNH+QTzuNgsLA8l/y436HtP9YHoX6nmwXRWq3xWthU3autMysXdm0fQUbhTZCx0W9ICozw==
+ dependencies:
+ debug "^4.1.1"
+ tslib "^2.0.1"
graphql-query-complexity@^0.7.0:
version "0.7.2"
@@ -3749,14 +3884,7 @@ graphql-subscriptions@^1.0.0, graphql-subscriptions@^1.1.0:
dependencies:
iterall "^1.3.0"
-graphql-tag@^2.11.0:
- version "2.12.5"
- resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.5.tgz#5cff974a67b417747d05c8d9f5f3cb4495d0db8f"
- integrity sha512-5xNhP4063d16Pz3HBtKprutsPrmHZi5IdUGOWRxA2B6VF7BIRGOHZ5WQvDmJXZuPcBg7rYwaFxvQYjqkSdR3TQ==
- dependencies:
- tslib "^2.1.0"
-
-graphql-tag@^2.12.6:
+graphql-tag@^2.11.0, graphql-tag@^2.12.6:
version "2.12.6"
resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"
integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==
@@ -3774,71 +3902,63 @@ graphql-tools@^4.0.8:
iterall "^1.1.3"
uuid "^3.1.0"
-graphql@^15.5.1:
- version "15.6.1"
- resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.6.1.tgz#9125bdf057553525da251e19e96dab3d3855ddfc"
- integrity sha512-3i5lu0z6dRvJ48QP9kFxBkJ7h4Kso7PS8eahyTFz5Jm6CvQfLtNIE8LX9N6JLnXTuwR+sIYnXzaWp6anOg0QQw==
+graphql-type-json@0.3.2:
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/graphql-type-json/-/graphql-type-json-0.3.2.tgz#f53a851dbfe07bd1c8157d24150064baab41e115"
+ integrity sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg==
-has-bigints@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
- integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+graphql@^15.5.1:
+ version "15.10.1"
+ resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.10.1.tgz#e9ff3bb928749275477f748b14aa5c30dcad6f2f"
+ integrity sha512-BL/Xd/T9baO6NFzoMpiMD7YUZ62R6viR5tp/MULVEnbYJXZA//kRNW7J0j1w/wXArgL0sCxhDfK5dczSKn3+cg==
has-bigints@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
- integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.1.0.tgz#28607e965ac967e03cd2a2c70a2636a1edad49fe"
+ integrity sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==
has-flag@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
- integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+ integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
has-flag@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-has-property-descriptors@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
- integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
- dependencies:
- get-intrinsic "^1.1.1"
-
-has-proto@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
- integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
-
-has-symbols@^1.0.1, has-symbols@^1.0.2:
+has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
version "1.0.2"
- resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
- integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
-
-has-symbols@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
- integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
-
-has-tostringtag@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
- integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+ resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
+ integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
dependencies:
- has-symbols "^1.0.2"
+ es-define-property "^1.0.0"
-has-yarn@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
- integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
-
-has@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
- integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+has-proto@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.2.0.tgz#5de5a6eabd95fdffd9818b43055e8065e39fe9d5"
+ integrity sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==
dependencies:
- function-bind "^1.1.1"
+ dunder-proto "^1.0.0"
+
+has-symbols@^1.0.3, has-symbols@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
+ integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
+
+has-tostringtag@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+ integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
+ dependencies:
+ has-symbols "^1.0.3"
+
+hasown@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+ integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+ dependencies:
+ function-bind "^1.1.2"
he@1.2.0, he@^1.2.0:
version "1.2.0"
@@ -3850,11 +3970,6 @@ helmet@^5.1.1:
resolved "https://registry.yarnpkg.com/helmet/-/helmet-5.1.1.tgz#609823c5c2e78aea62dd9afc8f544ca409da5e85"
integrity sha512-/yX0oVZBggA9cLJh8aw3PPCfedBnbd7J2aowjzsaWwZh7/UFY0nccn/aHAggIgWUFfnykX8GKd3a1pSbrmlcVQ==
-highlight.js@^10.7.1:
- version "10.7.3"
- resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531"
- integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
-
html-encoding-sniffer@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
@@ -3867,17 +3982,16 @@ html-escaper@^2.0.0:
resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
-html-to-text@8.2.0:
- version "8.2.0"
- resolved "https://registry.yarnpkg.com/html-to-text/-/html-to-text-8.2.0.tgz#8b35e280ba7fc27710b7aa76d4500aab30731924"
- integrity sha512-CLXExYn1b++Lgri+ZyVvbUEFwzkLZppjjZOwB7X1qv2jIi8MrMEvxWX5KQ7zATAzTvcqgmtO00M2kCRMtEdOKQ==
+html-to-text@9.0.5:
+ version "9.0.5"
+ resolved "https://registry.yarnpkg.com/html-to-text/-/html-to-text-9.0.5.tgz#6149a0f618ae7a0db8085dca9bbf96d32bb8368d"
+ integrity sha512-qY60FjREgVZL03vJU6IfMV4GDjGBIoOyvuFdpBDIX9yTlDw0TjxVBQp+P8NvpdIXNJvfWBTNul7fsAQJq2FNpg==
dependencies:
- "@selderee/plugin-htmlparser2" "^0.6.0"
- deepmerge "^4.2.2"
- he "^1.2.0"
- htmlparser2 "^6.1.0"
- minimist "^1.2.6"
- selderee "^0.6.0"
+ "@selderee/plugin-htmlparser2" "^0.11.0"
+ deepmerge "^4.3.1"
+ dom-serializer "^2.0.0"
+ htmlparser2 "^8.0.2"
+ selderee "^0.11.0"
html-to-text@^8.2.0:
version "8.2.1"
@@ -3911,43 +4025,37 @@ htmlparser2@^6.1.0:
domutils "^2.5.2"
entities "^2.0.0"
-http-cache-semantics@^4.0.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
- integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
-
-http-errors@1.7.2:
- version "1.7.2"
- resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
- integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+htmlparser2@^8.0.2:
+ version "8.0.2"
+ resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21"
+ integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==
dependencies:
- depd "~1.1.2"
- inherits "2.0.3"
- setprototypeof "1.1.1"
- statuses ">= 1.5.0 < 2"
- toidentifier "1.0.0"
+ domelementtype "^2.3.0"
+ domhandler "^5.0.3"
+ domutils "^3.0.1"
+ entities "^4.4.0"
+
+http-errors@2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
+ integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
+ dependencies:
+ depd "2.0.0"
+ inherits "2.0.4"
+ setprototypeof "1.2.0"
+ statuses "2.0.1"
+ toidentifier "1.0.1"
http-errors@^1.7.3:
- version "1.8.0"
- resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.0.tgz#75d1bbe497e1044f51e4ee9e704a62f28d336507"
- integrity sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A==
+ version "1.8.1"
+ resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
+ integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
dependencies:
depd "~1.1.2"
inherits "2.0.4"
setprototypeof "1.2.0"
statuses ">= 1.5.0 < 2"
- toidentifier "1.0.0"
-
-http-errors@~1.7.2:
- version "1.7.3"
- resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
- integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
- dependencies:
- depd "~1.1.2"
- inherits "2.0.4"
- setprototypeof "1.1.1"
- statuses ">= 1.5.0 < 2"
- toidentifier "1.0.0"
+ toidentifier "1.0.1"
http-proxy-agent@^4.0.1:
version "4.0.1"
@@ -3959,9 +4067,9 @@ http-proxy-agent@^4.0.1:
debug "4"
https-proxy-agent@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
- integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+ integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
dependencies:
agent-base "6"
debug "4"
@@ -3971,6 +4079,13 @@ human-signals@^2.1.0:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+humanize-ms@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+ integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
+ dependencies:
+ ms "^2.0.0"
+
i18n-locales@^0.0.5:
version "0.0.5"
resolved "https://registry.yarnpkg.com/i18n-locales/-/i18n-locales-0.0.5.tgz#8f587e598ab982511d7c7db910cb45b8d93cd96a"
@@ -3978,19 +4093,7 @@ i18n-locales@^0.0.5:
dependencies:
"@ladjs/country-language" "^0.2.1"
-i18n@^0.15.0:
- version "0.15.0"
- resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.15.0.tgz#dca7a498a4371874db01f6610381a412897306eb"
- integrity sha512-TUOkuFbl8Y/q7zF0tHdtpk1/TtxH0T+Drp2NFrHhmN1Qs0Sob9/0uVLS2BPVkEXNh2jZrimOiFJk+tkaOumzog==
- dependencies:
- "@messageformat/core" "^3.0.0"
- debug "^4.3.3"
- fast-printf "^1.6.9"
- make-plural "^7.0.0"
- math-interval-parser "^2.0.1"
- mustache "^4.2.0"
-
-i18n@^0.15.1:
+i18n@^0.15.0, i18n@^0.15.1:
version "0.15.1"
resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.15.1.tgz#68fb8993c461cc440bc2485d82f72019f2b92de8"
integrity sha512-yue187t8MqUPMHdKjiZGrX+L+xcUsDClGO0Cz4loaKUOK9WrGw5pgan4bv130utOwX7fHE9w2iUeHFalVQWkXA==
@@ -4009,7 +4112,7 @@ iconv-lite@0.4.24:
dependencies:
safer-buffer ">= 2.1.2 < 3"
-iconv-lite@0.6.3, iconv-lite@^0.6.2:
+iconv-lite@0.6.3, iconv-lite@^0.6.3:
version "0.6.3"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -4024,35 +4127,25 @@ ieee754@^1.2.1:
ignore-by-default@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
- integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk=
+ integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==
-ignore@^5.1.1:
- version "5.1.8"
- resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
- integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+ignore@^5.1.1, ignore@^5.2.0, ignore@^5.2.4:
+ version "5.3.2"
+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+ integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
-ignore@^5.2.0, ignore@^5.2.4:
- version "5.2.4"
- resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
- integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
-
-import-fresh@^3.0.0, import-fresh@^3.2.1:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
- integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+import-fresh@^3.2.1:
+ version "3.3.1"
+ resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.1.tgz#9cecb56503c0ada1f2741dbbd6546e4b13b57ccf"
+ integrity sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==
dependencies:
parent-module "^1.0.0"
resolve-from "^4.0.0"
-import-lazy@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
- integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
-
import-local@^3.0.2:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz#4d51c2c495ca9393da259ec66b62e022920211e0"
- integrity sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.2.0.tgz#c3d5c745798c02a6f8b897726aba5100186ee260"
+ integrity sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==
dependencies:
pkg-dir "^4.2.0"
resolve-cwd "^3.0.0"
@@ -4060,12 +4153,12 @@ import-local@^3.0.2:
imurmurhash@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
- integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+ integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
inflight@^1.0.4:
version "1.0.6"
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
- integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+ integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
dependencies:
once "^1.3.0"
wrappy "1"
@@ -4075,59 +4168,56 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@~2.0.3:
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-inherits@2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
- integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-ini@2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
- integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
-
ini@~1.3.0:
version "1.3.8"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-internal-slot@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
- integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
+internal-slot@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.1.0.tgz#1eac91762947d2f7056bc838d93e13b2e9604961"
+ integrity sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==
dependencies:
- get-intrinsic "^1.1.0"
- has "^1.0.3"
- side-channel "^1.0.4"
-
-internal-slot@^1.0.4:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
- integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
- dependencies:
- get-intrinsic "^1.2.0"
- has "^1.0.3"
- side-channel "^1.0.4"
+ es-errors "^1.3.0"
+ hasown "^2.0.2"
+ side-channel "^1.1.0"
ipaddr.js@1.9.1:
version "1.9.1"
resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
-is-array-buffer@^3.0.1:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
- integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
+is-array-buffer@^3.0.4, is-array-buffer@^3.0.5:
+ version "3.0.5"
+ resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz#65742e1e687bd2cc666253068fd8707fe4d44280"
+ integrity sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==
dependencies:
- call-bind "^1.0.2"
- get-intrinsic "^1.2.0"
- is-typed-array "^1.1.10"
+ call-bind "^1.0.8"
+ call-bound "^1.0.3"
+ get-intrinsic "^1.2.6"
-is-bigint@^1.0.1:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
- integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+is-arrayish@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+ integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
+
+is-async-function@^2.0.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.1.1.tgz#3e69018c8e04e73b738793d020bfe884b9fd3523"
+ integrity sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==
dependencies:
- has-bigints "^1.0.1"
+ async-function "^1.0.0"
+ call-bound "^1.0.3"
+ get-proto "^1.0.1"
+ has-tostringtag "^1.0.2"
+ safe-regex-test "^1.1.0"
+
+is-bigint@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.1.0.tgz#dda7a3445df57a42583db4228682eba7c4170672"
+ integrity sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==
+ dependencies:
+ has-bigints "^1.0.2"
is-binary-path@~2.1.0:
version "2.1.0"
@@ -4136,67 +4226,51 @@ is-binary-path@~2.1.0:
dependencies:
binary-extensions "^2.0.0"
-is-boolean-object@^1.1.0:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
- integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
+is-boolean-object@^1.2.1:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.2.tgz#7067f47709809a393c71ff5bb3e135d8a9215d9e"
+ integrity sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==
dependencies:
- call-bind "^1.0.2"
- has-tostringtag "^1.0.0"
+ call-bound "^1.0.3"
+ has-tostringtag "^1.0.2"
-is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.4:
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
- integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
+is-bun-module@^1.0.2:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/is-bun-module/-/is-bun-module-1.3.0.tgz#ea4d24fdebfcecc98e81bcbcb506827fee288760"
+ integrity sha512-DgXeu5UWI0IsMQundYb5UAOzm6G2eVnarJ0byP6Tm55iZNKceD59LNPA2L4VvsScTtHcw0yEkVwSf7PC+QoLSA==
+ dependencies:
+ semver "^7.6.3"
is-callable@^1.2.7:
version "1.2.7"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
-is-ci@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
- integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
+is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.15.1, is-core-module@^2.16.0:
+ version "2.16.1"
+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
+ integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
dependencies:
- ci-info "^2.0.0"
+ hasown "^2.0.2"
-is-ci@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz#c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994"
- integrity sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==
+is-data-view@^1.0.1, is-data-view@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.2.tgz#bae0a41b9688986c2188dda6657e56b8f9e63b8e"
+ integrity sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==
dependencies:
- ci-info "^3.1.1"
+ call-bound "^1.0.2"
+ get-intrinsic "^1.2.6"
+ is-typed-array "^1.1.13"
-is-core-module@^2.11.0:
- version "2.11.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
- integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+is-date-object@^1.0.5, is-date-object@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.1.0.tgz#ad85541996fc7aa8b2729701d27b7319f95d82f7"
+ integrity sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==
dependencies:
- has "^1.0.3"
+ call-bound "^1.0.2"
+ has-tostringtag "^1.0.2"
-is-core-module@^2.2.0:
- version "2.7.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3"
- integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==
- dependencies:
- has "^1.0.3"
-
-is-core-module@^2.9.0:
- version "2.9.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
- integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
- dependencies:
- has "^1.0.3"
-
-is-date-object@^1.0.1:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
- integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
- dependencies:
- has-tostringtag "^1.0.0"
-
-is-docker@^2.0.0, is-docker@^2.1.1:
+is-docker@^2.0.0:
version "2.2.1"
resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
@@ -4212,7 +4286,14 @@ is-expression@^4.0.0:
is-extglob@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
- integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+ integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
+
+is-finalizationregistry@^1.1.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz#eefdcdc6c94ddd0674d9c85887bf93f944a97c90"
+ integrity sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==
+ dependencies:
+ call-bound "^1.0.3"
is-fullwidth-code-point@^3.0.0:
version "3.0.0"
@@ -4224,6 +4305,16 @@ is-generator-fn@^2.0.0:
resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
+is-generator-function@^1.0.10:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.0.tgz#bf3eeda931201394f57b5dba2800f91a238309ca"
+ integrity sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==
+ dependencies:
+ call-bound "^1.0.3"
+ get-proto "^1.0.0"
+ has-tostringtag "^1.0.2"
+ safe-regex-test "^1.1.0"
+
is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
version "4.0.3"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
@@ -4231,47 +4322,25 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
dependencies:
is-extglob "^2.1.1"
-is-installed-globally@^0.4.0:
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
- integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==
+is-map@^2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
+ integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
+
+is-number-object@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541"
+ integrity sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==
dependencies:
- global-dirs "^3.0.0"
- is-path-inside "^3.0.2"
-
-is-negative-zero@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
- integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
-
-is-negative-zero@^2.0.2:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
- integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
-
-is-npm@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8"
- integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==
-
-is-number-object@^1.0.4:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0"
- integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==
- dependencies:
- has-tostringtag "^1.0.0"
+ call-bound "^1.0.3"
+ has-tostringtag "^1.0.2"
is-number@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-is-obj@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
- integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
-
-is-path-inside@^3.0.2, is-path-inside@^3.0.3:
+is-path-inside@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
@@ -4289,27 +4358,29 @@ is-promise@^2.0.0:
is-property@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
- integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
+ integrity sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==
-is-regex@^1.0.3, is-regex@^1.1.4:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
- integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
+is-regex@^1.0.3, is-regex@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22"
+ integrity sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==
dependencies:
- call-bind "^1.0.2"
- has-tostringtag "^1.0.0"
+ call-bound "^1.0.2"
+ gopd "^1.2.0"
+ has-tostringtag "^1.0.2"
+ hasown "^2.0.2"
-is-shared-array-buffer@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
- integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
+is-set@^2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"
+ integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==
-is-shared-array-buffer@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
- integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+is-shared-array-buffer@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz#9b67844bd9b7f246ba0708c3a93e34269c774f6f"
+ integrity sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==
dependencies:
- call-bind "^1.0.2"
+ call-bound "^1.0.3"
is-stream@^1.1.0:
version "1.1.0"
@@ -4321,61 +4392,66 @@ is-stream@^2.0.0:
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-is-string@^1.0.5, is-string@^1.0.7:
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
- integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+is-string@^1.0.7, is-string@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.1.1.tgz#92ea3f3d5c5b6e039ca8677e5ac8d07ea773cbb9"
+ integrity sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==
dependencies:
- has-tostringtag "^1.0.0"
+ call-bound "^1.0.3"
+ has-tostringtag "^1.0.2"
-is-symbol@^1.0.2, is-symbol@^1.0.3:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
- integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
+is-symbol@^1.0.4, is-symbol@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.1.tgz#f47761279f532e2b05a7024a7506dbbedacd0634"
+ integrity sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==
dependencies:
- has-symbols "^1.0.2"
+ call-bound "^1.0.2"
+ has-symbols "^1.1.0"
+ safe-regex-test "^1.1.0"
-is-typed-array@^1.1.10, is-typed-array@^1.1.9:
- version "1.1.10"
- resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
- integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
+is-typed-array@^1.1.13, is-typed-array@^1.1.14, is-typed-array@^1.1.15:
+ version "1.1.15"
+ resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b"
+ integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==
dependencies:
- available-typed-arrays "^1.0.5"
- call-bind "^1.0.2"
- for-each "^0.3.3"
- gopd "^1.0.1"
- has-tostringtag "^1.0.0"
+ which-typed-array "^1.1.16"
is-typedarray@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
- integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+ integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
-is-weakref@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
- integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==
+is-weakmap@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"
+ integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==
+
+is-weakref@^1.0.2, is-weakref@^1.1.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.1.1.tgz#eea430182be8d64174bd96bffbc46f21bf3f9293"
+ integrity sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==
dependencies:
- call-bind "^1.0.0"
+ call-bound "^1.0.3"
-is-weakref@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
- integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
+is-weakset@^2.0.3:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.4.tgz#c9f5deb0bc1906c6d6f1027f284ddf459249daca"
+ integrity sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==
dependencies:
- call-bind "^1.0.2"
+ call-bound "^1.0.3"
+ get-intrinsic "^1.2.6"
-is-wsl@^2.1.1, is-wsl@^2.2.0:
+is-wsl@^2.1.1:
version "2.2.0"
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
dependencies:
is-docker "^2.0.0"
-is-yarn-global@^0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
- integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
+isarray@^2.0.5:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+ integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
isarray@~1.0.0:
version "1.0.0"
@@ -4385,45 +4461,46 @@ isarray@~1.0.0:
isexe@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
- integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+ integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-istanbul-lib-coverage@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
- integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
+istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
+ integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
-istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
- version "4.0.3"
- resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
- integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
+istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
+ integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
dependencies:
- "@babel/core" "^7.7.5"
+ "@babel/core" "^7.12.3"
+ "@babel/parser" "^7.14.7"
"@istanbuljs/schema" "^0.1.2"
- istanbul-lib-coverage "^3.0.0"
+ istanbul-lib-coverage "^3.2.0"
semver "^6.3.0"
istanbul-lib-report@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
- integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
+ integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
dependencies:
istanbul-lib-coverage "^3.0.0"
- make-dir "^3.0.0"
+ make-dir "^4.0.0"
supports-color "^7.1.0"
istanbul-lib-source-maps@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"
- integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
+ integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
dependencies:
debug "^4.1.1"
istanbul-lib-coverage "^3.0.0"
source-map "^0.6.1"
-istanbul-reports@^3.0.2:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.3.tgz#974d682037f6d12b15dc55f9a2a5f8f1ea923831"
- integrity sha512-0i77ZFLsb9U3DHi22WzmIngVzfoyxxbQcZRqlF3KoKmCJGq9nhFHoGi8FqBztN2rE8w6hURnZghetn0xpkVb6A==
+istanbul-reports@^3.1.3:
+ version "3.1.7"
+ resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b"
+ integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==
dependencies:
html-escaper "^2.0.0"
istanbul-lib-report "^3.0.0"
@@ -4433,426 +4510,435 @@ iterall@^1.1.3, iterall@^1.2.1, iterall@^1.3.0:
resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea"
integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==
-jest-changed-files@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.2.5.tgz#9dfd550d158260bcb6fa80aff491f5647f7daeca"
- integrity sha512-jfnNJzF89csUKRPKJ4MwZ1SH27wTmX2xiAIHUHrsb/OYd9Jbo4/SXxJ17/nnx6RIifpthk3Y+LEeOk+/dDeGdw==
+jackspeak@^3.1.2:
+ version "3.4.3"
+ resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
+ integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
dependencies:
- "@jest/types" "^27.2.5"
+ "@isaacs/cliui" "^8.0.2"
+ optionalDependencies:
+ "@pkgjs/parseargs" "^0.11.0"
+
+jest-changed-files@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz#a348aed00ec9bf671cc58a66fcbe7c3dfd6a68f5"
+ integrity sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==
+ dependencies:
+ "@jest/types" "^27.5.1"
execa "^5.0.0"
throat "^6.0.1"
-jest-circus@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.2.5.tgz#573256a6fb6e447ac2fc7e0ade9375013309037f"
- integrity sha512-eyL9IcrAxm3Saq3rmajFCwpaxaRMGJ1KJs+7hlTDinXpJmeR3P02bheM3CYohE7UfwOBmrFMJHjgo/WPcLTM+Q==
+jest-circus@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.1.tgz#37a5a4459b7bf4406e53d637b49d22c65d125ecc"
+ integrity sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==
dependencies:
- "@jest/environment" "^27.2.5"
- "@jest/test-result" "^27.2.5"
- "@jest/types" "^27.2.5"
+ "@jest/environment" "^27.5.1"
+ "@jest/test-result" "^27.5.1"
+ "@jest/types" "^27.5.1"
"@types/node" "*"
chalk "^4.0.0"
co "^4.6.0"
dedent "^0.7.0"
- expect "^27.2.5"
+ expect "^27.5.1"
is-generator-fn "^2.0.0"
- jest-each "^27.2.5"
- jest-matcher-utils "^27.2.5"
- jest-message-util "^27.2.5"
- jest-runtime "^27.2.5"
- jest-snapshot "^27.2.5"
- jest-util "^27.2.5"
- pretty-format "^27.2.5"
+ jest-each "^27.5.1"
+ jest-matcher-utils "^27.5.1"
+ jest-message-util "^27.5.1"
+ jest-runtime "^27.5.1"
+ jest-snapshot "^27.5.1"
+ jest-util "^27.5.1"
+ pretty-format "^27.5.1"
slash "^3.0.0"
stack-utils "^2.0.3"
throat "^6.0.1"
-jest-cli@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.2.5.tgz#88718c8f05f1c0f209152952ecd61afe4c3311bb"
- integrity sha512-XzfcOXi5WQrXqFYsDxq5RDOKY4FNIgBgvgf3ZBz4e/j5/aWep5KnsAYH5OFPMdX/TP/LFsYQMRH7kzJUMh6JKg==
+jest-cli@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.1.tgz#278794a6e6458ea8029547e6c6cbf673bd30b145"
+ integrity sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==
dependencies:
- "@jest/core" "^27.2.5"
- "@jest/test-result" "^27.2.5"
- "@jest/types" "^27.2.5"
+ "@jest/core" "^27.5.1"
+ "@jest/test-result" "^27.5.1"
+ "@jest/types" "^27.5.1"
chalk "^4.0.0"
exit "^0.1.2"
- graceful-fs "^4.2.4"
+ graceful-fs "^4.2.9"
import-local "^3.0.2"
- jest-config "^27.2.5"
- jest-util "^27.2.5"
- jest-validate "^27.2.5"
+ jest-config "^27.5.1"
+ jest-util "^27.5.1"
+ jest-validate "^27.5.1"
prompts "^2.0.1"
yargs "^16.2.0"
-jest-config@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.2.5.tgz#c2e4ec6ea2bf4ffd2cae3d927999fe6159cba207"
- integrity sha512-QdENtn9b5rIIYGlbDNEcgY9LDL5kcokJnXrp7x8AGjHob/XFqw1Z6p+gjfna2sUulQsQ3ce2Fvntnv+7fKYDhQ==
+jest-config@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.1.tgz#5c387de33dca3f99ad6357ddeccd91bf3a0e4a41"
+ integrity sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==
dependencies:
- "@babel/core" "^7.1.0"
- "@jest/test-sequencer" "^27.2.5"
- "@jest/types" "^27.2.5"
- babel-jest "^27.2.5"
+ "@babel/core" "^7.8.0"
+ "@jest/test-sequencer" "^27.5.1"
+ "@jest/types" "^27.5.1"
+ babel-jest "^27.5.1"
chalk "^4.0.0"
+ ci-info "^3.2.0"
deepmerge "^4.2.2"
glob "^7.1.1"
- graceful-fs "^4.2.4"
- is-ci "^3.0.0"
- jest-circus "^27.2.5"
- jest-environment-jsdom "^27.2.5"
- jest-environment-node "^27.2.5"
- jest-get-type "^27.0.6"
- jest-jasmine2 "^27.2.5"
- jest-regex-util "^27.0.6"
- jest-resolve "^27.2.5"
- jest-runner "^27.2.5"
- jest-util "^27.2.5"
- jest-validate "^27.2.5"
+ graceful-fs "^4.2.9"
+ jest-circus "^27.5.1"
+ jest-environment-jsdom "^27.5.1"
+ jest-environment-node "^27.5.1"
+ jest-get-type "^27.5.1"
+ jest-jasmine2 "^27.5.1"
+ jest-regex-util "^27.5.1"
+ jest-resolve "^27.5.1"
+ jest-runner "^27.5.1"
+ jest-util "^27.5.1"
+ jest-validate "^27.5.1"
micromatch "^4.0.4"
- pretty-format "^27.2.5"
+ parse-json "^5.2.0"
+ pretty-format "^27.5.1"
+ slash "^3.0.0"
+ strip-json-comments "^3.1.1"
-jest-diff@^27.0.0, jest-diff@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.2.5.tgz#908f7a6aca5653824516ad30e0a9fd9767e53623"
- integrity sha512-7gfwwyYkeslOOVQY4tVq5TaQa92mWfC9COsVYMNVYyJTOYAqbIkoD3twi5A+h+tAPtAelRxkqY6/xu+jwTr0dA==
+jest-diff@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def"
+ integrity sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==
dependencies:
chalk "^4.0.0"
- diff-sequences "^27.0.6"
- jest-get-type "^27.0.6"
- pretty-format "^27.2.5"
+ diff-sequences "^27.5.1"
+ jest-get-type "^27.5.1"
+ pretty-format "^27.5.1"
-jest-docblock@^27.0.6:
- version "27.0.6"
- resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.6.tgz#cc78266acf7fe693ca462cbbda0ea4e639e4e5f3"
- integrity sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA==
+jest-docblock@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz#14092f364a42c6108d42c33c8cf30e058e25f6c0"
+ integrity sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==
dependencies:
detect-newline "^3.0.0"
-jest-each@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.2.5.tgz#378118d516db730b92096a9607b8711165946353"
- integrity sha512-HUPWIbJT0bXarRwKu/m7lYzqxR4GM5EhKOsu0z3t0SKtbFN6skQhpAUADM4qFShBXb9zoOuag5lcrR1x/WM+Ag==
+jest-each@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.1.tgz#5bc87016f45ed9507fed6e4702a5b468a5b2c44e"
+ integrity sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==
dependencies:
- "@jest/types" "^27.2.5"
+ "@jest/types" "^27.5.1"
chalk "^4.0.0"
- jest-get-type "^27.0.6"
- jest-util "^27.2.5"
- pretty-format "^27.2.5"
+ jest-get-type "^27.5.1"
+ jest-util "^27.5.1"
+ pretty-format "^27.5.1"
-jest-environment-jsdom@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.2.5.tgz#21de3ad0e89441d961b592ba7561b16241279208"
- integrity sha512-QtRpOh/RQKuXniaWcoFE2ElwP6tQcyxHu0hlk32880g0KczdonCs5P1sk5+weu/OVzh5V4Bt1rXuQthI01mBLg==
+jest-environment-jsdom@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz#ea9ccd1fc610209655a77898f86b2b559516a546"
+ integrity sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==
dependencies:
- "@jest/environment" "^27.2.5"
- "@jest/fake-timers" "^27.2.5"
- "@jest/types" "^27.2.5"
+ "@jest/environment" "^27.5.1"
+ "@jest/fake-timers" "^27.5.1"
+ "@jest/types" "^27.5.1"
"@types/node" "*"
- jest-mock "^27.2.5"
- jest-util "^27.2.5"
+ jest-mock "^27.5.1"
+ jest-util "^27.5.1"
jsdom "^16.6.0"
-jest-environment-node@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.2.5.tgz#ffa1afb3604c640ec841f044d526c65912e02cef"
- integrity sha512-0o1LT4grm7iwrS8fIoLtwJxb/hoa3GsH7pP10P02Jpj7Mi4BXy65u46m89vEM2WfD1uFJQ2+dfDiWZNA2e6bJg==
+jest-environment-node@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.1.tgz#dedc2cfe52fab6b8f5714b4808aefa85357a365e"
+ integrity sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==
dependencies:
- "@jest/environment" "^27.2.5"
- "@jest/fake-timers" "^27.2.5"
- "@jest/types" "^27.2.5"
+ "@jest/environment" "^27.5.1"
+ "@jest/fake-timers" "^27.5.1"
+ "@jest/types" "^27.5.1"
"@types/node" "*"
- jest-mock "^27.2.5"
- jest-util "^27.2.5"
+ jest-mock "^27.5.1"
+ jest-util "^27.5.1"
-jest-get-type@^27.0.6:
- version "27.0.6"
- resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.6.tgz#0eb5c7f755854279ce9b68a9f1a4122f69047cfe"
- integrity sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg==
+jest-get-type@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1"
+ integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==
-jest-haste-map@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.2.5.tgz#0247b7299250643472bbcf5b4ad85c72d5178e2e"
- integrity sha512-pzO+Gw2WLponaSi0ilpzYBE0kuVJstoXBX8YWyUebR8VaXuX4tzzn0Zp23c/WaETo7XYTGv2e8KdnpiskAFMhQ==
+jest-haste-map@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz#9fd8bd7e7b4fa502d9c6164c5640512b4e811e7f"
+ integrity sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==
dependencies:
- "@jest/types" "^27.2.5"
+ "@jest/types" "^27.5.1"
"@types/graceful-fs" "^4.1.2"
"@types/node" "*"
anymatch "^3.0.3"
fb-watchman "^2.0.0"
- graceful-fs "^4.2.4"
- jest-regex-util "^27.0.6"
- jest-serializer "^27.0.6"
- jest-util "^27.2.5"
- jest-worker "^27.2.5"
+ graceful-fs "^4.2.9"
+ jest-regex-util "^27.5.1"
+ jest-serializer "^27.5.1"
+ jest-util "^27.5.1"
+ jest-worker "^27.5.1"
micromatch "^4.0.4"
walker "^1.0.7"
optionalDependencies:
fsevents "^2.3.2"
-jest-jasmine2@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.2.5.tgz#baaf96c69913c52bce0100000cf0721027c0fd66"
- integrity sha512-hdxY9Cm/CjLqu2tXeAoQHPgA4vcqlweVXYOg1+S9FeFdznB9Rti+eEBKDDkmOy9iqr4Xfbq95OkC4NFbXXPCAQ==
+jest-jasmine2@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz#a037b0034ef49a9f3d71c4375a796f3b230d1ac4"
+ integrity sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==
dependencies:
- "@babel/traverse" "^7.1.0"
- "@jest/environment" "^27.2.5"
- "@jest/source-map" "^27.0.6"
- "@jest/test-result" "^27.2.5"
- "@jest/types" "^27.2.5"
+ "@jest/environment" "^27.5.1"
+ "@jest/source-map" "^27.5.1"
+ "@jest/test-result" "^27.5.1"
+ "@jest/types" "^27.5.1"
"@types/node" "*"
chalk "^4.0.0"
co "^4.6.0"
- expect "^27.2.5"
+ expect "^27.5.1"
is-generator-fn "^2.0.0"
- jest-each "^27.2.5"
- jest-matcher-utils "^27.2.5"
- jest-message-util "^27.2.5"
- jest-runtime "^27.2.5"
- jest-snapshot "^27.2.5"
- jest-util "^27.2.5"
- pretty-format "^27.2.5"
+ jest-each "^27.5.1"
+ jest-matcher-utils "^27.5.1"
+ jest-message-util "^27.5.1"
+ jest-runtime "^27.5.1"
+ jest-snapshot "^27.5.1"
+ jest-util "^27.5.1"
+ pretty-format "^27.5.1"
throat "^6.0.1"
-jest-leak-detector@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.2.5.tgz#e2edc3b37d38e8d9a527e10e456b403c3151b206"
- integrity sha512-HYsi3GUR72bYhOGB5C5saF9sPdxGzSjX7soSQS+BqDRysc7sPeBwPbhbuT8DnOpijnKjgwWQ8JqvbmReYnt3aQ==
+jest-leak-detector@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz#6ec9d54c3579dd6e3e66d70e3498adf80fde3fb8"
+ integrity sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==
dependencies:
- jest-get-type "^27.0.6"
- pretty-format "^27.2.5"
+ jest-get-type "^27.5.1"
+ pretty-format "^27.5.1"
-jest-matcher-utils@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.2.5.tgz#4684faaa8eb32bf15e6edaead6834031897e2980"
- integrity sha512-qNR/kh6bz0Dyv3m68Ck2g1fLW5KlSOUNcFQh87VXHZwWc/gY6XwnKofx76Qytz3x5LDWT09/2+yXndTkaG4aWg==
+jest-matcher-utils@^27.0.0, jest-matcher-utils@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab"
+ integrity sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==
dependencies:
chalk "^4.0.0"
- jest-diff "^27.2.5"
- jest-get-type "^27.0.6"
- pretty-format "^27.2.5"
+ jest-diff "^27.5.1"
+ jest-get-type "^27.5.1"
+ pretty-format "^27.5.1"
-jest-message-util@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.2.5.tgz#ed8b7b0965247bb875a49c1f9b9ab2d1d0820028"
- integrity sha512-ggXSLoPfIYcbmZ8glgEJZ8b+e0Msw/iddRmgkoO7lDAr9SmI65IIfv7VnvTnV4FGnIIUIjzM+fHRHO5RBvyAbQ==
+jest-message-util@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz#bdda72806da10d9ed6425e12afff38cd1458b6cf"
+ integrity sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==
dependencies:
"@babel/code-frame" "^7.12.13"
- "@jest/types" "^27.2.5"
+ "@jest/types" "^27.5.1"
"@types/stack-utils" "^2.0.0"
chalk "^4.0.0"
- graceful-fs "^4.2.4"
+ graceful-fs "^4.2.9"
micromatch "^4.0.4"
- pretty-format "^27.2.5"
+ pretty-format "^27.5.1"
slash "^3.0.0"
stack-utils "^2.0.3"
-jest-mock@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.2.5.tgz#0ec38d5ff1e49c4802e7a4a8179e8d7a2fd84de0"
- integrity sha512-HiMB3LqE9RzmeMzZARi2Bz3NoymxyP0gCid4y42ca1djffNtYFKgI220aC1VP1mUZ8rbpqZbHZOJ15093bZV/Q==
+jest-mock@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz#19948336d49ef4d9c52021d34ac7b5f36ff967d6"
+ integrity sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==
dependencies:
- "@jest/types" "^27.2.5"
+ "@jest/types" "^27.5.1"
"@types/node" "*"
jest-pnp-resolver@^1.2.2:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
- integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
+ integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
-jest-regex-util@^27.0.6:
- version "27.0.6"
- resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz#02e112082935ae949ce5d13b2675db3d8c87d9c5"
- integrity sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ==
+jest-regex-util@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz#4da143f7e9fd1e542d4aa69617b38e4a78365b95"
+ integrity sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==
-jest-resolve-dependencies@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.2.5.tgz#fcd8eca005b3d11ba32da443045c028164b83be1"
- integrity sha512-BSjefped31bcvvCh++/pN9ueqqN1n0+p8/58yScuWfklLm2tbPbS9d251vJhAy0ZI2pL/0IaGhOTJrs9Y4FJlg==
+jest-resolve-dependencies@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz#d811ecc8305e731cc86dd79741ee98fed06f1da8"
+ integrity sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==
dependencies:
- "@jest/types" "^27.2.5"
- jest-regex-util "^27.0.6"
- jest-snapshot "^27.2.5"
+ "@jest/types" "^27.5.1"
+ jest-regex-util "^27.5.1"
+ jest-snapshot "^27.5.1"
-jest-resolve@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.2.5.tgz#04dadbfc1312a2541f5c199c5011945e9cfe5cef"
- integrity sha512-q5irwS3oS73SKy3+FM/HL2T7WJftrk9BRzrXF92f7net5HMlS7lJMg/ZwxLB4YohKqjSsdksEw7n/jvMxV7EKg==
+jest-resolve@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.1.tgz#a2f1c5a0796ec18fe9eb1536ac3814c23617b384"
+ integrity sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==
dependencies:
- "@jest/types" "^27.2.5"
+ "@jest/types" "^27.5.1"
chalk "^4.0.0"
- escalade "^3.1.1"
- graceful-fs "^4.2.4"
- jest-haste-map "^27.2.5"
+ graceful-fs "^4.2.9"
+ jest-haste-map "^27.5.1"
jest-pnp-resolver "^1.2.2"
- jest-util "^27.2.5"
- jest-validate "^27.2.5"
+ jest-util "^27.5.1"
+ jest-validate "^27.5.1"
resolve "^1.20.0"
+ resolve.exports "^1.1.0"
slash "^3.0.0"
-jest-runner@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.2.5.tgz#3d9d0626f351480bb2cffcfbbfac240c0097ebd4"
- integrity sha512-n41vw9RLg5TKAnEeJK9d6pGOsBOpwE89XBniK+AD1k26oIIy3V7ogM1scbDjSheji8MUPC9pNgCrZ/FHLVDNgg==
+jest-runner@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.1.tgz#071b27c1fa30d90540805c5645a0ec167c7b62e5"
+ integrity sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==
dependencies:
- "@jest/console" "^27.2.5"
- "@jest/environment" "^27.2.5"
- "@jest/test-result" "^27.2.5"
- "@jest/transform" "^27.2.5"
- "@jest/types" "^27.2.5"
+ "@jest/console" "^27.5.1"
+ "@jest/environment" "^27.5.1"
+ "@jest/test-result" "^27.5.1"
+ "@jest/transform" "^27.5.1"
+ "@jest/types" "^27.5.1"
"@types/node" "*"
chalk "^4.0.0"
emittery "^0.8.1"
- exit "^0.1.2"
- graceful-fs "^4.2.4"
- jest-docblock "^27.0.6"
- jest-environment-jsdom "^27.2.5"
- jest-environment-node "^27.2.5"
- jest-haste-map "^27.2.5"
- jest-leak-detector "^27.2.5"
- jest-message-util "^27.2.5"
- jest-resolve "^27.2.5"
- jest-runtime "^27.2.5"
- jest-util "^27.2.5"
- jest-worker "^27.2.5"
+ graceful-fs "^4.2.9"
+ jest-docblock "^27.5.1"
+ jest-environment-jsdom "^27.5.1"
+ jest-environment-node "^27.5.1"
+ jest-haste-map "^27.5.1"
+ jest-leak-detector "^27.5.1"
+ jest-message-util "^27.5.1"
+ jest-resolve "^27.5.1"
+ jest-runtime "^27.5.1"
+ jest-util "^27.5.1"
+ jest-worker "^27.5.1"
source-map-support "^0.5.6"
throat "^6.0.1"
-jest-runtime@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.2.5.tgz#d144c3f6889b927aae1e695b63a41a3323b7016b"
- integrity sha512-N0WRZ3QszKyZ3Dm27HTBbBuestsSd3Ud5ooVho47XZJ8aSKO/X1Ag8M1dNx9XzfGVRNdB/xCA3lz8MJwIzPLLA==
+jest-runtime@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.1.tgz#4896003d7a334f7e8e4a53ba93fb9bcd3db0a1af"
+ integrity sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==
dependencies:
- "@jest/console" "^27.2.5"
- "@jest/environment" "^27.2.5"
- "@jest/fake-timers" "^27.2.5"
- "@jest/globals" "^27.2.5"
- "@jest/source-map" "^27.0.6"
- "@jest/test-result" "^27.2.5"
- "@jest/transform" "^27.2.5"
- "@jest/types" "^27.2.5"
- "@types/yargs" "^16.0.0"
+ "@jest/environment" "^27.5.1"
+ "@jest/fake-timers" "^27.5.1"
+ "@jest/globals" "^27.5.1"
+ "@jest/source-map" "^27.5.1"
+ "@jest/test-result" "^27.5.1"
+ "@jest/transform" "^27.5.1"
+ "@jest/types" "^27.5.1"
chalk "^4.0.0"
cjs-module-lexer "^1.0.0"
collect-v8-coverage "^1.0.0"
execa "^5.0.0"
- exit "^0.1.2"
glob "^7.1.3"
- graceful-fs "^4.2.4"
- jest-haste-map "^27.2.5"
- jest-message-util "^27.2.5"
- jest-mock "^27.2.5"
- jest-regex-util "^27.0.6"
- jest-resolve "^27.2.5"
- jest-snapshot "^27.2.5"
- jest-util "^27.2.5"
- jest-validate "^27.2.5"
+ graceful-fs "^4.2.9"
+ jest-haste-map "^27.5.1"
+ jest-message-util "^27.5.1"
+ jest-mock "^27.5.1"
+ jest-regex-util "^27.5.1"
+ jest-resolve "^27.5.1"
+ jest-snapshot "^27.5.1"
+ jest-util "^27.5.1"
slash "^3.0.0"
strip-bom "^4.0.0"
- yargs "^16.2.0"
-jest-serializer@^27.0.6:
- version "27.0.6"
- resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.6.tgz#93a6c74e0132b81a2d54623251c46c498bb5bec1"
- integrity sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA==
+jest-serializer@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.1.tgz#81438410a30ea66fd57ff730835123dea1fb1f64"
+ integrity sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==
dependencies:
"@types/node" "*"
- graceful-fs "^4.2.4"
+ graceful-fs "^4.2.9"
-jest-snapshot@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.2.5.tgz#8a612fe31e2967f58ad364542198dff61f92ef32"
- integrity sha512-2/Jkn+VN6Abwz0llBltZaiJMnL8b1j5Bp/gRIxe9YR3FCEh9qp0TXVV0dcpTGZ8AcJV1SZGQkczewkI9LP5yGw==
+jest-snapshot@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.5.1.tgz#b668d50d23d38054a51b42c4039cab59ae6eb6a1"
+ integrity sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==
dependencies:
"@babel/core" "^7.7.2"
"@babel/generator" "^7.7.2"
- "@babel/parser" "^7.7.2"
"@babel/plugin-syntax-typescript" "^7.7.2"
"@babel/traverse" "^7.7.2"
"@babel/types" "^7.0.0"
- "@jest/transform" "^27.2.5"
- "@jest/types" "^27.2.5"
+ "@jest/transform" "^27.5.1"
+ "@jest/types" "^27.5.1"
"@types/babel__traverse" "^7.0.4"
"@types/prettier" "^2.1.5"
babel-preset-current-node-syntax "^1.0.0"
chalk "^4.0.0"
- expect "^27.2.5"
- graceful-fs "^4.2.4"
- jest-diff "^27.2.5"
- jest-get-type "^27.0.6"
- jest-haste-map "^27.2.5"
- jest-matcher-utils "^27.2.5"
- jest-message-util "^27.2.5"
- jest-resolve "^27.2.5"
- jest-util "^27.2.5"
+ expect "^27.5.1"
+ graceful-fs "^4.2.9"
+ jest-diff "^27.5.1"
+ jest-get-type "^27.5.1"
+ jest-haste-map "^27.5.1"
+ jest-matcher-utils "^27.5.1"
+ jest-message-util "^27.5.1"
+ jest-util "^27.5.1"
natural-compare "^1.4.0"
- pretty-format "^27.2.5"
+ pretty-format "^27.5.1"
semver "^7.3.2"
-jest-util@^27.0.0, jest-util@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.2.5.tgz#88740c4024d223634a82ce7c2263e8bc6df3b3ba"
- integrity sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==
+jest-util@^27.0.0, jest-util@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz#3ba9771e8e31a0b85da48fe0b0891fb86c01c2f9"
+ integrity sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==
dependencies:
- "@jest/types" "^27.2.5"
+ "@jest/types" "^27.5.1"
"@types/node" "*"
chalk "^4.0.0"
- graceful-fs "^4.2.4"
- is-ci "^3.0.0"
+ ci-info "^3.2.0"
+ graceful-fs "^4.2.9"
picomatch "^2.2.3"
-jest-validate@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.2.5.tgz#2d59bf1627d180f395ba58f24599b0ee0efcfbdf"
- integrity sha512-XgYtjS89nhVe+UfkbLgcm+GgXKWgL80t9nTcNeejyO3t0Sj/yHE8BtIJqjZu9NXQksYbGImoQRXmQ1gP+Guffw==
+jest-validate@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.1.tgz#9197d54dc0bdb52260b8db40b46ae668e04df067"
+ integrity sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==
dependencies:
- "@jest/types" "^27.2.5"
+ "@jest/types" "^27.5.1"
camelcase "^6.2.0"
chalk "^4.0.0"
- jest-get-type "^27.0.6"
+ jest-get-type "^27.5.1"
leven "^3.1.0"
- pretty-format "^27.2.5"
+ pretty-format "^27.5.1"
-jest-watcher@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.2.5.tgz#41cd3e64dc5bea8a4327083d71ba7667be400567"
- integrity sha512-umV4qGozg2Dn6DTTtqAh9puPw+DGLK9AQas7+mWjiK8t0fWMpxKg8ZXReZw7L4C88DqorsGUiDgwHNZ+jkVrkQ==
+jest-watcher@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.1.tgz#71bd85fb9bde3a2c2ec4dc353437971c43c642a2"
+ integrity sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==
dependencies:
- "@jest/test-result" "^27.2.5"
- "@jest/types" "^27.2.5"
+ "@jest/test-result" "^27.5.1"
+ "@jest/types" "^27.5.1"
"@types/node" "*"
ansi-escapes "^4.2.1"
chalk "^4.0.0"
- jest-util "^27.2.5"
+ jest-util "^27.5.1"
string-length "^4.0.1"
-jest-worker@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.2.5.tgz#ed42865661959488aa020e8a325df010597c36d4"
- integrity sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==
+jest-worker@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
+ integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
dependencies:
"@types/node" "*"
merge-stream "^2.0.0"
supports-color "^8.0.0"
jest@^27.2.4:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/jest/-/jest-27.2.5.tgz#7d8a5c8781a160f693beeb7c68e46c16ef948148"
- integrity sha512-vDMzXcpQN4Ycaqu+vO7LX8pZwNNoKMhc+gSp6q1D8S6ftRk8gNW8cni3YFxknP95jxzQo23Lul0BI2FrWgnwYQ==
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc"
+ integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==
dependencies:
- "@jest/core" "^27.2.5"
+ "@jest/core" "^27.5.1"
import-local "^3.0.2"
- jest-cli "^27.2.5"
+ jest-cli "^27.5.1"
+
+joi@*, joi@^17.13.3:
+ version "17.13.3"
+ resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.3.tgz#0f5cc1169c999b30d344366d384b12d92558bcec"
+ integrity sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==
+ dependencies:
+ "@hapi/hoek" "^9.3.0"
+ "@hapi/topo" "^5.1.0"
+ "@sideway/address" "^4.1.5"
+ "@sideway/formula" "^3.0.1"
+ "@sideway/pinpoint" "^2.0.0"
jose@^4.14.4:
- version "4.14.4"
- resolved "https://registry.yarnpkg.com/jose/-/jose-4.14.4.tgz#59e09204e2670c3164ee24cbfe7115c6f8bff9ca"
- integrity sha512-j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g==
-
-js-sdsl@^4.1.4:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711"
- integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==
+ version "4.15.9"
+ resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.9.tgz#9b68eda29e9a0614c042fa29387196c7dd800100"
+ integrity sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==
js-stringify@^1.0.2:
version "1.0.2"
@@ -4912,15 +4998,20 @@ jsdom@^16.6.0:
ws "^7.4.6"
xml-name-validator "^3.0.0"
-jsesc@^2.5.1:
- version "2.5.2"
- resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
- integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+jsesc@^3.0.2:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d"
+ integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==
-json-buffer@3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
- integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+json-buffer@3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+ integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
+json-parse-even-better-errors@^2.3.0:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+ integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
json-schema-traverse@^0.4.1:
version "0.4.1"
@@ -4930,21 +5021,12 @@ json-schema-traverse@^0.4.1:
json-stable-stringify-without-jsonify@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
- integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+ integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
-json5@2.x, json5@^2.1.2:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
- integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
- dependencies:
- minimist "^1.2.5"
-
-json5@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
- integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
- dependencies:
- minimist "^1.2.0"
+json5@2.x, json5@^2.2.3:
+ version "2.2.3"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+ integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
json5@^1.0.2:
version "1.0.2"
@@ -4953,12 +5035,10 @@ json5@^1.0.2:
dependencies:
minimist "^1.2.0"
-jsonfile@^6.0.1:
- version "6.1.0"
- resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
- integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
- dependencies:
- universalify "^2.0.0"
+jsonfile@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+ integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
optionalDependencies:
graceful-fs "^4.1.6"
@@ -4981,12 +5061,12 @@ juice@^8.0.0:
slick "^1.12.2"
web-resource-inliner "^6.0.1"
-keyv@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
- integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
+keyv@^4.5.3:
+ version "4.5.4"
+ resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+ integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
dependencies:
- json-buffer "3.0.0"
+ json-buffer "3.0.1"
kleur@^3.0.3:
version "3.0.3"
@@ -5000,12 +5080,10 @@ klicktipp-api@^1.0.2:
dependencies:
axios "^0.21.1"
-latest-version@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
- integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
- dependencies:
- package-json "^6.3.0"
+leac@^0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/leac/-/leac-0.6.0.tgz#dcf136e382e666bd2475f44a1096061b70dc0912"
+ integrity sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==
leven@^3.1.0:
version "3.1.0"
@@ -5020,45 +5098,42 @@ levn@^0.4.1:
prelude-ls "^1.2.1"
type-check "~0.4.0"
-levn@~0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
- integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
- dependencies:
- prelude-ls "~1.1.2"
- type-check "~0.3.2"
+libbase64@1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/libbase64/-/libbase64-1.3.0.tgz#053314755a05d2e5f08bbfc48d0290e9322f4406"
+ integrity sha512-GgOXd0Eo6phYgh0DJtjQ2tO8dc0IVINtZJeARPeiIJqge+HdsWSuaDTe8ztQ7j/cONByDZ3zeB325AHiv5O0dg==
-libbase64@1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/libbase64/-/libbase64-1.2.1.tgz#fb93bf4cb6d730f29b92155b6408d1bd2176a8c8"
- integrity sha512-l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew==
-
-libmime@5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/libmime/-/libmime-5.1.0.tgz#d9a1c4a85c982fa4e64c2c841f95e3827c3f71d2"
- integrity sha512-xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA==
+libmime@5.3.6:
+ version "5.3.6"
+ resolved "https://registry.yarnpkg.com/libmime/-/libmime-5.3.6.tgz#e6dfc655b6b4614bad90e8e65817957903b56580"
+ integrity sha512-j9mBC7eiqi6fgBPAGvKCXJKJSIASanYF4EeA4iBzSG0HxQxmXnR3KbyWqTn4CwsKSebqCv2f5XZfAO6sKzgvwA==
dependencies:
- encoding-japanese "2.0.0"
+ encoding-japanese "2.2.0"
iconv-lite "0.6.3"
- libbase64 "1.2.1"
- libqp "1.1.0"
+ libbase64 "1.3.0"
+ libqp "2.1.1"
-libphonenumber-js@^1.9.7:
- version "1.9.37"
- resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.9.37.tgz#944f59a3618a8f85d9b619767a0b6fb87523f285"
- integrity sha512-RnUR4XwiVhMLnT7uFSdnmLeprspquuDtaShAgKTA+g/ms9/S4hQU3/QpFdh3iXPHtxD52QscXLm2W2+QBmvYAg==
+libphonenumber-js@^1.9.43:
+ version "1.12.6"
+ resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.12.6.tgz#32a211b976dde3ccdf201c3c0b6e60351167c8bf"
+ integrity sha512-PJiS4ETaUfCOFLpmtKzAbqZQjCCKVu2OhTV4SVNNE7c2nu/dACvtCqj4L0i/KWNnIgRv7yrILvBj5Lonv5Ncxw==
-libqp@1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/libqp/-/libqp-1.1.0.tgz#f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"
- integrity sha512-4Rgfa0hZpG++t1Vi2IiqXG9Ad1ig4QTmtuZF946QJP4bPqOYC78ixUXgz5TW/wE7lNaNKlplSYTxQ+fR2KZ0EA==
+libqp@2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/libqp/-/libqp-2.1.1.tgz#f1be767a58f966f500597997cab72cfc1e17abfa"
+ integrity sha512-0Wd+GPz1O134cP62YU2GTOPNA7Qgl09XwCqM5zpBv87ERCXdfDtyKXvV7c9U22yWJh44QZqBocFnXN11K96qow==
-linkify-it@4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.0.tgz#4f2d16879adc637cdfe9056cbc02de30e88ffa32"
- integrity sha512-QAxkXyzT/TXgwGyY4rTgC95Ex6/lZ5/lYTV9nug6eJt93BCBQGOE47D/g2+/m5J1MrVLr2ot97OXkBZ9bBpR4A==
+lines-and-columns@^1.1.6:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+ integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
+
+linkify-it@5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-5.0.0.tgz#9ef238bfa6dc70bd8e7f9572b52d369af569b421"
+ integrity sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==
dependencies:
- uc.micro "^1.0.1"
+ uc.micro "^2.0.0"
locate-path@^5.0.0:
version "5.0.0"
@@ -5077,12 +5152,17 @@ locate-path@^6.0.0:
lodash.clonedeep@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
- integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+ integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==
lodash.get@^4.4.2:
version "4.4.2"
resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
- integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+ integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
+
+lodash.memoize@4.x:
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+ integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
lodash.merge@^4.6.2:
version "4.6.2"
@@ -5092,51 +5172,45 @@ lodash.merge@^4.6.2:
lodash.sortby@^4.7.0:
version "4.7.0"
resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
- integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+ integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
-lodash@4.x, lodash@^4.17.21, lodash@^4.7.0:
+lodash@^4.17.21, lodash@^4.7.0:
version "4.17.21"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
log4js@^6.4.6:
- version "6.4.6"
- resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.4.6.tgz#1878aa3f09973298ecb441345fe9dd714e355c15"
- integrity sha512-1XMtRBZszmVZqPAOOWczH+Q94AI42mtNWjvjA5RduKTSWjEc56uOBbyM1CJnfN4Ym0wSd8cQ43zOojlSHgRDAw==
+ version "6.9.1"
+ resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.9.1.tgz#aba5a3ff4e7872ae34f8b4c533706753709e38b6"
+ integrity sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==
dependencies:
- date-format "^4.0.9"
+ date-format "^4.0.14"
debug "^4.3.4"
- flatted "^3.2.5"
+ flatted "^3.2.7"
rfdc "^1.3.0"
- streamroller "^3.0.8"
+ streamroller "^3.1.5"
loglevel@^1.6.7:
- version "1.7.1"
- resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
- integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
+ version "1.9.2"
+ resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.9.2.tgz#c2e028d6c757720107df4e64508530db6621ba08"
+ integrity sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==
long@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
-lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
- integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+lru-cache@^10.2.0:
+ version "10.4.3"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
+ integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
-lowercase-keys@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
- integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
-
-lru-cache@^4.1.3:
- version "4.1.5"
- resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
- integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+lru-cache@^5.1.1:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+ integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
dependencies:
- pseudomap "^1.0.2"
- yallist "^2.1.2"
+ yallist "^3.0.2"
lru-cache@^6.0.0:
version "6.0.0"
@@ -5145,36 +5219,42 @@ lru-cache@^6.0.0:
dependencies:
yallist "^4.0.0"
-mailparser@^3.5.0:
- version "3.5.0"
- resolved "https://registry.yarnpkg.com/mailparser/-/mailparser-3.5.0.tgz#5b333b0ef2f063a7db9d24ed95f29efb464cbef3"
- integrity sha512-mdr2DFgz8LKC0/Q6io6znA0HVnzaPFT0a4TTnLeZ7mWHlkfnm227Wxlq7mHh7AgeP32h7gOUpXvyhSfJJIEeyg==
+lru-cache@^7.14.1:
+ version "7.18.3"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
+ integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
+
+mailparser@^3.7.1:
+ version "3.7.2"
+ resolved "https://registry.yarnpkg.com/mailparser/-/mailparser-3.7.2.tgz#00feec656e23c0ae805163581b460c2f72ca75d1"
+ integrity sha512-iI0p2TCcIodR1qGiRoDBBwboSSff50vQAWytM5JRggLfABa4hHYCf3YVujtuzV454xrOP352VsAPIzviqMTo4Q==
dependencies:
- encoding-japanese "2.0.0"
+ encoding-japanese "2.2.0"
he "1.2.0"
- html-to-text "8.2.0"
+ html-to-text "9.0.5"
iconv-lite "0.6.3"
- libmime "5.1.0"
- linkify-it "4.0.0"
- mailsplit "5.3.2"
- nodemailer "6.7.3"
- tlds "1.231.0"
+ libmime "5.3.6"
+ linkify-it "5.0.0"
+ mailsplit "5.4.2"
+ nodemailer "6.9.16"
+ punycode.js "2.3.1"
+ tlds "1.255.0"
-mailsplit@5.3.2:
- version "5.3.2"
- resolved "https://registry.yarnpkg.com/mailsplit/-/mailsplit-5.3.2.tgz#c344c019f631be4f54d5213509637127e3e3dd66"
- integrity sha512-coES12hhKqagkuBTJoqERX+y9bXNpxbxw3Esd07auuwKYmcagouVlgucyIVRp48fnswMKxcUtLoFn/L1a75ynQ==
+mailsplit@5.4.2:
+ version "5.4.2"
+ resolved "https://registry.yarnpkg.com/mailsplit/-/mailsplit-5.4.2.tgz#ee2be344bb3511345c0bd6ea72e5657acb8cd83b"
+ integrity sha512-4cczG/3Iu3pyl8JgQ76dKkisurZTmxMrA4dj/e8d2jKYcFTZ7MxOzg1gTioTDMPuFXwTrVuN/gxhkrO7wLg7qA==
dependencies:
- libbase64 "1.2.1"
- libmime "5.1.0"
- libqp "1.1.0"
+ libbase64 "1.3.0"
+ libmime "5.3.6"
+ libqp "2.1.1"
-make-dir@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
- integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+make-dir@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+ integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
dependencies:
- semver "^6.0.0"
+ semver "^7.5.3"
make-error@1.x, make-error@^1.1.1:
version "1.3.6"
@@ -5182,36 +5262,41 @@ make-error@1.x, make-error@^1.1.1:
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
make-plural@^7.0.0:
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-7.1.0.tgz#8a0381ff8c9be4f074e0acdc42ec97639c2344f9"
- integrity sha512-PKkwVlAxYVo98NrbclaQIT4F5Oy+X58PZM5r2IwUSCe3syya6PXkIRCn2XCdz7p58Scgpp50PBeHmepXVDG3hg==
+ version "7.4.0"
+ resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-7.4.0.tgz#fa6990dd550dea4de6b20163f74e5ed83d8a8d6d"
+ integrity sha512-4/gC9KVNTV6pvYg2gFeQYTW3mWaoJt7WZE5vrp1KnQDgW92JtYZnzmZT81oj/dUTqAIu0ufI2x3dkgu3bB1tYg==
-makeerror@1.0.x:
- version "1.0.11"
- resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
- integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+makeerror@1.0.12:
+ version "1.0.12"
+ resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
+ integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
dependencies:
- tmpl "1.0.x"
+ tmpl "1.0.5"
math-interval-parser@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/math-interval-parser/-/math-interval-parser-2.0.1.tgz#e22cd6d15a0a7f4c03aec560db76513da615bed4"
integrity sha512-VmlAmb0UJwlvMyx8iPhXUDnVW1F9IrGEd9CIOmv+XL8AErCUUuozoDMrgImvnYt2A+53qVX/tPW6YJurMKYsvA==
+math-intrinsics@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
+ integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
+
media-typer@0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
- integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+ integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
mensch@^0.3.4:
version "0.3.4"
resolved "https://registry.yarnpkg.com/mensch/-/mensch-0.3.4.tgz#770f91b46cb16ea5b204ee735768c3f0c491fecd"
integrity sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==
-merge-descriptors@1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
- integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+merge-descriptors@1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5"
+ integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==
merge-stream@^2.0.0:
version "2.0.0"
@@ -5226,27 +5311,27 @@ merge2@^1.3.0, merge2@^1.4.1:
methods@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
- integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+ integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
-micromatch@^4.0.4:
- version "4.0.4"
- resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
- integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+micromatch@^4.0.4, micromatch@^4.0.8:
+ version "4.0.8"
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+ integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
dependencies:
- braces "^3.0.1"
- picomatch "^2.2.3"
+ braces "^3.0.3"
+ picomatch "^2.3.1"
-mime-db@1.50.0:
- version "1.50.0"
- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f"
- integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==
+mime-db@1.52.0:
+ version "1.52.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+ integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-mime-types@^2.1.12, mime-types@~2.1.24:
- version "2.1.33"
- resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz#1fa12a904472fafd068e48d9e8401f74d3f70edb"
- integrity sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==
+mime-types@^2.1.12, mime-types@^2.1.35, mime-types@~2.1.24, mime-types@~2.1.34:
+ version "2.1.35"
+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+ integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
dependencies:
- mime-db "1.50.0"
+ mime-db "1.52.0"
mime@1.6.0:
version "1.6.0"
@@ -5263,46 +5348,29 @@ mimic-fn@^2.1.0:
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-mimic-response@^1.0.0, mimic-response@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
- integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
-
-minimatch@^3.0.4:
- version "3.0.4"
- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
- integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
- dependencies:
- brace-expansion "^1.1.7"
-
-minimatch@^3.0.5, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
dependencies:
brace-expansion "^1.1.7"
-minimatch@^5.0.1:
- version "5.1.6"
- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
- integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+minimatch@^9.0.4:
+ version "9.0.5"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+ integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
dependencies:
brace-expansion "^2.0.1"
-minimist@^1.2.0, minimist@^1.2.5:
- version "1.2.5"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
- integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+minimist@^1.2.0, minimist@^1.2.6:
+ version "1.2.8"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+ integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-minimist@^1.2.6:
- version "1.2.6"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
- integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
-
-mkdirp@^2.1.3:
- version "2.1.6"
- resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-2.1.6.tgz#964fbcb12b2d8c5d6fbc62a963ac95a273e2cc19"
- integrity sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
+ version "7.1.2"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+ integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
mkdirp@^3.0.1:
version "3.0.1"
@@ -5310,26 +5378,16 @@ mkdirp@^3.0.1:
integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==
moo@^0.5.0, moo@^0.5.1:
- version "0.5.1"
- resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz#7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4"
- integrity sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==
+ version "0.5.2"
+ resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c"
+ integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==
ms@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
- integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+ integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
-ms@2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
- integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
-ms@2.1.2:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
- integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@^2.1.1:
+ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
version "2.1.3"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -5351,13 +5409,13 @@ mustache@^4.2.0:
integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==
mysql2@^2.3.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.3.0.tgz#600f5cc27e397dfb77b59eac93666434f88e8079"
- integrity sha512-0t5Ivps5Tdy5YHk5NdKwQhe/4Qyn2pload+S+UooDBvsqngtzujG1BaTWBihQLfeKO3t3122/GtusBtmHEHqww==
+ version "2.3.3"
+ resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.3.3.tgz#944f3deca4b16629052ff8614fbf89d5552545a0"
+ integrity sha512-wxJUev6LgMSgACDkb/InIFxDprRa6T95+VEoR+xPvtngtccNH2dGjEB/fVZ8yg1gWv1510c9CvXuJHi5zUm0ZA==
dependencies:
- denque "^1.4.1"
+ denque "^2.0.1"
generate-function "^2.3.1"
- iconv-lite "^0.6.2"
+ iconv-lite "^0.6.3"
long "^4.0.0"
lru-cache "^6.0.0"
named-placeholders "^1.1.2"
@@ -5374,21 +5432,12 @@ mysql@^2.18.1:
safe-buffer "5.1.2"
sqlstring "2.3.1"
-mz@^2.4.0:
- version "2.7.0"
- resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
- integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
- dependencies:
- any-promise "^1.0.0"
- object-assign "^4.0.1"
- thenify-all "^1.0.0"
-
named-placeholders@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.2.tgz#ceb1fbff50b6b33492b5cf214ccf5e39cef3d0e8"
- integrity sha512-wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA==
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.3.tgz#df595799a36654da55dda6152ba7a137ad1d9351"
+ integrity sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==
dependencies:
- lru-cache "^4.1.3"
+ lru-cache "^7.14.1"
natural-compare-lite@^1.4.0:
version "1.4.0"
@@ -5398,7 +5447,7 @@ natural-compare-lite@^1.4.0:
natural-compare@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
- integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+ integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
ncp@^2.0.0:
version "2.0.0"
@@ -5415,98 +5464,74 @@ nearley@^2.20.1:
railroad-diagrams "^1.0.0"
randexp "0.4.6"
-negotiator@0.6.2:
- version "0.6.2"
- resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
- integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+negotiator@0.6.3:
+ version "0.6.3"
+ resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+ integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
nice-try@^1.0.4:
version "1.0.5"
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-node-fetch@2.6.7, node-fetch@^2.6.0:
- version "2.6.7"
- resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
- integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
- dependencies:
- whatwg-url "^5.0.0"
+node-domexception@1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
+ integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
-node-fetch@^2.6.1:
- version "2.6.5"
- resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd"
- integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==
+node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@^2.7.0:
+ version "2.7.0"
+ resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+ integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
dependencies:
whatwg-url "^5.0.0"
node-gyp-build@^4.3.0:
- version "4.5.0"
- resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40"
- integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==
+ version "4.8.4"
+ resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.4.tgz#8a70ee85464ae52327772a90d66c6077a900cfc8"
+ integrity sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==
node-int64@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
- integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
+ integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
-node-modules-regexp@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
- integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
+node-releases@^2.0.19:
+ version "2.0.19"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314"
+ integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==
-node-releases@^1.1.77:
- version "1.1.77"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.77.tgz#50b0cfede855dd374e7585bf228ff34e57c1c32e"
- integrity sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==
+nodemailer@6.9.16:
+ version "6.9.16"
+ resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.16.tgz#3ebdf6c6f477c571c0facb0727b33892635e0b8b"
+ integrity sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ==
-nodemailer@6.7.3:
- version "6.7.3"
- resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.3.tgz#b73f9a81b9c8fa8acb4ea14b608f5e725ea8e018"
- integrity sha512-KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g==
-
-nodemailer@^6.6.5:
- version "6.6.5"
- resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.6.5.tgz#f9f6953cee5cfe82cbea152eeddacf7a0442049a"
- integrity sha512-C/v856DBijUzHcHIgGpQoTrfsH3suKIRAGliIzCstatM2cAa+MYX3LuyCrABiO/cdJTxgBBHXxV1ztiqUwst5A==
-
-nodemailer@^6.7.7:
- version "6.7.8"
- resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.8.tgz#9f1af9911314960c0b889079e1754e8d9e3f740a"
- integrity sha512-2zaTFGqZixVmTxpJRCFC+Vk5eGRd/fYtvIR+dl5u9QXLTQWGIf48x/JXvo58g9sa0bU6To04XUv554Paykum3g==
+nodemailer@^6.6.5, nodemailer@^6.7.7, nodemailer@^6.9.13:
+ version "6.10.0"
+ resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.10.0.tgz#1f24c9de94ad79c6206f66d132776b6503003912"
+ integrity sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==
nodemon@^2.0.7:
- version "2.0.13"
- resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.13.tgz#67d40d3a4d5bd840aa785c56587269cfcf5d24aa"
- integrity sha512-UMXMpsZsv1UXUttCn6gv8eQPhn6DR4BW+txnL3IN5IHqrCwcrT/yWHfL35UsClGXknTH79r5xbu+6J1zNHuSyA==
+ version "2.0.22"
+ resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.22.tgz#182c45c3a78da486f673d6c1702e00728daf5258"
+ integrity sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==
dependencies:
- chokidar "^3.2.2"
- debug "^3.2.6"
+ chokidar "^3.5.2"
+ debug "^3.2.7"
ignore-by-default "^1.0.1"
- minimatch "^3.0.4"
- pstree.remy "^1.1.7"
+ minimatch "^3.1.2"
+ pstree.remy "^1.1.8"
semver "^5.7.1"
+ simple-update-notifier "^1.0.7"
supports-color "^5.5.0"
touch "^3.1.0"
- undefsafe "^2.0.3"
- update-notifier "^5.1.0"
-
-nopt@~1.0.10:
- version "1.0.10"
- resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
- integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=
- dependencies:
- abbrev "1"
+ undefsafe "^2.0.5"
normalize-path@^3.0.0, normalize-path@~3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-normalize-url@^4.1.0:
- version "4.5.1"
- resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
- integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
-
npm-run-path@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -5529,26 +5554,21 @@ nth-check@^2.0.1:
boolbase "^1.0.0"
nwsapi@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
- integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+ version "2.2.18"
+ resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.18.tgz#3c4d7927e1ef4d042d319438ecfda6cd81b7ee41"
+ integrity sha512-p1TRH/edngVEHVbwqWnxUViEmq5znDvyB+Sik5cmuLpGOIfDf/39zLiq3swPF8Vakqn+gvNiOQAZu8djYlQILA==
-object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1:
+object-assign@^4, object-assign@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
-object-inspect@^1.11.0, object-inspect@^1.9.0:
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
- integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
+object-inspect@^1.13.3:
+ version "1.13.4"
+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
+ integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
-object-inspect@^1.12.2:
- version "1.12.3"
- resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
- integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
-
-object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -5558,55 +5578,71 @@ object-path@^0.11.4:
resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.8.tgz#ed002c02bbdd0070b78a27455e8ae01fc14d4742"
integrity sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==
-object.assign@^4.1.2:
- version "4.1.2"
- resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
- integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
+object.assign@^4.1.7:
+ version "4.1.7"
+ resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.7.tgz#8c14ca1a424c6a561b0bb2a22f66f5049a945d3d"
+ integrity sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==
dependencies:
- call-bind "^1.0.0"
- define-properties "^1.1.3"
- has-symbols "^1.0.1"
+ call-bind "^1.0.8"
+ call-bound "^1.0.3"
+ define-properties "^1.2.1"
+ es-object-atoms "^1.0.0"
+ has-symbols "^1.1.0"
object-keys "^1.1.1"
-object.assign@^4.1.4:
- version "4.1.4"
- resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
- integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
+object.fromentries@^2.0.8:
+ version "2.0.8"
+ resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
+ integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.4"
- has-symbols "^1.0.3"
- object-keys "^1.1.1"
+ call-bind "^1.0.7"
+ define-properties "^1.2.1"
+ es-abstract "^1.23.2"
+ es-object-atoms "^1.0.0"
-object.getownpropertydescriptors@^2.1.1:
- version "2.1.3"
- resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e"
- integrity sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==
+object.getownpropertydescriptors@^2.1.8:
+ version "2.1.8"
+ resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz#2f1fe0606ec1a7658154ccd4f728504f69667923"
+ integrity sha512-qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A==
dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.3"
- es-abstract "^1.19.1"
+ array.prototype.reduce "^1.0.6"
+ call-bind "^1.0.7"
+ define-properties "^1.2.1"
+ es-abstract "^1.23.2"
+ es-object-atoms "^1.0.0"
+ gopd "^1.0.1"
+ safe-array-concat "^1.1.2"
-object.values@^1.1.6:
- version "1.1.6"
- resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
- integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
+object.groupby@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"
+ integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==
dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.4"
- es-abstract "^1.20.4"
+ call-bind "^1.0.7"
+ define-properties "^1.2.1"
+ es-abstract "^1.23.2"
-on-finished@~2.3.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
- integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+object.values@^1.2.0:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.1.tgz#deed520a50809ff7f75a7cfd4bc64c7a038c6216"
+ integrity sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==
+ dependencies:
+ call-bind "^1.0.8"
+ call-bound "^1.0.3"
+ define-properties "^1.2.1"
+ es-object-atoms "^1.0.0"
+
+on-finished@2.4.1:
+ version "2.4.1"
+ resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
+ integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
dependencies:
ee-first "1.1.1"
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
- integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+ integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
dependencies:
wrappy "1"
@@ -5625,43 +5661,56 @@ open@7:
is-docker "^2.0.0"
is-wsl "^2.1.1"
-open@^8.4.0:
- version "8.4.2"
- resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
- integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
+openai@^4.87.3:
+ version "4.87.3"
+ resolved "https://registry.yarnpkg.com/openai/-/openai-4.87.3.tgz#82679f09d91f0e8e9da94b9ee0369c44733577da"
+ integrity sha512-d2D54fzMuBYTxMW8wcNmhT1rYKcTfMJ8t+4KjH2KtvYenygITiGBgHoIrzHwnDQWW+C5oCA+ikIR2jgPCFqcKQ==
dependencies:
- define-lazy-prop "^2.0.0"
- is-docker "^2.1.1"
- is-wsl "^2.2.0"
+ "@types/node" "^18.11.18"
+ "@types/node-fetch" "^2.6.4"
+ abort-controller "^3.0.0"
+ agentkeepalive "^4.2.1"
+ form-data-encoder "1.7.2"
+ formdata-node "^4.3.2"
+ node-fetch "^2.6.7"
-optionator@^0.8.1:
- version "0.8.3"
- resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
- integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
- dependencies:
- deep-is "~0.1.3"
- fast-levenshtein "~2.0.6"
- levn "~0.3.0"
- prelude-ls "~1.1.2"
- type-check "~0.3.2"
- word-wrap "~1.2.3"
-
-optionator@^0.9.1:
- version "0.9.1"
- resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
- integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+ version "0.9.4"
+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+ integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
dependencies:
deep-is "^0.1.3"
fast-levenshtein "^2.0.6"
levn "^0.4.1"
prelude-ls "^1.2.1"
type-check "^0.4.0"
- word-wrap "^1.2.3"
+ word-wrap "^1.2.5"
-p-cancelable@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
- integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
+own-keys@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/own-keys/-/own-keys-1.0.1.tgz#e4006910a2bf913585289676eebd6f390cf51358"
+ integrity sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==
+ dependencies:
+ get-intrinsic "^1.2.6"
+ object-keys "^1.1.1"
+ safe-push-apply "^1.0.0"
+
+oxc-resolver@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/oxc-resolver/-/oxc-resolver-5.0.0.tgz#8aac10775e45f8656393bf9b90dda0f1b2f507cd"
+ integrity sha512-66fopyAqCN8Mx4tzNiBXWbk8asCSuxUWN62gwTc3yfRs7JfWhX/eVJCf+fUrfbNOdQVOWn+o8pAKllp76ysMXA==
+ optionalDependencies:
+ "@oxc-resolver/binding-darwin-arm64" "5.0.0"
+ "@oxc-resolver/binding-darwin-x64" "5.0.0"
+ "@oxc-resolver/binding-freebsd-x64" "5.0.0"
+ "@oxc-resolver/binding-linux-arm-gnueabihf" "5.0.0"
+ "@oxc-resolver/binding-linux-arm64-gnu" "5.0.0"
+ "@oxc-resolver/binding-linux-arm64-musl" "5.0.0"
+ "@oxc-resolver/binding-linux-x64-gnu" "5.0.0"
+ "@oxc-resolver/binding-linux-x64-musl" "5.0.0"
+ "@oxc-resolver/binding-wasm32-wasi" "5.0.0"
+ "@oxc-resolver/binding-win32-arm64-msvc" "5.0.0"
+ "@oxc-resolver/binding-win32-x64-msvc" "5.0.0"
p-event@4.2.0:
version "4.2.0"
@@ -5722,15 +5771,10 @@ p-wait-for@3.2.0:
dependencies:
p-timeout "^3.0.0"
-package-json@^6.3.0:
- version "6.5.0"
- resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
- integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
- dependencies:
- got "^9.6.0"
- registry-auth-token "^4.0.0"
- registry-url "^5.0.0"
- semver "^6.2.0"
+package-json-from-dist@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"
+ integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
parent-module@^1.0.0:
version "1.0.1"
@@ -5739,7 +5783,17 @@ parent-module@^1.0.0:
dependencies:
callsites "^3.0.0"
-parse5-htmlparser2-tree-adapter@^6.0.0, parse5-htmlparser2-tree-adapter@^6.0.1:
+parse-json@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+ integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+ dependencies:
+ "@babel/code-frame" "^7.0.0"
+ error-ex "^1.3.1"
+ json-parse-even-better-errors "^2.3.0"
+ lines-and-columns "^1.1.6"
+
+parse5-htmlparser2-tree-adapter@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
@@ -5751,10 +5805,13 @@ parse5@6.0.1, parse5@^6.0.1:
resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
-parse5@^5.1.1:
- version "5.1.1"
- resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
- integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
+parseley@^0.12.0:
+ version "0.12.1"
+ resolved "https://registry.yarnpkg.com/parseley/-/parseley-0.12.1.tgz#4afd561d50215ebe259e3e7a853e62f600683aef"
+ integrity sha512-e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw==
+ dependencies:
+ leac "^0.6.0"
+ peberminta "^0.9.0"
parseley@^0.7.0:
version "0.7.0"
@@ -5777,7 +5834,7 @@ path-exists@^4.0.0:
path-is-absolute@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
- integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+ integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
path-key@^2.0.0, path-key@^2.0.1:
version "2.0.1"
@@ -5789,47 +5846,58 @@ path-key@^3.0.0, path-key@^3.1.0:
resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-path-parse@^1.0.6, path-parse@^1.0.7:
+path-parse@^1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-path-to-regexp@0.1.7:
- version "0.1.7"
- resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
- integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+path-scurry@^1.11.1:
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
+ integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
+ dependencies:
+ lru-cache "^10.2.0"
+ minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
+path-to-regexp@0.1.12:
+ version "0.1.12"
+ resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
+ integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
path-type@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-picocolors@^0.2.1:
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
- integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
+peberminta@^0.9.0:
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/peberminta/-/peberminta-0.9.0.tgz#8ec9bc0eb84b7d368126e71ce9033501dca2a352"
+ integrity sha512-XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ==
-picocolors@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
- integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+picocolors@^1.0.0, picocolors@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+ integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
- integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+ integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
+picomatch@^4.0.2:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab"
+ integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==
pify@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-pirates@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
- integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
- dependencies:
- node-modules-regexp "^1.0.0"
+pirates@^4.0.4:
+ version "4.0.6"
+ resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
+ integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
pkg-dir@^4.2.0:
version "4.2.0"
@@ -5838,21 +5906,16 @@ pkg-dir@^4.2.0:
dependencies:
find-up "^4.0.0"
+possible-typed-array-names@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
+ integrity sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==
+
prelude-ls@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
-prelude-ls@~1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
- integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
-prepend-http@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
- integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
-
prettier-linter-helpers@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
@@ -5861,36 +5924,35 @@ prettier-linter-helpers@^1.0.0:
fast-diff "^1.1.2"
prettier@^2.8.7:
- version "2.8.7"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.7.tgz#bb79fc8729308549d28fe3a98fce73d2c0656450"
- integrity sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==
+ version "2.8.8"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+ integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
-pretty-format@^27.0.0, pretty-format@^27.2.5:
- version "27.2.5"
- resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.2.5.tgz#7cfe2a8e8f01a5b5b29296a0b70f4140df0830c5"
- integrity sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==
+pretty-format@^27.0.0, pretty-format@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
+ integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
dependencies:
- "@jest/types" "^27.2.5"
ansi-regex "^5.0.1"
ansi-styles "^5.0.0"
react-is "^17.0.1"
preview-email@^3.0.7:
- version "3.0.7"
- resolved "https://registry.yarnpkg.com/preview-email/-/preview-email-3.0.7.tgz#b43e997294367f9c7437150bbe61a52e6bc7dca4"
- integrity sha512-WGko2NiS3d8qoGcC981sXotm7noW/dcv4Cp4wo+X95ek2WwJ4A+aDpw/MzMjMW/johihvmfrfUdUWBbh+HnxCw==
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/preview-email/-/preview-email-3.1.0.tgz#ee8525d878afef4309ae548116e4a4fe8b119a6d"
+ integrity sha512-ZtV1YrwscEjlrUzYrTSs6Nwo49JM3pXLM4fFOBSC3wSni+bxaWlw9/Qgk75PZO8M7cX2EybmL2iwvaV3vkAttw==
dependencies:
- ci-info "^3.3.2"
- crypto-random-string "3.3.1"
+ ci-info "^3.8.0"
display-notification "2.0.0"
+ fixpack "^4.0.0"
get-port "5.1.1"
- mailparser "^3.5.0"
- nodemailer "^6.7.7"
+ mailparser "^3.7.1"
+ nodemailer "^6.9.13"
open "7"
p-event "4.2.0"
p-wait-for "3.2.0"
- pug "^3.0.2"
- uuid "^8.3.2"
+ pug "^3.0.3"
+ uuid "^9.0.1"
process-nextick-args@~2.0.0:
version "2.0.1"
@@ -5912,7 +5974,7 @@ prompts@^2.0.1:
kleur "^3.0.3"
sisteransi "^1.0.5"
-proxy-addr@~2.0.5:
+proxy-addr@~2.0.7:
version "2.0.7"
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
@@ -5920,17 +5982,14 @@ proxy-addr@~2.0.5:
forwarded "0.2.0"
ipaddr.js "1.9.1"
-pseudomap@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
- integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-
psl@^1.1.33:
- version "1.8.0"
- resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
- integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+ version "1.15.0"
+ resolved "https://registry.yarnpkg.com/psl/-/psl-1.15.0.tgz#bdace31896f1d97cec6a79e8224898ce93d974c6"
+ integrity sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==
+ dependencies:
+ punycode "^2.3.1"
-pstree.remy@^1.1.7:
+pstree.remy@^1.1.8:
version "1.1.8"
resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a"
integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==
@@ -5944,24 +6003,24 @@ pug-attrs@^3.0.0:
js-stringify "^1.0.2"
pug-runtime "^3.0.0"
-pug-code-gen@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-3.0.2.tgz#ad190f4943133bf186b60b80de483100e132e2ce"
- integrity sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==
+pug-code-gen@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-3.0.3.tgz#58133178cb423fe1716aece1c1da392a75251520"
+ integrity sha512-cYQg0JW0w32Ux+XTeZnBEeuWrAY7/HNE6TWnhiHGnnRYlCgyAUPoyh9KzCMa9WhcJlJ1AtQqpEYHc+vbCzA+Aw==
dependencies:
constantinople "^4.0.1"
doctypes "^1.1.0"
js-stringify "^1.0.2"
pug-attrs "^3.0.0"
- pug-error "^2.0.0"
- pug-runtime "^3.0.0"
+ pug-error "^2.1.0"
+ pug-runtime "^3.0.1"
void-elements "^3.1.0"
with "^7.0.0"
-pug-error@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-2.0.0.tgz#5c62173cb09c34de2a2ce04f17b8adfec74d8ca5"
- integrity sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==
+pug-error@^2.0.0, pug-error@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-2.1.0.tgz#17ea37b587b6443d4b8f148374ec27b54b406e55"
+ integrity sha512-lv7sU9e5Jk8IeUheHata6/UThZ7RK2jnaaNztxfPYUY+VxZyk/ePVaNZ/vwmH8WqGvDz3LrNYt/+gA55NDg6Pg==
pug-filters@^4.0.0:
version "4.0.0"
@@ -6024,12 +6083,12 @@ pug-walk@^2.0.0:
resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-2.0.0.tgz#417aabc29232bb4499b5b5069a2b2d2a24d5f5fe"
integrity sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==
-pug@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/pug/-/pug-3.0.2.tgz#f35c7107343454e43bc27ae0ff76c731b78ea535"
- integrity sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==
+pug@^3.0.2, pug@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/pug/-/pug-3.0.3.tgz#e18324a314cd022883b1e0372b8af3a1a99f7597"
+ integrity sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g==
dependencies:
- pug-code-gen "^3.0.2"
+ pug-code-gen "^3.0.3"
pug-filters "^4.0.0"
pug-lexer "^5.0.1"
pug-linker "^4.0.0"
@@ -6038,37 +6097,34 @@ pug@^3.0.2:
pug-runtime "^3.0.1"
pug-strip-comments "^2.0.0"
-pump@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
- integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+punycode.js@2.3.1:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.3.1.tgz#6b53e56ad75588234e79f4affa90972c7dd8cdb7"
+ integrity sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==
+
+punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.1:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+ integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
+
+qs@6.13.0:
+ version "6.13.0"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
+ integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==
dependencies:
- end-of-stream "^1.1.0"
- once "^1.3.1"
+ side-channel "^1.0.6"
-punycode@^2.1.0, punycode@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
- integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-pupa@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62"
- integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==
+qs@^6.11.0, qs@^6.9.1:
+ version "6.14.0"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930"
+ integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==
dependencies:
- escape-goat "^2.0.0"
+ side-channel "^1.1.0"
-qs@6.7.0:
- version "6.7.0"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
- integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
-
-qs@^6.11.0:
- version "6.11.0"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
- integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
- dependencies:
- side-channel "^1.0.4"
+querystringify@^2.1.1:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+ integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
queue-microtask@^1.2.2:
version "1.2.3"
@@ -6098,13 +6154,13 @@ range-parser@~1.2.1:
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-raw-body@2.4.0:
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
- integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+raw-body@2.5.2:
+ version "2.5.2"
+ resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+ integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
dependencies:
- bytes "3.1.0"
- http-errors "1.7.2"
+ bytes "3.1.2"
+ http-errors "2.0.0"
iconv-lite "0.4.24"
unpipe "1.0.0"
@@ -6144,52 +6200,60 @@ readdirp@~3.6.0:
picomatch "^2.2.1"
reflect-metadata@^0.1.13:
- version "0.1.13"
- resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
- integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
+ version "0.1.14"
+ resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.14.tgz#24cf721fe60677146bb77eeb0e1f9dece3d65859"
+ integrity sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==
-regenerator-runtime@^0.13.11:
- version "0.13.11"
- resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
- integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
+reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:
+ version "1.0.10"
+ resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz#c629219e78a3316d8b604c765ef68996964e7bf9"
+ integrity sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==
+ dependencies:
+ call-bind "^1.0.8"
+ define-properties "^1.2.1"
+ es-abstract "^1.23.9"
+ es-errors "^1.3.0"
+ es-object-atoms "^1.0.0"
+ get-intrinsic "^1.2.7"
+ get-proto "^1.0.1"
+ which-builtin-type "^1.2.1"
+
+regenerator-runtime@^0.14.0:
+ version "0.14.1"
+ resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
+ integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
regexp-tree@~0.1.1:
version "0.1.27"
resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd"
integrity sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==
-regexp.prototype.flags@^1.4.3:
- version "1.4.3"
- resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
- integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
+regexp.prototype.flags@^1.5.3:
+ version "1.5.4"
+ resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19"
+ integrity sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==
dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.3"
- functions-have-names "^1.2.2"
+ call-bind "^1.0.8"
+ define-properties "^1.2.1"
+ es-errors "^1.3.0"
+ get-proto "^1.0.1"
+ gopd "^1.2.0"
+ set-function-name "^2.0.2"
regexpp@^3.0.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-registry-auth-token@^4.0.0:
- version "4.2.1"
- resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
- integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
- dependencies:
- rc "^1.2.8"
-
-registry-url@^5.0.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
- integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
- dependencies:
- rc "^1.2.8"
-
require-directory@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
- integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+ integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+
+requires-port@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+ integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
resolve-cwd@^3.0.0:
version "3.0.0"
@@ -6208,30 +6272,25 @@ resolve-from@^5.0.0:
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-resolve@^1.15.1, resolve@^1.22.1:
- version "1.22.1"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
- integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
+resolve-pkg-maps@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f"
+ integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==
+
+resolve.exports@^1.1.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999"
+ integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==
+
+resolve@^1.15.1, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.4:
+ version "1.22.10"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"
+ integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==
dependencies:
- is-core-module "^2.9.0"
+ is-core-module "^2.16.0"
path-parse "^1.0.7"
supports-preserve-symlinks-flag "^1.0.0"
-resolve@^1.20.0:
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
- integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
- dependencies:
- is-core-module "^2.2.0"
- path-parse "^1.0.6"
-
-responselike@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
- integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
- dependencies:
- lowercase-keys "^1.0.0"
-
ret@~0.1.10:
version "0.1.15"
resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -6243,14 +6302,14 @@ retry@0.13.1:
integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
reusify@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
- integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.1.0.tgz#0fe13b9522e1473f51b558ee796e08f11f9b489f"
+ integrity sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==
rfdc@^1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
- integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca"
+ integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==
rimraf@^3.0.0, rimraf@^3.0.2:
version "3.0.2"
@@ -6273,12 +6332,23 @@ run-parallel@^1.1.9:
dependencies:
queue-microtask "^1.2.2"
+safe-array-concat@^1.1.2, safe-array-concat@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3"
+ integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==
+ dependencies:
+ call-bind "^1.0.8"
+ call-bound "^1.0.2"
+ get-intrinsic "^1.2.6"
+ has-symbols "^1.1.0"
+ isarray "^2.0.5"
+
safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-safe-buffer@^5.0.1:
+safe-buffer@5.2.1, safe-buffer@^5.0.1:
version "5.2.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -6288,14 +6358,22 @@ safe-identifier@^0.4.1:
resolved "https://registry.yarnpkg.com/safe-identifier/-/safe-identifier-0.4.2.tgz#cf6bfca31c2897c588092d1750d30ef501d59fcb"
integrity sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==
-safe-regex-test@^1.0.0:
+safe-push-apply@^1.0.0:
version "1.0.0"
- resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
- integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+ resolved "https://registry.yarnpkg.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz#01850e981c1602d398c85081f360e4e6d03d27f5"
+ integrity sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==
dependencies:
- call-bind "^1.0.2"
- get-intrinsic "^1.1.3"
- is-regex "^1.1.4"
+ es-errors "^1.3.0"
+ isarray "^2.0.5"
+
+safe-regex-test@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1"
+ integrity sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==
+ dependencies:
+ call-bound "^1.0.2"
+ es-errors "^1.3.0"
+ is-regex "^1.2.1"
safe-regex@^2.1.1:
version "2.1.1"
@@ -6316,6 +6394,13 @@ saxes@^5.0.1:
dependencies:
xmlchars "^2.2.0"
+selderee@^0.11.0:
+ version "0.11.0"
+ resolved "https://registry.yarnpkg.com/selderee/-/selderee-0.11.0.tgz#6af0c7983e073ad3e35787ffe20cefd9daf0ec8a"
+ integrity sha512-5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA==
+ dependencies:
+ parseley "^0.12.0"
+
selderee@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/selderee/-/selderee-0.6.0.tgz#f3bee66cfebcb6f33df98e4a1df77388b42a96f7"
@@ -6323,75 +6408,90 @@ selderee@^0.6.0:
dependencies:
parseley "^0.7.0"
-semver-diff@^3.1.1:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
- integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==
- dependencies:
- semver "^6.3.0"
-
-semver@7.x, semver@^7.3.2, semver@^7.3.4:
- version "7.3.5"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
- integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
- dependencies:
- lru-cache "^6.0.0"
+semver@7.x, semver@^7.0.0, semver@^7.3.2, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.6.3:
+ version "7.7.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f"
+ integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==
semver@^5.5.0, semver@^5.7.1:
- version "5.7.1"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
- integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+ version "5.7.2"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+ integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
-semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
- version "6.3.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
- integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+semver@^6.3.0, semver@^6.3.1:
+ version "6.3.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+ integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-semver@^7.0.0, semver@^7.3.7, semver@^7.3.8:
- version "7.3.8"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
- integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
- dependencies:
- lru-cache "^6.0.0"
+semver@~7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+ integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-send@0.17.1:
- version "0.17.1"
- resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
- integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+send@0.19.0:
+ version "0.19.0"
+ resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
+ integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==
dependencies:
debug "2.6.9"
- depd "~1.1.2"
- destroy "~1.0.4"
+ depd "2.0.0"
+ destroy "1.2.0"
encodeurl "~1.0.2"
escape-html "~1.0.3"
etag "~1.8.1"
fresh "0.5.2"
- http-errors "~1.7.2"
+ http-errors "2.0.0"
mime "1.6.0"
- ms "2.1.1"
- on-finished "~2.3.0"
+ ms "2.1.3"
+ on-finished "2.4.1"
range-parser "~1.2.1"
- statuses "~1.5.0"
+ statuses "2.0.1"
seq-queue@^0.0.5:
version "0.0.5"
resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"
- integrity sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4=
+ integrity sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==
-serve-static@1.14.1:
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
- integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+serve-static@1.16.2:
+ version "1.16.2"
+ resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"
+ integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==
dependencies:
- encodeurl "~1.0.2"
+ encodeurl "~2.0.0"
escape-html "~1.0.3"
parseurl "~1.3.3"
- send "0.17.1"
+ send "0.19.0"
-setprototypeof@1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
- integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+set-function-length@^1.2.2:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
+ integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
+ dependencies:
+ define-data-property "^1.1.4"
+ es-errors "^1.3.0"
+ function-bind "^1.1.2"
+ get-intrinsic "^1.2.4"
+ gopd "^1.0.1"
+ has-property-descriptors "^1.0.2"
+
+set-function-name@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
+ integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
+ dependencies:
+ define-data-property "^1.1.4"
+ es-errors "^1.3.0"
+ functions-have-names "^1.2.3"
+ has-property-descriptors "^1.0.2"
+
+set-proto@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/set-proto/-/set-proto-1.0.0.tgz#0760dbcff30b2d7e801fd6e19983e56da337565e"
+ integrity sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==
+ dependencies:
+ dunder-proto "^1.0.1"
+ es-errors "^1.3.0"
+ es-object-atoms "^1.0.0"
setprototypeof@1.2.0:
version "1.2.0"
@@ -6430,24 +6530,62 @@ shebang-regex@^3.0.0:
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-side-channel@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
- integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+side-channel-list@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
+ integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
dependencies:
- call-bind "^1.0.0"
- get-intrinsic "^1.0.2"
- object-inspect "^1.9.0"
+ es-errors "^1.3.0"
+ object-inspect "^1.13.3"
-signal-exit@^3.0.0:
+side-channel-map@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"
+ integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==
+ dependencies:
+ call-bound "^1.0.2"
+ es-errors "^1.3.0"
+ get-intrinsic "^1.2.5"
+ object-inspect "^1.13.3"
+
+side-channel-weakmap@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea"
+ integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==
+ dependencies:
+ call-bound "^1.0.2"
+ es-errors "^1.3.0"
+ get-intrinsic "^1.2.5"
+ object-inspect "^1.13.3"
+ side-channel-map "^1.0.1"
+
+side-channel@^1.0.6, side-channel@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
+ integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
+ dependencies:
+ es-errors "^1.3.0"
+ object-inspect "^1.13.3"
+ side-channel-list "^1.0.0"
+ side-channel-map "^1.0.1"
+ side-channel-weakmap "^1.0.2"
+
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
version "3.0.7"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-signal-exit@^3.0.2, signal-exit@^3.0.3:
- version "3.0.5"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f"
- integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==
+signal-exit@^4.0.1:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+ integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
+simple-update-notifier@^1.0.7:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82"
+ integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==
+ dependencies:
+ semver "~7.0.0"
sisteransi@^1.0.5:
version "1.0.5"
@@ -6459,50 +6597,45 @@ slash@^3.0.0:
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-slash@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
- integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
-
slick@^1.12.2:
version "1.12.2"
resolved "https://registry.yarnpkg.com/slick/-/slick-1.12.2.tgz#bd048ddb74de7d1ca6915faa4a57570b3550c2d7"
integrity sha512-4qdtOGcBjral6YIBCWJ0ljFSKNLz9KkhbWtuGvUyRowl1kxfuE1x/Z/aJcaiilpb3do9bl5K7/1h9XC5wWpY/A==
-sodium-native@^3.3.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/sodium-native/-/sodium-native-3.3.0.tgz#50ee52ac843315866cce3d0c08ab03eb78f22361"
- integrity sha512-rg6lCDM/qa3p07YGqaVD+ciAbUqm6SoO4xmlcfkbU5r1zIGrguXztLiEtaLYTV5U6k8KSIUFmnU3yQUSKmf6DA==
+sodium-native@^3.4.1:
+ version "3.4.1"
+ resolved "https://registry.yarnpkg.com/sodium-native/-/sodium-native-3.4.1.tgz#44616c07ccecea15195f553af88b3e574b659741"
+ integrity sha512-PaNN/roiFWzVVTL6OqjzYct38NSXewdl2wz8SRB51Br/MLIJPrbM3XexhVWkq7D3UWMysfrhKVf1v1phZq6MeQ==
dependencies:
node-gyp-build "^4.3.0"
source-map-support@^0.5.6:
- version "0.5.20"
- resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
- integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
+ version "0.5.21"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+ integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
dependencies:
buffer-from "^1.0.0"
source-map "^0.6.0"
-source-map@^0.5.0:
- version "0.5.7"
- resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
- integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
source-map@^0.7.3:
- version "0.7.3"
- resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
- integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+ version "0.7.4"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
+ integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
sprintf-js@~1.0.2:
version "1.0.3"
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
- integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+ integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
+
+sql-highlight@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/sql-highlight/-/sql-highlight-6.0.0.tgz#e62977ed5c7a1644634a1554b8588ee42611a4be"
+ integrity sha512-+fLpbAbWkQ+d0JEchJT/NrRRXbYRNbG15gFpANx73EwxQB1PRjj+k/OI0GTU0J63g8ikGkJECQp9z8XEJZvPRw==
sqlstring@2.3.1:
version "2.3.1"
@@ -6510,35 +6643,45 @@ sqlstring@2.3.1:
integrity sha512-ooAzh/7dxIG5+uDik1z/Rd1vli0+38izZhGzSa34FwR7IbelPWCCKSNIl8jlL/F7ERvy8CB2jNeM1E9i9mXMAQ==
sqlstring@^2.3.2:
- version "2.3.2"
- resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.2.tgz#cdae7169389a1375b18e885f2e60b3e460809514"
- integrity sha512-vF4ZbYdKS8OnoJAWBmMxCQDkiEBkGQYU7UZPtL8flbDRSNkhaXvRJ279ZtI6M+zDaQovVU4tuRgzK5fVhvFAhg==
+ version "2.3.3"
+ resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.3.tgz#2ddc21f03bce2c387ed60680e739922c65751d0c"
+ integrity sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==
+
+stable-hash@^0.0.5:
+ version "0.0.5"
+ resolved "https://registry.yarnpkg.com/stable-hash/-/stable-hash-0.0.5.tgz#94e8837aaeac5b4d0f631d2972adef2924b40269"
+ integrity sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==
stack-utils@^2.0.3:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
- integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
+ integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
dependencies:
escape-string-regexp "^2.0.0"
-"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+statuses@2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
+ integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
+
+"statuses@>= 1.5.0 < 2":
version "1.5.0"
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
- integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+ integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
-streamroller@^3.0.8:
- version "3.0.8"
- resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.0.8.tgz#84b190e4080ee311ca1ebe0444e30ac8eedd028d"
- integrity sha512-VI+ni3czbFZrd1MrlybxykWZ8sMDCMtTU7YJyhgb9M5X6d1DDxLdJr+gSnmRpXPMnIWxWKMaAE8K0WumBp3lDg==
+streamroller@^3.1.5:
+ version "3.1.5"
+ resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.5.tgz#1263182329a45def1ffaef58d31b15d13d2ee7ff"
+ integrity sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==
dependencies:
- date-format "^4.0.9"
+ date-format "^4.0.14"
debug "^4.3.4"
- fs-extra "^10.1.0"
+ fs-extra "^8.1.0"
streamsearch@0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
- integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=
+ integrity sha512-jos8u++JKm0ARcSUTAZXOVC0mSox7Bhn6sBgty73P1f3JGf7yG2clTbBNHUdde/kdvP2FESam+vM6l8jBrNxHA==
string-length@^4.0.1:
version "4.0.2"
@@ -6548,7 +6691,7 @@ string-length@^4.0.1:
char-regex "^1.0.2"
strip-ansi "^6.0.0"
-string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -6557,39 +6700,55 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"
-string.prototype.trimend@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
- integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+ version "4.2.3"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+ integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.3"
+ emoji-regex "^8.0.0"
+ is-fullwidth-code-point "^3.0.0"
+ strip-ansi "^6.0.1"
-string.prototype.trimend@^1.0.6:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
- integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+string-width@^5.0.1, string-width@^5.1.2:
+ version "5.1.2"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+ integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.4"
- es-abstract "^1.20.4"
+ eastasianwidth "^0.2.0"
+ emoji-regex "^9.2.2"
+ strip-ansi "^7.0.1"
-string.prototype.trimstart@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
- integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+string.prototype.trim@^1.2.10:
+ version "1.2.10"
+ resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz#40b2dd5ee94c959b4dcfb1d65ce72e90da480c81"
+ integrity sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==
dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.3"
+ call-bind "^1.0.8"
+ call-bound "^1.0.2"
+ define-data-property "^1.1.4"
+ define-properties "^1.2.1"
+ es-abstract "^1.23.5"
+ es-object-atoms "^1.0.0"
+ has-property-descriptors "^1.0.2"
-string.prototype.trimstart@^1.0.6:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
- integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+string.prototype.trimend@^1.0.8, string.prototype.trimend@^1.0.9:
+ version "1.0.9"
+ resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz#62e2731272cd285041b36596054e9f66569b6942"
+ integrity sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==
dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.4"
- es-abstract "^1.20.4"
+ call-bind "^1.0.8"
+ call-bound "^1.0.2"
+ define-properties "^1.2.1"
+ es-object-atoms "^1.0.0"
+
+string.prototype.trimstart@^1.0.8:
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde"
+ integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==
+ dependencies:
+ call-bind "^1.0.7"
+ define-properties "^1.2.1"
+ es-object-atoms "^1.0.0"
string_decoder@~1.1.1:
version "1.1.1"
@@ -6598,6 +6757,13 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+ integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+ dependencies:
+ ansi-regex "^5.0.1"
+
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -6605,10 +6771,17 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
dependencies:
ansi-regex "^5.0.1"
+strip-ansi@^7.0.1:
+ version "7.1.0"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+ integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
+ dependencies:
+ ansi-regex "^6.0.1"
+
strip-bom@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
- integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+ integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
strip-bom@^4.0.0:
version "4.0.0"
@@ -6625,7 +6798,7 @@ strip-final-newline@^2.0.0:
resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -6633,7 +6806,7 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
strip-json-comments@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
- integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+ integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
subscriptions-transport-ws@^0.9.19:
version "0.9.19"
@@ -6646,7 +6819,7 @@ subscriptions-transport-ws@^0.9.19:
symbol-observable "^1.0.4"
ws "^5.2.0 || ^6.0.0 || ^7.0.0"
-supports-color@^5.3.0, supports-color@^5.5.0:
+supports-color@^5.5.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -6668,9 +6841,9 @@ supports-color@^8.0.0:
has-flag "^4.0.0"
supports-hyperlinks@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
- integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
+ integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==
dependencies:
has-flag "^4.0.0"
supports-color "^7.0.0"
@@ -6690,19 +6863,6 @@ symbol-tree@^3.2.4:
resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
-synckit@^0.8.5:
- version "0.8.5"
- resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.8.5.tgz#b7f4358f9bb559437f9f167eb6bc46b3c9818fa3"
- integrity sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==
- dependencies:
- "@pkgr/utils" "^2.3.1"
- tslib "^2.5.0"
-
-tapable@^2.2.0:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
- integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
-
terminal-link@^2.0.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
@@ -6723,60 +6883,41 @@ test-exclude@^6.0.0:
text-table@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
- integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
-
-thenify-all@^1.0.0:
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
- integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==
- dependencies:
- thenify ">= 3.1.0 < 4"
-
-"thenify@>= 3.1.0 < 4":
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
- integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
- dependencies:
- any-promise "^1.0.0"
+ integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
throat@^6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375"
- integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.2.tgz#51a3fbb5e11ae72e2cf74861ed5c8020f89f29fe"
+ integrity sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==
-tiny-glob@^0.2.9:
- version "0.2.9"
- resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz#2212d441ac17928033b110f8b3640683129d31e2"
- integrity sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==
+tinyglobby@^0.2.12:
+ version "0.2.12"
+ resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.12.tgz#ac941a42e0c5773bd0b5d08f32de82e74a1a61b5"
+ integrity sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==
dependencies:
- globalyzer "0.1.0"
- globrex "^0.1.2"
+ fdir "^6.4.3"
+ picomatch "^4.0.2"
titleize@2:
version "2.1.0"
resolved "https://registry.yarnpkg.com/titleize/-/titleize-2.1.0.tgz#5530de07c22147a0488887172b5bd94f5b30a48f"
integrity sha512-m+apkYlfiQTKLW+sI4vqUkwMEzfgEUEYSqljx1voUE3Wz/z1ZsxyzSxvH2X8uKVrOp7QkByWt0rA6+gvhCKy6g==
-tlds@1.231.0, tlds@^1.231.0:
- version "1.231.0"
- resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.231.0.tgz#93880175cd0a06fdf7b5b5b9bcadff9d94813e39"
- integrity sha512-L7UQwueHSkGxZHQBXHVmXW64oi+uqNtzFt2x6Ssk7NVnpIbw16CRs4eb/jmKOZ9t2JnqZ/b3Cfvo97lnXqKrhw==
+tlds@1.255.0:
+ version "1.255.0"
+ resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.255.0.tgz#53c2571766c10da95928c716c48dfcf141341e3f"
+ integrity sha512-tcwMRIioTcF/FcxLev8MJWxCp+GUALRhFEqbDoZrnowmKSGqPrl5pqS+Sut2m8BgJ6S4FExCSSpGffZ0Tks6Aw==
-tmpl@1.0.x:
+tlds@^1.231.0:
+ version "1.256.0"
+ resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.256.0.tgz#4285b41a7ed4fcc7c5eed8516c3a180e892fad36"
+ integrity sha512-ZmyVB9DAw+FFTmLElGYJgdZFsKLYd/I59Bg9NHkCGPwAbVZNRilFWDMAdX8UG+bHuv7kfursd5XGqo/9wi26lA==
+
+tmpl@1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
-to-fast-properties@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
- integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
-to-readable-stream@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
- integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
-
to-regex-range@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -6784,10 +6925,10 @@ to-regex-range@^5.0.1:
dependencies:
is-number "^7.0.0"
-toidentifier@1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
- integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+toidentifier@1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
+ integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
token-stream@1.0.0:
version "1.0.0"
@@ -6795,20 +6936,19 @@ token-stream@1.0.0:
integrity sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==
touch@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
- integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==
- dependencies:
- nopt "~1.0.10"
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.1.tgz#097a23d7b161476435e5c1344a95c0f75b4a5694"
+ integrity sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==
tough-cookie@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
- integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+ version "4.1.4"
+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
+ integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==
dependencies:
psl "^1.1.33"
punycode "^2.1.1"
- universalify "^0.1.2"
+ universalify "^0.2.0"
+ url-parse "^1.5.3"
tr46@^2.1.0:
version "2.1.0"
@@ -6820,7 +6960,7 @@ tr46@^2.1.0:
tr46@~0.0.3:
version "0.0.3"
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
- integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+ integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
ts-invariant@^0.4.0:
version "0.4.4"
@@ -6830,33 +6970,33 @@ ts-invariant@^0.4.0:
tslib "^1.9.3"
ts-jest@^27.0.5:
- version "27.0.5"
- resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.0.5.tgz#0b0604e2271167ec43c12a69770f0bb65ad1b750"
- integrity sha512-lIJApzfTaSSbtlksfFNHkWOzLJuuSm4faFAfo5kvzOiRAuoN4/eKxVJ2zEAho8aecE04qX6K1pAzfH5QHL1/8w==
+ version "27.1.5"
+ resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.1.5.tgz#0ddf1b163fbaae3d5b7504a1e65c914a95cff297"
+ integrity sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==
dependencies:
bs-logger "0.x"
fast-json-stable-stringify "2.x"
jest-util "^27.0.0"
json5 "2.x"
- lodash "4.x"
+ lodash.memoize "4.x"
make-error "1.x"
semver "7.x"
yargs-parser "20.x"
ts-mysql-migrate@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/ts-mysql-migrate/-/ts-mysql-migrate-1.0.2.tgz#736d37c3aa3fef92f226b869098e939950d0e18c"
- integrity sha512-zDW6iQsfPCJfQ3JMhfUGjhy8aK+VNTvPrXmJH66PB2EGEvyn4m7x2nBdhDNhKuwYU9LMxW1p+l39Ei+btXNpxA==
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/ts-mysql-migrate/-/ts-mysql-migrate-1.1.2.tgz#6f280f4684cb95440ffa7254b926b494badb8cf3"
+ integrity sha512-jwhVaMrYBNNhAoZ5XISxzqbnXTHqwazqu/r1UQ6kUaGNPGL43ZFnBiXVj4Gm3pfe3xtCGIaNInehDfdDuigPgw==
dependencies:
"@types/mysql" "^2.15.8"
mysql "^2.18.1"
-ts-node@^10.0.0:
- version "10.2.1"
- resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.2.1.tgz#4cc93bea0a7aba2179497e65bb08ddfc198b3ab5"
- integrity sha512-hCnyOyuGmD5wHleOQX6NIjJtYVIO8bPP8F2acWkB4W06wdlkgyvJtubO/I9NkI88hCFECbsEgoLc0VNkYmcSfw==
+ts-node@^10.9.2:
+ version "10.9.2"
+ resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
+ integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
dependencies:
- "@cspotcode/source-map-support" "0.6.1"
+ "@cspotcode/source-map-support" "^0.8.0"
"@tsconfig/node10" "^1.0.7"
"@tsconfig/node12" "^1.0.7"
"@tsconfig/node14" "^1.0.0"
@@ -6867,22 +7007,13 @@ ts-node@^10.0.0:
create-require "^1.1.0"
diff "^4.0.1"
make-error "^1.1.1"
+ v8-compile-cache-lib "^3.0.1"
yn "3.1.1"
-tsconfig-paths@^3.14.0:
- version "3.14.0"
- resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.0.tgz#4fcc48f9ccea8826c41b9ca093479de7f5018976"
- integrity sha512-cg/1jAZoL57R39+wiw4u/SCC6Ic9Q5NqjBOb+9xISedOYurfog9ZNmKJSxAnb2m/5Bq4lE9lhUcau33Ml8DM0g==
- dependencies:
- "@types/json5" "^0.0.29"
- json5 "^1.0.1"
- minimist "^1.2.0"
- strip-bom "^3.0.0"
-
-tsconfig-paths@^3.14.1:
- version "3.14.2"
- resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
- integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
+tsconfig-paths@^3.14.0, tsconfig-paths@^3.15.0:
+ version "3.15.0"
+ resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
+ integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
dependencies:
"@types/json5" "^0.0.29"
json5 "^1.0.2"
@@ -6894,20 +7025,10 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.3:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-tslib@^2.0.1, tslib@^2.1.0:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
- integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
-
-tslib@^2.2.0:
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
- integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
-
-tslib@^2.4.0, tslib@^2.5.0:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
- integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
+tslib@^2.0.1, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.4.0, tslib@^2.5.0:
+ version "2.8.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
+ integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
tsutils@^3.21.0:
version "3.21.0"
@@ -6916,6 +7037,11 @@ tsutils@^3.21.0:
dependencies:
tslib "^1.8.1"
+tunnel@0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+ integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+
type-check@^0.4.0, type-check@~0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -6923,13 +7049,6 @@ type-check@^0.4.0, type-check@~0.4.0:
dependencies:
prelude-ls "^1.2.1"
-type-check@~0.3.2:
- version "0.3.2"
- resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
- integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
- dependencies:
- prelude-ls "~1.1.2"
-
type-detect@4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
@@ -6945,11 +7064,6 @@ type-fest@^0.21.3:
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-type-fest@^0.8.1:
- version "0.8.1"
- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
- integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
-
type-graphql@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/type-graphql/-/type-graphql-1.1.1.tgz#dc0710d961713b92d3fee927981fa43bf71667a4"
@@ -6964,7 +7078,7 @@ type-graphql@^1.1.1:
semver "^7.3.2"
tslib "^2.0.1"
-type-is@^1.6.16, type-is@~1.6.17, type-is@~1.6.18:
+type-is@^1.6.16, type-is@~1.6.18:
version "1.6.18"
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
@@ -6972,14 +7086,59 @@ type-is@^1.6.16, type-is@~1.6.17, type-is@~1.6.18:
media-typer "0.3.0"
mime-types "~2.1.24"
-typed-array-length@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
- integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
+typed-array-buffer@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536"
+ integrity sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==
dependencies:
- call-bind "^1.0.2"
+ call-bound "^1.0.3"
+ es-errors "^1.3.0"
+ is-typed-array "^1.1.14"
+
+typed-array-byte-length@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz#8407a04f7d78684f3d252aa1a143d2b77b4160ce"
+ integrity sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==
+ dependencies:
+ call-bind "^1.0.8"
for-each "^0.3.3"
- is-typed-array "^1.1.9"
+ gopd "^1.2.0"
+ has-proto "^1.2.0"
+ is-typed-array "^1.1.14"
+
+typed-array-byte-offset@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz#ae3698b8ec91a8ab945016108aef00d5bff12355"
+ integrity sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==
+ dependencies:
+ available-typed-arrays "^1.0.7"
+ call-bind "^1.0.8"
+ for-each "^0.3.3"
+ gopd "^1.2.0"
+ has-proto "^1.2.0"
+ is-typed-array "^1.1.15"
+ reflect.getprototypeof "^1.0.9"
+
+typed-array-length@^1.0.7:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.7.tgz#ee4deff984b64be1e118b0de8c9c877d5ce73d3d"
+ integrity sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==
+ dependencies:
+ call-bind "^1.0.7"
+ for-each "^0.3.3"
+ gopd "^1.0.1"
+ is-typed-array "^1.1.13"
+ possible-typed-array-names "^1.0.0"
+ reflect.getprototypeof "^1.0.6"
+
+typed-rest-client@^1.8.11:
+ version "1.8.11"
+ resolved "https://registry.yarnpkg.com/typed-rest-client/-/typed-rest-client-1.8.11.tgz#6906f02e3c91e8d851579f255abf0fd60800a04d"
+ integrity sha512-5UvfMpd1oelmUPRbbaVnq+rHP7ng2cE4qoQkQeAqxRL6PklkxsM0g32/HL0yfvruK6ojQ5x8EE+HF4YV6DtuCA==
+ dependencies:
+ qs "^6.9.1"
+ tunnel "0.0.6"
+ underscore "^1.12.1"
typedarray-to-buffer@^3.1.5:
version "3.1.5"
@@ -6989,114 +7148,91 @@ typedarray-to-buffer@^3.1.5:
is-typedarray "^1.0.0"
typeorm@^0.3.16:
- version "0.3.17"
- resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.17.tgz#a73c121a52e4fbe419b596b244777be4e4b57949"
- integrity sha512-UDjUEwIQalO9tWw9O2A4GU+sT3oyoUXheHJy4ft+RFdnRdQctdQ34L9SqE2p7LdwzafHx1maxT+bqXON+Qnmig==
+ version "0.3.21"
+ resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.21.tgz#8da9e0f079302a263eb05a4376239cef055886fd"
+ integrity sha512-lh4rUWl1liZGjyPTWpwcK8RNI5x4ekln+/JJOox1wCd7xbucYDOXWD+1cSzTN3L0wbTGxxOtloM5JlxbOxEufA==
dependencies:
"@sqltools/formatter" "^1.2.5"
+ ansis "^3.9.0"
app-root-path "^3.1.0"
buffer "^6.0.3"
- chalk "^4.1.2"
- cli-highlight "^2.1.11"
- date-fns "^2.29.3"
+ dayjs "^1.11.9"
debug "^4.3.4"
dotenv "^16.0.3"
- glob "^8.1.0"
- mkdirp "^2.1.3"
- reflect-metadata "^0.1.13"
+ glob "^10.4.5"
sha.js "^2.4.11"
+ sql-highlight "^6.0.0"
tslib "^2.5.0"
- uuid "^9.0.0"
+ uuid "^11.0.5"
yargs "^17.6.2"
-typescript@^4.3.4:
- version "4.4.3"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324"
- integrity sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==
+typescript@^4.9.5:
+ version "4.9.5"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+ integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
-uc.micro@^1.0.1:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
- integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
+uc.micro@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-2.1.0.tgz#f8d3f7d0ec4c3dea35a7e3c8efa4cb8b45c9e7ee"
+ integrity sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==
-unbox-primitive@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
- integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+unbox-primitive@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz#8d9d2c9edeea8460c7f35033a88867944934d1e2"
+ integrity sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==
dependencies:
- function-bind "^1.1.1"
- has-bigints "^1.0.1"
- has-symbols "^1.0.2"
- which-boxed-primitive "^1.0.2"
-
-unbox-primitive@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
- integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
- dependencies:
- call-bind "^1.0.2"
+ call-bound "^1.0.3"
has-bigints "^1.0.2"
- has-symbols "^1.0.3"
- which-boxed-primitive "^1.0.2"
+ has-symbols "^1.1.0"
+ which-boxed-primitive "^1.1.1"
-undefsafe@^2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.3.tgz#6b166e7094ad46313b2202da7ecc2cd7cc6e7aae"
- integrity sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A==
- dependencies:
- debug "^2.2.0"
+undefsafe@^2.0.5:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
+ integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==
underscore.deep@~0.5.1:
version "0.5.3"
resolved "https://registry.yarnpkg.com/underscore.deep/-/underscore.deep-0.5.3.tgz#210969d58025339cecabd2a2ad8c3e8925e5c095"
integrity sha512-4OuSOlFNkiVFVc3khkeG112Pdu1gbitMj7t9B9ENb61uFmN70Jq7Iluhi3oflcSgexkKfDdJ5XAJET2gEq6ikA==
-underscore@~1.13.1:
- version "1.13.4"
- resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.4.tgz#7886b46bbdf07f768e0052f1828e1dcab40c0dee"
- integrity sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ==
+underscore@^1.12.1, underscore@~1.13.1:
+ version "1.13.7"
+ resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.7.tgz#970e33963af9a7dda228f17ebe8399e5fbe63a10"
+ integrity sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==
-unique-string@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
- integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
- dependencies:
- crypto-random-string "^2.0.0"
+undici-types@~5.26.4:
+ version "5.26.5"
+ resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+ integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-universalify@^0.1.2:
+undici-types@~6.20.0:
+ version "6.20.0"
+ resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433"
+ integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==
+
+universalify@^0.1.0:
version "0.1.2"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-universalify@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
- integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+universalify@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
+ integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
unpipe@1.0.0, unpipe@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
- integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+ integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
-update-notifier@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"
- integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==
+update-browserslist-db@^1.1.1:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz#348377dd245216f9e7060ff50b15a1b740b75420"
+ integrity sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==
dependencies:
- boxen "^5.0.0"
- chalk "^4.1.0"
- configstore "^5.0.1"
- has-yarn "^2.1.0"
- import-lazy "^2.1.0"
- is-ci "^2.0.0"
- is-installed-globally "^0.4.0"
- is-npm "^5.0.0"
- is-yarn-global "^0.3.0"
- latest-version "^5.1.0"
- pupa "^2.1.1"
- semver "^7.3.4"
- semver-diff "^3.1.1"
- xdg-basedir "^4.0.0"
+ escalade "^3.2.0"
+ picocolors "^1.1.1"
uri-js@^4.2.2:
version "4.4.1"
@@ -7105,12 +7241,13 @@ uri-js@^4.2.2:
dependencies:
punycode "^2.1.0"
-url-parse-lax@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
- integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
+url-parse@^1.5.3:
+ version "1.5.10"
+ resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+ integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
dependencies:
- prepend-http "^2.0.0"
+ querystringify "^2.1.1"
+ requires-port "^1.0.0"
util-deprecate@~1.0.1:
version "1.0.2"
@@ -7118,20 +7255,32 @@ util-deprecate@~1.0.1:
integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
util.promisify@^1.0.0:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz#77832f57ced2c9478174149cae9b96e9918cd54b"
- integrity sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.3.tgz#3d77cf56628b4aad743e5acde8e5c44cea7dbf1c"
+ integrity sha512-GIEaZ6o86fj09Wtf0VfZ5XP7tmd4t3jM5aZCgmBi231D0DB1AEBa3Aa6MP48DMsAIi96WkpWLimIWVwOjbDMOw==
dependencies:
- call-bind "^1.0.0"
- define-properties "^1.1.3"
+ call-bind "^1.0.8"
+ call-bound "^1.0.3"
+ define-data-property "^1.1.4"
+ define-properties "^1.2.1"
+ es-errors "^1.3.0"
+ es-object-atoms "^1.0.0"
for-each "^0.3.3"
- has-symbols "^1.0.1"
- object.getownpropertydescriptors "^2.1.1"
+ get-intrinsic "^1.2.6"
+ has-proto "^1.2.0"
+ has-symbols "^1.1.0"
+ object.getownpropertydescriptors "^2.1.8"
+ safe-array-concat "^1.1.3"
utils-merge@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
- integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+ integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
+
+uuid@^11.0.5:
+ version "11.1.0"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-11.1.0.tgz#9549028be1753bb934fc96e2bca09bb4105ae912"
+ integrity sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==
uuid@^3.1.0:
version "3.4.0"
@@ -7143,15 +7292,20 @@ uuid@^8.0.0, uuid@^8.3.2:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-uuid@^9.0.0:
- version "9.0.0"
- resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
- integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+uuid@^9.0.1:
+ version "9.0.1"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
+ integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
+
+v8-compile-cache-lib@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+ integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
v8-to-istanbul@^8.1.0:
- version "8.1.0"
- resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz#0aeb763894f1a0a1676adf8a8b7612a38902446c"
- integrity sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==
+ version "8.1.1"
+ resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed"
+ integrity sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==
dependencies:
"@types/istanbul-lib-coverage" "^2.0.1"
convert-source-map "^1.6.0"
@@ -7162,15 +7316,15 @@ valid-data-url@^3.0.0:
resolved "https://registry.yarnpkg.com/valid-data-url/-/valid-data-url-3.0.1.tgz#826c1744e71b5632e847dd15dbd45b9fb38aa34f"
integrity sha512-jOWVmzVceKlVVdwjNSenT4PbGghU0SBIizAev8ofZVgivk/TVHXSbNL8LP6M3spZvkR9/QolkyJavGSX5Cs0UA==
-validator@^13.5.2:
- version "13.6.0"
- resolved "https://registry.yarnpkg.com/validator/-/validator-13.6.0.tgz#1e71899c14cdc7b2068463cb24c1cc16f6ec7059"
- integrity sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg==
+validator@^13.7.0:
+ version "13.12.0"
+ resolved "https://registry.yarnpkg.com/validator/-/validator-13.12.0.tgz#7d78e76ba85504da3fee4fd1922b385914d4b35f"
+ integrity sha512-c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg==
vary@^1, vary@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
- integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+ integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
void-elements@^3.1.0:
version "3.1.0"
@@ -7192,11 +7346,11 @@ w3c-xmlserializer@^2.0.0:
xml-name-validator "^3.0.0"
walker@^1.0.7:
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
- integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
+ integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
dependencies:
- makeerror "1.0.x"
+ makeerror "1.0.12"
web-resource-inliner@^6.0.1:
version "6.0.1"
@@ -7210,10 +7364,15 @@ web-resource-inliner@^6.0.1:
node-fetch "^2.6.0"
valid-data-url "^3.0.0"
+web-streams-polyfill@4.0.0-beta.3:
+ version "4.0.0-beta.3"
+ resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz#2898486b74f5156095e473efe989dcf185047a38"
+ integrity sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==
+
webidl-conversions@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
- integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+ integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
webidl-conversions@^5.0.0:
version "5.0.0"
@@ -7240,7 +7399,7 @@ whatwg-mimetype@^2.3.0:
whatwg-url@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
- integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+ integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
dependencies:
tr46 "~0.0.3"
webidl-conversions "^3.0.0"
@@ -7254,28 +7413,58 @@ whatwg-url@^8.0.0, whatwg-url@^8.5.0:
tr46 "^2.1.0"
webidl-conversions "^6.1.0"
-which-boxed-primitive@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
- integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+which-boxed-primitive@^1.1.0, which-boxed-primitive@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz#d76ec27df7fa165f18d5808374a5fe23c29b176e"
+ integrity sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==
dependencies:
- is-bigint "^1.0.1"
- is-boolean-object "^1.1.0"
- is-number-object "^1.0.4"
- is-string "^1.0.5"
- is-symbol "^1.0.3"
+ is-bigint "^1.1.0"
+ is-boolean-object "^1.2.1"
+ is-number-object "^1.1.1"
+ is-string "^1.1.1"
+ is-symbol "^1.1.1"
-which-typed-array@^1.1.9:
- version "1.1.9"
- resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
- integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
+which-builtin-type@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz#89183da1b4907ab089a6b02029cc5d8d6574270e"
+ integrity sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==
dependencies:
- available-typed-arrays "^1.0.5"
- call-bind "^1.0.2"
- for-each "^0.3.3"
- gopd "^1.0.1"
- has-tostringtag "^1.0.0"
- is-typed-array "^1.1.10"
+ call-bound "^1.0.2"
+ function.prototype.name "^1.1.6"
+ has-tostringtag "^1.0.2"
+ is-async-function "^2.0.0"
+ is-date-object "^1.1.0"
+ is-finalizationregistry "^1.1.0"
+ is-generator-function "^1.0.10"
+ is-regex "^1.2.1"
+ is-weakref "^1.0.2"
+ isarray "^2.0.5"
+ which-boxed-primitive "^1.1.0"
+ which-collection "^1.0.2"
+ which-typed-array "^1.1.16"
+
+which-collection@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0"
+ integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==
+ dependencies:
+ is-map "^2.0.3"
+ is-set "^2.0.3"
+ is-weakmap "^2.0.2"
+ is-weakset "^2.0.3"
+
+which-typed-array@^1.1.16, which-typed-array@^1.1.18:
+ version "1.1.19"
+ resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956"
+ integrity sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==
+ dependencies:
+ available-typed-arrays "^1.0.7"
+ call-bind "^1.0.8"
+ call-bound "^1.0.4"
+ for-each "^0.3.5"
+ get-proto "^1.0.1"
+ gopd "^1.2.0"
+ has-tostringtag "^1.0.2"
which@^1.2.9:
version "1.3.1"
@@ -7291,13 +7480,6 @@ which@^2.0.1:
dependencies:
isexe "^2.0.0"
-widest-line@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
- integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==
- dependencies:
- string-width "^4.0.0"
-
with@^7.0.0:
version "7.0.2"
resolved "https://registry.yarnpkg.com/with/-/with-7.0.2.tgz#ccee3ad542d25538a7a7a80aad212b9828495bac"
@@ -7315,10 +7497,24 @@ wkx@^0.5.0:
dependencies:
"@types/node" "*"
-word-wrap@^1.2.3, word-wrap@~1.2.3:
- version "1.2.3"
- resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
- integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+word-wrap@^1.2.5:
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+ integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
+
+workerpool@^9.2.0:
+ version "9.2.0"
+ resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-9.2.0.tgz#f74427cbb61234708332ed8ab9cbf56dcb1c4371"
+ integrity sha512-PKZqBOCo6CYkVOwAxWxQaSF2Fvb5Iv2fCeTP7buyWI2GiynWr46NcXSgK/idoV6e60dgCBfgYc+Un3HMvmqP8w==
+
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+ integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+ dependencies:
+ ansi-styles "^4.0.0"
+ string-width "^4.1.0"
+ strip-ansi "^6.0.0"
wrap-ansi@^7.0.0:
version "7.0.0"
@@ -7329,10 +7525,19 @@ wrap-ansi@^7.0.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"
+wrap-ansi@^8.1.0:
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+ integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+ dependencies:
+ ansi-styles "^6.1.0"
+ string-width "^5.0.1"
+ strip-ansi "^7.0.1"
+
wrappy@1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
- integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+ integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
write-file-atomic@^3.0.0:
version "3.0.3"
@@ -7345,14 +7550,9 @@ write-file-atomic@^3.0.0:
typedarray-to-buffer "^3.1.5"
"ws@^5.2.0 || ^6.0.0 || ^7.0.0", ws@^7.4.6:
- version "7.5.5"
- resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
- integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==
-
-xdg-basedir@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
- integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
+ version "7.5.10"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
+ integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
xml-name-validator@^3.0.0:
version "3.0.0"
@@ -7364,10 +7564,17 @@ xmlchars@^2.2.0:
resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
+xregexp@^5.1.1:
+ version "5.1.2"
+ resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-5.1.2.tgz#ae4979868313d2f4dc4da9ab31ff5c2352fb969e"
+ integrity sha512-6hGgEMCGhqCTFEJbqmWrNIPqfpdirdGWkqshu7fFZddmTSfgv5Sn9D2SaKloR79s5VUiUlpwzg3CM3G6D3VIlw==
+ dependencies:
+ "@babel/runtime-corejs3" "^7.26.9"
+
xss@^1.0.8:
- version "1.0.10"
- resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.10.tgz#5cd63a9b147a755a14cb0455c7db8866120eb4d2"
- integrity sha512-qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw==
+ version "1.0.15"
+ resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.15.tgz#96a0e13886f0661063028b410ed1b18670f4e59a"
+ integrity sha512-FVdlVVC67WOIPvfOwhoMETV72f6GbW7aOabBC3WxN/oUdoEMDyLz4OgRv5/gck2ZeNqEQu+Tb0kloovXOfpYVg==
dependencies:
commander "^2.20.3"
cssfilter "0.0.10"
@@ -7377,10 +7584,10 @@ y18n@^5.0.5:
resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
-yallist@^2.1.2:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
- integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+yallist@^3.0.2:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+ integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
yallist@^4.0.0:
version "4.0.0"
@@ -7397,7 +7604,7 @@ yargs-parser@^21.1.1:
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-yargs@^16.0.0, yargs@^16.2.0:
+yargs@^16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
diff --git a/config/.eslintignore b/config/.eslintignore
new file mode 100644
index 000000000..1ae86fe5e
--- /dev/null
+++ b/config/.eslintignore
@@ -0,0 +1,4 @@
+node_modules
+**/*.min.js
+build
+coverage
\ No newline at end of file
diff --git a/config/.eslintrc.js b/config/.eslintrc.js
new file mode 100644
index 000000000..4be107982
--- /dev/null
+++ b/config/.eslintrc.js
@@ -0,0 +1,214 @@
+// eslint-disable-next-line import/no-commonjs, import/unambiguous
+module.exports = {
+ root: true,
+ env: {
+ node: true,
+ },
+ parser: '@typescript-eslint/parser',
+ plugins: ['prettier', '@typescript-eslint', 'type-graphql', 'import', 'n', 'promise'],
+ extends: [
+ 'standard',
+ 'eslint:recommended',
+ 'plugin:prettier/recommended',
+ 'plugin:import/recommended',
+ 'plugin:import/typescript',
+ 'plugin:security/recommended',
+ 'plugin:@eslint-community/eslint-comments/recommended',
+ ],
+ settings: {
+ 'import/parsers': {
+ '@typescript-eslint/parser': ['.ts', '.tsx'],
+ },
+ 'import/resolver': {
+ typescript: {
+ project: ['./tsconfig.json', '**/tsconfig.json'],
+ },
+ node: true,
+ },
+ // the parser cannot handle the split sodium import
+ 'import/ignore': ['sodium-native'],
+ },
+ rules: {
+ 'no-console': 'error',
+ camelcase: ['error', { allow: ['crypto_*', 'randombytes_random'] }],
+ 'no-debugger': 'error',
+ 'prettier/prettier': [
+ 'error',
+ {
+ htmlWhitespaceSensitivity: 'ignore',
+ },
+ ],
+ // import
+ 'import/export': 'error',
+ // 'import/no-deprecated': 'error',
+ 'import/no-empty-named-blocks': 'error',
+ 'import/no-extraneous-dependencies': 'error',
+ 'import/no-mutable-exports': 'error',
+ 'import/no-unused-modules': 'error',
+ 'import/no-named-as-default': 'error',
+ 'import/no-named-as-default-member': 'error',
+ 'import/no-amd': 'error',
+ 'import/no-commonjs': 'error',
+ 'import/no-import-module-exports': 'error',
+ 'import/no-nodejs-modules': 'off',
+ 'import/unambiguous': 'error',
+ 'import/default': 'error',
+ 'import/named': 'error',
+ 'import/namespace': 'error',
+ 'import/no-absolute-path': 'error',
+ 'import/no-cycle': 'error',
+ 'import/no-dynamic-require': 'error',
+ 'import/no-internal-modules': 'off',
+ 'import/no-relative-packages': 'error',
+ 'import/no-relative-parent-imports': [
+ 'error',
+ { ignore: ['@/*', 'random-bigint', 'sodium-native'] },
+ ],
+ 'import/no-self-import': 'error',
+ 'import/no-unresolved': 'error',
+ 'import/no-useless-path-segments': 'error',
+ 'import/no-webpack-loader-syntax': 'error',
+ 'import/consistent-type-specifier-style': 'error',
+ 'import/exports-last': 'off',
+ 'import/extensions': 'error',
+ 'import/first': 'error',
+ 'import/group-exports': 'off',
+ 'import/newline-after-import': 'error',
+ 'import/no-anonymous-default-export': 'error',
+ 'import/no-default-export': 'error',
+ 'import/no-duplicates': 'error',
+ 'import/no-named-default': 'error',
+ 'import/no-namespace': 'error',
+ 'import/no-unassigned-import': 'error',
+ 'import/order': [
+ 'error',
+ {
+ groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index', 'object', 'type'],
+ 'newlines-between': 'always',
+ pathGroups: [
+ {
+ pattern: '@?*/**',
+ group: 'external',
+ position: 'after',
+ },
+ {
+ pattern: '@/**',
+ group: 'external',
+ position: 'after',
+ },
+ ],
+ alphabetize: {
+ order: 'asc' /* sort in ascending order. Options: ['ignore', 'asc', 'desc'] */,
+ caseInsensitive: true /* ignore case. Options: [true, false] */,
+ },
+ distinctGroup: true,
+ },
+ ],
+ 'import/prefer-default-export': 'off',
+ // n
+ 'n/handle-callback-err': 'error',
+ 'n/no-callback-literal': 'error',
+ 'n/no-exports-assign': 'error',
+ 'n/no-extraneous-import': 'error',
+ 'n/no-extraneous-require': 'error',
+ 'n/no-hide-core-modules': 'error',
+ 'n/no-missing-import': 'off', // not compatible with typescript
+ 'n/no-missing-require': 'error',
+ 'n/no-new-require': 'error',
+ 'n/no-path-concat': 'error',
+ 'n/no-process-exit': 'error',
+ 'n/no-unpublished-bin': 'error',
+ 'n/no-unpublished-import': 'off', // TODO need to exclude seeds
+ 'n/no-unpublished-require': 'error',
+ 'n/no-unsupported-features': ['error', { ignores: ['modules'] }],
+ 'n/no-unsupported-features/es-builtins': 'error',
+ 'n/no-unsupported-features/es-syntax': 'error',
+ 'n/no-unsupported-features/node-builtins': 'error',
+ 'n/process-exit-as-throw': 'error',
+ 'n/shebang': 'error',
+ 'n/callback-return': 'error',
+ 'n/exports-style': 'error',
+ 'n/file-extension-in-import': 'off',
+ 'n/global-require': 'error',
+ 'n/no-mixed-requires': 'error',
+ 'n/no-process-env': 'error',
+ 'n/no-restricted-import': 'error',
+ 'n/no-restricted-require': 'error',
+ 'n/no-sync': 'error',
+ 'n/prefer-global/buffer': 'error',
+ 'n/prefer-global/console': 'error',
+ 'n/prefer-global/process': 'error',
+ 'n/prefer-global/text-decoder': 'error',
+ 'n/prefer-global/text-encoder': 'error',
+ 'n/prefer-global/url': 'error',
+ 'n/prefer-global/url-search-params': 'error',
+ 'n/prefer-promises/dns': 'error',
+ 'n/prefer-promises/fs': 'error',
+ // promise
+ 'promise/catch-or-return': 'error',
+ 'promise/no-return-wrap': 'error',
+ 'promise/param-names': 'error',
+ 'promise/always-return': 'error',
+ 'promise/no-native': 'off',
+ 'promise/no-nesting': 'warn',
+ 'promise/no-promise-in-callback': 'warn',
+ 'promise/no-callback-in-promise': 'warn',
+ 'promise/avoid-new': 'warn',
+ 'promise/no-new-statics': 'error',
+ 'promise/no-return-in-finally': 'warn',
+ 'promise/valid-params': 'warn',
+ 'promise/prefer-await-to-callbacks': 'error',
+ 'promise/no-multiple-resolved': 'error',
+ // eslint comments
+ '@eslint-community/eslint-comments/disable-enable-pair': ['error', { allowWholeFile: true }],
+ '@eslint-community/eslint-comments/no-restricted-disable': 'error',
+ '@eslint-community/eslint-comments/no-use': 'off',
+ '@eslint-community/eslint-comments/require-description': 'off',
+ },
+ overrides: [
+ // only for ts files
+ {
+ files: ['*.ts', '*.tsx'],
+ extends: [
+ 'plugin:@typescript-eslint/recommended',
+ 'plugin:@typescript-eslint/recommended-requiring-type-checking',
+ 'plugin:@typescript-eslint/strict',
+ 'plugin:type-graphql/recommended',
+ ],
+ rules: {
+ // allow explicitly defined dangling promises
+ '@typescript-eslint/no-floating-promises': ['error', { ignoreVoid: true }],
+ 'no-void': ['error', { allowAsStatement: true }],
+ // ignore prefer-regexp-exec rule to allow string.match(regex)
+ '@typescript-eslint/prefer-regexp-exec': 'off',
+ // this should not run on ts files: https://github.com/import-js/eslint-plugin-import/issues/2215#issuecomment-911245486
+ 'import/unambiguous': 'off',
+ // this is not compatible with typeorm, due to joined tables can be null, but are not defined as nullable
+ '@typescript-eslint/no-unnecessary-condition': 'off',
+ },
+ parserOptions: {
+ tsconfigRootDir: __dirname,
+ project: ['./tsconfig.json', '**/tsconfig.json'],
+ // this is to properly reference the referenced project database without requirement of compiling it
+ // eslint-disable-next-line camelcase
+ EXPERIMENTAL_useSourceOfProjectReferenceRedirect: true,
+ },
+ },
+ {
+ files: ['*.test.ts'],
+ plugins: ['jest'],
+ env: {
+ jest: true,
+ },
+ rules: {
+ 'jest/no-disabled-tests': 'error',
+ 'jest/no-focused-tests': 'error',
+ 'jest/no-identical-title': 'error',
+ 'jest/prefer-to-have-length': 'error',
+ 'jest/valid-expect': 'error',
+ '@typescript-eslint/unbound-method': 'off',
+ 'jest/unbound-method': 'error',
+ },
+ },
+ ],
+}
diff --git a/config/.gitignore b/config/.gitignore
new file mode 100644
index 000000000..ce6695205
--- /dev/null
+++ b/config/.gitignore
@@ -0,0 +1,14 @@
+node_modules/
+build/
+.cache/
+.yarn/install-state.gz
+
+/.env
+/.env.bak
+
+# coverage folder
+coverage/
+
+# emacs
+*~
+
diff --git a/config/.nvmrc b/config/.nvmrc
new file mode 100644
index 000000000..216afccff
--- /dev/null
+++ b/config/.nvmrc
@@ -0,0 +1 @@
+v18.20.7
diff --git a/config/package.json b/config/package.json
new file mode 100644
index 000000000..c25e145ff
--- /dev/null
+++ b/config/package.json
@@ -0,0 +1,26 @@
+{
+ "name": "gradido-config",
+ "version": "1.0.0",
+ "description": "Gradido Config for validate config",
+ "main": "build/src/index.js",
+ "types": "build/src/index.d.ts",
+ "repository": "https://github.com/gradido/gradido/config",
+ "author": "einhornimmond",
+ "license": "Apache-2.0",
+ "private": false,
+ "scripts": {
+ "build": "tsc --build",
+ "clean": "tsc --build --clean",
+ "test": "node test/index"
+ },
+ "devDependencies": {
+ "@types/joi": "^17.2.3",
+ "@types/node": "^17.0.21",
+ "typescript": "^4.9.5",
+ "mkdirp": "^3.0.1",
+ "ncp": "^2.0.0"
+ },
+ "dependencies": {
+ "joi": "^17.13.3"
+ }
+}
diff --git a/config/src/commonSchema.ts b/config/src/commonSchema.ts
new file mode 100644
index 000000000..b3221491c
--- /dev/null
+++ b/config/src/commonSchema.ts
@@ -0,0 +1,246 @@
+import Joi from 'joi'
+
+export const browserUrls = Joi.array()
+ .items(Joi.string().uri())
+ .sparse(true)
+ .custom((value: string[], helpers: Joi.CustomHelpers) => {
+ let protocol: string | undefined
+ for (const url of value) {
+ if (url === undefined) {
+ continue
+ }
+ const urlObject = new URL(url)
+ if(!protocol) {
+ protocol = urlObject.protocol
+ } else if(urlObject.protocol !== protocol) {
+ return helpers.error('any.invalid')
+ }
+ }
+ return value;
+ })
+ .required()
+ .description('All URLs need to have same protocol to prevent mixed block errors')
+
+export const DECAY_START_TIME = Joi.date()
+ .iso() // ISO 8601 format for date validation
+ .description('The start time for decay, expected in ISO 8601 format (e.g. 2021-05-13T17:46:31Z)')
+ .default(new Date('2021-05-13T17:46:31Z')) // default to the specified date if not provided
+ .required()
+
+export const DB_VERSION = Joi.string()
+ .pattern(/^\d{4}-[a-z0-9-_]+$/)
+ .message('DB_VERSION must be in the format: YYYY-description, e.g. "0087-add_index_on_user_roles".')
+ .description('db version string, last migration file name without ending or last folder in entity')
+ .required()
+
+export const COMMUNITY_URL = Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .custom((value: string, helpers: Joi.CustomHelpers) => {
+ if (value.endsWith('/')) {
+ return helpers.error('any.invalid', { message: 'URL should not end with a slash (/)' })
+ }
+ return value;
+ })
+ .description('The base URL of the community, should have the same protocol as frontend, admin and backend api to prevent mixed contend issues.')
+ .default('http://0.0.0.0')
+ .required()
+
+export const GRAPHQL_URI = Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .description(
+ `
+ The external URL of the backend service,
+ accessible from outside the server (e.g., via Nginx or the server's public URL),
+ should have the same protocol as frontend and admin to prevent mixed contend issues.
+ `,
+ )
+ .default('http://0.0.0.0/graphql')
+ .required()
+
+export const COMMUNITY_NAME = Joi.string()
+ .min(3)
+ .max(40)
+ .description('The name of the community')
+ .default('Gradido Entwicklung')
+ .required()
+
+export const COMMUNITY_DESCRIPTION = Joi.string()
+ .min(10)
+ .max(255)
+ .description('A short description of the community')
+ .default('Die lokale Entwicklungsumgebung von Gradido.')
+ .required()
+
+export const COMMUNITY_SUPPORT_MAIL = Joi.string()
+ .email()
+ .description('The support email address for the community will be used in frontend and E-Mails')
+ .default('support@supportmail.com')
+ .required()
+
+export const COMMUNITY_LOCATION = Joi.string()
+ .pattern(/^[-+]?[0-9]{1,2}(\.[0-9]+)?,\s?[-+]?[0-9]{1,3}(\.[0-9]+)?$/)
+ .when('GMS_ACTIVE', {
+ is: true,
+ then: Joi.string().required(),
+ otherwise: Joi.string().optional()
+ })
+ .description('Geographical location of the community in "latitude, longitude" format')
+ .default('49.280377, 9.690151')
+
+export const GRAPHIQL = Joi.boolean()
+ .description('Flag for enabling GraphQL playground for debugging.')
+ .default(false)
+ .when('NODE_ENV', {
+ is: 'development',
+ then: Joi.boolean().valid(true, false).required(), // only allow true in development mode
+ otherwise: Joi.boolean().valid(false).required() // false in any other mode
+ })
+
+export const GMS_ACTIVE = Joi.boolean()
+ .description('Flag to indicate if the GMS (Geographic Member Search) service is used.')
+ .default(false)
+ .required()
+
+export const GDT_ACTIVE = Joi.boolean()
+ .description('Flag to indicate if the GMS (Geographic Member Search) service is used.')
+ .default(false)
+ .required()
+
+export const GDT_API_URL = Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .default('https://gdt.gradido.net')
+ .when('GDT_ACTIVE', { is: true, then: Joi.required() })
+ .description('The URL for GDT API endpoint')
+
+export const HUMHUB_ACTIVE = Joi.boolean()
+ .description('Flag to indicate if the HumHub based Community Server is used.')
+ .default(false)
+ .required()
+
+export const HUMHUB_API_URL = Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .when('HUMHUB_ACTIVE', { is: true, then: Joi.required(), otherwise: Joi.optional() })
+ .description('The API URL for HumHub integration')
+
+export const LOG_LEVEL = Joi.string()
+ .valid('all', 'mark', 'trace', 'debug', 'info', 'warn', 'error', 'fatal', 'off')
+ .description('set log level')
+ .default('info')
+ .required()
+
+export const LOG4JS_CONFIG = Joi.string()
+ .pattern(/^[a-zA-Z0-9-_]+\.json$/)
+ .message('LOG4JS_CONFIG must be a valid filename ending with .json')
+ .description('config file name for log4js config file')
+ .default('log4js-config.json')
+ .required()
+
+export const LOGIN_APP_SECRET = Joi.string()
+ .pattern(/^[a-fA-F0-9]+$/)
+ .message('need to be valid hex')
+ .default('21ffbbc616fe')
+ .description('App secret for salt component for libsodium crypto_pwhash')
+ .required()
+
+export const LOGIN_SERVER_KEY = Joi.string()
+ .pattern(/^[a-fA-F0-9]+$/)
+ .length(32)
+ .message('need to be valid hex and 32 character')
+ .default('a51ef8ac7ef1abf162fb7a65261acd7a')
+ .description('Server key for password hashing as additional salt for libsodium crypto_shorthash_keygen')
+ .required()
+
+export const OPENAI_ACTIVE = Joi.boolean()
+ .default(false)
+ .description('Flag to enable or disable OpenAI API')
+ .required()
+
+export const TYPEORM_LOGGING_RELATIVE_PATH = Joi.string()
+ .pattern(new RegExp('^[a-zA-Z0-9-_\./]+\.log$'))
+ .message('TYPEORM_LOGGING_RELATIVE_PATH must be a valid filename ending with .log')
+ .description('log file name for logging typeorm activities')
+ .default('typeorm.log')
+ .required()
+
+export const DB_HOST = Joi.string()
+ .hostname()
+ .message('must be a valid host with alphanumeric characters, numbers, points and -')
+ .description("database host like 'localhost' or 'mariadb' in docker setup")
+ .default('localhost')
+ .required()
+
+export const DB_PORT = Joi.number()
+ .integer()
+ .min(1024)
+ .max(49151)
+ .description('database port, default: 3306')
+ .default(3306)
+ .required()
+
+export const DB_USER = Joi.string()
+ .pattern(/^[A-Za-z0-9]([A-Za-z0-9-_\.]*[A-Za-z0-9])?$/) // Validates MariaDB username rules
+ .min(1) // Minimum length 1
+ .max(16) // Maximum length 16
+ .message(
+ 'Valid database username (letters, numbers, hyphens, underscores, dots allowed; no spaces, must not start or end with hyphen, dot, or underscore)'
+ )
+ .description('database username for mariadb')
+ .default('root')
+ .required()
+
+export const DB_PASSWORD = Joi.string()
+ .when(Joi.ref('NODE_ENV'), {
+ is: 'development',
+ then: Joi.string().allow(''),
+ otherwise: Joi.string()
+ .min(8)
+ .max(32)
+ .pattern(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*(),.?":{}|<>]).+$/)
+ .message(
+ 'Password must be between 8 and 32 characters long, and contain at least one uppercase letter, one lowercase letter, one number, and one special character (e.g., !@#$%^&*).'
+ )
+ })
+ .description(
+ 'Password for the database user. In development mode, an empty password is allowed. In other environments, a complex password is required.'
+ )
+ .default('')
+ .required()
+
+export const DB_DATABASE = Joi.string()
+ .pattern(/^[a-zA-Z][a-zA-Z0-9_-]{1,63}$/)
+ .description('Database name like gradido_community (must start with a letter, and can only contain letters, numbers, underscores, or dashes)')
+ .default('gradido_community')
+ .required()
+
+export const APP_VERSION = Joi.string()
+ .pattern(/^\d+\.\d+\.\d+$/)
+ .message('Version must be in the format "major.minor.patch" (e.g., "2.4.1")')
+ .description('App Version from package.json, alle modules share one version')
+ .required()
+
+export const BUILD_COMMIT = Joi.string()
+ .pattern(/^[0-9a-f]{40}$/)
+ .message('The commit hash must be a 40-character hexadecimal string.')
+ .description('The full git commit hash.')
+ .optional()
+
+export const BUILD_COMMIT_SHORT = Joi.string()
+ .pattern(/^[0-9a-f]{7}$/)
+ .message('The first 7 hexadecimal character from git commit hash.')
+ .description('A short version from the git commit hash.')
+ .required()
+
+export const NODE_ENV = Joi.string()
+ .valid('production', 'development', 'test')
+ .default('development')
+ .description('Specifies the environment in which the application is running.')
+
+export const DEBUG = Joi.boolean()
+ .description('Indicates whether the application is in debugging mode. Set to true when NODE_ENV is not "production".')
+ .default(false)
+ .required()
+
+export const PRODUCTION = Joi.boolean()
+ .default(false)
+ .description('Indicates whether the application is running in production mode. Set to true when NODE_ENV is "production".')
+ .required()
diff --git a/config/src/index.ts b/config/src/index.ts
new file mode 100644
index 000000000..9137ead6d
--- /dev/null
+++ b/config/src/index.ts
@@ -0,0 +1,33 @@
+import { ObjectSchema } from 'joi'
+export * from './commonSchema'
+
+export function validate(schema: ObjectSchema, data: any) {
+ const { error } = schema.validate(data)
+ const schemaJson = schema.describe()
+ if (error) {
+ error.details.forEach((err) => {
+ const details = JSON.stringify(err, null, 2)
+ if (!err.context) {
+ throw new Error('missing context in config validation with joi: ' + details)
+ }
+ if (!schemaJson) {
+ throw new Error('invalid schema in config validation with joi: ' + details)
+ }
+ const key = err.context.key
+ if (key === undefined) {
+ throw new Error('missing key in config validation with joi: ' + details)
+ }
+ const value = err.context.value
+ const description = schemaJson.keys[key]
+ ? schema.describe().keys[key].flags.description
+ : 'No description available'
+ if (data[key] === undefined) {
+ throw new Error(`Environment Variable '${key}' is missing. ${description}, details: ${details}`)
+ } else {
+ throw new Error(
+ `Error on Environment Variable ${key} with value = ${value}: ${err.message}. ${description}`,
+ )
+ }
+ })
+ }
+}
\ No newline at end of file
diff --git a/config/test/index.js b/config/test/index.js
new file mode 100644
index 000000000..5aff2f2e9
--- /dev/null
+++ b/config/test/index.js
@@ -0,0 +1,8 @@
+const Joi = require('joi')
+const commonSchema = require('../dist/commonSchema')
+
+const schema = Joi.object({
+ commonSchema
+})
+
+// console.log(commonSchema.DECAY_START_TIME)
\ No newline at end of file
diff --git a/config/tsconfig.json b/config/tsconfig.json
new file mode 100644
index 000000000..04306edad
--- /dev/null
+++ b/config/tsconfig.json
@@ -0,0 +1,73 @@
+{
+ "compilerOptions": {
+ /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+ /* Basic Options */
+ // "incremental": true, /* Enable incremental compilation */
+ "target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */
+ "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
+ // "lib": [], /* Specify library files to be included in the compilation. */
+ // "allowJs": true, /* Allow javascript files to be compiled. */
+ // "checkJs": true, /* Report errors in .js files. */
+ // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
+ "declaration": true, /* Generates corresponding '.d.ts' file. */
+ "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
+ // "sourceMap": true, /* Generates corresponding '.map' file. */
+ // "outFile": "./build/outfile.js", /* Concatenate and emit output to single file. */
+ "outDir": "./build", /* Redirect output structure to the directory. */
+ // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+ "composite": true, /* Enable project compilation */
+ // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
+ // "removeComments": true, /* Do not emit comments to output. */
+ // "noEmit": true, /* Do not emit outputs. */
+ // "importHelpers": true, /* Import emit helpers from 'tslib'. */
+ // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+ // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+ /* Strict Type-Checking Options */
+ "strict": true, /* Enable all strict type-checking options. */
+ // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
+ // "strictNullChecks": true, /* Enable strict null checks. */
+ // "strictFunctionTypes": true, /* Enable strict checking of function types. */
+ // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+ "strictPropertyInitialization": false, /* Enable strict checking of property initialization in classes. */
+ // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
+ // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
+
+ /* Additional Checks */
+ // "noUnusedLocals": true, /* Report errors on unused locals. */
+ // "noUnusedParameters": true, /* Report errors on unused parameters. */
+ // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
+ // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
+ // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
+ // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an 'override' modifier. */
+ // "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */
+
+ /* Module Resolution Options */
+ // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+ // "baseUrl": ".", /* Base directory to resolve non-absolute module names. */
+ // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+ // "rootDirs": [".", "../database"], /* List of root folders whose combined content represents the structure of the project at runtime. */
+ // "typeRoots": [], /* List of folders to include type definitions from. */
+ // "types": [], /* Type declaration files to be included in compilation. */
+ // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+ "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+ // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
+ // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
+
+ /* Source Map Options */
+ // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+ // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
+ // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
+ // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+ /* Experimental Options */
+ "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
+ "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
+
+ /* Advanced Options */
+ "skipLibCheck": true, /* Skip type checking of declaration files. */
+ "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
+ },
+ "references": [] /* Any project that is referenced must itself have a `references` array (which may be empty). */
+}
diff --git a/config/yarn.lock b/config/yarn.lock
new file mode 100644
index 000000000..8c8dcddd5
--- /dev/null
+++ b/config/yarn.lock
@@ -0,0 +1,70 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0":
+ version "9.3.0"
+ resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
+ integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==
+
+"@hapi/topo@^5.1.0":
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012"
+ integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==
+ dependencies:
+ "@hapi/hoek" "^9.0.0"
+
+"@sideway/address@^4.1.5":
+ version "4.1.5"
+ resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5"
+ integrity sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==
+ dependencies:
+ "@hapi/hoek" "^9.0.0"
+
+"@sideway/formula@^3.0.1":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
+ integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
+
+"@sideway/pinpoint@^2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
+ integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
+
+"@types/joi@^17.2.3":
+ version "17.2.3"
+ resolved "https://registry.yarnpkg.com/@types/joi/-/joi-17.2.3.tgz#b7768ed9d84f1ebd393328b9f97c1cf3d2b94798"
+ integrity sha512-dGjs/lhrWOa+eO0HwgxCSnDm5eMGCsXuvLglMghJq32F6q5LyyNuXb41DHzrg501CKNOSSAHmfB7FDGeUnDmzw==
+ dependencies:
+ joi "*"
+
+"@types/node@^17.0.21":
+ version "17.0.45"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
+ integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
+
+joi@*, joi@^17.13.3:
+ version "17.13.3"
+ resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.3.tgz#0f5cc1169c999b30d344366d384b12d92558bcec"
+ integrity sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==
+ dependencies:
+ "@hapi/hoek" "^9.3.0"
+ "@hapi/topo" "^5.1.0"
+ "@sideway/address" "^4.1.5"
+ "@sideway/formula" "^3.0.1"
+ "@sideway/pinpoint" "^2.0.0"
+
+mkdirp@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
+ integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==
+
+ncp@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
+ integrity sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==
+
+typescript@^4.9.5:
+ version "4.9.5"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+ integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
diff --git a/database/.env.dist b/database/.env.dist
index 0b2c342ca..658d4d08d 100644
--- a/database/.env.dist
+++ b/database/.env.dist
@@ -1,4 +1,4 @@
-DB_HOST=localhost
+DB_HOST=127.0.0.1
DB_PORT=3306
DB_USER=root
DB_PASSWORD=
diff --git a/database/.env.template b/database/.env.template
index e21d4548c..b5aebba8f 100644
--- a/database/.env.template
+++ b/database/.env.template
@@ -1,6 +1,6 @@
CONFIG_VERSION=$DATABASE_CONFIG_VERSION
-DB_HOST=localhost
+DB_HOST=127.0.0.1
DB_PORT=3306
DB_USER=$DB_USER
DB_PASSWORD=$DB_PASSWORD
diff --git a/database/.nvmrc b/database/.nvmrc
index 02c4afe7d..5a0afb48b 100644
--- a/database/.nvmrc
+++ b/database/.nvmrc
@@ -1 +1 @@
-v18.7.0
\ No newline at end of file
+v18.20.7
\ No newline at end of file
diff --git a/database/Dockerfile b/database/Dockerfile
index e34a4dbb6..3e6be7dbc 100644
--- a/database/Dockerfile
+++ b/database/Dockerfile
@@ -1,7 +1,7 @@
##################################################################################
# BASE ###########################################################################
##################################################################################
-FROM node:18.7.0-alpine3.16 as base
+FROM node:18.20.7-alpine3.21 as base
# ENVs (available in production aswell, can be overwritten by commandline or env file)
## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame
diff --git a/database/entity/0083-join_community_federated_communities/Community.ts b/database/entity/0083-join_community_federated_communities/Community.ts
new file mode 100644
index 000000000..839a0ee79
--- /dev/null
+++ b/database/entity/0083-join_community_federated_communities/Community.ts
@@ -0,0 +1,78 @@
+import {
+ BaseEntity,
+ Entity,
+ PrimaryGeneratedColumn,
+ Column,
+ CreateDateColumn,
+ UpdateDateColumn,
+ OneToMany,
+ JoinColumn,
+} from 'typeorm'
+import { FederatedCommunity } from '../FederatedCommunity'
+import { User } from '../User'
+
+@Entity('communities')
+export class Community extends BaseEntity {
+ @PrimaryGeneratedColumn('increment', { unsigned: true })
+ id: number
+
+ @Column({ name: 'foreign', type: 'bool', nullable: false, default: true })
+ foreign: boolean
+
+ @Column({ name: 'url', length: 255, nullable: false })
+ url: string
+
+ @Column({ name: 'public_key', type: 'binary', length: 32, nullable: false })
+ publicKey: Buffer
+
+ @Column({ name: 'private_key', type: 'binary', length: 64, nullable: true })
+ privateKey: Buffer | null
+
+ @Column({
+ name: 'community_uuid',
+ type: 'char',
+ length: 36,
+ nullable: true,
+ collation: 'utf8mb4_unicode_ci',
+ })
+ communityUuid: string | null
+
+ @Column({ name: 'authenticated_at', type: 'datetime', nullable: true })
+ authenticatedAt: Date | null
+
+ @Column({ name: 'name', type: 'varchar', length: 40, nullable: true })
+ name: string | null
+
+ @Column({ name: 'description', type: 'varchar', length: 255, nullable: true })
+ description: string | null
+
+ @CreateDateColumn({ name: 'creation_date', type: 'datetime', nullable: true })
+ creationDate: Date | null
+
+ @Column({ name: 'gms_api_key', type: 'varchar', length: 512, nullable: true, default: null })
+ gmsApiKey: string | null
+
+ @CreateDateColumn({
+ name: 'created_at',
+ type: 'datetime',
+ default: () => 'CURRENT_TIMESTAMP(3)',
+ nullable: false,
+ })
+ createdAt: Date
+
+ @UpdateDateColumn({
+ name: 'updated_at',
+ type: 'datetime',
+ onUpdate: 'CURRENT_TIMESTAMP(3)',
+ nullable: true,
+ })
+ updatedAt: Date | null
+
+ @OneToMany(() => User, (user) => user.community)
+ @JoinColumn({ name: 'community_uuid', referencedColumnName: 'communityUuid' })
+ users: User[]
+
+ @OneToMany(() => FederatedCommunity, (federatedCommunity) => federatedCommunity.community)
+ @JoinColumn({ name: 'public_key', referencedColumnName: 'publicKey' })
+ federatedCommunities?: FederatedCommunity[]
+}
diff --git a/database/entity/0083-join_community_federated_communities/FederatedCommunity.ts b/database/entity/0083-join_community_federated_communities/FederatedCommunity.ts
new file mode 100644
index 000000000..b5eb64ea1
--- /dev/null
+++ b/database/entity/0083-join_community_federated_communities/FederatedCommunity.ts
@@ -0,0 +1,58 @@
+import {
+ BaseEntity,
+ Entity,
+ PrimaryGeneratedColumn,
+ Column,
+ CreateDateColumn,
+ UpdateDateColumn,
+ ManyToOne,
+ JoinColumn,
+} from 'typeorm'
+import { Community } from '../Community'
+
+@Entity('federated_communities')
+export class FederatedCommunity extends BaseEntity {
+ @PrimaryGeneratedColumn('increment', { unsigned: true })
+ id: number
+
+ @Column({ name: 'foreign', type: 'bool', nullable: false, default: true })
+ foreign: boolean
+
+ @Column({ name: 'public_key', type: 'binary', length: 32, default: null, nullable: true })
+ publicKey: Buffer
+
+ @Column({ name: 'api_version', length: 10, nullable: false })
+ apiVersion: string
+
+ @Column({ name: 'end_point', length: 255, nullable: false })
+ endPoint: string
+
+ @Column({ name: 'last_announced_at', type: 'datetime', nullable: true })
+ lastAnnouncedAt: Date | null
+
+ @Column({ name: 'verified_at', type: 'datetime', nullable: true })
+ verifiedAt: Date | null
+
+ @Column({ name: 'last_error_at', type: 'datetime', nullable: true })
+ lastErrorAt: Date | null
+
+ @CreateDateColumn({
+ name: 'created_at',
+ type: 'datetime',
+ default: () => 'CURRENT_TIMESTAMP(3)',
+ nullable: false,
+ })
+ createdAt: Date
+
+ @UpdateDateColumn({
+ name: 'updated_at',
+ type: 'datetime',
+ onUpdate: 'CURRENT_TIMESTAMP(3)',
+ nullable: true,
+ })
+ updatedAt: Date | null
+
+ @ManyToOne(() => Community, (community) => community.federatedCommunities)
+ @JoinColumn({ name: 'public_key', referencedColumnName: 'publicKey' })
+ community?: Community
+}
diff --git a/database/entity/0084-introduce_humhub_registration/User.ts b/database/entity/0084-introduce_humhub_registration/User.ts
new file mode 100644
index 000000000..a375f6748
--- /dev/null
+++ b/database/entity/0084-introduce_humhub_registration/User.ts
@@ -0,0 +1,176 @@
+import {
+ BaseEntity,
+ Entity,
+ PrimaryGeneratedColumn,
+ Column,
+ DeleteDateColumn,
+ OneToMany,
+ JoinColumn,
+ OneToOne,
+ Geometry,
+ ManyToOne,
+} from 'typeorm'
+import { Contribution } from '../Contribution'
+import { ContributionMessage } from '../ContributionMessage'
+import { UserContact } from '../UserContact'
+import { UserRole } from '../UserRole'
+import { GeometryTransformer } from '../../src/typeorm/GeometryTransformer'
+import { Community } from '../Community'
+
+@Entity('users', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' })
+export class User extends BaseEntity {
+ @PrimaryGeneratedColumn('increment', { unsigned: true })
+ id: number
+
+ @Column({ type: 'bool', default: false })
+ foreign: boolean
+
+ @Column({
+ name: 'gradido_id',
+ length: 36,
+ nullable: false,
+ collation: 'utf8mb4_unicode_ci',
+ })
+ gradidoID: string
+
+ @Column({
+ name: 'community_uuid',
+ type: 'char',
+ length: 36,
+ nullable: true,
+ collation: 'utf8mb4_unicode_ci',
+ })
+ communityUuid: string
+
+ @ManyToOne(() => Community, (community) => community.users)
+ @JoinColumn({ name: 'community_uuid', referencedColumnName: 'communityUuid' })
+ community: Community | null
+
+ @Column({
+ name: 'alias',
+ length: 20,
+ nullable: true,
+ default: null,
+ collation: 'utf8mb4_unicode_ci',
+ })
+ alias: string
+
+ @OneToOne(() => UserContact, (emailContact: UserContact) => emailContact.user)
+ @JoinColumn({ name: 'email_id' })
+ emailContact: UserContact
+
+ @Column({ name: 'email_id', type: 'int', unsigned: true, nullable: true, default: null })
+ emailId: number | null
+
+ @Column({
+ name: 'first_name',
+ length: 255,
+ nullable: true,
+ default: null,
+ collation: 'utf8mb4_unicode_ci',
+ })
+ firstName: string
+
+ @Column({
+ name: 'last_name',
+ length: 255,
+ nullable: true,
+ default: null,
+ collation: 'utf8mb4_unicode_ci',
+ })
+ lastName: string
+
+ @Column({ name: 'gms_publish_name', type: 'int', unsigned: true, nullable: false, default: 0 })
+ gmsPublishName: number
+
+ @Column({ name: 'humhub_publish_name', type: 'int', unsigned: true, nullable: false, default: 0 })
+ humhubPublishName: number
+
+ @Column({ name: 'created_at', default: () => 'CURRENT_TIMESTAMP(3)', nullable: false })
+ createdAt: Date
+
+ @DeleteDateColumn({ name: 'deleted_at', nullable: true })
+ deletedAt: Date | null
+
+ @Column({ type: 'bigint', default: 0, unsigned: true })
+ password: BigInt
+
+ @Column({
+ name: 'password_encryption_type',
+ type: 'int',
+ unsigned: true,
+ nullable: false,
+ default: 0,
+ })
+ passwordEncryptionType: number
+
+ @Column({ length: 4, default: 'de', collation: 'utf8mb4_unicode_ci', nullable: false })
+ language: string
+
+ @Column({ type: 'bool', default: false })
+ hideAmountGDD: boolean
+
+ @Column({ type: 'bool', default: false })
+ hideAmountGDT: boolean
+
+ @OneToMany(() => UserRole, (userRole) => userRole.user)
+ @JoinColumn({ name: 'user_id' })
+ userRoles: UserRole[]
+
+ @Column({ name: 'referrer_id', type: 'int', unsigned: true, nullable: true, default: null })
+ referrerId?: number | null
+
+ @Column({
+ name: 'contribution_link_id',
+ type: 'int',
+ unsigned: true,
+ nullable: true,
+ default: null,
+ })
+ contributionLinkId?: number | null
+
+ @Column({ name: 'publisher_id', default: 0 })
+ publisherId: number
+
+ @Column({ name: 'gms_allowed', type: 'bool', default: true })
+ gmsAllowed: boolean
+
+ @Column({
+ name: 'location',
+ type: 'geometry',
+ default: null,
+ nullable: true,
+ transformer: GeometryTransformer,
+ })
+ location: Geometry | null
+
+ @Column({
+ name: 'gms_publish_location',
+ type: 'int',
+ unsigned: true,
+ nullable: false,
+ default: 2,
+ })
+ gmsPublishLocation: number
+
+ @Column({ name: 'gms_registered', type: 'bool', default: false })
+ gmsRegistered: boolean
+
+ @Column({ name: 'gms_registered_at', type: 'datetime', default: null, nullable: true })
+ gmsRegisteredAt: Date | null
+
+ @Column({ name: 'humhub_allowed', type: 'bool', default: false })
+ humhubAllowed: boolean
+
+ @OneToMany(() => Contribution, (contribution) => contribution.user)
+ @JoinColumn({ name: 'user_id' })
+ contributions?: Contribution[]
+
+ @OneToMany(() => ContributionMessage, (message) => message.user)
+ @JoinColumn({ name: 'user_id' })
+ messages?: ContributionMessage[]
+
+ @OneToMany(() => UserContact, (userContact: UserContact) => userContact.user)
+ @JoinColumn({ name: 'user_id' })
+ userContacts?: UserContact[]
+}
diff --git a/database/entity/0086-add_community_location/Community.ts b/database/entity/0086-add_community_location/Community.ts
new file mode 100644
index 000000000..60410c8ce
--- /dev/null
+++ b/database/entity/0086-add_community_location/Community.ts
@@ -0,0 +1,89 @@
+import {
+ BaseEntity,
+ Entity,
+ PrimaryGeneratedColumn,
+ Column,
+ CreateDateColumn,
+ UpdateDateColumn,
+ OneToMany,
+ JoinColumn,
+ Geometry,
+} from 'typeorm'
+import { FederatedCommunity } from '../FederatedCommunity'
+import { GeometryTransformer } from '../../src/typeorm/GeometryTransformer'
+import { User } from '../User'
+
+@Entity('communities')
+export class Community extends BaseEntity {
+ @PrimaryGeneratedColumn('increment', { unsigned: true })
+ id: number
+
+ @Column({ name: 'foreign', type: 'bool', nullable: false, default: true })
+ foreign: boolean
+
+ @Column({ name: 'url', length: 255, nullable: false })
+ url: string
+
+ @Column({ name: 'public_key', type: 'binary', length: 32, nullable: false })
+ publicKey: Buffer
+
+ @Column({ name: 'private_key', type: 'binary', length: 64, nullable: true })
+ privateKey: Buffer | null
+
+ @Column({
+ name: 'community_uuid',
+ type: 'char',
+ length: 36,
+ nullable: true,
+ collation: 'utf8mb4_unicode_ci',
+ })
+ communityUuid: string | null
+
+ @Column({ name: 'authenticated_at', type: 'datetime', nullable: true })
+ authenticatedAt: Date | null
+
+ @Column({ name: 'name', type: 'varchar', length: 40, nullable: true })
+ name: string | null
+
+ @Column({ name: 'description', type: 'varchar', length: 255, nullable: true })
+ description: string | null
+
+ @CreateDateColumn({ name: 'creation_date', type: 'datetime', nullable: true })
+ creationDate: Date | null
+
+ @Column({ name: 'gms_api_key', type: 'varchar', length: 512, nullable: true, default: null })
+ gmsApiKey: string | null
+
+ @Column({
+ name: 'location',
+ type: 'geometry',
+ default: null,
+ nullable: true,
+ transformer: GeometryTransformer,
+ })
+ location: Geometry | null
+
+ @CreateDateColumn({
+ name: 'created_at',
+ type: 'datetime',
+ default: () => 'CURRENT_TIMESTAMP(3)',
+ nullable: false,
+ })
+ createdAt: Date
+
+ @UpdateDateColumn({
+ name: 'updated_at',
+ type: 'datetime',
+ onUpdate: 'CURRENT_TIMESTAMP(3)',
+ nullable: true,
+ })
+ updatedAt: Date | null
+
+ @OneToMany(() => User, (user) => user.community)
+ @JoinColumn({ name: 'community_uuid', referencedColumnName: 'communityUuid' })
+ users: User[]
+
+ @OneToMany(() => FederatedCommunity, (federatedCommunity) => federatedCommunity.community)
+ @JoinColumn({ name: 'public_key', referencedColumnName: 'publicKey' })
+ federatedCommunities?: FederatedCommunity[]
+}
diff --git a/database/entity/0088-create_project_brandings/ProjectBranding.ts b/database/entity/0088-create_project_brandings/ProjectBranding.ts
new file mode 100644
index 000000000..449dc62ee
--- /dev/null
+++ b/database/entity/0088-create_project_brandings/ProjectBranding.ts
@@ -0,0 +1,28 @@
+import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from 'typeorm'
+
+@Entity('project_brandings')
+export class ProjectBranding extends BaseEntity {
+ @PrimaryGeneratedColumn('increment', { unsigned: true })
+ id: number
+
+ @Column({ name: 'name', type: 'varchar', length: 255 })
+ name: string
+
+ @Column({ name: 'alias', type: 'varchar', length: 32 })
+ alias: string
+
+ @Column({ name: 'description', type: 'text', nullable: true, default: null })
+ description: string | null
+
+ @Column({ name: 'space_id', type: 'int', unsigned: true, nullable: true, default: null })
+ spaceId: number | null
+
+ @Column({ name: 'space_url', type: 'varchar', length: 255, nullable: true, default: null })
+ spaceUrl: string | null
+
+ @Column({ name: 'new_user_to_space', type: 'tinyint', width: 1, default: 0 })
+ newUserToSpace: boolean
+
+ @Column({ name: 'logo_url', type: 'varchar', length: 255, nullable: true, default: null })
+ logoUrl: string | null
+}
diff --git a/database/entity/0089-add_openai_threads/OpenaiThreads.ts b/database/entity/0089-add_openai_threads/OpenaiThreads.ts
new file mode 100644
index 000000000..519dcea45
--- /dev/null
+++ b/database/entity/0089-add_openai_threads/OpenaiThreads.ts
@@ -0,0 +1,13 @@
+import { BaseEntity, Entity, PrimaryColumn, CreateDateColumn, Column } from 'typeorm'
+
+@Entity('openai_threads')
+export class OpenaiThreads extends BaseEntity {
+ @PrimaryColumn({ type: 'char', length: 30 })
+ id: string
+
+ @CreateDateColumn({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
+ createdAt: Date
+
+ @Column({ name: 'user_id', type: 'int', unsigned: true })
+ userId: number
+}
diff --git a/database/entity/Community.ts b/database/entity/Community.ts
index 3b48d5c29..9495cc2b6 100644
--- a/database/entity/Community.ts
+++ b/database/entity/Community.ts
@@ -1 +1 @@
-export { Community } from './0082-introduce_gms_registration/Community'
+export { Community } from './0086-add_community_location/Community'
diff --git a/database/entity/FederatedCommunity.ts b/database/entity/FederatedCommunity.ts
index 37a33e4d9..044966080 100644
--- a/database/entity/FederatedCommunity.ts
+++ b/database/entity/FederatedCommunity.ts
@@ -1 +1 @@
-export { FederatedCommunity } from './0068-community_tables_public_key_length/FederatedCommunity'
+export { FederatedCommunity } from './0083-join_community_federated_communities/FederatedCommunity'
diff --git a/database/entity/OpenaiThreads.ts b/database/entity/OpenaiThreads.ts
new file mode 100644
index 000000000..d0590811f
--- /dev/null
+++ b/database/entity/OpenaiThreads.ts
@@ -0,0 +1 @@
+export { OpenaiThreads } from './0089-add_openai_threads/OpenaiThreads'
diff --git a/database/entity/ProjectBranding.ts b/database/entity/ProjectBranding.ts
new file mode 100644
index 000000000..0622d00ef
--- /dev/null
+++ b/database/entity/ProjectBranding.ts
@@ -0,0 +1 @@
+export { ProjectBranding } from './0088-create_project_brandings/ProjectBranding'
diff --git a/database/entity/User.ts b/database/entity/User.ts
index e3f15113d..993d983ef 100644
--- a/database/entity/User.ts
+++ b/database/entity/User.ts
@@ -1 +1 @@
-export { User } from './0082-introduce_gms_registration/User'
+export { User } from './0084-introduce_humhub_registration/User'
diff --git a/database/entity/index.ts b/database/entity/index.ts
index 3352abdb4..e34a4b55e 100644
--- a/database/entity/index.ts
+++ b/database/entity/index.ts
@@ -2,6 +2,8 @@ import { ContributionLink } from './ContributionLink'
import { LoginElopageBuys } from './LoginElopageBuys'
import { LoginEmailOptIn } from './LoginEmailOptIn'
import { Migration } from './Migration'
+import { ProjectBranding } from './ProjectBranding'
+import { OpenaiThreads } from './OpenaiThreads'
import { Transaction } from './Transaction'
import { TransactionLink } from './TransactionLink'
import { User } from './User'
@@ -26,6 +28,8 @@ export const entities = [
LoginElopageBuys,
LoginEmailOptIn,
Migration,
+ ProjectBranding,
+ OpenaiThreads,
PendingTransaction,
Transaction,
TransactionLink,
diff --git a/database/migrations/0082-introduce_gms_registration.ts b/database/migrations/0082-introduce_gms_registration.ts
index e02801a4f..b24be2bb5 100644
--- a/database/migrations/0082-introduce_gms_registration.ts
+++ b/database/migrations/0082-introduce_gms_registration.ts
@@ -50,5 +50,5 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom
await queryFn('ALTER TABLE `user_contacts` DROP COLUMN IF EXISTS `gms_publish_email`;')
await queryFn('ALTER TABLE `user_contacts` DROP COLUMN IF EXISTS `country_code`;')
await queryFn('ALTER TABLE `user_contacts` DROP COLUMN IF EXISTS `gms_publish_phone`;')
- await queryFn('ALTER TABLE `communities` DROP COLUMN IF EXISTS `gms_api_key`;')
+ await queryFn('ALTER TABLE `communities` DROP COLUMN IF EXISTS `gms_api_key`;')
}
diff --git a/database/migrations/0083-join_community_federated_communities.ts b/database/migrations/0083-join_community_federated_communities.ts
new file mode 100644
index 000000000..ca40e28d4
--- /dev/null
+++ b/database/migrations/0083-join_community_federated_communities.ts
@@ -0,0 +1,3 @@
+export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) {}
+
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) {}
diff --git a/database/migrations/0084-introduce_humhub_registration.ts b/database/migrations/0084-introduce_humhub_registration.ts
new file mode 100644
index 000000000..858283602
--- /dev/null
+++ b/database/migrations/0084-introduce_humhub_registration.ts
@@ -0,0 +1,16 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) {
+ await queryFn(
+ 'ALTER TABLE `users` ADD COLUMN IF NOT EXISTS `humhub_allowed` tinyint(1) NOT NULL DEFAULT 0 AFTER `gms_registered_at`;',
+ )
+ await queryFn(
+ 'ALTER TABLE `users` ADD COLUMN IF NOT EXISTS `humhub_publish_name` int unsigned NOT NULL DEFAULT 0 AFTER `gms_publish_name`;',
+ )
+}
+
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) {
+ await queryFn('ALTER TABLE `users` DROP COLUMN IF EXISTS `humhub_allowed`;')
+ await queryFn('ALTER TABLE `users` DROP COLUMN IF EXISTS `humhub_publish_name`;')
+}
diff --git a/database/migrations/0085-add_index_transactions_user_id.ts b/database/migrations/0085-add_index_transactions_user_id.ts
new file mode 100644
index 000000000..c4cb02431
--- /dev/null
+++ b/database/migrations/0085-add_index_transactions_user_id.ts
@@ -0,0 +1,10 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) {
+ await queryFn('CREATE INDEX user_id ON transactions (user_id);')
+}
+
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) {
+ await queryFn('DROP INDEX user_id ON transactions;')
+}
diff --git a/database/migrations/0086-add_community_location.ts b/database/migrations/0086-add_community_location.ts
new file mode 100644
index 000000000..5aeaec233
--- /dev/null
+++ b/database/migrations/0086-add_community_location.ts
@@ -0,0 +1,12 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) {
+ await queryFn(
+ 'ALTER TABLE `communities` ADD COLUMN IF NOT EXISTS `location` geometry DEFAULT NULL NULL AFTER `gms_api_key`;',
+ )
+}
+
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) {
+ await queryFn('ALTER TABLE `communities` DROP COLUMN IF EXISTS `location`;')
+}
diff --git a/database/migrations/0087-add_index_on_user_roles.ts b/database/migrations/0087-add_index_on_user_roles.ts
new file mode 100644
index 000000000..40d49ccbf
--- /dev/null
+++ b/database/migrations/0087-add_index_on_user_roles.ts
@@ -0,0 +1,10 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) {
+ await queryFn('ALTER TABLE `user_roles` ADD INDEX user_id (user_id);')
+}
+
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) {
+ await queryFn('ALTER TABLE `user_roles` DROP INDEX `user_id`;')
+}
diff --git a/database/migrations/0088-create_project_brandings.ts b/database/migrations/0088-create_project_brandings.ts
new file mode 100644
index 000000000..9a0c56dc2
--- /dev/null
+++ b/database/migrations/0088-create_project_brandings.ts
@@ -0,0 +1,26 @@
+/* MIGRATION TO CREATE THE project_brandings table
+ *
+ * This migration creates the `community` and 'communityfederation' tables in the `apollo` database (`gradido_community`).
+ */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) {
+ await queryFn(`
+ CREATE TABLE \`project_brandings\`(
+ \`id\` INT UNSIGNED NOT NULL AUTO_INCREMENT,
+ \`name\` VARCHAR(255) NOT NULL,
+ \`alias\` VARCHAR(32) NOT NULL,
+ \`description\` TEXT NULL DEFAULT NULL,
+ \`space_id\` INT UNSIGNED NULL DEFAULT NULL,
+ \`space_url\` VARCHAR(255) NULL DEFAULT NULL,
+ \`new_user_to_space\` TINYINT(1) NOT NULL DEFAULT FALSE,
+ \`logo_url\` VARCHAR(255) NULL DEFAULT NULL,
+ PRIMARY KEY(\`id\`)
+ ) ENGINE = InnoDB;
+ `)
+}
+
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) {
+ await queryFn('DROP TABLE `project_brandings`')
+}
diff --git a/database/migrations/0089-add_openai_threads.ts b/database/migrations/0089-add_openai_threads.ts
new file mode 100644
index 000000000..d9dbed140
--- /dev/null
+++ b/database/migrations/0089-add_openai_threads.ts
@@ -0,0 +1,16 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) {
+ await queryFn(`
+ CREATE TABLE openai_threads (
+ id VARCHAR(128) PRIMARY KEY,
+ createdAt TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ user_id int(10) unsigned NOT NULL
+ ) ENGINE = InnoDB;
+ `)
+}
+
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) {
+ await queryFn(`DROP TABLE openai_threads`)
+}
diff --git a/database/package.json b/database/package.json
index caeb917c4..47af20975 100644
--- a/database/package.json
+++ b/database/package.json
@@ -1,6 +1,6 @@
{
"name": "gradido-database",
- "version": "2.2.0",
+ "version": "2.5.1",
"description": "Gradido Database Tool to execute database migrations",
"main": "src/index.ts",
"repository": "https://github.com/gradido/gradido/database",
@@ -22,7 +22,7 @@
"@eslint-community/eslint-plugin-eslint-comments": "^3.2.1",
"@types/faker": "^5.5.9",
"@types/geojson": "^7946.0.13",
- "@types/node": "^16.10.3",
+ "@types/node": "^17.0.21",
"@typescript-eslint/eslint-plugin": "^5.57.1",
"@typescript-eslint/parser": "^5.57.1",
"eslint": "^8.37.0",
@@ -37,8 +37,8 @@
"mkdirp": "^3.0.1",
"ncp": "^2.0.0",
"prettier": "^2.8.7",
- "ts-node": "^10.2.1",
- "typescript": "^4.3.5"
+ "ts-node": "^10.9.2",
+ "typescript": "^4.9.5"
},
"dependencies": {
"@types/uuid": "^8.3.4",
diff --git a/database/src/config/detectLastDBVersion.ts b/database/src/config/detectLastDBVersion.ts
new file mode 100644
index 000000000..bc9e7766e
--- /dev/null
+++ b/database/src/config/detectLastDBVersion.ts
@@ -0,0 +1,43 @@
+import path from 'path'
+import fs from 'fs'
+
+// Define the regular expression pattern once
+const DB_VERSION_PATTERN = /^(\d{4}-[a-z0-9-_]+)/
+
+// Define the paths to check
+const migrationsDir = path.join(__dirname, '..', '..', 'migrations')
+const entitiesDir = path.join(__dirname, '..', '..', 'entity')
+
+// Helper function to get the highest version number from the directory
+function getLatestDbVersion(dir: string): string {
+ // Read all files and folders in the directory
+ const files = fs.readdirSync(dir)
+
+ // Filter out files/folders that don't match the pattern for DB_VERSION
+ const dbVersionFiles = files.filter((file) => file.match(DB_VERSION_PATTERN))
+
+ if (dbVersionFiles.length === 0) {
+ throw new Error(`couldn't found any file in ${dir} matching ${DB_VERSION_PATTERN}`)
+ }
+
+ // Sort files by the version number (extract the version from the filename)
+ const sortedFiles = dbVersionFiles.sort()
+
+ const lastFile = sortedFiles[sortedFiles.length - 1]
+ const matches = lastFile.match(DB_VERSION_PATTERN)
+ if (!matches || matches.length < 1) {
+ throw new Error('invalid match')
+ }
+ // Return the latest version file or folder
+ return matches[1]
+}
+
+// Get the latest version from migrations and entities
+const latestMigrationVersion = getLatestDbVersion(migrationsDir)
+const latestEntityVersion = getLatestDbVersion(entitiesDir)
+
+// Determine which directory has the latest version and return it
+export const latestDbVersion =
+ latestMigrationVersion && (!latestEntityVersion || latestMigrationVersion > latestEntityVersion)
+ ? latestMigrationVersion
+ : latestEntityVersion
diff --git a/database/yarn.lock b/database/yarn.lock
index fd5598693..491470016 100644
--- a/database/yarn.lock
+++ b/database/yarn.lock
@@ -9,17 +9,12 @@
dependencies:
regenerator-runtime "^0.13.11"
-"@cspotcode/source-map-consumer@0.8.0":
- version "0.8.0"
- resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b"
- integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==
-
-"@cspotcode/source-map-support@0.6.1":
- version "0.6.1"
- resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.6.1.tgz#118511f316e2e87ee4294761868e254d3da47960"
- integrity sha512-DX3Z+T5dt1ockmPdobJS/FAsQPW4V4SrWEhD2iYQT2Cb2tQsiMnYxrcUH9By/Z3B+v0S5LMBkQtV/XOBbpLEOg==
+"@cspotcode/source-map-support@^0.8.0":
+ version "0.8.1"
+ resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+ integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
dependencies:
- "@cspotcode/source-map-consumer" "0.8.0"
+ "@jridgewell/trace-mapping" "0.3.9"
"@eslint-community/eslint-plugin-eslint-comments@^3.2.1":
version "3.2.1"
@@ -80,6 +75,24 @@
resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+"@jridgewell/resolve-uri@^3.0.3":
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+ integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
+ integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
+
+"@jridgewell/trace-mapping@0.3.9":
+ version "0.3.9"
+ resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+ integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
+ dependencies:
+ "@jridgewell/resolve-uri" "^3.0.3"
+ "@jridgewell/sourcemap-codec" "^1.4.10"
+
"@nodelib/fs.scandir@2.1.5":
version "2.1.5"
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -170,10 +183,10 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.1.tgz#c6b9198178da504dfca1fd0be9b2e1002f1586f0"
integrity sha512-ncRdc45SoYJ2H4eWU9ReDfp3vtFqDYhjOsKlFFUDEn8V1Bgr2RjYal8YT5byfadWIRluhPFU6JiDOl0H6Sl87A==
-"@types/node@^16.10.3":
- version "16.10.3"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.3.tgz#7a8f2838603ea314d1d22bb3171d899e15c57bd5"
- integrity sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ==
+"@types/node@^17.0.21":
+ version "17.0.45"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
+ integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
"@types/semver@^7.3.12":
version "7.5.0"
@@ -2353,12 +2366,12 @@ ts-mysql-migrate@^1.0.2:
"@types/mysql" "^2.15.8"
mysql "^2.18.1"
-ts-node@^10.2.1:
- version "10.2.1"
- resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.2.1.tgz#4cc93bea0a7aba2179497e65bb08ddfc198b3ab5"
- integrity sha512-hCnyOyuGmD5wHleOQX6NIjJtYVIO8bPP8F2acWkB4W06wdlkgyvJtubO/I9NkI88hCFECbsEgoLc0VNkYmcSfw==
+ts-node@^10.9.2:
+ version "10.9.2"
+ resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
+ integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
dependencies:
- "@cspotcode/source-map-support" "0.6.1"
+ "@cspotcode/source-map-support" "^0.8.0"
"@tsconfig/node10" "^1.0.7"
"@tsconfig/node12" "^1.0.7"
"@tsconfig/node14" "^1.0.0"
@@ -2369,6 +2382,7 @@ ts-node@^10.2.1:
create-require "^1.1.0"
diff "^4.0.1"
make-error "^1.1.1"
+ v8-compile-cache-lib "^3.0.1"
yn "3.1.1"
tsconfig-paths@^3.14.1:
@@ -2440,10 +2454,10 @@ typeorm@^0.3.16:
uuid "^9.0.0"
yargs "^17.6.2"
-typescript@^4.3.5:
- version "4.3.5"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
- integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
+typescript@^4.9.5:
+ version "4.9.5"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+ integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
unbox-primitive@^1.0.2:
version "1.0.2"
@@ -2482,6 +2496,11 @@ uuid@^9.0.0:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+v8-compile-cache-lib@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+ integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
+
which-boxed-primitive@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist
index 9e6e911eb..11f5e1d76 100644
--- a/deployment/bare_metal/.env.dist
+++ b/deployment/bare_metal/.env.dist
@@ -9,7 +9,7 @@ EMAIL=true
EMAIL_USERNAME=peter@lustig.de
EMAIL_SENDER=peter@lustig.de
EMAIL_PASSWORD=1234
-EMAIL_SMTP_URL=smtp.lustig.de
+EMAIL_SMTP_HOST=smtp.lustig.de
EMAIL_SMTP_PORT=587
# if set to true allow sending gradidos to another communities
@@ -25,8 +25,8 @@ EMAIL_CODE_REQUEST_TIME=10
# Need to adjust by updates
# config versions
DATABASE_CONFIG_VERSION=v1.2022-03-18
-BACKEND_CONFIG_VERSION=v21.2024-01-06
-FRONTEND_CONFIG_VERSION=v5.2024-01-08
+BACKEND_CONFIG_VERSION=v23.2024-04-04
+FRONTEND_CONFIG_VERSION=v6.2024-02-27
ADMIN_CONFIG_VERSION=v2.2024-01-04
FEDERATION_CONFIG_VERSION=v2.2023-08-24
FEDERATION_DHT_CONFIG_VERSION=v4.2024-01-17
@@ -41,9 +41,10 @@ DEPLOY_SEED_DATA=false
# if true all email will be send to EMAIL_TEST_RECEIVER instead of email address of user
EMAIL_TEST_MODUS=false
EMAIL_TEST_RECEIVER=test_team@gradido.net
+USE_CRYPTO_WORKER=true
# Logging
-LOG_LEVEL=INFO
+LOG_LEVEL=info
GRADIDO_LOG_PATH=/home/gradido/gradido/deployment/bare_metal/log
TYPEORM_LOGGING_RELATIVE_PATH=../deployment/bare_metal/log/typeorm.backend.log
@@ -54,18 +55,19 @@ WEBHOOK_GITHUB_BRANCH=master
# frontend and admin paths, usually don't need changes
# used in nginx config and for links in emails
COMMUNITY_REGISTER_PATH=/register
-COMMUNITY_REDEEM_PATH=/redeem/{code}
-COMMUNITY_REDEEM_CONTRIBUTION_PATH=/redeem/CL-{code}
+COMMUNITY_REDEEM_PATH=/redeem/
+COMMUNITY_REDEEM_CONTRIBUTION_PATH=/redeem/CL-
WALLET_LOGIN_PATH=/login
-WALLET_AUTH_PATH=/authenticate?token={token}
-EMAIL_LINK_VERIFICATION_PATH=/checkEmail/{optin}{code}
-EMAIL_LINK_SETPASSWORD_PATH=/reset-password/{optin}
+WALLET_AUTH_PATH=/authenticate?token=
+EMAIL_LINK_VERIFICATION_PATH=/checkEmail/
+EMAIL_LINK_SETPASSWORD_PATH=/reset-password/
EMAIL_LINK_FORGOTPASSWORD_PATH=/forgot-password
EMAIL_LINK_OVERVIEW_PATH=/overview
-ADMIN_AUTH_PATH=/admin/authenticate?token={token}
+ADMIN_AUTH_PATH=/admin/authenticate?token=
GRAPHQL_PATH=/graphql
# login expire time
+JWT_SECRET=secret123
JWT_EXPIRES_IN=10m
# Federation
@@ -81,7 +83,7 @@ FEDERATION_VALIDATE_COMMUNITY_TIMER=60000
FEDERATION_COMMUNITY_APIS=1_0
# externe gradido services (more added in future)
-GDT_API_URL=https://gdt.gradido.net
+GDT_ACTIVE=false
# DLT-Connector (still in develop)
DLT_CONNECTOR=false
@@ -90,10 +92,10 @@ DLT_CONNECTOR_PORT=6010
# used for combining a newsletter on klicktipp with this gradido community
# if used, user will be subscribed on register and can unsubscribe in his account
KLICKTIPP=false
-KLICKTIPP_USER=
-KLICKTIPP_PASSWORD=
-KLICKTIPP_APIKEY_DE=
-KLICKTIPP_APIKEY_EN=
+KLICKTIPP_USER=gradido_test
+KLICKTIPP_PASSWORD=secret321
+KLICKTIPP_APIKEY_DE=SomeFakeKeyDE
+KLICKTIPP_APIKEY_EN=SomeFakeKeyEN
# Meta data in frontend pages, important when shared via facebook or twitter or for search engines
META_TITLE_DE="Gradido – Dein Dankbarkeitskonto"
@@ -116,11 +118,23 @@ NGINX_SSL_INCLUDE=/etc/letsencrypt/options-ssl-nginx.conf
NGINX_REWRITE_LEGACY_URLS=false
# LEGACY
-DEFAULT_PUBLISHER_ID=2896
WEBHOOK_ELOPAGE_SECRET=secret
# GMS
-#GMS_ACTIVE=true
+GMS_ACTIVE=false
# Coordinates of Illuminz test instance
-#GMS_URL=http://54.176.169.179:3071
-#GMS_URL=http://localhost:4044/
+#GMS_API_URL=http://54.176.169.179:3071
+GMS_API_URL=http://localhost:4044/
+GMS_DASHBOARD_URL=http://localhost:8080/
+GMS_WEBHOOK_SECRET=secret
+GMS_CREATE_USER_THROW_ERRORS=false
+
+# HUMHUB
+HUMHUB_ACTIVE=false
+HUMHUB_API_URL=https://community.gradido.net
+HUMHUB_JWT_KEY=
+
+# OPENAI
+OPENAI_ACTIVE=false
+OPENAI_API_KEY=''
+OPENAI_ASSISTANT_ID=asst_MF5cchZr7wY7rNXayuWvZFsM
\ No newline at end of file
diff --git a/deployment/bare_metal/nginx/sites-available/gradido-federation.conf.template b/deployment/bare_metal/nginx/sites-available/gradido-federation.conf.template
index 5123deb5e..cf5f53b25 100644
--- a/deployment/bare_metal/nginx/sites-available/gradido-federation.conf.template
+++ b/deployment/bare_metal/nginx/sites-available/gradido-federation.conf.template
@@ -1,7 +1,7 @@
location /api/$FEDERATION_APIVERSION {
- limit_req zone=api burst=60 nodelay;
- limit_conn addr 30;
+ #limit_req zone=api burst=60 nodelay;
+ #limit_conn addr 30;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
diff --git a/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template b/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
index d8ed50ba4..294e9f8a0 100644
--- a/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
+++ b/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
@@ -14,8 +14,8 @@ server {
server {
server_name $COMMUNITY_HOST;
- listen [::]:443 ssl ipv6only=on;
- listen 443 ssl;
+ listen [::]:443 ssl ipv6only=on http2;
+ listen 443 ssl http2;
ssl_certificate $NGINX_SSL_CERTIFICATE;
ssl_certificate_key $NGINX_SSL_CERTIFICATE_KEY;
include $NGINX_SSL_INCLUDE;
@@ -25,15 +25,15 @@ server {
include /etc/nginx/common/protect_add_header.conf;
# protect from slow loris
- client_body_timeout 10s;
- client_header_timeout 10s;
+ #client_body_timeout 10s;
+ #client_header_timeout 10s;
# protect from range attack (in http header)
if ($http_range ~ "d{9,}") {
return 444;
}
- #gzip_static on;
+ gzip_static on;
gzip on;
gzip_proxied any;
gzip_types
@@ -53,26 +53,21 @@ server {
# Frontend (default)
location / {
- limit_req zone=frontend burst=40 nodelay;
- limit_conn addr 40;
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection 'upgrade';
- proxy_set_header X-Forwarded-For $remote_addr;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header Host $host;
- proxy_pass http://127.0.0.1:3000;
- proxy_redirect off;
-
+ #limit_req zone=frontend burst=40 nodelay;
+ #limit_conn addr 40;
+ root $PROJECT_ROOT/frontend/build/;
+ index index.html;
+ try_files $uri $uri/ /index.html = 404;
+
access_log $GRADIDO_LOG_PATH/nginx-access.frontend.log gradido_log;
error_log $GRADIDO_LOG_PATH/nginx-error.frontend.log warn;
}
# Backend
location /graphql {
- limit_req zone=backend burst=10 nodelay;
- limit_conn addr 10;
+ #limit_req zone=backend burst=10 nodelay;
+ #limit_conn addr 10;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
@@ -89,8 +84,8 @@ server {
# Backend webhooks
location /hook {
- limit_req zone=backend burst=10;
- limit_conn addr 10;
+ #limit_req zone=backend burst=10;
+ #limit_conn addr 10;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
@@ -107,8 +102,8 @@ server {
# Webhook reverse proxy
location /hooks/ {
- limit_req zone=backend burst=10;
- limit_conn addr 10;
+ #limit_req zone=backend burst=10;
+ #limit_conn addr 10;
proxy_pass http://127.0.0.1:9000/hooks/;
access_log $GRADIDO_LOG_PATH/nginx-access.hooks.log gradido_log;
@@ -117,17 +112,12 @@ server {
# Admin Frontend
location /admin {
- limit_req zone=frontend burst=30 nodelay;
- limit_conn addr 40;
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection 'upgrade';
- proxy_set_header X-Forwarded-For $remote_addr;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header Host $host;
-
- proxy_pass http://127.0.0.1:8080/;
- proxy_redirect off;
+ #limit_req zone=frontend burst=30 nodelay;
+ #limit_conn addr 40;
+ rewrite ^/admin/(.*)$ /$1 break;
+ root $PROJECT_ROOT/admin/build/;
+ index index.html;
+ try_files $uri $uri/ /index.html = 404;
access_log $GRADIDO_LOG_PATH/nginx-access.admin.log gradido_log;
error_log $GRADIDO_LOG_PATH/nginx-error.admin.log warn;
diff --git a/deployment/bare_metal/nginx/sites-available/gradido.conf.template b/deployment/bare_metal/nginx/sites-available/gradido.conf.template
index e0f382467..7bd28b228 100644
--- a/deployment/bare_metal/nginx/sites-available/gradido.conf.template
+++ b/deployment/bare_metal/nginx/sites-available/gradido.conf.template
@@ -10,15 +10,15 @@ server {
include /etc/nginx/common/protect_add_header.conf;
# protect from slow loris
- client_body_timeout 10s;
- client_header_timeout 10s;
+ #client_body_timeout 10s;
+ #client_header_timeout 10s;
# protect from range attack (in http header)
if ($http_range ~ "d{9,}") {
return 444;
}
- #gzip_static on;
+ gzip_static on;
gzip on;
gzip_proxied any;
gzip_types
@@ -38,17 +38,11 @@ server {
# Frontend (default)
location / {
- limit_req zone=frontend burst=40 nodelay;
- limit_conn addr 40;
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection 'upgrade';
- proxy_set_header X-Forwarded-For $remote_addr;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header Host $host;
-
- proxy_pass http://127.0.0.1:3000;
- proxy_redirect off;
+ #limit_req zone=frontend burst=40 nodelay;
+ #limit_conn addr 40;
+ root $PROJECT_ROOT/frontend/build/;
+ index index.html;
+ try_files $uri $uri/ /index.html = 404;
access_log $GRADIDO_LOG_PATH/nginx-access.frontend.log gradido_log;
error_log $GRADIDO_LOG_PATH/nginx-error.frontend.log warn;
@@ -56,8 +50,8 @@ server {
# Backend
location /graphql {
- limit_req zone=backend burst=10 nodelay;
- limit_conn addr 10;
+ #limit_req zone=backend burst=10 nodelay;
+ #limit_conn addr 10;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
@@ -74,8 +68,8 @@ server {
# Backend webhooks
location /hook {
- limit_req zone=backend burst=10;
- limit_conn addr 10;
+ #limit_req zone=backend burst=10;
+ #limit_conn addr 10;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
@@ -92,8 +86,8 @@ server {
# Webhook reverse proxy
location /hooks/ {
- limit_req zone=backend burst=10;
- limit_conn addr 10;
+ #limit_req zone=backend burst=10;
+ #limit_conn addr 10;
proxy_pass http://127.0.0.1:9000/hooks/;
access_log $GRADIDO_LOG_PATH/nginx-access.hooks.log gradido_log;
@@ -102,17 +96,12 @@ server {
# Admin Frontend
location /admin {
- limit_req zone=frontend burst=30 nodelay;
- limit_conn addr 40;
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection 'upgrade';
- proxy_set_header X-Forwarded-For $remote_addr;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header Host $host;
-
- proxy_pass http://127.0.0.1:8080/;
- proxy_redirect off;
+ #limit_req zone=frontend burst=30 nodelay;
+ #limit_conn addr 40;
+ rewrite ^/admin/(.*)$ /$1 break;
+ root $PROJECT_ROOT/admin/build/;
+ index index.html;
+ try_files $uri $uri/ /index.html = 404;
access_log $GRADIDO_LOG_PATH/nginx-access.admin.log gradido_log;
error_log $GRADIDO_LOG_PATH/nginx-error.admin.log warn;
diff --git a/deployment/bare_metal/nginx/sites-available/update-page.conf.ssl.template b/deployment/bare_metal/nginx/sites-available/update-page.conf.ssl.template
index fd41c333d..7af8a7cae 100644
--- a/deployment/bare_metal/nginx/sites-available/update-page.conf.ssl.template
+++ b/deployment/bare_metal/nginx/sites-available/update-page.conf.ssl.template
@@ -24,8 +24,8 @@ server {
include /etc/nginx/common/protect_add_header.conf;
# protect from slow loris
- client_body_timeout 10s;
- client_header_timeout 10s;
+ #client_body_timeout 10s;
+ #client_header_timeout 10s;
# protect from range attack (in http header)
if ($http_range ~ "d{9,}") {
@@ -38,8 +38,8 @@ server {
index updating.html;
location / {
- limit_req zone=frontend;
- limit_conn addr 10;
+ #limit_req zone=frontend;
+ #limit_conn addr 10;
try_files /updating.html =404;
}
diff --git a/deployment/bare_metal/nginx/sites-available/update-page.conf.template b/deployment/bare_metal/nginx/sites-available/update-page.conf.template
index be91abc88..fd4b2da41 100644
--- a/deployment/bare_metal/nginx/sites-available/update-page.conf.template
+++ b/deployment/bare_metal/nginx/sites-available/update-page.conf.template
@@ -9,8 +9,8 @@ server {
include /etc/nginx/common/protect_add_header.conf;
# protect from slow loris
- client_body_timeout 10s;
- client_header_timeout 10s;
+ #client_body_timeout 10s;
+ #client_header_timeout 10s;
# protect from range attack (in http header)
if ($http_range ~ "d{9,}") {
@@ -23,8 +23,8 @@ server {
index updating.html;
location / {
- limit_req zone=frontend;
- limit_conn addr 10;
+ #limit_req zone=frontend;
+ #limit_conn addr 10;
try_files /updating.html =404;
}
diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index af8986318..5950547d0 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -1,4 +1,12 @@
#!/bin/bash
+
+# helper functions
+log_step() {
+ local message="$1"
+ echo -e "\e[34m$message\e[0m" > /dev/tty # blue in console
+ echo " $PROJECT_ROOT/database/.env
# Configure backend
-export JWT_SECRET=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo);
+export JWT_SECRET=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c 32; echo);
envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/backend/.env.template > $PROJECT_ROOT/backend/.env
# Configure frontend
@@ -149,7 +172,7 @@ envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/frontend/.env
envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/admin/.env.template > $PROJECT_ROOT/admin/.env
# Configure dht-node
-export FEDERATION_DHT_SEED=$(< /dev/urandom tr -dc a-f0-9 | head -c 32;echo);
+export FEDERATION_DHT_SEED=$(< /dev/urandom tr -dc a-f0-9 | head -c 32; echo);
envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/dht-node/.env.template > $PROJECT_ROOT/dht-node/.env
# Configure federation
@@ -163,4 +186,4 @@ sudo -u gradido crontab < $LOCAL_SCRIPT_DIR/crontabs.txt
# Start gradido
# Note: on first startup some errors will occur - nothing serious
-sudo -u gradido $SCRIPT_PATH/start.sh
\ No newline at end of file
+sudo -u gradido $SCRIPT_PATH/start.sh $1
\ No newline at end of file
diff --git a/deployment/hetzner_cloud/migration/2_2_0-2_2_1/README.md b/deployment/hetzner_cloud/migration/2_2_0-2_2_1/README.md
new file mode 100644
index 000000000..38c4e8330
--- /dev/null
+++ b/deployment/hetzner_cloud/migration/2_2_0-2_2_1/README.md
@@ -0,0 +1,18 @@
+## Migrate from Gradido Version 2.2.0 to 2.2.1
+### What was wrong
+In [hetzner_cloud/install.sh](../../install.sh) there was an error.
+$DB_PASSWORD and $JWT_SECRET password generation method don't work with `release-2_2_0` as parameter for install.sh
+
+The Parameter forwarding from branch, `release-2_2_0` in this case to start.sh was also missing.
+
+### What you can do now
+You need to only run this [fixInstall.sh](fixInstall.sh) with `release_2_2_1` as parameter
+```bash
+cd /home/gradido/gradido/deployment/hetzner_cloud/migration/2_2_0-2_2_1
+sudo ./fixInstall.sh `release_2_2_1`
+```
+
+Basically it will create a new $DB_PASSWORD, $JWT_SECRET and $FEDERATION_DHT_SEED,
+update db user with new db password and update .env files in module folders.
+Then it will call start.sh with first parameter if ./fixInstall.sh as his first parameter
+
diff --git a/deployment/hetzner_cloud/migration/2_2_0-2_2_1/fixInstall.sh b/deployment/hetzner_cloud/migration/2_2_0-2_2_1/fixInstall.sh
new file mode 100755
index 000000000..1995b220d
--- /dev/null
+++ b/deployment/hetzner_cloud/migration/2_2_0-2_2_1/fixInstall.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+# check for parameter
+if [ -z "$1" ]; then
+ echo "Usage: Please provide a branch name as the first argument."
+ exit 1
+fi
+
+set -o allexport
+SCRIPT_PATH=$(realpath ../../../bare_metal)
+SCRIPT_DIR=$(dirname $SCRIPT_PATH)
+LOCAL_SCRIPT_PATH=$(realpath $0)
+LOCAL_SCRIPT_DIR=$(dirname $LOCAL_SCRIPT_PATH)
+PROJECT_ROOT=$SCRIPT_DIR/..
+set +o allexport
+
+
+# Load .env or .env.dist if not present
+# NOTE: all config values will be in process.env when starting
+# the services and will therefore take precedence over the .env
+if [ -f "$SCRIPT_PATH/.env" ]; then
+ set -o allexport
+ source $SCRIPT_PATH/.env
+ set +o allexport
+else
+ set -o allexport
+ source $SCRIPT_PATH/.env.dist
+ set +o allexport
+fi
+
+# create db user
+export DB_USER=gradido
+# create a new password only if it not already exist
+export DB_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c 32; echo);
+
+
+mysql < $PROJECT_ROOT/database/.env
+
+# Configure backend
+export JWT_SECRET=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c 32; echo);
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/backend/.env.template > $PROJECT_ROOT/backend/.env
+
+# Configure frontend
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/frontend/.env.template > $PROJECT_ROOT/frontend/.env
+
+# Configure admin
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/admin/.env.template > $PROJECT_ROOT/admin/.env
+
+# Configure dht-node
+export FEDERATION_DHT_SEED=$(< /dev/urandom tr -dc a-f0-9 | head -c 32; echo);
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/dht-node/.env.template > $PROJECT_ROOT/dht-node/.env
+
+# Configure federation
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/federation/.env.template > $PROJECT_ROOT/federation/.env
+
+# set all created or modified files back to belonging to gradido
+chown -R gradido:gradido $PROJECT_ROOT
+
+# Start gradido
+# Note: on first startup some errors will occur - nothing serious
+sudo -u gradido $SCRIPT_PATH/start.sh $1
\ No newline at end of file
diff --git a/deployment/hetzner_cloud/migration/2_5_1-2_5_2/README.md b/deployment/hetzner_cloud/migration/2_5_1-2_5_2/README.md
new file mode 100644
index 000000000..7534ce060
--- /dev/null
+++ b/deployment/hetzner_cloud/migration/2_5_1-2_5_2/README.md
@@ -0,0 +1,15 @@
+## Migrate from Gradido Version 2.5.1 to 2.5.2
+### What
+We need to upgrade the used nodejs version in deployment. Until now for pm2, backend, dht-node, federation nodejs 16 was used,
+but some newer npm libs don't work with this old nodejs version so we upgrade to nodejs 18.20.7
+
+### What you can do now
+You need to only run this [upgradeNodeJs.sh](upgradeNodeJs.sh) with `release-2_5_2-beta` as parameter
+```bash
+cd /home/gradido/gradido/deployment/hetzner_cloud/migration/2_5_1-2_5_2
+sudo ./upgradeNodeJs.sh `release-2_5_2-beta`
+```
+
+It will stop pm2, install new nodejs version + pm2 + yarn, remove nodejs 16.
+Then it will call start.sh with first parameter of ./upgradeNodeJs.sh as his first parameter
+
diff --git a/deployment/hetzner_cloud/migration/2_5_1-2_5_2/upgradeNodeJs.sh b/deployment/hetzner_cloud/migration/2_5_1-2_5_2/upgradeNodeJs.sh
new file mode 100644
index 000000000..baef7550d
--- /dev/null
+++ b/deployment/hetzner_cloud/migration/2_5_1-2_5_2/upgradeNodeJs.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+# check for parameter
+if [ -z "$1" ]; then
+ echo "Usage: Please provide a branch name as the first argument."
+ exit 1
+fi
+
+# stop all services
+pm2 delete all
+pm2 save
+
+# upgrade node js version
+nvm install 18.20.7
+nvm use 18.20.7
+nvm alias default 18.20.7
+npm install -g pm2 yarn
+nvm uninstall 16
+
+# Start gradido
+sudo -u gradido $SCRIPT_PATH/start.sh $1
\ No newline at end of file
diff --git a/dht-node/.env.dist b/dht-node/.env.dist
index fa07fc904..351bc251d 100644
--- a/dht-node/.env.dist
+++ b/dht-node/.env.dist
@@ -1,5 +1,5 @@
# Database
-DB_HOST=localhost
+DB_HOST=127.0.0.1
DB_PORT=3306
DB_USER=root
DB_PASSWORD=
diff --git a/dht-node/.env.template b/dht-node/.env.template
index b4cef7f5e..ad5765f96 100644
--- a/dht-node/.env.template
+++ b/dht-node/.env.template
@@ -2,7 +2,7 @@
CONFIG_VERSION=$FEDERATION_DHT_CONFIG_VERSION
# Database
-DB_HOST=localhost
+DB_HOST=127.0.0.1
DB_PORT=3306
DB_USER=$DB_USER
DB_PASSWORD=$DB_PASSWORD
diff --git a/dht-node/.nvmrc b/dht-node/.nvmrc
index 9dfdb2923..5a0afb48b 100644
--- a/dht-node/.nvmrc
+++ b/dht-node/.nvmrc
@@ -1 +1 @@
-v19.5.0
\ No newline at end of file
+v18.20.7
\ No newline at end of file
diff --git a/dht-node/Dockerfile b/dht-node/Dockerfile
index 9f1bbabf7..dab401762 100644
--- a/dht-node/Dockerfile
+++ b/dht-node/Dockerfile
@@ -1,7 +1,7 @@
##################################################################################
# BASE ###########################################################################
##################################################################################
-FROM node:19.5.0-alpine3.17 as base
+FROM node:18.20.7-alpine3.21 as base
#FROM ubuntu:latest as base
# ENVs (available in production aswell, can be overwritten by commandline or env file)
@@ -33,10 +33,10 @@ LABEL maintainer="support@gradido.net"
# Install Additional Software
## install: sodium requirements
-RUN apk add --no-cache --virtual build-deps python3 alpine-sdk autoconf libtool automake && \
- mkdir -p /prebuilds && cd /prebuilds && npm init -y && npm install sodium-native@3.1.1 && \
- apk del build-deps
-ENV SODIUM_NATIVE_PREBUILD=/prebuilds/node_modules/sodium-native/
+#RUN apk add --no-cache --virtual build-deps python3 alpine-sdk autoconf libtool automake && \
+# mkdir -p /prebuilds && cd /prebuilds && npm init -y && npm install sodium-native@3.1.1 && \
+# apk del build-deps
+#ENV SODIUM_NATIVE_PREBUILD=/prebuilds/node_modules/sodium-native/
# Settings
## Expose Container Port
@@ -47,6 +47,7 @@ RUN mkdir -p ${DOCKER_WORKDIR}
WORKDIR ${DOCKER_WORKDIR}
RUN mkdir -p /database
+RUN mkdir -p /config
##################################################################################
# DEVELOPMENT (Connected to the local environment, to reload on demand) ##########
@@ -59,7 +60,7 @@ FROM base as development
# Run command
# (for development we need to execute yarn install since the
# node_modules are on another volume and need updating)
-CMD /bin/sh -c "cd /database && yarn install && yarn build && cd /app && yarn install && yarn run dev"
+CMD /bin/sh -c "cd /database && yarn install && yarn build && cd /config && yarn install && cd /app && yarn install && yarn run dev"
##################################################################################
# BUILD (Does contain all files and is therefore bloated) ########################
@@ -70,6 +71,11 @@ FROM base as build
COPY ./dht-node/ ./
# Copy everything from database
COPY ./database/ ../database/
+# Copy everything from config
+COPY ./config/ ../config/
+
+# yarn install and build config
+RUN cd ../config && yarn install --production=false --frozen-lockfile --non-interactive && yarn run build
# yarn install dht-node
RUN yarn install --production=false --frozen-lockfile --non-interactive
@@ -99,9 +105,11 @@ FROM base as production
# Copy "binary"-files from build image
COPY --from=build ${DOCKER_WORKDIR}/build ./build
COPY --from=build ${DOCKER_WORKDIR}/../database/build ../database/build
+COPY --from=build ${DOCKER_WORKDIR}/../config/build ../config/build
# We also copy the node_modules express and serve-static for the run script
COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
COPY --from=build ${DOCKER_WORKDIR}/../database/node_modules ../database/node_modules
+COPY --from=build ${DOCKER_WORKDIR}/../config/node_modules ../config/node_modules
# Copy static files
# COPY --from=build ${DOCKER_WORKDIR}/public ./public
diff --git a/dht-node/jest.config.js b/dht-node/jest.config.js
index 0bb09f0e4..66c5fba14 100644
--- a/dht-node/jest.config.js
+++ b/dht-node/jest.config.js
@@ -31,5 +31,10 @@ module.exports = {
process.env.NODE_ENV === 'development'
? '/../database/src/$1'
: '/../database/build/src/$1',
+ '@config/(.*)':
+ // eslint-disable-next-line n/no-process-env
+ process.env.NODE_ENV === 'development'
+ ? '/../config/src/$1'
+ : '/../config/build/$1',
},
}
diff --git a/dht-node/package.json b/dht-node/package.json
index 7a73791d5..aa86b5b2f 100644
--- a/dht-node/package.json
+++ b/dht-node/package.json
@@ -1,6 +1,6 @@
{
"name": "gradido-dht-node",
- "version": "2.2.0",
+ "version": "2.5.1",
"description": "Gradido dht-node module",
"main": "src/index.ts",
"repository": "https://github.com/gradido/gradido/",
@@ -19,7 +19,9 @@
"@hyperswarm/dht": "^6.4.4",
"cross-env": "^7.0.3",
"dotenv": "10.0.0",
+ "gradido-config": "file:../config",
"gradido-database": "file:../database",
+ "joi": "^17.13.3",
"log4js": "^6.7.1",
"nodemon": "^2.0.20",
"tsconfig-paths": "^4.1.2",
@@ -29,6 +31,7 @@
"@eslint-community/eslint-plugin-eslint-comments": "^3.2.1",
"@types/dotenv": "^8.2.0",
"@types/jest": "^27.0.2",
+ "@types/joi": "^17.2.3",
"@types/node": "^18.11.18",
"@types/uuid": "^8.3.4",
"@typescript-eslint/eslint-plugin": "^5.57.1",
@@ -46,7 +49,7 @@
"jest": "^27.2.4",
"prettier": "^2.8.7",
"ts-jest": "^27.0.5",
- "ts-node": "^10.9.1",
+ "ts-node": "^10.9.2",
"typescript": "^4.9.4"
},
"engines": {
diff --git a/dht-node/src/config/index.ts b/dht-node/src/config/index.ts
index 949ae47ce..6389a22af 100644
--- a/dht-node/src/config/index.ts
+++ b/dht-node/src/config/index.ts
@@ -1,18 +1,17 @@
/* eslint-disable n/no-process-env */
+import { validate } from '@config/index'
+import { latestDbVersion } from '@dbTools/config/detectLastDBVersion'
import dotenv from 'dotenv'
+import { schema } from './schema'
+
dotenv.config()
const constants = {
- DB_VERSION: '0082-introduce_gms_registration',
+ DB_VERSION: latestDbVersion,
LOG4JS_CONFIG: 'log4js-config.json',
// default log level on production should be info
LOG_LEVEL: process.env.LOG_LEVEL ?? 'info',
- CONFIG_VERSION: {
- DEFAULT: 'DEFAULT',
- EXPECTED: 'v4.2024-01-17',
- CURRENT: '',
- },
}
const server = {
@@ -46,18 +45,6 @@ const federation = {
FEDERATION_COMMUNITY_APIS: process.env.FEDERATION_COMMUNITY_APIS ?? '1_0',
}
-// Check config version
-constants.CONFIG_VERSION.CURRENT = process.env.CONFIG_VERSION ?? constants.CONFIG_VERSION.DEFAULT
-if (
- ![constants.CONFIG_VERSION.EXPECTED, constants.CONFIG_VERSION.DEFAULT].includes(
- constants.CONFIG_VERSION.CURRENT,
- )
-) {
- throw new Error(
- `Fatal: Config Version incorrect - expected "${constants.CONFIG_VERSION.EXPECTED}" or "${constants.CONFIG_VERSION.DEFAULT}", but found "${constants.CONFIG_VERSION.CURRENT}"`,
- )
-}
-
export const CONFIG = {
...constants,
...server,
@@ -65,3 +52,4 @@ export const CONFIG = {
...community,
...federation,
}
+validate(schema, CONFIG)
diff --git a/dht-node/src/config/schema.ts b/dht-node/src/config/schema.ts
new file mode 100644
index 000000000..cb7618cf4
--- /dev/null
+++ b/dht-node/src/config/schema.ts
@@ -0,0 +1,64 @@
+import {
+ COMMUNITY_NAME,
+ COMMUNITY_DESCRIPTION,
+ DB_DATABASE,
+ DB_HOST,
+ DB_PASSWORD,
+ DB_PORT,
+ DB_USER,
+ DB_VERSION,
+ LOG4JS_CONFIG,
+ LOG_LEVEL,
+ NODE_ENV,
+ PRODUCTION,
+ TYPEORM_LOGGING_RELATIVE_PATH,
+} from '@config/commonSchema'
+import Joi from 'joi'
+
+export const schema = Joi.object({
+ COMMUNITY_NAME,
+ COMMUNITY_DESCRIPTION,
+ DB_DATABASE,
+ DB_HOST,
+ DB_PASSWORD,
+ DB_PORT,
+ DB_USER,
+ DB_VERSION,
+ LOG4JS_CONFIG,
+ LOG_LEVEL,
+ NODE_ENV,
+ PRODUCTION,
+ TYPEORM_LOGGING_RELATIVE_PATH,
+
+ FEDERATION_DHT_TOPIC: Joi.string()
+ .default('GRADIDO_HUB')
+ .description('The topic for the DHT (Distributed Hash Table), defaults to GRADIDO_HUB')
+ .required(),
+
+ FEDERATION_DHT_SEED: Joi.string()
+ .when('NODE_ENV', {
+ is: 'development',
+ then: Joi.allow(null), // Allow empty for development
+ otherwise: Joi.string()
+ .hex()
+ .length(64)
+ .message('need to be valid hex with 64 character')
+ .required(), // Valid hex and 64 characters for other environments
+ })
+ .description(
+ 'Seed for libsodium crypto_sign_seed_keypair. Valid hex with 64 characters in production',
+ )
+ .default(''), // Default to empty string
+
+ FEDERATION_COMMUNITY_URL: Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .default(Joi.ref('COMMUNITY_URL'))
+ .description('Community URL for federation, defaults to COMMUNITY_URL')
+ .required(),
+
+ FEDERATION_COMMUNITY_APIS: Joi.string()
+ .valid('1_0', '1_1')
+ .default('1_0')
+ .description('Federation community API version, defaults to 1_0')
+ .required(),
+})
diff --git a/dht-node/tsconfig.json b/dht-node/tsconfig.json
index 33362b054..580319573 100644
--- a/dht-node/tsconfig.json
+++ b/dht-node/tsconfig.json
@@ -53,7 +53,8 @@
"@typeorm/*": ["../backend/src/typeorm/*", "../../backend/src/typeorm/*"],
"@dbTools/*": ["../database/src/*", "../../database/build/src/*"],
"@entity/*": ["../database/entity/*", "../../database/build/entity/*"],
- "@logging/*": ["../database/logging/*", "../../database/build/logging/*"]
+ "@logging/*": ["../database/logging/*", "../../database/build/logging/*"],
+ "@config/*": ["../config/src/*", "../../config/build/src/*"]
},
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
"typeRoots": ["src/dht_node/@types", "node_modules/@types"], /* List of folders to include type definitions from. */
@@ -82,6 +83,12 @@
"path": "../database/tsconfig.json",
// add 'prepend' if you want to include the referenced project in your output file
// "prepend": true
+ },
+ {
+ "path": "../config/tsconfig.json",
+ // add 'prepend' if you want to include the referenced project in your output file
+ // "prepend": true
}
+
]
}
diff --git a/dht-node/yarn.lock b/dht-node/yarn.lock
index 5f42f71a7..2419f760d 100644
--- a/dht-node/yarn.lock
+++ b/dht-node/yarn.lock
@@ -345,6 +345,18 @@
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.42.0.tgz#484a1d638de2911e6f5a30c12f49c7e4a3270fb6"
integrity sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==
+"@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0":
+ version "9.3.0"
+ resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
+ integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==
+
+"@hapi/topo@^5.1.0":
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012"
+ integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==
+ dependencies:
+ "@hapi/hoek" "^9.0.0"
+
"@humanwhocodes/config-array@^0.11.10":
version "0.11.10"
resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
@@ -665,6 +677,23 @@
picocolors "^1.0.0"
tslib "^2.5.0"
+"@sideway/address@^4.1.5":
+ version "4.1.5"
+ resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5"
+ integrity sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==
+ dependencies:
+ "@hapi/hoek" "^9.0.0"
+
+"@sideway/formula@^3.0.1":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
+ integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
+
+"@sideway/pinpoint@^2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
+ integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
+
"@sinonjs/commons@^1.7.0":
version "1.8.6"
resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9"
@@ -783,6 +812,13 @@
jest-matcher-utils "^27.0.0"
pretty-format "^27.0.0"
+"@types/joi@^17.2.3":
+ version "17.2.3"
+ resolved "https://registry.yarnpkg.com/@types/joi/-/joi-17.2.3.tgz#b7768ed9d84f1ebd393328b9f97c1cf3d2b94798"
+ integrity sha512-dGjs/lhrWOa+eO0HwgxCSnDm5eMGCsXuvLglMghJq32F6q5LyyNuXb41DHzrg501CKNOSSAHmfB7FDGeUnDmzw==
+ dependencies:
+ joi "*"
+
"@types/json-schema@^7.0.9":
version "7.0.11"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
@@ -2260,6 +2296,11 @@ gensync@^1.0.0-beta.2:
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+geojson@^0.5.0:
+ version "0.5.0"
+ resolved "https://registry.yarnpkg.com/geojson/-/geojson-0.5.0.tgz#3cd6c96399be65b56ee55596116fe9191ce701c0"
+ integrity sha512-/Bx5lEn+qRF4TfQ5aLu6NH+UKtvIv7Lhc487y/c8BdludrCTpiWf9wyI0RTyqg49MFefIAvFDuEi5Dfd/zgNxQ==
+
get-caller-file@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
@@ -2388,19 +2429,26 @@ graceful-fs@^4.2.4:
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+"gradido-config@file:../config":
+ version "1.0.0"
+ dependencies:
+ joi "^17.13.3"
+
"gradido-database@file:../database":
- version "1.22.3"
+ version "2.5.1"
dependencies:
"@types/uuid" "^8.3.4"
cross-env "^7.0.3"
crypto "^1.0.1"
decimal.js-light "^2.5.1"
dotenv "^10.0.0"
+ geojson "^0.5.0"
mysql2 "^2.3.0"
reflect-metadata "^0.1.13"
ts-mysql-migrate "^1.0.2"
typeorm "^0.3.16"
uuid "^8.3.2"
+ wkx "^0.5.0"
grapheme-splitter@^1.0.4:
version "1.0.4"
@@ -3219,6 +3267,17 @@ jest@^27.2.4:
import-local "^3.0.2"
jest-cli "^27.5.1"
+joi@*, joi@^17.13.3:
+ version "17.13.3"
+ resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.3.tgz#0f5cc1169c999b30d344366d384b12d92558bcec"
+ integrity sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==
+ dependencies:
+ "@hapi/hoek" "^9.3.0"
+ "@hapi/topo" "^5.1.0"
+ "@sideway/address" "^4.1.5"
+ "@sideway/formula" "^3.0.1"
+ "@sideway/pinpoint" "^2.0.0"
+
js-tokens@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -4608,10 +4667,10 @@ ts-mysql-migrate@^1.0.2:
"@types/mysql" "^2.15.8"
mysql "^2.18.1"
-ts-node@^10.9.1:
- version "10.9.1"
- resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
- integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
+ts-node@^10.9.2:
+ version "10.9.2"
+ resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
+ integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
dependencies:
"@cspotcode/source-map-support" "^0.8.0"
"@tsconfig/node10" "^1.0.7"
@@ -4888,6 +4947,13 @@ which@^2.0.1:
dependencies:
isexe "^2.0.0"
+wkx@^0.5.0:
+ version "0.5.0"
+ resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.5.0.tgz#c6c37019acf40e517cc6b94657a25a3d4aa33e8c"
+ integrity sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==
+ dependencies:
+ "@types/node" "*"
+
word-wrap@^1.2.3, word-wrap@~1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
diff --git a/dlt-connector/.env.dist b/dlt-connector/.env.dist
index 1247ac3ec..50e9fe8e1 100644
--- a/dlt-connector/.env.dist
+++ b/dlt-connector/.env.dist
@@ -1,4 +1,4 @@
-CONFIG_VERSION=v4.2023-09-12
+CONFIG_VERSION=v6.2024-02-20
# SET LOG LEVEL AS NEEDED IN YOUR .ENV
# POSSIBLE VALUES: all | trace | debug | info | warn | error | fatal
@@ -19,4 +19,8 @@ DB_DATABASE_TEST=gradido_dlt_test
TYPEORM_LOGGING_RELATIVE_PATH=typeorm.backend.log
# DLT-Connector
-DLT_CONNECTOR_PORT=6010
\ No newline at end of file
+DLT_CONNECTOR_PORT=6010
+
+# Route to Backend
+BACKEND_SERVER_URL=http://localhost:4000
+JWT_SECRET=secret123
\ No newline at end of file
diff --git a/dlt-connector/.env.template b/dlt-connector/.env.template
index e3793f642..2e123ca81 100644
--- a/dlt-connector/.env.template
+++ b/dlt-connector/.env.template
@@ -1,5 +1,7 @@
CONFIG_VERSION=$DLT_CONNECTOR_CONFIG_VERSION
+JWT_SECRET=$JWT_SECRET
+
#IOTA
IOTA_API_URL=$IOTA_API_URL
IOTA_COMMUNITY_ALIAS=$IOTA_COMMUNITY_ALIAS
@@ -15,4 +17,7 @@ DB_DATABASE_TEST=$DB_DATABASE_TEST
TYPEORM_LOGGING_RELATIVE_PATH=typeorm.backend.log
# DLT-Connector
-DLT_CONNECTOR_PORT=$DLT_CONNECTOR_PORT
\ No newline at end of file
+DLT_CONNECTOR_PORT=$DLT_CONNECTOR_PORT
+
+# Route to Backend
+BACKEND_SERVER_URL=http://localhost:4000
\ No newline at end of file
diff --git a/dlt-connector/jest.config.js b/dlt-connector/jest.config.js
index 3d731787f..9b5a01350 100644
--- a/dlt-connector/jest.config.js
+++ b/dlt-connector/jest.config.js
@@ -6,7 +6,7 @@ module.exports = {
collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!src/seeds/**', '!build/**'],
coverageThreshold: {
global: {
- lines: 75,
+ lines: 72,
},
},
setupFiles: ['/test/testSetup.ts'],
diff --git a/dlt-connector/package.json b/dlt-connector/package.json
index 3d0685d6e..4edc4842b 100644
--- a/dlt-connector/package.json
+++ b/dlt-connector/package.json
@@ -1,6 +1,6 @@
{
"name": "gradido-dlt-connector",
- "version": "2.2.0",
+ "version": "2.5.1",
"description": "Gradido DLT-Connector",
"main": "src/index.ts",
"repository": "https://github.com/gradido/gradido/",
@@ -31,8 +31,10 @@
"express": "4.17.1",
"express-slow-down": "^2.0.1",
"graphql": "^16.7.1",
+ "graphql-request": "^6.1.0",
"graphql-scalars": "^1.22.2",
"helmet": "^7.1.0",
+ "jose": "^5.2.2",
"log4js": "^6.7.1",
"nodemon": "^2.0.20",
"protobufjs": "^7.2.5",
diff --git a/dlt-connector/src/client/BackendClient.ts b/dlt-connector/src/client/BackendClient.ts
new file mode 100644
index 000000000..77356f5d8
--- /dev/null
+++ b/dlt-connector/src/client/BackendClient.ts
@@ -0,0 +1,105 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+import { gql, GraphQLClient } from 'graphql-request'
+import { SignJWT } from 'jose'
+
+import { CONFIG } from '@/config'
+import { CommunityDraft } from '@/graphql/input/CommunityDraft'
+import { logger } from '@/logging/logger'
+import { LogError } from '@/server/LogError'
+
+const homeCommunity = gql`
+ query {
+ homeCommunity {
+ uuid
+ foreign
+ creationDate
+ }
+ }
+`
+interface Community {
+ homeCommunity: {
+ uuid: string
+ foreign: boolean
+ creationDate: string
+ }
+}
+// Source: https://refactoring.guru/design-patterns/singleton/typescript/example
+// and ../federation/client/FederationClientFactory.ts
+/**
+ * A Singleton class defines the `getInstance` method that lets clients access
+ * the unique singleton instance.
+ */
+// eslint-disable-next-line @typescript-eslint/no-extraneous-class
+export class BackendClient {
+ // eslint-disable-next-line no-use-before-define
+ private static instance: BackendClient
+ client: GraphQLClient
+ /**
+ * The Singleton's constructor should always be private to prevent direct
+ * construction calls with the `new` operator.
+ */
+ // eslint-disable-next-line no-useless-constructor, @typescript-eslint/no-empty-function
+ private constructor() {}
+
+ /**
+ * The static method that controls the access to the singleton instance.
+ *
+ * This implementation let you subclass the Singleton class while keeping
+ * just one instance of each subclass around.
+ */
+ public static getInstance(): BackendClient | undefined {
+ if (!BackendClient.instance) {
+ BackendClient.instance = new BackendClient()
+ }
+ if (!BackendClient.instance.client) {
+ try {
+ BackendClient.instance.client = new GraphQLClient(CONFIG.BACKEND_SERVER_URL, {
+ headers: {
+ 'content-type': 'application/json',
+ },
+ method: 'GET',
+ jsonSerializer: {
+ parse: JSON.parse,
+ stringify: JSON.stringify,
+ },
+ })
+ } catch (e) {
+ logger.error("couldn't connect to backend: ", e)
+ return
+ }
+ }
+ return BackendClient.instance
+ }
+
+ public async getHomeCommunityDraft(): Promise {
+ logger.info('check home community on backend')
+ const { data, errors } = await this.client.rawRequest(
+ homeCommunity,
+ {},
+ {
+ authorization: 'Bearer ' + (await this.createJWTToken()),
+ },
+ )
+ if (errors) {
+ throw new LogError('error getting home community from backend', errors)
+ }
+ const communityDraft = new CommunityDraft()
+ communityDraft.uuid = data.homeCommunity.uuid
+ communityDraft.foreign = data.homeCommunity.foreign
+ communityDraft.createdAt = data.homeCommunity.creationDate
+ return communityDraft
+ }
+
+ private async createJWTToken(): Promise {
+ const secret = new TextEncoder().encode(CONFIG.JWT_SECRET)
+ const token = await new SignJWT({ gradidoID: 'dlt-connector', 'urn:gradido:claim': true })
+ .setProtectedHeader({ alg: 'HS256' })
+ .setIssuedAt()
+ .setIssuer('urn:gradido:issuer')
+ .setAudience('urn:gradido:audience')
+ .setExpirationTime('1m')
+ .sign(secret)
+ return token
+ }
+}
diff --git a/dlt-connector/src/config/index.ts b/dlt-connector/src/config/index.ts
index db26d9f37..6b4fdae9a 100644
--- a/dlt-connector/src/config/index.ts
+++ b/dlt-connector/src/config/index.ts
@@ -9,13 +9,14 @@ const constants = {
LOG_LEVEL: process.env.LOG_LEVEL ?? 'info',
CONFIG_VERSION: {
DEFAULT: 'DEFAULT',
- EXPECTED: 'v4.2023-09-12',
+ EXPECTED: 'v6.2024-02-20',
CURRENT: '',
},
}
const server = {
PRODUCTION: process.env.NODE_ENV === 'production' ?? false,
+ JWT_SECRET: process.env.JWT_SECRET ?? 'secret123',
}
const database = {
@@ -38,6 +39,10 @@ const dltConnector = {
DLT_CONNECTOR_PORT: process.env.DLT_CONNECTOR_PORT ?? 6010,
}
+const backendServer = {
+ BACKEND_SERVER_URL: process.env.BACKEND_SERVER_URL ?? 'http://backend:4000',
+}
+
// Check config version
constants.CONFIG_VERSION.CURRENT = process.env.CONFIG_VERSION ?? constants.CONFIG_VERSION.DEFAULT
if (
@@ -56,4 +61,5 @@ export const CONFIG = {
...database,
...iota,
...dltConnector,
+ ...backendServer,
}
diff --git a/dlt-connector/src/index.ts b/dlt-connector/src/index.ts
index 4e5ef9639..bfbff10c3 100644
--- a/dlt-connector/src/index.ts
+++ b/dlt-connector/src/index.ts
@@ -1,10 +1,42 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
+import 'reflect-metadata'
+
import { CONFIG } from '@/config'
+import { BackendClient } from './client/BackendClient'
+import { CommunityRepository } from './data/Community.repository'
import { Mnemonic } from './data/Mnemonic'
+import { CommunityDraft } from './graphql/input/CommunityDraft'
+import { AddCommunityContext } from './interactions/backendToDb/community/AddCommunity.context'
+import { logger } from './logging/logger'
import createServer from './server/createServer'
+import { LogError } from './server/LogError'
import { stopTransmitToIota, transmitToIota } from './tasks/transmitToIota'
+async function waitForServer(
+ backend: BackendClient,
+ retryIntervalMs: number,
+ maxRetries: number,
+): Promise {
+ let retries = 0
+ while (retries < maxRetries) {
+ logger.info(`Attempt ${retries + 1} for connecting to backend`)
+
+ try {
+ // Make a HEAD request to the server
+ return await backend.getHomeCommunityDraft()
+ } catch (error) {
+ logger.info('Server is not reachable: ', error)
+ }
+
+ // Server is not reachable, wait and retry
+ await new Promise((resolve) => setTimeout(resolve, retryIntervalMs))
+ retries++
+ }
+
+ throw new LogError('Max retries exceeded. Server did not become reachable.')
+}
+
async function main() {
if (CONFIG.IOTA_HOME_COMMUNITY_SEED) {
Mnemonic.validateSeed(CONFIG.IOTA_HOME_COMMUNITY_SEED)
@@ -13,6 +45,22 @@ async function main() {
console.log(`DLT_CONNECTOR_PORT=${CONFIG.DLT_CONNECTOR_PORT}`)
const { app } = await createServer()
+ // ask backend for home community if we haven't one
+ try {
+ await CommunityRepository.loadHomeCommunityKeyPair()
+ } catch (e) {
+ const backend = BackendClient.getInstance()
+ if (!backend) {
+ throw new LogError('cannot create backend client')
+ }
+ // wait for backend server to be ready
+ await waitForServer(backend, 2500, 10)
+
+ const communityDraft = await backend.getHomeCommunityDraft()
+ const addCommunityContext = new AddCommunityContext(communityDraft)
+ await addCommunityContext.run()
+ }
+
// loop run all the time, check for new transaction for sending to iota
void transmitToIota()
app.listen(CONFIG.DLT_CONNECTOR_PORT, () => {
diff --git a/dlt-connector/src/interactions/backendToDb/community/HomeCommunity.role.ts b/dlt-connector/src/interactions/backendToDb/community/HomeCommunity.role.ts
index 647c5d397..5d7bec94c 100644
--- a/dlt-connector/src/interactions/backendToDb/community/HomeCommunity.role.ts
+++ b/dlt-connector/src/interactions/backendToDb/community/HomeCommunity.role.ts
@@ -12,6 +12,7 @@ import { TransactionError } from '@/graphql/model/TransactionError'
import { CommunityLoggingView } from '@/logging/CommunityLogging.view'
import { logger } from '@/logging/logger'
import { InterruptiveSleepManager } from '@/manager/InterruptiveSleepManager'
+import { LogError } from '@/server/LogError'
import { getDataSource } from '@/typeorm/DataSource'
import { CreateTransactionRecipeContext } from '../transaction/CreateTransationRecipe.context'
@@ -24,7 +25,19 @@ export class HomeCommunityRole extends CommunityRole {
public async create(communityDraft: CommunityDraft, topic: string): Promise {
super.create(communityDraft, topic)
// generate key pair for signing transactions and deriving all keys for community
- const keyPair = new KeyPair(new Mnemonic(CONFIG.IOTA_HOME_COMMUNITY_SEED ?? undefined))
+ let mnemonic: Mnemonic
+ try {
+ mnemonic = new Mnemonic(CONFIG.IOTA_HOME_COMMUNITY_SEED ?? undefined)
+ } catch (e) {
+ throw new LogError(
+ 'error creating mnemonic for home community, please fill IOTA_HOME_COMMUNITY_SEED in .env',
+ {
+ IOTA_HOME_COMMUNITY_SEED: CONFIG.IOTA_HOME_COMMUNITY_SEED,
+ error: e,
+ },
+ )
+ }
+ const keyPair = new KeyPair(mnemonic)
keyPair.fillInCommunityKeys(this.self)
// create auf account and gmw account
diff --git a/dlt-connector/yarn.lock b/dlt-connector/yarn.lock
index 7f46d88bc..3188c39a0 100644
--- a/dlt-connector/yarn.lock
+++ b/dlt-connector/yarn.lock
@@ -569,7 +569,7 @@
"@graphql-typed-document-node/core" "^3.1.1"
tslib "^2.4.0"
-"@graphql-typed-document-node/core@^3.1.1":
+"@graphql-typed-document-node/core@^3.1.1", "@graphql-typed-document-node/core@^3.2.0":
version "3.2.0"
resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861"
integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==
@@ -2119,6 +2119,13 @@ cross-env@^7.0.3:
dependencies:
cross-spawn "^7.0.1"
+cross-fetch@^3.1.5:
+ version "3.1.8"
+ resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.8.tgz#0327eba65fd68a7d119f8fb2bf9334a1a7956f82"
+ integrity sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==
+ dependencies:
+ node-fetch "^2.6.12"
+
cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -3329,6 +3336,14 @@ graphql-query-complexity@^0.12.0:
dependencies:
lodash.get "^4.4.2"
+graphql-request@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-6.1.0.tgz#f4eb2107967af3c7a5907eb3131c671eac89be4f"
+ integrity sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw==
+ dependencies:
+ "@graphql-typed-document-node/core" "^3.2.0"
+ cross-fetch "^3.1.5"
+
graphql-scalars@^1.22.2:
version "1.22.2"
resolved "https://registry.yarnpkg.com/graphql-scalars/-/graphql-scalars-1.22.2.tgz#6326e6fe2d0ad4228a9fea72a977e2bf26b86362"
@@ -4266,6 +4281,11 @@ jiti@^1.19.3:
resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.20.0.tgz#2d823b5852ee8963585c8dd8b7992ffc1ae83b42"
integrity sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==
+jose@^5.2.2:
+ version "5.2.2"
+ resolved "https://registry.yarnpkg.com/jose/-/jose-5.2.2.tgz#b91170e9ba6dbe609b0c0a86568f9a1fbe4335c0"
+ integrity sha512-/WByRr4jDcsKlvMd1dRJnPfS1GVO3WuKyaurJ/vvXcOaUQO8rnNObCQMlv/5uCceVQIq5Q4WLF44ohsdiTohdg==
+
js-tokens@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -4775,7 +4795,7 @@ node-abort-controller@^3.1.1:
resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548"
integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==
-node-fetch@^2.6.7:
+node-fetch@^2.6.12, node-fetch@^2.6.7:
version "2.7.0"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
diff --git a/dlt-database/migrations/0004-fix_spelling.ts b/dlt-database/migrations/0004-fix_spelling.ts
index 3b2153a7d..1507ab590 100644
--- a/dlt-database/migrations/0004-fix_spelling.ts
+++ b/dlt-database/migrations/0004-fix_spelling.ts
@@ -1,7 +1,7 @@
export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) {
await queryFn(`
ALTER TABLE \`transactions\`
- RENAME COLUMN \`paring_transaction_id\` TO \`pairing_transaction_id\`,
+ RENAME COLUMN \`paring_transaction_id\` TO \`pairing_transaction_id\`
;
`)
}
@@ -9,7 +9,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) {
await queryFn(`
ALTER TABLE \`transactions\`
- RENAME COLUMN \`pairing_transaction_id\` TO \`paring_transaction_id\`,
+ RENAME COLUMN \`pairing_transaction_id\` TO \`paring_transaction_id\`
;
`)
}
diff --git a/docker-compose.apple-m1.override.yml b/docker-compose.apple-m1.override.yml
index 585a4555e..888bb551e 100644
--- a/docker-compose.apple-m1.override.yml
+++ b/docker-compose.apple-m1.override.yml
@@ -3,8 +3,6 @@
# To use it it is required to explicitly define if you want to build with it:
# > docker-compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.apple-m1.override.yml up
-version: "3.4"
-
services:
########################################################
# FRONTEND #############################################
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 08e02f1d7..e8c2d4d90 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,5 +1,3 @@
-version: "3.4"
-
services:
########################################################
@@ -11,7 +9,7 @@ services:
build:
target: development
environment:
- - NODE_ENV="development"
+ - NODE_ENV=development
# - DEBUG=true
volumes:
# This makes sure the docker container has its own node modules.
@@ -29,7 +27,7 @@ services:
build:
target: development
environment:
- - NODE_ENV="development"
+ - NODE_ENV=development
# - DEBUG=true
volumes:
# This makes sure the docker container has its own node modules.
@@ -57,9 +55,12 @@ services:
- backend_node_modules:/app/node_modules
- backend_database_node_modules:/database/node_modules
- backend_database_build:/database/build
+ - backend_config_node_modules:/config/node_modules
+ - backend_config_build:/config/build
# bind the local folder to the docker to allow live reload
- ./backend:/app
- ./database:/database
+ - ./config:/config
########################################################
# DHT-NODE #############################################
@@ -80,9 +81,12 @@ services:
- dht_node_modules:/app/node_modules
- dht_database_node_modules:/database/node_modules
- dht_database_build:/database/build
+ - dht_config_node_modules:/config/node_modules
+ - dht_config_build:/config/build
# bind the local folder to the docker to allow live reload
- ./dht-node:/app
- ./database:/database
+ - ./config:/config
########################################################
# DLT-CONNECTOR ########################################
@@ -124,9 +128,12 @@ services:
- federation_node_modules:/app/node_modules
- federation_database_node_modules:/database/node_modules
- federation_database_build:/database/build
+ - federation_config_node_modules:/config/node_modules
+ - federation_config_build:/config/build
# bind the local folder to the docker to allow live reload
- ./federation:/app
- ./database:/database
+ - ./config:/config
########################################################
# DATABASE ##############################################
@@ -218,13 +225,19 @@ volumes:
backend_node_modules:
backend_database_node_modules:
backend_database_build:
+ backend_config_node_modules:
+ backend_config_build:
dht_node_modules:
dht_database_node_modules:
dht_database_build:
+ dht_config_node_modules:
+ dht_config_build:
dlt_connector_modules:
federation_node_modules:
federation_database_node_modules:
federation_database_build:
+ federation_config_node_modules:
+ federation_config_build:
database_node_modules:
database_build:
dlt-database_node_modules:
diff --git a/docker-compose.reset.yml b/docker-compose.reset.yml
new file mode 100644
index 000000000..13708bdef
--- /dev/null
+++ b/docker-compose.reset.yml
@@ -0,0 +1,70 @@
+# This file defines the production settings. It is overwritten by docker-compose.override.yml,
+# which defines the development settings. The override.yml is loaded by default. Therefore it
+# is required to explicitly define if you want an production build:
+# > docker-compose -f docker-compose.yml up
+
+services:
+
+
+
+ ########################################################
+ # DATABASE #############################################
+ ########################################################
+ database:
+ # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
+ image: gradido/database:local-production_reset
+ build:
+ context: ./database
+ target: production_reset
+ depends_on:
+ - mariadb
+ networks:
+ - internal-net
+ - external-net # this is required to fetch the packages
+ environment:
+ # Envs used in Dockerfile
+ # - DOCKER_WORKDIR="/app"
+ - BUILD_DATE
+ - BUILD_VERSION
+ - BUILD_COMMIT
+ - NODE_ENV="production"
+ - DB_HOST=mariadb
+ # Application only envs
+ #env_file:
+ # - ./frontend/.env
+
+ ########################################################
+ # DLT-DATABASE #############################################
+ ########################################################
+ dlt-database:
+ # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
+ image: gradido/dlt-database:local-production_reset
+ build:
+ context: ./dlt-database
+ target: production_reset
+ depends_on:
+ - mariadb
+ networks:
+ - internal-net
+ - external-net # this is required to fetch the packages
+ environment:
+ # Envs used in Dockerfile
+ # - DOCKER_WORKDIR="/app"
+ - BUILD_DATE
+ - BUILD_VERSION
+ - BUILD_COMMIT
+ - NODE_ENV="production"
+ - DB_HOST=mariadb
+ # Application only envs
+ #env_file:
+ # - ./frontend/.env
+
+
+networks:
+ external-net:
+ internal-net:
+ internal: true
+
+volumes:
+ db_vol:
+
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index ff6ed61b8..de631ed15 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,5 +1,3 @@
-version: "3.4"
-
services:
########################################################
# FRONTEND #############################################
@@ -9,7 +7,7 @@ services:
build:
target: test
environment:
- - NODE_ENV="test"
+ - NODE_ENV=test
########################################################
# ADMIN INTERFACE ######################################
@@ -19,7 +17,7 @@ services:
build:
target: test
environment:
- - NODE_ENV="test"
+ - NODE_ENV=test
########################################################
# BACKEND ##############################################
@@ -33,7 +31,7 @@ services:
- external-net
- internal-net
environment:
- - NODE_ENV="test"
+ - NODE_ENV=test
- DB_HOST=mariadb
########################################################
@@ -48,7 +46,7 @@ services:
- external-net
- internal-net
environment:
- - NODE_ENV="test"
+ - NODE_ENV="test
- DB_HOST=mariadb
########################################################
@@ -63,7 +61,7 @@ services:
- external-net
- internal-net
environment:
- - NODE_ENV="test"
+ - NODE_ENV=test
- DB_HOST=mariadb
########################################################
@@ -75,7 +73,7 @@ services:
context: ./database
target: test_up
environment:
- - NODE_ENV="test"
+ - NODE_ENV=test
# restart: always # this is very dangerous, but worth a test for the delayed mariadb startup at first run
########################################################
@@ -87,14 +85,13 @@ services:
context: ./dlt-database
target: test_up
environment:
- - NODE_ENV="test"
+ - NODE_ENV=test
# restart: always # this is very dangerous, but worth a test for the delayed mariadb startup at first run
#########################################################
## MARIADB ##############################################
#########################################################
mariadb:
- image: gradido/mariadb:test
networks:
- internal-net
- external-net
diff --git a/docker-compose.yml b/docker-compose.yml
index 4243956c4..88fc3bbcf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,7 @@
# This file defines the production settings. It is overwritten by docker-compose.override.yml,
# which defines the development settings. The override.yml is loaded by default. Therefore it
# is required to explicitly define if you want an production build:
-# > docker-compose -f docker-compose.yml up
-
-version: "3.4"
+# > docker-compose -f docker-compose.yml up
services:
@@ -14,7 +12,8 @@ services:
# name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
image: gradido/frontend:local-production
build:
- context: ./frontend
+ context: ./
+ dockerfile: ./frontend/Dockerfile
target: production
networks:
- external-net
@@ -28,7 +27,9 @@ services:
# - BUILD_DATE="1970-01-01T00:00:00.00Z"
# - BUILD_VERSION="0.0.0.0"
# - BUILD_COMMIT="0000000"
- - NODE_ENV="production"
+ - NODE_ENV=production
+ volumes:
+ - ./config:/config
# env_file:
# - ./.env
# - ./frontend/.env
@@ -40,7 +41,8 @@ services:
# name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
image: gradido/admin:local-production
build:
- context: ./admin
+ context: ./
+ dockerfile: ./admin/Dockerfile
target: production
networks:
- external-net
@@ -54,7 +56,9 @@ services:
# - BUILD_DATE="1970-01-01T00:00:00.00Z"
# - BUILD_VERSION="0.0.0.0"
# - BUILD_COMMIT="0000000"
- - NODE_ENV="production"
+ - NODE_ENV=production
+ volumes:
+ - ./config:/config
# env_file:
# - ./.env
# - ./admin/.env
@@ -63,19 +67,17 @@ services:
## MARIADB ##############################################
#########################################################
mariadb:
- build:
- context: ./mariadb
- target: mariadb_server
+ image: mariadb:10.11.6
environment:
- MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1
- MARIADB_USER=root
- networks:
+ networks:
- internal-net
- ports:
+ ports:
- 3306:3306
- volumes:
+ volumes:
- db_vol:/var/lib/mysql
-
+
########################################################
# BACKEND ##############################################
########################################################
@@ -94,7 +96,6 @@ services:
- 4000:4000
depends_on:
- mariadb
- restart: always
environment:
# Envs used in Dockerfile
# - DOCKER_WORKDIR="/app"
@@ -130,7 +131,6 @@ services:
# - 5000:5000
depends_on:
- mariadb
- restart: always
environment:
# Envs used in Dockerfile
# - DOCKER_WORKDIR="/app"
@@ -164,7 +164,6 @@ services:
- external-net
ports:
- 6010:6010
- restart: always
environment:
# Envs used in Dockerfile
# - DOCKER_WORKDIR="/app"
@@ -198,7 +197,6 @@ services:
- 5010:5010
depends_on:
- mariadb
- restart: always
environment:
# Envs used in Dockerfile
# - DOCKER_WORKDIR="/app"
@@ -266,12 +264,12 @@ services:
# Application only envs
#env_file:
# - ./frontend/.env
-
+
#########################################################
## NGINX ################################################
#########################################################
nginx:
- build:
+ build:
context: ./nginx/
networks:
- external-net
@@ -279,17 +277,17 @@ services:
depends_on:
- frontend
- backend
- - admin
+ - admin
ports:
- 80:80
- volumes:
- - ./logs/nginx:/var/log/nginx
-
+ volumes:
+ - ./logs/nginx:/var/log/nginx
+
networks:
external-net:
internal-net:
internal: true
volumes:
- db_vol:
-
+ db_vol:
+
diff --git a/docu/Concepts/TechnicalRequirements/UC_publish_user_to_GMS.md b/docu/Concepts/TechnicalRequirements/UC_publish_user_to_GMS.md
index 409534748..6abfdaaa6 100644
--- a/docu/Concepts/TechnicalRequirements/UC_publish_user_to_GMS.md
+++ b/docu/Concepts/TechnicalRequirements/UC_publish_user_to_GMS.md
@@ -275,28 +275,45 @@ It contains a map-component of the leaflet library and offers to capture the use
There is no user-specific authentication nor autorization necessary for this dialog as mentioned above.
-### GMS user playground dialog (gms efforts)
+### GMS user playground dialog
As described in the chapter "User search" above, we need a dialog in GMS to display in a graphical map:
* the location of the user as a red needle, who opens the user search-dialog
* the location of his community as a circle, the invoker belongs to
-* the locations of all other users as white needles, belonging to the same community
+* the locations of all other users belonging to the same community as white/gray or black needles - depending on the location-type of the user
* circles and needles of all other communities and users, which are nearby the requesting user and community location
-There is no user-specific authentication nor autorization necessary for this dialog as mentioned above.
+On activation of the menu-entry _user-search_ a technical flow in the background have to prepare the connection between the gradido-system and the gms-component. The following list will describe the necessary steps of all involved components:
-Which (filter-)components this playground-dialog should have next to the graphical location map is not clear at the moment. In the first run to display the above mentioned locations of users and communities with circles and needles will be sufficient.
+* **gradido-frontend:** user press the menu entry _user search_
+* **(1.a) gradido-frontend:** invokes the gradido-backend `authUserForGmsUserSearch`
+* **(1.b) gradido-backend:** the method `authUserForGmsUserSearch` reads the context-user of the current request and the uuid of the user's home-community. With these values it prepares the parameters for invokation of the `gms.verifyAuthToken` method. The first parameter is set by the `community-uuid` and the second parameter is a JWT-token with the encrypted `user-uuid` in the payload and signed by the community's privateKey
+* **(2.a) gradido-backend:** invokes the `gms.verifyAuthToken` with community-uuid as 1st parameter and JWT-Token as 2nd parameter
+* **(2.b) gms-backend:** recieving the request `verifyAuthToken` with the community-uuid and the JWT-token. After searching and verifing the given community-uuid exists in gms, it prepares the invokation of the configured endpoint `community-Auth-Url` of this community by sending the given JWT-token as parameter back to gradido.
+* **(3.a) gms-backend:** invokes the endpoint configured in `gms.community-auth-url` with the previous received JWT-token
+* **(3.b) gradido-backend:** receives the request at the endpoint "communityAuthUrl" with the previously sent JWT-token. The JWT-token will be verified if the signature is valid and afterwards the payload is decrypted to verify the contained user-data will match with the current context-user of request (1).
+* **(4.a) gradido-backend:** in case of valid JWT-token signature and valid payload data the gradido-backend returns TRUE as result of the authentication-request otherwise FALSE.
+* **(4.b) gms-backend:** receives the response of request (3) and in case of TRUE the gms-backend prepares to return a complete URI including a _JWT-access-token_ to be used for entering the user-playground. *It will not return gms-data used for the user-playground as the current implementation of the api `verify-auth-token` do.* In case of FALSE prepare returning an authentication-error.
+* **(5.a) gms-backend:** returning the complete URI including a _JWT-access-token_ as response of request (2) or an authentication-error
+* **(5.b) gradido-backend:** receiving as response of request (2) a complete URI including a _JWT-access-token_ for entering the users-playground on gms or an authentication-error
+* **(6.a) gradido-backend:** returning the complete URI including a _JWT-access-token_ as response of request (1) or an expressive error message
+* **(6.b) gradido-frontend:** receiving the complete URI including a _JWT-access-token_ after activation of menu-entry "user-search" or an expressive error-message, which will end the _user search_-flow without requesting the gms-frontend (7).
+* **(7.a) gradido-frontend:** on opening a new browser-window the gradido-frontend uses the received URI with the _JWT-access-token_ to enter the gms user-playground
+* **(7.b) gms-frontend:** receiving the request for the user-playground with an _JWT-access-token_. After verifying the access-token the gms-frontend will read the data for the user given by the access-token and loads all necessary data to render the users playground
-The detailed requirements will come up as soon as we get some user expiriences and feedbacks.
+The following picture shows the logical flow and interaction between the involved components:
+
+
+
+
+The detailed requirements for the playground-dialog will come up as soon as we get some user expiriences and feedbacks.
### GMS Offer Capture dialog (gms efforts)
will come later...
-
-
### GMS Need Capture dialog (gms efforts)
will come later...
diff --git a/docu/Concepts/TechnicalRequirements/image/usecase-user_search.svg b/docu/Concepts/TechnicalRequirements/image/usecase-user_search.svg
new file mode 100644
index 000000000..7430ce4a8
--- /dev/null
+++ b/docu/Concepts/TechnicalRequirements/image/usecase-user_search.svg
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/e2e-tests/.nvmrc b/e2e-tests/.nvmrc
new file mode 100644
index 000000000..9dfdb2923
--- /dev/null
+++ b/e2e-tests/.nvmrc
@@ -0,0 +1 @@
+v19.5.0
\ No newline at end of file
diff --git a/e2e-tests/cypress.config.ts b/e2e-tests/cypress.config.ts
index fd6caa069..2fad72cab 100644
--- a/e2e-tests/cypress.config.ts
+++ b/e2e-tests/cypress.config.ts
@@ -35,7 +35,8 @@ export default defineConfig({
excludeSpecPattern: '*.js',
baseUrl: 'http://localhost:3000',
chromeWebSecurity: false,
- defaultCommandTimeout: 10000,
+ defaultCommandTimeout: 200000,
+ pageLoadTimeout: 240000,
supportFile: 'cypress/support/index.ts',
viewportHeight: 720,
viewportWidth: 1280,
diff --git a/e2e-tests/cypress/e2e/models/Toasts.ts b/e2e-tests/cypress/e2e/models/Toasts.ts
index efd5052fb..091d1ca19 100644
--- a/e2e-tests/cypress/e2e/models/Toasts.ts
+++ b/e2e-tests/cypress/e2e/models/Toasts.ts
@@ -2,9 +2,9 @@
export class Toasts {
// selectors
- toastSlot = '.b-toaster-slot'
- toastTypeSuccess = '.b-toast-success'
- toastTypeError = '.b-toast-danger'
+ toastSlot = '#__BVID__toaster-container'
+ toastTypeSuccess = '.toast.text-bg-success'
+ toastTypeError = '.toast.text-bg-danger'
toastTitle = '.gdd-toaster-title'
toastMessage = '.gdd-toaster-body'
}
diff --git a/e2e-tests/cypress/support/step_definitions/user_authentication_steps.ts b/e2e-tests/cypress/support/step_definitions/user_authentication_steps.ts
index 4b3b9cf16..f700be692 100644
--- a/e2e-tests/cypress/support/step_definitions/user_authentication_steps.ts
+++ b/e2e-tests/cypress/support/step_definitions/user_authentication_steps.ts
@@ -42,6 +42,7 @@ When('the user enters the e-mail address {string}', (email: string) => {
When('the user submits the e-mail form', () => {
forgotPasswordPage.submitEmail()
+ cy.get(forgotPasswordPage.successComponent).debug()
cy.get(forgotPasswordPage.successComponent).should('be.visible')
})
diff --git a/e2e-tests/cypress/support/step_definitions/user_profile_change_password_steps.ts b/e2e-tests/cypress/support/step_definitions/user_profile_change_password_steps.ts
index 84ffe46c6..0dc233a87 100644
--- a/e2e-tests/cypress/support/step_definitions/user_profile_change_password_steps.ts
+++ b/e2e-tests/cypress/support/step_definitions/user_profile_change_password_steps.ts
@@ -7,7 +7,6 @@ const profilePage = new ProfilePage()
When('the user opens the change password menu', () => {
cy.get(profilePage.openChangePassword).click()
cy.get(profilePage.newPasswordRepeatInput).should('be.visible')
- cy.get(profilePage.submitNewPasswordBtn).should('have.class','btn-light')
})
When('the user fills the password form with:', (table: DataTable) => {
diff --git a/e2e-tests/playwright/tests/global-setup.ts b/e2e-tests/playwright/tests/global-setup.ts
index 6f9dad9c4..1581a9aea 100644
--- a/e2e-tests/playwright/tests/global-setup.ts
+++ b/e2e-tests/playwright/tests/global-setup.ts
@@ -3,6 +3,8 @@ import { FullConfig } from '@playwright/test';
async function globalSetup(config: FullConfig) {
process.env.EMAIL = 'bibi@bloxberg.de';
process.env.PASSWORD = 'Aa12345_';
+ process.env.GMS_ACTIVE = false;
+ process.env.HUMHUB_ACTIVE = false;
}
export default globalSetup;
diff --git a/federation/.env.dist b/federation/.env.dist
index 42b3d05bf..2255436d5 100644
--- a/federation/.env.dist
+++ b/federation/.env.dist
@@ -1,5 +1,5 @@
# Database
-DB_HOST=localhost
+DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=gradido_community
DB_USER=root
diff --git a/federation/.env.template b/federation/.env.template
index 9a029c3d1..a4ac298ef 100644
--- a/federation/.env.template
+++ b/federation/.env.template
@@ -6,7 +6,7 @@ LOG_LEVEL=$LOG_LEVEL
GRAPHIQL=false
# Database
-DB_HOST=localhost
+DB_HOST=127.0.0.1
DB_PORT=3306
DB_USER=$DB_USER
DB_PASSWORD=$DB_PASSWORD
diff --git a/federation/.nvmrc b/federation/.nvmrc
index 02c4afe7d..5a0afb48b 100644
--- a/federation/.nvmrc
+++ b/federation/.nvmrc
@@ -1 +1 @@
-v18.7.0
\ No newline at end of file
+v18.20.7
\ No newline at end of file
diff --git a/federation/Dockerfile b/federation/Dockerfile
index 81b95010e..0227f8da7 100644
--- a/federation/Dockerfile
+++ b/federation/Dockerfile
@@ -1,7 +1,7 @@
##################################################################################
# BASE ###########################################################################
##################################################################################
-FROM node:18.7.0-alpine3.16 as base
+FROM node:18.20.7-alpine3.21 as base
# ENVs (available in production aswell, can be overwritten by commandline or env file)
## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame
@@ -44,6 +44,7 @@ RUN mkdir -p ${DOCKER_WORKDIR}
WORKDIR ${DOCKER_WORKDIR}
RUN mkdir -p /database
+RUN mkdir -p /config
##################################################################################
# DEVELOPMENT (Connected to the local environment, to reload on demand) ##########
@@ -56,7 +57,7 @@ FROM base as development
# Run command
# (for development we need to execute yarn install since the
# node_modules are on another volume and need updating)
-CMD /bin/sh -c "cd /database && yarn install && yarn build && cd /app && yarn install && yarn run dev"
+CMD /bin/sh -c "cd /database && yarn install && yarn build && cd /config && yarn install && cd /app && yarn install && yarn run dev"
##################################################################################
# BUILD (Does contain all files and is therefore bloated) ########################
@@ -67,6 +68,11 @@ FROM base as build
COPY ./federation/ ./
# Copy everything from database
COPY ./database/ ../database/
+# Copy everything from config
+COPY ./config/ ../config/
+
+# yarn install and build config
+RUN cd ../config && yarn install --production=false --frozen-lockfile --non-interactive && yarn run build
# yarn install federation
RUN yarn install --production=false --frozen-lockfile --non-interactive
@@ -96,9 +102,11 @@ FROM base as production
# Copy "binary"-files from build image
COPY --from=build ${DOCKER_WORKDIR}/build ./build
COPY --from=build ${DOCKER_WORKDIR}/../database/build ../database/build
+COPY --from=build ${DOCKER_WORKDIR}/../config/build ../config/build
# We also copy the node_modules express and serve-static for the run script
COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
COPY --from=build ${DOCKER_WORKDIR}/../database/node_modules ../database/node_modules
+COPY --from=build ${DOCKER_WORKDIR}/../config/node_modules ../config/node_modules
# Copy static files
# COPY --from=build ${DOCKER_WORKDIR}/public ./public
diff --git a/federation/jest.config.js b/federation/jest.config.js
index 42bac0002..17386f225 100644
--- a/federation/jest.config.js
+++ b/federation/jest.config.js
@@ -33,5 +33,10 @@ module.exports = {
process.env.NODE_ENV === 'development'
? '/../database/src/$1'
: '/../database/build/src/$1',
+ '@config/(.*)':
+ // eslint-disable-next-line n/no-process-env
+ process.env.NODE_ENV === 'development'
+ ? '/../config/src/$1'
+ : '/../config/build/$1',
},
}
diff --git a/federation/package.json b/federation/package.json
index fcfaa0e46..d54562abd 100644
--- a/federation/package.json
+++ b/federation/package.json
@@ -1,6 +1,6 @@
{
"name": "gradido-federation",
- "version": "2.2.0",
+ "version": "2.5.1",
"description": "Gradido federation module providing Gradido-Hub-Federation and versioned API for inter community communication",
"main": "src/index.ts",
"repository": "https://github.com/gradido/gradido/federation",
@@ -28,6 +28,7 @@
"graphql": "15.5.1",
"graphql-request": "5.0.0",
"helmet": "^7.1.0",
+ "joi": "^17.13.3",
"lodash.clonedeep": "^4.5.0",
"log4js": "^6.7.1",
"reflect-metadata": "^0.1.13",
@@ -38,6 +39,7 @@
"devDependencies": {
"@types/express": "4.17.12",
"@types/jest": "27.0.2",
+ "@types/joi": "^17.2.3",
"@types/lodash.clonedeep": "^4.5.6",
"@types/node": "^16.10.3",
"@types/sodium-native": "^2.3.5",
@@ -56,12 +58,13 @@
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-security": "^1.7.1",
"eslint-plugin-type-graphql": "^1.0.0",
+ "gradido-config": "../config",
"graphql-tag": "^2.12.6",
"jest": "^27.2.4",
"nodemon": "^2.0.7",
"prettier": "^2.8.7",
"ts-jest": "27.0.5",
- "ts-node": "^10.9.1",
+ "ts-node": "^10.9.2",
"tsconfig-paths": "^4.1.1",
"typescript": "^4.3.4"
},
diff --git a/federation/src/config/index.ts b/federation/src/config/index.ts
index ec6fdff26..6649e2ba3 100644
--- a/federation/src/config/index.ts
+++ b/federation/src/config/index.ts
@@ -1,7 +1,12 @@
// ATTENTION: DO NOT PUT ANY SECRETS IN HERE (or the .env)
import { Decimal } from 'decimal.js-light'
+import { latestDbVersion } from '@dbTools/config/detectLastDBVersion'
import dotenv from 'dotenv'
+import { validate } from '@config/index'
+
+import { schema } from './schema'
+
dotenv.config()
Decimal.set({
@@ -10,16 +15,11 @@ Decimal.set({
})
const constants = {
- DB_VERSION: '0082-introduce_gms_registration',
+ DB_VERSION: latestDbVersion,
DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
LOG4JS_CONFIG: 'log4js-config.json',
// default log level on production should be info
LOG_LEVEL: process.env.LOG_LEVEL ?? 'info',
- CONFIG_VERSION: {
- DEFAULT: 'DEFAULT',
- EXPECTED: 'v2.2023-08-24',
- CURRENT: '',
- },
}
const server = {
@@ -38,18 +38,6 @@ const database = {
TYPEORM_LOGGING_RELATIVE_PATH: process.env.TYPEORM_LOGGING_RELATIVE_PATH ?? 'typeorm.backend.log',
}
-// Check config version
-constants.CONFIG_VERSION.CURRENT = process.env.CONFIG_VERSION ?? constants.CONFIG_VERSION.DEFAULT
-if (
- ![constants.CONFIG_VERSION.EXPECTED, constants.CONFIG_VERSION.DEFAULT].includes(
- constants.CONFIG_VERSION.CURRENT,
- )
-) {
- throw new Error(
- `Fatal: Config Version incorrect - expected "${constants.CONFIG_VERSION.EXPECTED}" or "${constants.CONFIG_VERSION.DEFAULT}", but found "${constants.CONFIG_VERSION.CURRENT}"`,
- )
-}
-
const COMMUNITY_HOST = process.env.COMMUNITY_HOST ?? 'localhost'
const URL_PROTOCOL = process.env.URL_PROTOCOL ?? 'http'
const COMMUNITY_URL = process.env.COMMUNITY_URL ?? `${URL_PROTOCOL}://${COMMUNITY_HOST}`
@@ -74,4 +62,6 @@ export const CONFIG = {
...federation,
}
+validate(schema, CONFIG)
+
export default CONFIG
diff --git a/federation/src/config/schema.ts b/federation/src/config/schema.ts
new file mode 100644
index 000000000..8aa54736b
--- /dev/null
+++ b/federation/src/config/schema.ts
@@ -0,0 +1,75 @@
+import {
+ DB_DATABASE,
+ DB_HOST,
+ DB_PASSWORD,
+ DB_PORT,
+ DB_USER,
+ DB_VERSION,
+ DECAY_START_TIME,
+ GRAPHIQL,
+ LOG4JS_CONFIG,
+ LOG_LEVEL,
+ NODE_ENV,
+ PRODUCTION,
+ TYPEORM_LOGGING_RELATIVE_PATH,
+} from '@config/commonSchema'
+import Joi from 'joi'
+
+export const schema = Joi.object({
+ DB_DATABASE,
+ DB_HOST,
+ DB_PASSWORD,
+ DB_PORT,
+ DB_USER,
+ DB_VERSION,
+ DECAY_START_TIME,
+ GRAPHIQL,
+ LOG4JS_CONFIG,
+ LOG_LEVEL,
+ NODE_ENV,
+ PRODUCTION,
+ TYPEORM_LOGGING_RELATIVE_PATH,
+
+ FEDERATION_API: Joi.string()
+ .valid('1_0', '1_1')
+ .default('1_0')
+ .description('Federation API version, defaults to 1_0')
+ .required(),
+
+ FEDERATION_PORT: Joi.number()
+ .integer()
+ .min(1024)
+ .max(49151)
+ .default(5010)
+ .description('Port number for the federation service, defaults to 5010')
+ .required(),
+
+ FEDERATION_COMMUNITY_URL: Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .default(Joi.ref('COMMUNITY_URL'))
+ .description('Community URL for federation, defaults to COMMUNITY_URL')
+ .required(),
+
+ FEDERATION_TRADING_LEVEL: Joi.object({
+ RECEIVER_COMMUNITY_URL: Joi.string()
+ .uri({ scheme: ['http', 'https'] })
+ .default('https://stage3.gradido.net/api/')
+ .description('URL of the receiver community for trading')
+ .required(),
+
+ SEND_COINS: Joi.boolean()
+ .default(true)
+ .description('Indicates if coins can be sent to the receiver community')
+ .required(),
+
+ AMOUNT: Joi.number()
+ .integer()
+ .min(1)
+ .default(100)
+ .description('Maximum amount of coins allowed for trading')
+ .required(),
+ })
+ .default()
+ .description('Trading level configuration for federation')
+ .optional(),
+})
diff --git a/federation/tsconfig.json b/federation/tsconfig.json
index 0f96e80e5..1a180f99f 100644
--- a/federation/tsconfig.json
+++ b/federation/tsconfig.json
@@ -61,7 +61,8 @@
"@typeorm/*": ["../backend/src/typeorm/*", "../../backend/src/typeorm/*"],
"@dbTools/*": ["../database/src/*", "../../database/build/src/*"],
"@entity/*": ["../database/entity/*", "../../database/build/entity/*"],
- "@logging/*": ["../database/logging/*", "../../database/build/logging/*"]
+ "@logging/*": ["../database/logging/*", "../../database/build/logging/*"],
+ "@config/*": ["../config/src/*", "../../config/build/src/*"]
},
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
"typeRoots": ["node_modules/@types"], /* List of folders to include type definitions from. */
@@ -90,6 +91,11 @@
"path": "../database/tsconfig.json",
// add 'prepend' if you want to include the referenced project in your output file
// "prepend": true
+ },
+ {
+ "path": "../config/tsconfig.json",
+ // add 'prepend' if you want to include the referenced project in your output file
+ // "prepend": true
}
]
}
diff --git a/federation/yarn.lock b/federation/yarn.lock
index 74cc04521..30b56b378 100644
--- a/federation/yarn.lock
+++ b/federation/yarn.lock
@@ -379,6 +379,18 @@
resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861"
integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==
+"@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0":
+ version "9.3.0"
+ resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
+ integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==
+
+"@hapi/topo@^5.1.0":
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012"
+ integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==
+ dependencies:
+ "@hapi/hoek" "^9.0.0"
+
"@humanwhocodes/config-array@^0.11.10":
version "0.11.10"
resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
@@ -722,6 +734,23 @@
resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
+"@sideway/address@^4.1.5":
+ version "4.1.5"
+ resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5"
+ integrity sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==
+ dependencies:
+ "@hapi/hoek" "^9.0.0"
+
+"@sideway/formula@^3.0.1":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
+ integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
+
+"@sideway/pinpoint@^2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
+ integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
+
"@sinonjs/commons@^1.7.0":
version "1.8.6"
resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9"
@@ -941,6 +970,13 @@
jest-diff "^27.0.0"
pretty-format "^27.0.0"
+"@types/joi@^17.2.3":
+ version "17.2.3"
+ resolved "https://registry.yarnpkg.com/@types/joi/-/joi-17.2.3.tgz#b7768ed9d84f1ebd393328b9f97c1cf3d2b94798"
+ integrity sha512-dGjs/lhrWOa+eO0HwgxCSnDm5eMGCsXuvLglMghJq32F6q5LyyNuXb41DHzrg501CKNOSSAHmfB7FDGeUnDmzw==
+ dependencies:
+ joi "*"
+
"@types/json-schema@^7.0.9":
version "7.0.12"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
@@ -3027,6 +3063,11 @@ graceful-fs@^4.2.4:
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+gradido-config@../config:
+ version "1.0.0"
+ dependencies:
+ joi "^17.13.3"
+
grapheme-splitter@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
@@ -3944,6 +3985,17 @@ jest@^27.2.4:
import-local "^3.0.2"
jest-cli "^27.5.1"
+joi@*, joi@^17.13.3:
+ version "17.13.3"
+ resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.3.tgz#0f5cc1169c999b30d344366d384b12d92558bcec"
+ integrity sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==
+ dependencies:
+ "@hapi/hoek" "^9.3.0"
+ "@hapi/topo" "^5.1.0"
+ "@sideway/address" "^4.1.5"
+ "@sideway/formula" "^3.0.1"
+ "@sideway/pinpoint" "^2.0.0"
+
js-tokens@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -5311,10 +5363,10 @@ ts-jest@27.0.5:
semver "7.x"
yargs-parser "20.x"
-ts-node@^10.9.1:
- version "10.9.1"
- resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
- integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
+ts-node@^10.9.2:
+ version "10.9.2"
+ resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
+ integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
dependencies:
"@cspotcode/source-map-support" "^0.8.0"
"@tsconfig/node10" "^1.0.7"
diff --git a/frontend/.env.dist b/frontend/.env.dist
index f7e7edcd6..817bbc5de 100644
--- a/frontend/.env.dist
+++ b/frontend/.env.dist
@@ -1,9 +1,6 @@
-# Environment
-DEFAULT_PUBLISHER_ID=2896
-
# Endpoints
GRAPHQL_PATH=/graphql
-ADMIN_AUTH_PATH=/admin/authenticate?token={token}
+ADMIN_AUTH_PATH=/admin/authenticate?token=
# Community
COMMUNITY_NAME=Gradido Entwicklung
@@ -21,3 +18,6 @@ META_DESCRIPTION_EN="Gratitude is the currency of the new age. More and more peo
META_KEYWORDS_DE="Grundeinkommen, Währung, Dankbarkeit, Schenk-Ökonomie, Natürliche Ökonomie des Lebens, Ökonomie, Ökologie, Potenzialentfaltung, Schenken und Danken, Kreislauf des Lebens, Geldsystem"
META_KEYWORDS_EN="Basic Income, Currency, Gratitude, Gift Economy, Natural Economy of Life, Economy, Ecology, Potential Development, Giving and Thanking, Cycle of Life, Monetary System"
META_AUTHOR="Bernd Hückstädt - Gradido-Akademie"
+
+GMS_ACTIVE=false
+HUMHUB_ACTIVE=false
diff --git a/frontend/.env.template b/frontend/.env.template
index c365ab8cf..9c51e03ca 100644
--- a/frontend/.env.template
+++ b/frontend/.env.template
@@ -1,8 +1,5 @@
CONFIG_VERSION=$FRONTEND_CONFIG_VERSION
-# Environment
-DEFAULT_PUBLISHER_ID=$DEFAULT_PUBLISHER_ID
-
# Endpoints
GRAPHQL_PATH=$GRAPHQL_PATH
ADMIN_AUTH_PATH=$ADMIN_AUTH_PATH
@@ -16,7 +13,7 @@ COMMUNITY_DESCRIPTION=$COMMUNITY_DESCRIPTION
COMMUNITY_SUPPORT_MAIL=$COMMUNITY_SUPPORT_MAIL
# Meta
-META_URL=$COMMUNITY_HOST
+META_URL=$URL_PROTOCOL://$COMMUNITY_HOST
META_TITLE_DE=$META_TITLE_DE
META_TITLE_EN=$META_TITLE_EN
META_DESCRIPTION_DE=$META_DESCRIPTION_DE
@@ -24,3 +21,6 @@ META_DESCRIPTION_EN=$META_DESCRIPTION_EN
META_KEYWORDS_DE=$META_KEYWORDS_DE
META_KEYWORDS_EN=$META_KEYWORDS_EN
META_AUTHOR=$META_AUTHOR
+
+GMS_ACTIVE=$GMS_ACTIVE
+HUMHUB_ACTIVE=$HUMHUB_ACTIVE
\ No newline at end of file
diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
index 80a0d2d22..74a82c45c 100644
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -3,19 +3,20 @@ module.exports = {
env: {
browser: true,
node: true,
- jest: true,
+ 'vue/setup-compiler-macros': true,
},
parserOptions: {
- parser: 'babel-eslint',
+ ecmaVersion: 2020,
},
extends: [
'standard',
- 'plugin:vue/essential',
+ 'plugin:vue/vue3-recommended',
'plugin:prettier/recommended',
'plugin:@intlify/vue-i18n/recommended',
+ 'prettier',
],
// required to lint *.vue files
- plugins: ['vue', 'prettier', 'jest'],
+ plugins: ['vue', 'prettier'],
overrides: [
{
files: ['*.json'],
@@ -30,14 +31,26 @@ module.exports = {
rules: {
'no-console': ['error'],
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+ 'no-useless-escape': 0,
+ 'no-unused-vars': 0, // TODO remove at the end of migration and fix
+ 'node/no-callback-literal': 0, // Necessary to run tests
'vue/component-name-in-template-casing': ['error', 'kebab-case'],
- 'vue/no-static-inline-styles': [
- 'error',
- {
- allowBinding: false,
- },
- ],
- '@intlify/vue-i18n/no-dynamic-keys': 'error',
+ // 'vue/no-static-inline-styles': [
+ // 'error',
+ // {
+ // allowBinding: false,
+ // },
+ // ],
+ 'vue/multi-word-component-names': 0,
+ 'vue/no-v-html': 0,
+ 'vue/no-export-in-script-setup': 0, // TODO remove at the end of migration and fix
+ 'vue/prop-name-casing': 0, // TODO remove at the end of migration and fix
+ 'vue/require-explicit-emits': 0, // TODO remove at the end of migration and fix
+ 'vue/no-static-inline-styles': 0, // TODO remove at the end of migration and fix
+ 'vue/v-on-event-hyphenation': 0, // TODO remove at the end of migration and fix
+ 'vue/require-default-prop': 0, // TODO remove at the end of migration and fix
+ 'vue/no-computed-properties-in-data': 0, // TODO remove at the end of migration and fix
+ '@intlify/vue-i18n/no-missing-keys': 0, // TODO remove at the end of migration and fix
'@intlify/vue-i18n/no-unused-keys': [
'error',
{
@@ -75,7 +88,7 @@ module.exports = {
localeDir: './src/locales/{en,de}.json',
// Specify the version of `vue-i18n` you are using.
// If not specified, the message will be parsed twice.
- messageSyntaxVersion: '^8.22.4',
+ messageSyntaxVersion: '^9.13.1',
},
},
}
diff --git a/frontend/.gitignore b/frontend/.gitignore
index 843f840a1..b527252d0 100644
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -1,7 +1,11 @@
.DS_Store
node_modules/
build/
+src/assets/css/gradido.css
+src/assets/css/gradido.css.map
.cache/
+.yarn/install-state.gz
+
npm-debug.log*
yarn-debug.log*
yarn-error.log*
@@ -24,3 +28,5 @@ package-lock.json
coverage/
*~
+
+components.d.ts
diff --git a/frontend/.nvmrc b/frontend/.nvmrc
index 112a2eaed..6e50b5972 100644
--- a/frontend/.nvmrc
+++ b/frontend/.nvmrc
@@ -1 +1 @@
-lts/gallium
\ No newline at end of file
+v18.20
diff --git a/frontend/.postcssrc.js b/frontend/.postcssrc.js
deleted file mode 100644
index 373f665cb..000000000
--- a/frontend/.postcssrc.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// https://github.com/michael-ciniawsky/postcss-load-config
-
-module.exports = {
- plugins: {
- // to edit target browsers: use "browserslist" field in package.json
- autoprefixer: {}
- }
-};
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 4b21fd2ea..96d0106bb 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,7 +1,7 @@
##################################################################################
# BASE ###########################################################################
##################################################################################
-FROM node:16-alpine3.14 as base
+FROM node:18.20-alpine3.20 as base
# ENVs (available in production aswell, can be overwritten by commandline or env file)
## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame
@@ -11,7 +11,7 @@ ENV BUILD_DATE="1970-01-01T00:00:00.00Z"
## We cannot do $(npm run version).${BUILD_NUMBER} here so we default to 0.0.0.0
ENV BUILD_VERSION="0.0.0.0"
## We cannot do `$(git rev-parse --short HEAD)` here so we default to 0000000
-ENV BUILD_COMMIT="0000000"
+ENV BUILD_COMMIT_SHORT="0000000"
## SET NODE_ENV
ENV NODE_ENV="production"
## App relevant Envs
@@ -42,6 +42,8 @@ EXPOSE ${PORT}
RUN mkdir -p ${DOCKER_WORKDIR}
WORKDIR ${DOCKER_WORKDIR}
+RUN mkdir -p /config
+
##################################################################################
# DEVELOPMENT (Connected to the local environment, to reload on demand) ##########
##################################################################################
@@ -53,7 +55,7 @@ FROM base as development
# Run command
# (for development we need to execute npm install since the
# node_modules are on another volume and need updating)
-CMD /bin/sh -c "yarn install && yarn run dev"
+CMD /bin/sh -c "cd /config && yarn install && yarn build && cd /app && yarn install && yarn run dev"
##################################################################################
# BUILD (Does contain all files and is therefore bloated) ########################
@@ -61,9 +63,17 @@ CMD /bin/sh -c "yarn install && yarn run dev"
FROM base as build
# Copy everything
-COPY . .
+COPY ./frontend ./
+
+# Copy everything from config
+COPY ./config/ ../config/
+
+# install and build config
+RUN cd ../config && yarn install --production=false --frozen-lockfile --non-interactive && yarn build
+
# npm install
RUN yarn global add node-gyp && yarn install --production=false --frozen-lockfile --non-interactive
+
# npm build
RUN yarn run build
@@ -76,7 +86,7 @@ FROM build as test
RUN apk add --no-cache bash jq
# Run command
-CMD /bin/sh -c "yarn run dev"
+CMD /bin/sh -c "yarn run start"
##################################################################################
# PRODUCTION (Does contain only "binary"- and static-files to reduce image size) #
@@ -85,6 +95,7 @@ FROM base as production
# Copy "binary"-files from build image
COPY --from=build ${DOCKER_WORKDIR}/build ./build
+COPY --from=build ${DOCKER_WORKDIR}/../config/build ../config/build
# We also copy the node_modules express and serve-static for the run script
COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
# Copy static files
@@ -98,13 +109,13 @@ COPY --from=build ${DOCKER_WORKDIR}/run ./run
CMD /bin/sh -c "yarn run start"
-
+
## add `/usr/src/app/node_modules/.bin` to $PATH
#ENV PATH /usr/src/app/node_modules/.bin:$PATH
-#
+#
## install and cache app dependencies
#COPY package.json /usr/src/app/package.json
#RUN npm install
#RUN npm install -g @vue/cli
## start app
-#CMD ["npm", "run", "serve"]
\ No newline at end of file
+#CMD ["npm", "run", "serve"]
diff --git a/frontend/index.html b/frontend/index.html
new file mode 100644
index 000000000..22d3a550d
--- /dev/null
+++ b/frontend/index.html
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/jest.config.js b/frontend/jest.config.js
deleted file mode 100644
index 4c3e6ab73..000000000
--- a/frontend/jest.config.js
+++ /dev/null
@@ -1,32 +0,0 @@
-module.exports = {
- verbose: true,
- collectCoverage: true,
- collectCoverageFrom: ['src/**/*.{js,vue}', '!**/node_modules/**', '!**/?(*.)+(spec|test).js?(x)'],
- coverageThreshold: {
- global: {
- lines: 94,
- },
- },
- moduleFileExtensions: [
- 'js',
- // 'jsx',
- 'json',
- 'vue',
- ],
- moduleNameMapper: {
- '\\.(css|less)$': 'identity-obj-proxy',
- '\\.(scss)$': '/src/assets/mocks/styleMock.js',
- '^@/(.*)$': '/src/$1',
- '^@test/(.*)$': '/test/$1',
- },
- transform: {
- '^.+\\.vue$': 'vue-jest',
- '^.+\\.(js|jsx)?$': 'babel-jest',
- '/node_modules/vee-validate/dist/rules': 'babel-jest',
- },
- setupFiles: ['/test/testSetup.js', 'jest-canvas-mock'],
- testMatch: ['**/?(*.)+(spec|test).js?(x)'],
- // snapshotSerializers: ['jest-serializer-vue'],
- transformIgnorePatterns: ['/node_modules/(?!vee-validate/dist/rules)'],
- // testEnvironment: 'jest-environment-jsdom-sixteen', // not needed anymore since jest@26, see: https://www.npmjs.com/package/jest-environment-jsdom-sixteen
-}
diff --git a/frontend/package.json b/frontend/package.json
index 2a3eeb56a..24922b0f4 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,97 +1,121 @@
{
"name": "bootstrap-vue-gradido-wallet",
- "version": "2.2.0",
+ "version": "2.5.1",
"private": true,
"scripts": {
"start": "node run/server.js",
- "serve": "vue-cli-service serve --open",
- "build": "vue-cli-service build",
- "dev": "yarn run serve",
+ "dev": "concurrently \"yarn watch-scss\" \"vite\"",
+ "prebuild": "yarn compile-scss",
+ "build": "vite build",
+ "preserve": "yarn compile-scss",
+ "serve": "vite preview",
+ "postbuild": "find build -type f -regex '.*\\.\\(html\\|js\\|css\\|svg\\|json\\)' -exec gzip -9 -k {} +",
"analyse-bundle": "yarn build && webpack-bundle-analyzer build/webpack.stats.json",
"lint": "eslint --max-warnings=0 --ext .js,.vue,.json .",
"stylelint": "stylelint --max-warnings=0 '**/*.{scss,vue}'",
- "test": "cross-env TZ=UTC jest",
- "locales": "scripts/sort.sh"
+ "test": "cross-env TZ=UTC vitest run",
+ "test:coverage": "cross-env TZ=UTC vitest run --coverage",
+ "test:debug": "cross-env TZ=UTC node --inspect-brk ./node_modules/vitest/vitest.mjs",
+ "test:watch": "cross-env TZ=UTC vitest",
+ "locales": "scripts/sort.sh",
+ "compile-scss": "sass --load-path=node_modules --load-path=src/assets/scss src/assets/scss/gradido.scss src/assets/css/gradido.css",
+ "watch-scss": "sass --watch --load-path=node_modules --load-path=src/assets/scss src/assets/scss/gradido.scss src/assets/css/gradido.css"
},
"dependencies": {
"@babel/core": "^7.13.13",
"@babel/node": "^7.13.13",
"@babel/preset-env": "^7.13.12",
- "@vue/cli-plugin-unit-jest": "^4.5.12",
- "@vue/test-utils": "^1.1.3",
+ "@morev/vue-transitions": "^3.0.2",
+ "@types/leaflet": "^1.9.12",
+ "@vee-validate/i18n": "^4.14.7",
+ "@vee-validate/rules": "^4.14.1",
+ "@vee-validate/yup": "^4.14.1",
+ "@vitejs/plugin-vue": "5.1.4",
+ "@vue-leaflet/vue-leaflet": "^0.10.1",
+ "@vue/apollo-composable": "^4.0.2",
+ "@vue/apollo-option": "^4.0.0",
"apollo-boost": "^0.4.9",
+ "autoprefixer": "^10.4.19",
"babel-core": "^7.0.0-bridge.0",
- "babel-jest": "^27.3.1",
"babel-preset-vue": "^2.0.2",
- "bootstrap": "^4.5.3",
- "bootstrap-vue": "^2.21.2",
+ "bootstrap": "^5.3.3",
+ "bootstrap-vue-next": "0.26.8",
"clipboard-polyfill": "^4.0.0-rc1",
"date-fns": "^2.29.3",
"es6-promise": "^4.1.1",
- "eslint": "^7.25.0",
- "eslint-config-prettier": "^8.1.0",
- "eslint-config-standard": "^16.0.2",
- "eslint-loader": "^4.0.2",
- "eslint-plugin-import": "^2.22.1",
- "eslint-plugin-jest": "^24.3.2",
- "eslint-plugin-node": "^11.1.0",
- "eslint-plugin-prettier": "^3.3.1",
- "eslint-plugin-promise": "^4.3.1",
- "eslint-plugin-vue": "^7.8.0",
"express": "^4.17.1",
"flatpickr": "^4.5.7",
"flush-promises": "^1.0.2",
- "graphql": "^15.5.1",
+ "graphql": "^16.9.0",
+ "graphql-tag": "^2.12.6",
"identity-obj-proxy": "^3.0.0",
- "jest": "^26.6.3",
- "jest-canvas-mock": "^2.5.0",
"jwt-decode": "^3.1.2",
- "portal-vue": "^2.1.7",
- "prettier": "^2.2.1",
- "qrcanvas-vue": "2.1.1",
+ "leaflet": "^1.9.4",
+ "leaflet-geosearch": "^4.0.0",
+ "portal-vue": "^3.0.0",
+ "qrcanvas-vue": "3",
"regenerator-runtime": "^0.13.7",
+ "tua-body-scroll-lock": "^1.5.1",
"uuid": "^9.0.0",
- "vee-validate": "^3.4.5",
- "vue": "2.6.12",
- "vue-apollo": "^3.0.7",
- "vue-avatar": "^2.3.3",
+ "vee-validate": "^4.13.2",
+ "vite": "3.2.10",
+ "vite-plugin-commonjs": "^0.10.1",
+ "vue": "3.5.13",
+ "vue-apollo": "^3.1.2",
"vue-flatpickr-component": "^8.1.2",
- "vue-focus": "^2.1.0",
- "vue-i18n": "^8.22.4",
- "vue-jest": "^3.0.7",
- "vue-loading-overlay": "^3.4.2",
- "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"
+ "vue-i18n": "^9.13.1",
+ "vue-router": "^4.4.0",
+ "vue-timer-hook": "^1.0.84",
+ "vuex": "^4.1.0",
+ "vuex-persistedstate": "^4.1.0",
+ "yup": "^1.4.0"
},
"devDependencies": {
- "@apollo/client": "^3.7.4",
+ "@apollo/client": "^3.10.8",
+ "@iconify-json/arcticons": "^1.2.20",
+ "@iconify-json/bi": "^1.1.23",
+ "@iconify-json/fa": "^1.2.1",
+ "@iconify-json/humbleicons": "^1.2.6",
+ "@iconify-json/ion": "^1.2.2",
+ "@iconify-json/mdi": "^1.2.3",
"@intlify/eslint-plugin-vue-i18n": "^1.4.0",
- "@vue/cli-plugin-babel": "^3.7.0",
- "@vue/cli-plugin-eslint": "^3.7.0",
- "@vue/cli-service": "^3.7.0",
+ "@vitest/coverage-v8": "^2.0.5",
"@vue/eslint-config-prettier": "^4.0.1",
- "babel-eslint": "^10.1.0",
+ "@vue/test-utils": "^2.4.5",
"babel-plugin-component": "^1.1.0",
"babel-plugin-transform-require-context": "^0.1.1",
+ "concurrently": "^9.1.2",
"cross-env": "^7.0.3",
"dotenv-webpack": "^7.0.3",
+ "eslint": "8.57.0",
+ "eslint-config-prettier": "8.10.0",
+ "eslint-config-standard": "^16.0.3",
+ "eslint-loader": "^4.0.2",
+ "eslint-plugin-import": "^2.25.2",
+ "eslint-plugin-node": "^11.1.0",
+ "eslint-plugin-prettier": "5.2.1",
+ "eslint-plugin-promise": "^5.1.1",
+ "eslint-plugin-vitest": "^0.5.4",
+ "eslint-plugin-vue": "8.7.1",
+ "gradido-config": "file:../config",
+ "joi": "^17.13.3",
+ "jsdom": "^25.0.0",
"mock-apollo-client": "^1.2.1",
"postcss": "^8.4.8",
"postcss-html": "^1.3.0",
"postcss-scss": "^4.0.3",
- "sass": "1.32.13",
- "sass-loader": "^10",
- "stats-webpack-plugin": "^0.7.0",
- "stylelint": "^14.5.3",
- "stylelint-config-recommended-vue": "^1.3.0",
- "stylelint-config-standard-scss": "^3.0.0",
- "vue-cli-plugin-i18n": "^1.0.1",
- "vue-html-webpack-plugin": "^3.2.2",
- "vue-template-compiler": "^2.6.11",
- "webpack-bundle-analyzer": "^4.5.0"
+ "prettier": "^3.3.3",
+ "sass": "^1.83.4",
+ "stylelint": "16.7.0",
+ "stylelint-config-recommended-vue": "1.5.0",
+ "stylelint-config-standard-scss": "13.1.0",
+ "unplugin-icons": "^0.19.1",
+ "unplugin-vue-components": "^0.27.3",
+ "vite-plugin-environment": "^1.1.3",
+ "vite-plugin-graphql-loader": "^4.0.4",
+ "vite-plugin-html": "^3.2.2",
+ "vitest": "^2.0.5",
+ "vitest-canvas-mock": "^0.3.3"
},
"postcss": {
"plugins": {
@@ -110,5 +134,10 @@
"ignore": [
"**/*.spec.js"
]
+ },
+ "resolutions": {
+ "strip-ansi": "6.0.1",
+ "string-width": "4.2.2",
+ "wrap-ansi": "7.0.0"
}
}
diff --git a/frontend/public/img/brand/gradido-logo_200x59.png b/frontend/public/img/brand/gradido-logo_200x59.png
new file mode 100644
index 000000000..9467bf533
Binary files /dev/null and b/frontend/public/img/brand/gradido-logo_200x59.png differ
diff --git a/frontend/public/img/brand/gradido_coin_128x128.png b/frontend/public/img/brand/gradido_coin_128x128.png
new file mode 100644
index 000000000..71647ce36
Binary files /dev/null and b/frontend/public/img/brand/gradido_coin_128x128.png differ
diff --git a/frontend/public/img/svg/community.svg b/frontend/public/img/svg/community.svg
deleted file mode 100644
index 8f1cdbd61..000000000
--- a/frontend/public/img/svg/community.svg
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
diff --git a/frontend/public/img/svg/home.svg b/frontend/public/img/svg/home.svg
deleted file mode 100644
index 9122b7e68..000000000
--- a/frontend/public/img/svg/home.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
diff --git a/frontend/public/img/svg/info.svg b/frontend/public/img/svg/info.svg
deleted file mode 100644
index 0510a5b60..000000000
--- a/frontend/public/img/svg/info.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
diff --git a/frontend/public/img/svg/logout.svg b/frontend/public/img/svg/logout.svg
deleted file mode 100644
index a9826a5dd..000000000
--- a/frontend/public/img/svg/logout.svg
+++ /dev/null
@@ -1,162 +0,0 @@
-
-
-
diff --git a/frontend/public/img/svg/my_profil.svg b/frontend/public/img/svg/my_profil.svg
deleted file mode 100644
index ef41c2ef4..000000000
--- a/frontend/public/img/svg/my_profil.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
diff --git a/frontend/public/img/svg/qr-code.svg b/frontend/public/img/svg/qr-code.svg
deleted file mode 100644
index 3cbd987c4..000000000
--- a/frontend/public/img/svg/qr-code.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/frontend/public/img/svg/send.svg b/frontend/public/img/svg/send.svg
deleted file mode 100644
index 6f1d8dafa..000000000
--- a/frontend/public/img/svg/send.svg
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
diff --git a/frontend/public/img/svg/settings.svg b/frontend/public/img/svg/settings.svg
deleted file mode 100644
index 6966262f3..000000000
--- a/frontend/public/img/svg/settings.svg
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-
diff --git a/frontend/public/img/svg/transaction.svg b/frontend/public/img/svg/transaction.svg
deleted file mode 100644
index f7cb156ff..000000000
--- a/frontend/public/img/svg/transaction.svg
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
diff --git a/frontend/public/img/svg/usersearchmap.png b/frontend/public/img/svg/usersearchmap.png
new file mode 100644
index 000000000..4470b5e90
Binary files /dev/null and b/frontend/public/img/svg/usersearchmap.png differ
diff --git a/frontend/public/img/svg/usersearchmap2.png b/frontend/public/img/svg/usersearchmap2.png
new file mode 100644
index 000000000..919e36184
Binary files /dev/null and b/frontend/public/img/svg/usersearchmap2.png differ
diff --git a/frontend/public/img/svg/usersearchmap3.png b/frontend/public/img/svg/usersearchmap3.png
new file mode 100644
index 000000000..ad58dc5ea
Binary files /dev/null and b/frontend/public/img/svg/usersearchmap3.png differ
diff --git a/frontend/public/img/svg/usersearchmap4.jpg b/frontend/public/img/svg/usersearchmap4.jpg
new file mode 100644
index 000000000..f96fd69db
Binary files /dev/null and b/frontend/public/img/svg/usersearchmap4.jpg differ
diff --git a/frontend/public/img/svg/usersearchmap5.jpg b/frontend/public/img/svg/usersearchmap5.jpg
new file mode 100644
index 000000000..f59c396dd
Binary files /dev/null and b/frontend/public/img/svg/usersearchmap5.jpg differ
diff --git a/frontend/public/img/svg/usersearchmap6.jpg b/frontend/public/img/svg/usersearchmap6.jpg
new file mode 100644
index 000000000..a8b6ab1fa
Binary files /dev/null and b/frontend/public/img/svg/usersearchmap6.jpg differ
diff --git a/frontend/public/index.html b/frontend/public/index.html
deleted file mode 100644
index b9abe3876..000000000
--- a/frontend/public/index.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/run/server.js b/frontend/run/server.js
index 4a49dcd75..a459230b3 100644
--- a/frontend/run/server.js
+++ b/frontend/run/server.js
@@ -1,10 +1,15 @@
// Imports
+const dotenv = require('dotenv')
const express = require('express')
const path = require('path')
+dotenv.config() // load env vars from .env
+
+const CONFIG = require('../src/config')
+
// Host & Port
-const hostname = '127.0.0.1'
-const port = process.env.PORT || 3000
+const hostname = CONFIG.FRONTEND_MODULE_HOST
+const port = CONFIG.FRONTEND_MODULE_PORT
// Express Server
const app = express()
diff --git a/frontend/src/App.spec.js b/frontend/src/App.spec.js
index 3041cb40a..e04b483be 100644
--- a/frontend/src/App.spec.js
+++ b/frontend/src/App.spec.js
@@ -1,62 +1,76 @@
-import { shallowMount, RouterLinkStub } from '@vue/test-utils'
+import { shallowMount } from '@vue/test-utils'
+import { describe, it, expect, beforeEach } from 'vitest'
import App from './App'
+import DashboardLayout from '@/layouts/DashboardLayout'
+import AuthLayout from '@/layouts/AuthLayout'
-const localVue = global.localVue
-const mockStoreCommit = jest.fn()
+// Mock the store
+const createMockStore = (state = {}) => ({
+ state: {
+ darkMode: false,
+ ...state,
+ },
+})
-const stubs = {
- RouterLink: RouterLinkStub,
- RouterView: true,
-}
+// Mock the route
+const createMockRoute = (meta = {}) => ({
+ meta: {
+ requiresAuth: false,
+ ...meta,
+ },
+ params: {},
+})
describe('App', () => {
- const mocks = {
- $i18n: {
- locale: 'en',
- },
- $t: jest.fn((t) => t),
- $store: {
- commit: mockStoreCommit,
- state: {
- token: null,
- },
- },
- $route: {
- meta: {
- requiresAuth: false,
- },
- params: {},
- },
- }
-
let wrapper
- const Wrapper = () => {
- return shallowMount(App, { localVue, mocks, stubs })
+ const createWrapper = (options = {}) => {
+ return shallowMount(App, {
+ global: {
+ mocks: {
+ $store: createMockStore(options.state),
+ $route: createMockRoute(options.routeMeta),
+ },
+ stubs: {
+ BToastOrchestrator: true,
+ DashboardLayout: true,
+ AuthLayout: true,
+ },
+ },
+ })
}
- describe('mount', () => {
- beforeEach(() => {
- wrapper = Wrapper()
+ beforeEach(() => {
+ wrapper = createWrapper()
+ })
+
+ it('renders the App', () => {
+ expect(wrapper.find('#app').exists()).toBe(true)
+ })
+
+ it('renders AuthLayout when route does not require auth', () => {
+ expect(wrapper.findComponent(AuthLayout).exists()).toBe(true)
+ expect(wrapper.findComponent(DashboardLayout).exists()).toBe(false)
+ })
+
+ it('renders DashboardLayout when route requires auth', () => {
+ wrapper = createWrapper({
+ routeMeta: { requiresAuth: true },
})
- it('renders the App', () => {
- expect(wrapper.find('#app').exists()).toBe(true)
+ expect(wrapper.findComponent(DashboardLayout).exists()).toBe(true)
+ expect(wrapper.findComponent(AuthLayout).exists()).toBe(false)
+ })
+
+ it('applies dark mode class when darkMode is true', () => {
+ wrapper = createWrapper({
+ state: { darkMode: true },
})
- it('has a component AuthLayout', () => {
- expect(wrapper.findComponent({ name: 'AuthLayout' }).exists()).toBe(true)
- })
+ expect(wrapper.classes()).toContain('dark-mode')
+ })
- describe('route requires authorization', () => {
- beforeEach(async () => {
- mocks.$route.meta.requiresAuth = true
- wrapper = Wrapper()
- })
-
- it('has a component DashboardLayout', () => {
- expect(wrapper.findComponent({ name: 'DashboardLayout' }).exists()).toBe(true)
- })
- })
+ it('does not apply dark mode class when darkMode is false', () => {
+ expect(wrapper.classes('dark-mode')).toBe(false)
})
})
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 46f7dacb8..7ea051fe2 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,6 +1,7 @@
+
-
+
diff --git a/admin/src/components/EditCreationFormular.spec.js b/admin/src/components/EditCreationFormular.spec.js
index ee0458ba2..3a3b2955c 100644
--- a/admin/src/components/EditCreationFormular.spec.js
+++ b/admin/src/components/EditCreationFormular.spec.js
@@ -1,163 +1,156 @@
import { mount } from '@vue/test-utils'
-import EditCreationFormular from './EditCreationFormular'
-import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
-import VueApollo from 'vue-apollo'
-import { createMockClient } from 'mock-apollo-client'
-import { adminOpenCreations } from '../graphql/adminOpenCreations'
-import { adminUpdateContribution } from '../graphql/adminUpdateContribution'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import EditCreationFormular from './EditCreationFormular.vue'
+import { useMutation, useQuery } from '@vue/apollo-composable'
+import { useI18n } from 'vue-i18n'
+import { useAppToast } from '@/composables/useToast'
+import useCreationMonths from '@/composables/useCreationMonths'
+import {
+ BButton,
+ BCol,
+ BForm,
+ BFormInput,
+ BFormRadioGroup,
+ BFormTextarea,
+ BInputGroup,
+ BRow,
+} from 'bootstrap-vue-next'
+import { nextTick } from 'vue'
-const mockClient = createMockClient()
-const apolloProvider = new VueApollo({
- defaultClient: mockClient,
-})
-
-const localVue = global.localVue
-localVue.use(VueApollo)
-
-const stateCommitMock = jest.fn()
-
-const mocks = {
- $t: jest.fn((t) => t),
- $d: jest.fn((d) => {
- const date = new Date(d)
- return date.toISOString().split('T')[0]
- }),
- $store: {
- commit: stateCommitMock,
- },
-}
-
-const now = new Date()
-const getCreationDate = (sub) => {
- const date = sub === 0 ? now : new Date(now.getFullYear(), now.getMonth() - sub, 1, 0)
- return date.toISOString().split('T')[0]
-}
-
-const propsData = {
- creationUserData: {
- memo: 'Test schöpfung 1',
- amount: 100,
- date: getCreationDate(0),
- },
- item: {
- id: 0,
- amount: '300',
- contributionDate: `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`,
- },
-}
-
-const data = () => {
- return { creation: ['1000', '1000', '400'] }
-}
+vi.mock('@vue/apollo-composable')
+vi.mock('vue-i18n')
+vi.mock('@/composables/useToast')
+vi.mock('@/composables/useCreationMonths')
describe('EditCreationFormular', () => {
let wrapper
-
- const adminUpdateContributionMock = jest.fn()
- const adminOpenCreationsMock = jest.fn()
- mockClient.setRequestHandler(
- adminOpenCreations,
- adminOpenCreationsMock.mockResolvedValue({
- data: {
- adminOpenCreations: [
- {
- month: new Date(now.getFullYear(), now.getMonth() - 2).getMonth(),
- year: new Date(now.getFullYear(), now.getMonth() - 2).getFullYear(),
- amount: '1000',
- },
- {
- month: new Date(now.getFullYear(), now.getMonth() - 1).getMonth(),
- year: new Date(now.getFullYear(), now.getMonth() - 1).getFullYear(),
- amount: '1000',
- },
- {
- month: now.getMonth(),
- year: now.getFullYear(),
- amount: '400',
- },
- ],
- },
- }),
- )
- mockClient.setRequestHandler(
- adminUpdateContribution,
- adminUpdateContributionMock.mockResolvedValue({
- data: {
- adminUpdateContribution: {
- amount: '600',
- date: new Date(),
- memo: 'This is my memo',
- },
- },
- }),
- )
-
- const Wrapper = () => {
- return mount(EditCreationFormular, { localVue, mocks, propsData, data, apolloProvider })
+ let mockMutate
+ let mockOnDone
+ let mockOnError
+ const mockRefetch = vi.fn()
+ const mockT = vi.fn((key) => key)
+ const mockD = vi.fn((date) => new Date(date).toISOString().split('T')[0])
+ const mockToastSuccess = vi.fn()
+ const mockToastError = vi.fn()
+ const mockCreationMonths = {
+ radioOptions: vi.fn(() => [
+ { item: { short: 'Jan', date: '2023-01-01' }, name: 'January' },
+ { item: { short: 'Feb', date: '2023-02-01' }, name: 'February' },
+ { item: { short: 'Mar', date: '2023-03-01' }, name: 'March' },
+ ]),
+ creation: { value: [1000, 1000, 1000] },
}
- describe('mount', () => {
- beforeEach(async () => {
- wrapper = Wrapper()
- await wrapper.vm.$nextTick()
+ beforeEach(() => {
+ mockMutate = vi.fn()
+ mockOnDone = vi.fn()
+ mockOnError = vi.fn()
+ useMutation.mockReturnValue({
+ mutate: mockMutate,
+ onDone: mockOnDone,
+ onError: mockOnError,
})
+ useQuery.mockReturnValue({ refetch: mockRefetch })
+ useI18n.mockReturnValue({ t: mockT, d: mockD })
+ useAppToast.mockReturnValue({ toastSuccess: mockToastSuccess, toastError: mockToastError })
+ useCreationMonths.mockReturnValue(mockCreationMonths)
- it('has a DIV element with the class.component-edit-creation-formular', () => {
- expect(wrapper.find('.component-edit-creation-formular').exists()).toBeTruthy()
- })
-
- describe('radio buttons to select month', () => {
- it('has three radio buttons', () => {
- expect(wrapper.findAll('input[type="radio"]').length).toBe(3)
- })
-
- it('has the third radio button checked', () => {
- expect(wrapper.findAll('input[type="radio"]').at(0).element.checked).toBeFalsy()
- expect(wrapper.findAll('input[type="radio"]').at(1).element.checked).toBeFalsy()
- expect(wrapper.findAll('input[type="radio"]').at(2).element.checked).toBeTruthy()
- })
-
- it('has rangeMax of 700', () => {
- expect(wrapper.find('input[type="number"]').attributes('max')).toBe('700')
- })
-
- describe('change and save memo and value with success', () => {
- beforeEach(async () => {
- await wrapper.find('input[type="number"]').setValue(500)
- await wrapper.find('textarea').setValue('Test Schöpfung 2')
- await wrapper.find('.test-submit').trigger('click')
- })
-
- it('calls the API', () => {
- expect(adminUpdateContributionMock).toBeCalledWith({
- id: 0,
- creationDate: getCreationDate(0),
- amount: 500,
- memo: 'Test Schöpfung 2',
- })
- })
-
- it('emits update-creation-data', () => {
- expect(wrapper.emitted('update-creation-data')).toBeTruthy()
- })
-
- it('toasts a success message', () => {
- expect(toastSuccessSpy).toBeCalledWith('creation_form.toasted_update')
- })
- })
-
- describe('change and save memo and value with error', () => {
- beforeEach(async () => {
- adminUpdateContributionMock.mockRejectedValue({ message: 'Oh no!' })
- await wrapper.find('input[type="number"]').setValue(500)
- await wrapper.find('textarea').setValue('Test Schöpfung 2')
- await wrapper.find('.test-submit').trigger('click')
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Oh no!')
- })
- })
+ wrapper = mount(EditCreationFormular, {
+ props: {
+ item: {
+ id: 1,
+ contributionDate: '2023-02-15',
+ amount: '300',
+ email: 'test@example.com',
+ },
+ creationUserData: {
+ id: 1,
+ memo: 'Initial memo',
+ amount: 200,
+ },
+ },
+ global: {
+ stubs: {
+ BForm,
+ BRow,
+ BCol,
+ BButton,
+ BFormRadioGroup,
+ BInputGroup,
+ BFormInput,
+ BFormTextarea,
+ },
+ },
})
})
+
+ it('renders the component', () => {
+ expect(wrapper.find('.component-edit-creation-formular').exists()).toBe(true)
+ })
+
+ it('initializes form with correct values', () => {
+ expect(wrapper.vm.text).toBe('Initial memo')
+ expect(wrapper.vm.value).toBe(200)
+ expect(wrapper.vm.selected).toEqual({ short: 'Feb', date: '2023-02-01' })
+ })
+
+ it('computes rangeMax correctly', () => {
+ expect(wrapper.vm.rangeMax).toBe(1300) // 1000 + 300
+ })
+
+ it('disables submit button when form is invalid', async () => {
+ wrapper.vm.text = 'memo'
+ const submitButton = wrapper.find('.test-submit')
+ await nextTick()
+ expect(submitButton.attributes('disabled')).toBeDefined()
+ })
+
+ it('enables submit button when form is valid', async () => {
+ wrapper.vm.text = 'Valid long text'
+ wrapper.vm.value = 100
+ const submitButton = wrapper.find('.test-submit')
+ await nextTick()
+ expect(submitButton.attributes('disabled')).toBeUndefined()
+ })
+
+ it('calls mutation on form submit', async () => {
+ wrapper.vm.text = 'New memo valid'
+ wrapper.vm.value = 250
+ await wrapper.find('.test-submit').trigger('click')
+
+ expect(mockMutate).toHaveBeenCalledWith({
+ id: 1,
+ creationDate: '2023-02-01',
+ amount: 250,
+ memo: 'New memo valid',
+ })
+ })
+
+ it('handles successful mutation', async () => {
+ wrapper.vm.text = 'New memo valid'
+ wrapper.vm.value = 250
+ await wrapper.find('.test-submit').trigger('click')
+
+ // Simulate successful mutation
+ const onDoneCallback = mockOnDone.mock.calls[0][0]
+ onDoneCallback()
+
+ expect(wrapper.emitted('update-creation-data')).toBeTruthy()
+ expect(mockToastSuccess).toHaveBeenCalledWith('creation_form.toasted_update')
+ expect(mockRefetch).toHaveBeenCalled()
+ expect(wrapper.vm.value).toBe(0) // Check if form was reset
+ })
+
+ it('handles failed mutation', async () => {
+ wrapper.vm.text = 'New memo valid'
+ wrapper.vm.value = 250
+ await wrapper.find('.test-submit').trigger('click')
+
+ // Simulate failed mutation
+ const onErrorCallback = mockOnError.mock.calls[0][0]
+ onErrorCallback({ message: 'API Error' })
+
+ expect(mockToastError).toHaveBeenCalledWith('API Error')
+ expect(wrapper.vm.value).toBe(0) // Check if form was reset
+ })
})
diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 6dbe22ebb..0eb695a12 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -1,166 +1,162 @@
{{ $t('removeNotSelf') }}
-
{{ $t('delete_user') }}
-
-
+
+
{{ $t('undelete_user') }}
-
+
-
- ',
+// creationDate: createdDate,
+// createdAt: createdDate,
+// updatedAt: createdDate,
+// federatedCommunities: [
+// {
+// id: 2046,
+// apiVersion: '2_0',
+// endPoint: 'http://localhost/api/',
+// lastAnnouncedAt: createdDate,
+// verifiedAt: today,
+// lastErrorAt: null,
+// createdAt: createdDate,
+// updatedAt: null,
+// },
+// {
+// id: 2045,
+// apiVersion: '1_1',
+// endPoint: 'http://localhost/api/',
+// lastAnnouncedAt: null,
+// verifiedAt: null,
+// lastErrorAt: null,
+// createdAt: '2024-01-16T10:08:21.550Z',
+// updatedAt: null,
+// },
+// {
+// id: 2044,
+// apiVersion: '1_0',
+// endPoint: 'http://localhost/api/',
+// lastAnnouncedAt: null,
+// verifiedAt: null,
+// lastErrorAt: null,
+// createdAt: '2024-01-16T10:08:21.544Z',
+// updatedAt: null,
+// },
+// ],
+// },
+// }
+//
+// const mocks = {
+// $t: (key) => key,
+// $i18n: {
+// locale: 'en',
+// },
+// }
+//
+// describe('CommunityVisualizeItem', () => {
+// let wrapper
+//
+// const updateHomeCommunityMock = jest.fn()
+// mockClient.setRequestHandler(
+// updateHomeCommunity,
+// updateHomeCommunityMock.mockResolvedValue({
+// data: {
+// updateHomeCommunity: { id: 1 },
+// },
+// }),
+// )
+//
+// const Wrapper = () => {
+// return mount(CommunityVisualizeItem, { localVue, mocks, propsData, store, apolloProvider })
+// }
+//
+// describe('mount', () => {
+// beforeEach(() => {
+// wrapper = Wrapper()
+// })
+//
+// it('renders the component', () => {
+// expect(wrapper.exists()).toBe(true)
+// expect(wrapper.find('div.community-visualize-item').exists()).toBe(true)
+// expect(wrapper.find('.details').exists()).toBe(false)
+// })
+//
+// it('toggles details on click', async () => {
+// // Click the row to toggle details
+// await wrapper.find('.row').trigger('click')
+//
+// // Assert that details are now open
+// expect(wrapper.find('.details').exists()).toBe(true)
+//
+// // Click the row again to toggle details back
+// await wrapper.find('.row').trigger('click')
+//
+// // Assert that details are now closed
+// expect(wrapper.find('.details').exists()).toBe(false)
+// })
+//
+// describe('rendering item properties', () => {
+// it('has the url', () => {
+// expect(wrapper.find('.row > div:nth-child(2) > div > a').text()).toBe(
+// 'http://localhost/api/',
+// )
+// })
+//
+// it('has the public key', () => {
+// expect(wrapper.find('.row > div:nth-child(2) > small').text()).toContain(
+// '4007170edd8d33fb009cd99ee4e87f214e7cd21b668d45540a064deb42e243c2'.substring(0, 26),
+// )
+// })
+//
+// describe('verified item', () => {
+// it('has the check icon', () => {
+// expect(wrapper.find('svg.bi-check').exists()).toBe(true)
+// })
+//
+// it('has the text variant "success"', () => {
+// expect(wrapper.find('.text-success').exists()).toBe(true)
+// })
+// })
+//
+// // describe('with different locales (de, en, fr, es, nl)', () => {
+// describe('lastAnnouncedAt', () => {
+// it('computes the time string for different locales (de, en, fr, es, nl)', () => {
+// wrapper.vm.$i18n.locale = 'de'
+// wrapper = Wrapper()
+// expect(wrapper.vm.lastAnnouncedAt).toBe('vor 3 Tagen')
+//
+// wrapper.vm.$i18n.locale = 'fr'
+// wrapper = Wrapper()
+// expect(wrapper.vm.lastAnnouncedAt).toBe('il y a 3 jours')
+//
+// wrapper.vm.$i18n.locale = 'es'
+// wrapper = Wrapper()
+// expect(wrapper.vm.lastAnnouncedAt).toBe('hace 3 días')
+//
+// wrapper.vm.$i18n.locale = 'nl'
+// wrapper = Wrapper()
+// expect(wrapper.vm.lastAnnouncedAt).toBe('3 dagen geleden')
+// })
+//
+// describe('lastAnnouncedAt == null', () => {
+// beforeEach(() => {
+// propsData = {
+// item: {
+// uuid: 7590,
+// foreign: false,
+// publicKey: 'eaf6a426b24fd54f8fbae11c17700fc595080ca25159579c63d38dbc64284ba7',
+// url: 'http://localhost/api/2_0',
+// lastAnnouncedAt: null,
+// verifiedAt: null,
+// lastErrorAt: null,
+// createdAt: createdDate,
+// updatedAt: null,
+// },
+// }
+// wrapper = Wrapper()
+// })
+//
+// it('computes empty string', async () => {
+// expect(wrapper.vm.lastAnnouncedAt).toBe('')
+// })
+// })
+// })
+//
+// describe('createdAt', () => {
+// it('computes the time string for different locales (de, en, fr, es, nl)', () => {
+// wrapper.vm.$i18n.locale = 'de'
+// wrapper = Wrapper()
+// expect(wrapper.vm.createdAt).toBe('vor 3 Tagen')
+//
+// wrapper.vm.$i18n.locale = 'fr'
+// wrapper = Wrapper()
+// expect(wrapper.vm.createdAt).toBe('il y a 3 jours')
+//
+// wrapper.vm.$i18n.locale = 'es'
+// wrapper = Wrapper()
+// expect(wrapper.vm.createdAt).toBe('hace 3 días')
+//
+// wrapper.vm.$i18n.locale = 'nl'
+// wrapper = Wrapper()
+// expect(wrapper.vm.createdAt).toBe('3 dagen geleden')
+// })
+//
+// describe('not verified item', () => {
+// beforeEach(() => {
+// propsData = {
+// item: {
+// uuid: 7590,
+// foreign: false,
+// publicKey: 'eaf6a426b24fd54f8fbae11c17700fc595080ca25159579c63d38dbc64284ba7',
+// url: 'http://localhost/api/',
+// createdAt: createdDate,
+// updatedAt: null,
+// },
+// }
+// wrapper = Wrapper()
+// })
+//
+// it('has the x-circle icon', () => {
+// expect(wrapper.find('svg.bi-x-circle').exists()).toBe(true)
+// })
+//
+// it('has the text variant "danger"', () => {
+// expect(wrapper.find('.text-danger').exists()).toBe(true)
+// })
+// })
+//
+// describe('createdAt == null', () => {
+// beforeEach(() => {
+// propsData = {
+// item: {
+// uuid: 7590,
+// foreign: false,
+// publicKey: 'eaf6a426b24fd54f8fbae11c17700fc595080ca25159579c63d38dbc64284ba7',
+// url: 'http://localhost/api/2_0',
+// communityUuid: '5ab0befd-b150-4f31-a631-7f3637e47b21',
+// authenticatedAt: null,
+// creationDate: null,
+// createdAt: null,
+// updatedAt: null,
+// },
+// }
+// wrapper = Wrapper()
+// })
+//
+// it('computes empty string', async () => {
+// expect(wrapper.vm.createdAt).toBe('')
+// })
+// })
+//
+// describe('test handleUpdateHomeCommunity', () => {
+// describe('gms api key', () => {
+// beforeEach(async () => {
+// wrapper = Wrapper()
+// wrapper.vm.originalGmsApiKey = 'original'
+// wrapper.vm.gmsApiKey = 'changed key'
+//
+// await wrapper.vm.handleUpdateHomeCommunity()
+// // Wait for the next tick to allow async operations to complete
+// await wrapper.vm.$nextTick()
+// })
+//
+// it('expect changed gms api key', () => {
+// expect(updateHomeCommunityMock).toBeCalledWith({
+// uuid: propsData.item.uuid,
+// gmsApiKey: 'changed key',
+// location: undefined,
+// })
+// expect(wrapper.vm.originalGmsApiKey).toBe('changed key')
+// expect(toastSuccessSpy).toBeCalledWith('federation.toast_gmsApiKeyUpdated')
+// })
+// })
+//
+// describe('location', () => {
+// beforeEach(async () => {
+// wrapper = Wrapper()
+// wrapper.vm.originalLocation = { latitude: 15.121, longitude: 1.212 }
+// wrapper.vm.location = { latitude: 1.121, longitude: 17.212 }
+//
+// await wrapper.vm.handleUpdateHomeCommunity()
+// // Wait for the next tick to allow async operations to complete
+// await wrapper.vm.$nextTick()
+// })
+//
+// it('expect changed location', () => {
+// expect(updateHomeCommunityMock).toBeCalledWith({
+// uuid: propsData.item.uuid,
+// location: { latitude: 1.121, longitude: 17.212 },
+// gmsApiKey: undefined,
+// })
+// expect(wrapper.vm.originalLocation).toStrictEqual({
+// latitude: 1.121,
+// longitude: 17.212,
+// })
+// expect(toastSuccessSpy).toBeCalledWith('federation.toast_gmsLocationUpdated')
+// })
+// })
+//
+// describe('gms api key and location', () => {
+// beforeEach(async () => {
+// wrapper = Wrapper()
+// wrapper.vm.originalGmsApiKey = 'original'
+// wrapper.vm.gmsApiKey = 'changed key'
+// wrapper.vm.originalLocation = { latitude: 15.121, longitude: 1.212 }
+// wrapper.vm.location = { latitude: 1.121, longitude: 17.212 }
+//
+// await wrapper.vm.handleUpdateHomeCommunity()
+// // Wait for the next tick to allow async operations to complete
+// await wrapper.vm.$nextTick()
+// })
+//
+// it('expect changed gms api key and changed location', () => {
+// expect(updateHomeCommunityMock).toBeCalledWith({
+// uuid: propsData.item.uuid,
+// gmsApiKey: 'changed key',
+// location: undefined,
+// })
+// expect(wrapper.vm.originalGmsApiKey).toBe('changed key')
+// expect(wrapper.vm.originalLocation).toStrictEqual({
+// latitude: 1.121,
+// longitude: 17.212,
+// })
+// expect(toastSuccessSpy).toBeCalledWith('federation.toast_gmsApiKeyAndLocationUpdated')
+// })
+// })
+// })
+//
+// describe('test resetHomeCommunityEditable', () => {
+// beforeEach(async () => {
+// wrapper = Wrapper()
+// })
+//
+// it('test', () => {
+// wrapper.vm.originalGmsApiKey = 'original'
+// wrapper.vm.gmsApiKey = 'changed key'
+// wrapper.vm.originalLocation = { latitude: 15.121, longitude: 1.212 }
+// wrapper.vm.location = { latitude: 1.121, longitude: 17.212 }
+// wrapper.vm.resetHomeCommunityEditable()
+//
+// expect(wrapper.vm.location).toStrictEqual({ latitude: 15.121, longitude: 1.212 })
+// expect(wrapper.vm.gmsApiKey).toBe('original')
+// })
+// })
+// })
+// })
+// })
+// })
+
+import { mount } from '@vue/test-utils'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import { createStore } from 'vuex'
+import CommunityVisualizeItem from './CommunityVisualizeItem.vue'
+import { BCol, BFormGroup, BListGroup, BListGroupItem, BRow } from 'bootstrap-vue-next'
+import { de, enUS as en, fr, es, nl } from 'date-fns/locale'
+import { useI18n } from 'vue-i18n'
+import { nextTick, ref } from 'vue'
+import { formatDistanceToNow } from 'date-fns'
+
+vi.mock('@/composables/useToast', () => ({
+ useAppToast: vi.fn(() => ({
+ toastSuccess: vi.fn(),
+ toastError: vi.fn(),
+ })),
+}))
+
+vi.mock('vue-i18n', () => ({
+ useI18n: vi.fn(() => ({
+ locale: ref('en'),
+ t: (key) => key,
+ })),
+}))
+
+const mockMutate = vi.fn().mockResolvedValue({ data: { updateHomeCommunity: { id: 1 } } })
+vi.mock('@vue/apollo-composable', () => ({
+ useMutation: vi.fn(() => ({
+ mutate: mockMutate,
+ })),
+}))
+
+const today = new Date()
+const createdDate = new Date(today)
+createdDate.setDate(createdDate.getDate() - 3)
+
+const createItem = (overrides = {}) => ({
+ uuid: 1,
+ foreign: false,
+ url: 'http://localhost/api/',
+ publicKey: '4007170edd8d33fb009cd99ee4e87f214e7cd21b668d45540a064deb42e243c2',
+ communityUuid: '5ab0befd-b150-4f31-a631-7f3637e47b21',
+ authenticatedAt: null,
+ name: 'Gradido Test',
+ description: 'Gradido Community zum testen',
+ gmsApiKey: '',
+ creationDate: createdDate,
+ createdAt: createdDate,
+ updatedAt: createdDate,
+ federatedCommunities: [
+ {
+ id: 2046,
+ apiVersion: '2_0',
+ endPoint: 'http://localhost/api/',
+ lastAnnouncedAt: createdDate,
+ verifiedAt: today,
+ lastErrorAt: null,
+ createdAt: createdDate,
+ updatedAt: null,
+ },
+ {
+ id: 2045,
+ apiVersion: '1_1',
+ endPoint: 'http://localhost/api/',
+ lastAnnouncedAt: null,
+ verifiedAt: null,
+ lastErrorAt: null,
+ createdAt: '2024-01-16T10:08:21.550Z',
+ updatedAt: null,
+ },
+ {
+ id: 2044,
+ apiVersion: '1_0',
+ endPoint: 'http://localhost/api/',
+ lastAnnouncedAt: null,
+ verifiedAt: null,
+ lastErrorAt: null,
+ createdAt: '2024-01-16T10:08:21.544Z',
+ updatedAt: null,
+ },
+ ],
+ ...overrides,
+})
+
+describe('CommunityVisualizeItem', () => {
+ let wrapper
+ let store
+ let mockI18n
+
+ const createWrapper = (props = {}, locale = 'en') => {
+ store = createStore({
+ state: {
+ moderator: {
+ roles: ['ADMIN'],
+ },
+ },
+ })
+
+ mockI18n = {
+ locale: ref(locale),
+ t: (key) => key,
+ }
+ vi.mocked(useI18n).mockReturnValue(mockI18n)
+
+ return mount(CommunityVisualizeItem, {
+ props: {
+ item: createItem(),
+ ...props,
+ },
+ global: {
+ plugins: [store],
+ mocks: {
+ $t: (key) => key,
+ $i18n: {
+ locale: locale,
+ },
+ },
+ stubs: {
+ BRow,
+ BCol,
+ BListGroup,
+ BListGroupItem,
+ BFormGroup,
+ 'variant-icon': true,
+ 'editable-group': true,
+ 'editable-groupable-label': true,
+ coordinates: true,
+ 'federation-visualize-item': true,
+ },
+ directives: {
+ 'b-tooltip': {},
+ },
+ },
+ })
+ }
+
+ beforeEach(() => {
+ vi.clearAllMocks()
+ wrapper = createWrapper()
+ })
+
+ it('renders the component', () => {
+ expect(wrapper.exists()).toBe(true)
+ expect(wrapper.find('div.community-visualize-item').exists()).toBe(true)
+ expect(wrapper.find('.details').exists()).toBe(false)
+ })
+
+ it('toggles details on click', async () => {
+ await wrapper.find('.row').trigger('click')
+ expect(wrapper.find('.details').exists()).toBe(true)
+
+ await wrapper.find('.row').trigger('click')
+ expect(wrapper.find('.details').exists()).toBe(false)
+ })
+
+ describe('rendering item properties', () => {
+ it('has the url', () => {
+ expect(wrapper.find('.row > div:nth-child(2) > div > a').text()).toBe('http://localhost/api/')
+ })
+
+ it('has the public key', () => {
+ expect(wrapper.find('.row > div:nth-child(2) > small').text()).toContain(
+ '4007170edd8d33fb009cd99ee4e87f214e7cd21b668d45540a064deb42e243c2'.substring(0, 26),
+ )
+ })
+
+ describe('verified item', () => {
+ it('has the check icon', () => {
+ expect(wrapper.find('variant-icon-stub[icon="check"]').exists()).toBe(true)
+ })
+
+ it('has the text variant "success"', () => {
+ expect(wrapper.find('variant-icon-stub[variant="success"]').exists()).toBe(true)
+ })
+ })
+
+ describe('lastAnnouncedAt', () => {
+ it.each([
+ ['en', en],
+ ['de', de],
+ ['fr', fr],
+ ['es', es],
+ ['nl', nl],
+ ])('computes the time string for %s locale', async (locale, dateLocale) => {
+ wrapper = createWrapper(
+ {
+ item: createItem(),
+ },
+ locale,
+ )
+
+ await nextTick()
+
+ const expectedString = formatDistanceToNow(createdDate, {
+ addSuffix: true,
+ locale: dateLocale,
+ })
+ expect(wrapper.vm.lastAnnouncedAt).toBe(expectedString)
+ })
+
+ it('computes empty string when lastAnnouncedAt is null', () => {
+ wrapper = createWrapper({ item: createItem({ federatedCommunities: [] }) })
+ expect(wrapper.vm.lastAnnouncedAt).toBe('')
+ })
+ })
+
+ describe('createdAt', () => {
+ it.each([
+ ['en', en],
+ ['de', de],
+ ['fr', fr],
+ ['es', es],
+ ['nl', nl],
+ ])('computes the time string for %s locale', async (locale, dateLocale) => {
+ wrapper = createWrapper(
+ {
+ item: createItem(),
+ },
+ locale,
+ )
+
+ await nextTick()
+
+ const expectedString = formatDistanceToNow(createdDate, {
+ addSuffix: true,
+ locale: dateLocale,
+ })
+ expect(wrapper.vm.createdAt).toBe(expectedString)
+ })
+
+ it('computes empty string when createdAt is null', () => {
+ wrapper = createWrapper({ item: createItem({ createdAt: null }) })
+ expect(wrapper.vm.createdAt).toBe('')
+ })
+ })
+ })
+
+ describe('not verified item', () => {
+ beforeEach(() => {
+ wrapper = createWrapper({
+ item: createItem({ federatedCommunities: [] }),
+ })
+ })
+
+ it('has the x-circle icon', () => {
+ expect(wrapper.find('variant-icon-stub[icon="x-circle"]').exists()).toBe(true)
+ })
+
+ it('has the text variant "danger"', () => {
+ expect(wrapper.find('variant-icon-stub[variant="danger"]').exists()).toBe(true)
+ })
+ })
+
+ describe('handleUpdateHomeCommunity', () => {
+ beforeEach(() => {
+ wrapper = createWrapper()
+ })
+
+ it('updates gms api key', async () => {
+ wrapper.vm.gmsApiKey = 'changed key'
+ await wrapper.vm.handleUpdateHomeCommunity()
+
+ expect(mockMutate).toHaveBeenCalledWith({
+ uuid: 1,
+ gmsApiKey: 'changed key',
+ })
+ })
+
+ it('updates location', async () => {
+ wrapper.vm.location = { latitude: 1.121, longitude: 17.212 }
+ await wrapper.vm.handleUpdateHomeCommunity()
+
+ expect(mockMutate).toHaveBeenCalledWith({
+ uuid: 1,
+ location: { latitude: 1.121, longitude: 17.212 },
+ gmsApiKey: '',
+ })
+ })
+
+ it('updates both gms api key and location', async () => {
+ wrapper.vm.gmsApiKey = 'changed key'
+ wrapper.vm.location = { latitude: 1.121, longitude: 17.212 }
+ await wrapper.vm.handleUpdateHomeCommunity()
+
+ expect(mockMutate).toHaveBeenCalledWith({
+ uuid: 1,
+ gmsApiKey: 'changed key',
+ location: { latitude: 1.121, longitude: 17.212 },
+ })
+ })
+ })
+
+ describe('resetHomeCommunityEditable', () => {
+ it('resets gms api key and location', () => {
+ wrapper.vm.gmsApiKey = 'changed key'
+ wrapper.vm.location = { latitude: 1.121, longitude: 17.212 }
+ wrapper.vm.resetHomeCommunityEditable()
+
+ expect(wrapper.vm.gmsApiKey).toBe('')
+ expect(wrapper.vm.location).toEqual(wrapper.vm.originalLocation)
+ })
+ })
+})
diff --git a/admin/src/components/Federation/CommunityVisualizeItem.vue b/admin/src/components/Federation/CommunityVisualizeItem.vue
new file mode 100644
index 000000000..ecb4b79a0
--- /dev/null
+++ b/admin/src/components/Federation/CommunityVisualizeItem.vue
@@ -0,0 +1,201 @@
+
+
@@ -18,26 +18,26 @@ export default {
},
data() {
return {
- options: {
+ image: null,
+ showQr: false,
+ }
+ },
+ computed: {
+ qrOptions() {
+ return {
cellSize: 8,
correctLevel: 'H',
data: this.link,
- logo: {
- image: null,
- },
- },
- }
+ logo: { image: this.image },
+ }
+ },
},
created() {
const image = new Image()
- image.src = 'img/gdd-coin.png'
+ image.src = '/img/gdd-coin.png'
image.onload = () => {
- this.options = {
- ...this.options,
- logo: {
- image,
- },
- }
+ this.image = image
+ this.showQr = true
}
},
}
@@ -45,12 +45,13 @@ export default {
diff --git a/admin/src/components/NavBar.spec.js b/admin/src/components/NavBar.spec.js
index 6a4a69959..8f4b0a171 100644
--- a/admin/src/components/NavBar.spec.js
+++ b/admin/src/components/NavBar.spec.js
@@ -1,124 +1,131 @@
import { mount } from '@vue/test-utils'
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
import NavBar from './NavBar'
+import { createStore } from 'vuex'
+import { createRouter, createWebHistory } from 'vue-router'
+import CONFIG from '../config'
+import { BNavbar, BNavbarNav, BNavItem } from 'bootstrap-vue-next'
-const localVue = global.localVue
+// Mock vue-router
+vi.mock('vue-router', async () => {
+ const actual = await vi.importActual('vue-router')
+ return {
+ ...actual,
+ useRoute: vi.fn(() => ({
+ name: 'user',
+ })),
+ }
+})
-const apolloMutateMock = jest.fn()
-const storeDispatchMock = jest.fn()
-const routerPushMock = jest.fn()
-
-const stubs = {
- RouterLink: true,
-}
-
-const mocks = {
- $t: jest.fn((t) => t),
- $apollo: {
- mutate: apolloMutateMock,
- },
- $store: {
+const createVuexStore = () =>
+ createStore({
state: {
openCreations: 1,
token: 'valid-token',
},
- dispatch: storeDispatchMock,
- },
- $router: {
- push: routerPushMock,
- },
-}
+ actions: {
+ logout: vi.fn(),
+ },
+ })
+
+vi.mock('@vue/apollo-composable', () => ({
+ useMutation: vi.fn(() => ({
+ mutate: vi.fn(),
+ })),
+}))
describe('NavBar', () => {
let wrapper
+ let store
+ let router
+ let originalWindow
- const Wrapper = () => {
- return mount(NavBar, { mocks, localVue, stubs })
+ const createWrapper = () => {
+ return mount(NavBar, {
+ global: {
+ components: {
+ BNavbarNav,
+ BNavItem,
+ BNavbar,
+ },
+ plugins: [store, router],
+ mocks: {
+ $t: (key) => key,
+ },
+ stubs: {
+ BCollapse: { template: '
+
diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js
index 6babe9956..e2749329a 100644
--- a/admin/src/components/Tables/OpenCreationsTable.spec.js
+++ b/admin/src/components/Tables/OpenCreationsTable.spec.js
@@ -1,156 +1,133 @@
-import { mount } from '@vue/test-utils'
-import OpenCreationsTable from './OpenCreationsTable'
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import { shallowMount } from '@vue/test-utils'
+import { createStore } from 'vuex'
+import OpenCreationsTable from './OpenCreationsTable.vue'
-const localVue = global.localVue
-
-const apolloMutateMock = jest.fn().mockResolvedValue({})
-const apolloQueryMock = jest.fn().mockResolvedValue({})
-
-const propsData = {
- items: [
- {
- id: 4,
- firstName: 'Bob',
- lastName: 'der Baumeister',
- email: 'bob@baumeister.de',
- amount: 300,
- memo: 'Aktives Grundeinkommen für Januar 2022',
- date: '2022-01-01T00:00:00.000Z',
- moderatorId: 1,
- creation: [700, 1000, 1000],
- __typename: 'PendingCreation',
- },
- {
- id: 5,
- firstName: 'Räuber',
- lastName: 'Hotzenplotz',
- email: 'raeuber@hotzenplotz.de',
- amount: 210,
- memo: 'Aktives Grundeinkommen für Januar 2022',
- date: '2022-01-01T00:00:00.000Z',
- moderatorId: null,
- creation: [790, 1000, 1000],
- __typename: 'PendingCreation',
- },
- {
- id: 6,
- firstName: 'Stephen',
- lastName: 'Hawking',
- email: 'stephen@hawking.uk',
- amount: 330,
- memo: 'Aktives Grundeinkommen für Januar 2022',
- date: '2022-01-01T00:00:00.000Z',
- moderatorId: 1,
- creation: [670, 1000, 1000],
- __typename: 'PendingCreation',
- },
- ],
- fields: [
- { key: 'bookmark', label: 'delete' },
- { key: 'email', label: 'e_mail' },
- { key: 'firstName', label: 'firstname' },
- { key: 'lastName', label: 'lastname' },
- {
- key: 'amount',
- label: 'creation',
- formatter: (value) => {
- return value + ' GDD'
- },
- },
- { key: 'memo', label: 'text', class: 'text-break' },
- {
- key: 'date',
- label: 'date',
- formatter: (value) => {
- return value
- },
- },
- { key: 'moderator', label: 'moderator' },
- { key: 'editCreation', label: 'edit' },
- { key: 'confirm', label: 'save' },
- ],
- toggleDetails: false,
- hideResubmission: true,
-}
-
-const mocks = {
- $t: jest.fn((t) => t),
- $d: jest.fn((d) => d),
- $apollo: {
- mutate: apolloMutateMock,
- query: apolloQueryMock,
- },
- $store: {
- state: {
- moderator: {
- id: 1,
- name: 'test moderator',
- },
- },
- },
-}
+vi.mock('../RowDetails', () => ({ default: { name: 'RowDetails' } }))
+vi.mock('../EditCreationFormular', () => ({ default: { name: 'EditCreationFormular' } }))
+vi.mock('../ContributionMessages/ContributionMessagesList', () => ({
+ default: { name: 'ContributionMessagesList' },
+}))
describe('OpenCreationsTable', () => {
let wrapper
+ let store
- const Wrapper = () => {
- return mount(OpenCreationsTable, { localVue, mocks, propsData })
- }
+ const mockItems = [
+ { id: 1, status: 'PENDING', userId: 2, moderatorId: null, messagesCount: 0 },
+ { id: 2, status: 'CONFIRMED', userId: 3, moderatorId: 1, messagesCount: 2 },
+ ]
- describe('mount', () => {
- beforeEach(() => {
- wrapper = Wrapper()
+ const mockFields = [
+ { key: 'status', label: 'Status' },
+ { key: 'bookmark', label: 'Bookmark' },
+ { key: 'memo', label: 'Memo' },
+ { key: 'editCreation', label: 'Edit' },
+ { key: 'chatCreation', label: 'Chat' },
+ { key: 'deny', label: 'Deny' },
+ { key: 'confirm', label: 'Confirm' },
+ ]
+
+ beforeEach(() => {
+ store = createStore({
+ state: {
+ moderator: {
+ id: 1,
+ },
+ },
})
- it('has a DIV element with the class .open-creations-table', () => {
- expect(wrapper.find('div.open-creations-table').exists()).toBe(true)
- })
-
- it('has a table with three rows', () => {
- expect(wrapper.findAll('tbody > tr')).toHaveLength(3)
- })
-
- it('find first button.bi-pencil-square for open EditCreationFormular ', () => {
- expect(wrapper.findAll('tr').at(1).find('.bi-pencil-square').exists()).toBe(true)
- })
-
- it('has no button.bi-pencil-square for user contribution ', () => {
- expect(wrapper.findAll('tr').at(2).find('.bi-pencil-square').exists()).toBe(false)
- })
-
- describe('show edit details', () => {
- beforeEach(async () => {
- await wrapper.findAll('tr').at(1).find('.bi-pencil-square').trigger('click')
- })
-
- it.skip('has a component element with name EditCreationFormular', () => {
- expect(wrapper.findComponent({ name: 'EditCreationFormular' }).exists()).toBe(true)
- })
-
- it.skip('renders the component component-edit-creation-formular', () => {
- expect(wrapper.find('div.component-edit-creation-formular').exists()).toBe(true)
- })
- })
-
- describe('call updateStatus', () => {
- beforeEach(() => {
- wrapper.vm.updateStatus(4)
- })
-
- it('emits update-status', () => {
- expect(wrapper.vm.$root.$emit('update-status', 4)).toBeTruthy()
- })
- })
-
- describe('test reload-contribution', () => {
- beforeEach(() => {
- wrapper.vm.reloadContribution(3)
- })
-
- it('emits reload-contribution', () => {
- expect(wrapper.emitted('reload-contribution')).toBeTruthy()
- expect(wrapper.emitted('reload-contribution')[0]).toEqual([3])
- })
+ wrapper = shallowMount(OpenCreationsTable, {
+ props: {
+ items: mockItems,
+ fields: mockFields,
+ hideResubmission: false,
+ },
+ global: {
+ plugins: [store],
+ mocks: {
+ $t: (key) => key,
+ },
+ stubs: {
+ BTableLite: true,
+ BButton: true,
+ IBiQuestionSquare: true,
+ IBiBellFill: true,
+ IBiCheck: true,
+ IBiXCircle: true,
+ IBiTrash: true,
+ IBiPencilSquare: true,
+ IBiChatDots: true,
+ IBiExclamationCircleFill: true,
+ IBiQuestionDiamond: true,
+ IBiX: true,
+ },
+ },
})
})
+
+ it('renders the component', () => {
+ expect(wrapper.exists()).toBe(true)
+ expect(wrapper.findComponent({ name: 'BTableLite' }).exists()).toBe(true)
+ })
+
+ it('applies correct row class based on status', () => {
+ const rowClass = wrapper.vm.rowClass({ status: 'CONFIRMED' }, 'row')
+ expect(rowClass).toBe('table-success')
+ })
+
+ it('emits show-overlay event when calling $emit', async () => {
+ const mockItem = mockItems[0]
+ await wrapper.vm.$emit('show-overlay', mockItem, 'delete')
+ expect(wrapper.emitted('show-overlay')).toBeTruthy()
+ expect(wrapper.emitted('show-overlay')[0]).toEqual([mockItem, 'delete'])
+ })
+
+ it('toggles row details correctly', () => {
+ const mockRow = {
+ toggleDetails: vi.fn(),
+ detailsShowing: false,
+ index: 0,
+ item: mockItems[0],
+ }
+
+ wrapper.vm.rowToggleDetails(mockRow, 0)
+ expect(mockRow.toggleDetails).toHaveBeenCalled()
+ expect(wrapper.vm.openRow).toEqual(mockRow)
+ expect(wrapper.vm.slotIndex).toBe(0)
+ expect(wrapper.vm.creationUserData).toEqual(mockItems[0])
+ })
+
+ it('identifies if the item belongs to the current user', () => {
+ expect(wrapper.vm.myself({ userId: 1 })).toBe(true)
+ expect(wrapper.vm.myself({ userId: 2 })).toBe(false)
+ })
+
+ it('emits update-contributions event', async () => {
+ await wrapper.vm.updateContributions()
+ expect(wrapper.emitted('update-contributions')).toBeTruthy()
+ })
+
+ it('emits update-status event', async () => {
+ const id = 1
+ await wrapper.vm.updateStatus(id)
+ expect(wrapper.emitted('update-status')).toBeTruthy()
+ expect(wrapper.emitted('update-status')[0]).toEqual([id])
+ })
+
+ it('emits reload-contribution event', async () => {
+ const id = 1
+ await wrapper.vm.reloadContribution(id)
+ expect(wrapper.emitted('reload-contribution')).toBeTruthy()
+ expect(wrapper.emitted('reload-contribution')[0]).toEqual([id])
+ })
+
+ it('gets correct status icon', () => {
+ expect(wrapper.vm.getStatusIcon('IN_PROGRESS')).toBe('question-square')
+ expect(wrapper.vm.getStatusIcon('PENDING')).toBe('bell-fill')
+ expect(wrapper.vm.getStatusIcon('CONFIRMED')).toBe('check')
+ expect(wrapper.vm.getStatusIcon('DENIED')).toBe('x-circle')
+ expect(wrapper.vm.getStatusIcon('DELETED')).toBe('trash')
+ expect(wrapper.vm.getStatusIcon('UNKNOWN')).toBe('default-icon')
+ })
})
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 54157a6ef..5bce1bfb7 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -1,6 +1,6 @@
-
diff --git a/admin/src/components/VariantIcon.vue b/admin/src/components/VariantIcon.vue
new file mode 100644
index 000000000..4b05ea0d8
--- /dev/null
+++ b/admin/src/components/VariantIcon.vue
@@ -0,0 +1,22 @@
+
+
+
+
-
-
+
-
+ >
+
-
-
-
+
+
+
{{ $t('creation_form.reset') }}
-
-
-
-
-
diff --git a/admin/src/components/Fedaration/FederationVisualizeItem.spec.js b/admin/src/components/Fedaration/FederationVisualizeItem.spec.js
deleted file mode 100644
index 6058cc6f4..000000000
--- a/admin/src/components/Fedaration/FederationVisualizeItem.spec.js
+++ /dev/null
@@ -1,183 +0,0 @@
-import { mount } from '@vue/test-utils'
-import FederationVisualizeItem from './FederationVisualizeItem.vue'
-
-const localVue = global.localVue
-const today = new Date()
-const createdDate = new Date()
-createdDate.setDate(createdDate.getDate() - 3)
-
-let propsData = {
- item: {
- id: 7590,
- foreign: false,
- publicKey: 'eaf6a426b24fd54f8fbae11c17700fc595080ca25159579c63d38dbc64284ba7',
- url: 'http://localhost/api/2_0',
- lastAnnouncedAt: createdDate,
- verifiedAt: today,
- lastErrorAt: null,
- createdAt: createdDate,
- updatedAt: null,
- },
-}
-
-const mocks = {
- $i18n: {
- locale: 'en',
- },
-}
-
-describe('FederationVisualizeItem', () => {
- let wrapper
-
- const Wrapper = () => {
- return mount(FederationVisualizeItem, { localVue, mocks, propsData })
- }
-
- describe('mount', () => {
- beforeEach(() => {
- wrapper = Wrapper()
- })
-
- it('renders the component', () => {
- expect(wrapper.find('div.federation-visualize-item').exists()).toBe(true)
- })
-
- describe('rendering item properties', () => {
- it('has the url', () => {
- expect(wrapper.find('.row > div:nth-child(2) > div').text()).toBe(
- 'http://localhost/api/2_0',
- )
- })
-
- it('has the public key', () => {
- expect(wrapper.find('.row > div:nth-child(2) > small').text()).toContain(
- 'eaf6a426b24fd54f8fbae11c17700fc595080ca25159579c63d38dbc64284ba7'.substring(0, 26),
- )
- })
-
- describe('verified item', () => {
- it('has the check icon', () => {
- expect(wrapper.find('svg.bi-check').exists()).toBe(true)
- })
-
- it('has the text variant "success"', () => {
- expect(wrapper.find('.text-success').exists()).toBe(true)
- })
- })
-
- describe('not verified item', () => {
- beforeEach(() => {
- propsData = {
- item: {
- id: 7590,
- foreign: false,
- publicKey: 'eaf6a426b24fd54f8fbae11c17700fc595080ca25159579c63d38dbc64284ba7',
- url: 'http://localhost/api/2_0',
- lastAnnouncedAt: createdDate,
- verifiedAt: null,
- lastErrorAt: null,
- createdAt: createdDate,
- updatedAt: null,
- },
- }
- wrapper = Wrapper()
- })
-
- it('has the x-circle icon', () => {
- expect(wrapper.find('svg.bi-x-circle').exists()).toBe(true)
- })
-
- it('has the text variant "danger"', () => {
- expect(wrapper.find('.text-danger').exists()).toBe(true)
- })
- })
-
- // describe('with different locales (de, en, fr, es, nl)', () => {
- describe('lastAnnouncedAt', () => {
- it('computes the time string for different locales (de, en, fr, es, nl)', () => {
- wrapper.vm.$i18n.locale = 'de'
- wrapper = Wrapper()
- expect(wrapper.vm.lastAnnouncedAt).toBe('vor 3 Tagen')
-
- wrapper.vm.$i18n.locale = 'fr'
- wrapper = Wrapper()
- expect(wrapper.vm.lastAnnouncedAt).toBe('il y a 3 jours')
-
- wrapper.vm.$i18n.locale = 'es'
- wrapper = Wrapper()
- expect(wrapper.vm.lastAnnouncedAt).toBe('hace 3 días')
-
- wrapper.vm.$i18n.locale = 'nl'
- wrapper = Wrapper()
- expect(wrapper.vm.lastAnnouncedAt).toBe('3 dagen geleden')
- })
-
- describe('lastAnnouncedAt == null', () => {
- beforeEach(() => {
- propsData = {
- item: {
- id: 7590,
- foreign: false,
- publicKey: 'eaf6a426b24fd54f8fbae11c17700fc595080ca25159579c63d38dbc64284ba7',
- url: 'http://localhost/api/2_0',
- lastAnnouncedAt: null,
- verifiedAt: null,
- lastErrorAt: null,
- createdAt: createdDate,
- updatedAt: null,
- },
- }
- wrapper = Wrapper()
- })
-
- it('computes empty string', async () => {
- expect(wrapper.vm.lastAnnouncedAt).toBe('')
- })
- })
- })
-
- describe('createdAt', () => {
- it('computes the time string for different locales (de, en, fr, es, nl)', () => {
- wrapper.vm.$i18n.locale = 'de'
- wrapper = Wrapper()
- expect(wrapper.vm.createdAt).toBe('vor 3 Tagen')
-
- wrapper.vm.$i18n.locale = 'fr'
- wrapper = Wrapper()
- expect(wrapper.vm.createdAt).toBe('il y a 3 jours')
-
- wrapper.vm.$i18n.locale = 'es'
- wrapper = Wrapper()
- expect(wrapper.vm.createdAt).toBe('hace 3 días')
-
- wrapper.vm.$i18n.locale = 'nl'
- wrapper = Wrapper()
- expect(wrapper.vm.createdAt).toBe('3 dagen geleden')
- })
-
- describe('createdAt == null', () => {
- beforeEach(() => {
- propsData = {
- item: {
- id: 7590,
- foreign: false,
- publicKey: 'eaf6a426b24fd54f8fbae11c17700fc595080ca25159579c63d38dbc64284ba7',
- url: 'http://localhost/api/2_0',
- lastAnnouncedAt: createdDate,
- verifiedAt: null,
- lastErrorAt: null,
- createdAt: null,
- updatedAt: null,
- },
- }
- wrapper = Wrapper()
- })
-
- it('computes empty string', async () => {
- expect(wrapper.vm.createdAt).toBe('')
- })
- })
- })
- })
- })
-})
diff --git a/admin/src/components/Fedaration/FederationVisualizeItem.vue b/admin/src/components/Fedaration/FederationVisualizeItem.vue
deleted file mode 100644
index a947387f4..000000000
--- a/admin/src/components/Fedaration/FederationVisualizeItem.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
+
-
-
-
+ >
+
+
+
-
-
+
+
+
+
+
+
{{ $t('creation_form.update_creation') }}
-
+
-
-
-
+
-
-
-
- {{ lastAnnouncedAt }}
- {{ createdAt }}
-
-
-
-
diff --git a/admin/src/components/Federation/CommunityVisualizeItem.spec.js b/admin/src/components/Federation/CommunityVisualizeItem.spec.js
new file mode 100644
index 000000000..3cf785c0f
--- /dev/null
+++ b/admin/src/components/Federation/CommunityVisualizeItem.spec.js
@@ -0,0 +1,660 @@
+// import { createMockClient } from 'mock-apollo-client'
+// import { mount } from '@vue/test-utils'
+// import VueApollo from 'vue-apollo'
+// import Vuex from 'vuex'
+// import CommunityVisualizeItem from './CommunityVisualizeItem.vue'
+// import { updateHomeCommunity } from '../../graphql/updateHomeCommunity'
+// import { toastSuccessSpy } from '../../../test/testSetup'
+//
+// const mockClient = createMockClient()
+// const apolloProvider = new VueApollo({
+// defaultClient: mockClient,
+// })
+//
+// const localVue = global.localVue
+// localVue.use(Vuex)
+// localVue.use(VueApollo)
+// const today = new Date()
+// const createdDate = new Date()
+// createdDate.setDate(createdDate.getDate() - 3)
+//
+// // Mock für den Vuex-Store
+// const store = new Vuex.Store({
+// state: {
+// moderator: {
+// roles: ['ADMIN'],
+// },
+// },
+// })
+//
+// let propsData = {
+// item: {
+// uuid: 1,
+// foreign: false,
+// url: 'http://localhost/api/',
+// publicKey: '4007170edd8d33fb009cd99ee4e87f214e7cd21b668d45540a064deb42e243c2',
+// communityUuid: '5ab0befd-b150-4f31-a631-7f3637e47b21',
+// authenticatedAt: null,
+// name: 'Gradido Test',
+// description: 'Gradido Community zum testen',
+// gmsApiKey: '{{ item.url }}
- {{ `${item.publicKey.substring(0, 26)}…` }}
-
+
+
+
+
+
+
+ {{ item.name }}
+
+ {{ lastAnnouncedAt }}
+ {{ createdAt }}
+
+
+
+
+
+ {{ $t('federation.communityUuid') }} {{ item.uuid }}
+
+
+ {{ $t('federation.authenticatedAt') }} {{ item.authenticatedAt }}
+
+
+ {{ $t('federation.publicKey') }} {{ item.publicKey }}
+
+
+
+
+
+ {{ $t('federation.coordinates') }}
+
+ {{
+ $t('geo-coordinates.format', {
+ latitude: location.latitude,
+ longitude: location.longitude,
+ })
+ }}
+
+
+
+
+
+
+
+
+
+ {{ $t('federation.verified') }}
+ {{ $t('federation.apiVersion') }}
+ {{ $t('federation.createdAt') }}
+ {{ $t('federation.lastAnnouncedAt') }}
+ {{ $t('federation.verifiedAt') }}
+ {{ $t('federation.lastErrorAt') }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/admin/src/components/Federation/FederationVisualizeItem.vue b/admin/src/components/Federation/FederationVisualizeItem.vue
new file mode 100644
index 000000000..1aa4176e9
--- /dev/null
+++ b/admin/src/components/Federation/FederationVisualizeItem.vue
@@ -0,0 +1,65 @@
+
+
+ {{ item.url }}
+
+ {{ `${item.publicKey.substring(0, 26)}…` }}
+
+
+ {{ $t('federation.gmsApiKey') }}
+ {{ gmsApiKey }} +
+
+
+
+ {{ item.apiVersion }}
+
+
+ {{ distanceDate(item.createdAt) }}
+
+
+
+
+ {{ distanceDate(item.lastAnnouncedAt) }}
+
+
+
+
+ {{ distanceDate(item.verifiedAt) }}
+
+
+
+
+ {{ distanceDate(item.lastErrorAt) }}
+
+
+
+
+
+
diff --git a/admin/src/components/FigureQrCode.spec.js b/admin/src/components/FigureQrCode.spec.js
index 2cc1d0e89..d42c68ff8 100644
--- a/admin/src/components/FigureQrCode.spec.js
+++ b/admin/src/components/FigureQrCode.spec.js
@@ -1,30 +1,72 @@
import { mount } from '@vue/test-utils'
-import FigureQrCode from './FigureQrCode'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import FigureQrCode from './FigureQrCode.vue'
+import { QRCanvas } from 'qrcanvas-vue'
-const localVue = global.localVue
-
-const propsData = {
- link: '',
-}
+// Mock QRCanvas component
+vi.mock('qrcanvas-vue', () => ({
+ QRCanvas: {
+ name: 'QRCanvas',
+ template: '',
+ },
+}))
describe('FigureQrCode', () => {
let wrapper
+ let mockImage
- const Wrapper = () => {
- return mount(FigureQrCode, { localVue, propsData })
- }
+ beforeEach(() => {
+ // Mock Image object
+ mockImage = {
+ src: '',
+ onload: null,
+ }
+ global.Image = vi.fn(() => mockImage)
- describe('mount', () => {
- beforeEach(() => {
- wrapper = Wrapper()
- })
-
- it('renders the Div Element ".figure-qr-code"', () => {
- expect(wrapper.find('div.figure-qr-code').exists()).toBe(true)
- })
-
- it('renders the QRCanvas Element ".canvas"', () => {
- expect(wrapper.find('.canvas').exists()).toBe(true)
+ wrapper = mount(FigureQrCode, {
+ props: {
+ link: 'https://example.com',
+ },
+ global: {
+ stubs: {
+ QRCanvas: true,
+ },
+ },
})
})
+
+ it('renders the component', () => {
+ expect(wrapper.find('.figure-qr-code').exists()).toBe(true)
+ expect(wrapper.find('.qrbox').exists()).toBe(true)
+ })
+
+ it('does not render QRCanvas initially', () => {
+ expect(wrapper.find('.canvas').exists()).toBe(false)
+ })
+
+ it('renders QRCanvas after image loads', async () => {
+ expect(wrapper.vm.showQr).toBe(false)
+ mockImage.onload()
+ await wrapper.vm.$nextTick()
+ expect(wrapper.vm.showQr).toBe(true)
+ expect(wrapper.findComponent(QRCanvas).exists()).toBe(true)
+ })
+
+ it('sets correct qrOptions', () => {
+ expect(wrapper.vm.qrOptions).toEqual({
+ cellSize: 8,
+ correctLevel: 'H',
+ data: 'https://example.com',
+ logo: { image: null },
+ })
+ })
+
+ it('updates qrOptions when link prop changes', async () => {
+ await wrapper.setProps({ link: 'https://newexample.com' })
+ expect(wrapper.vm.qrOptions.data).toBe('https://newexample.com')
+ })
+
+ it('loads the correct image', () => {
+ expect(mockImage.src).toBe('/img/gdd-coin.png')
+ })
})
diff --git a/admin/src/components/FigureQrCode.vue b/admin/src/components/FigureQrCode.vue
index 11a11d98c..edea28ad8 100644
--- a/admin/src/components/FigureQrCode.vue
+++ b/admin/src/components/FigureQrCode.vue
@@ -1,7 +1,7 @@
-
-
-
- 
-
+
+
+ 
+
-
-
- {{ $t('navbar.user_search') }}
-
+
+
+
+ {{ $t('navbar.user_search') }}
+
+
{{ $t('creation') }}
-
- {{ $store.state.openCreations }}
-
-
-
+
+ {{ openCreations }}
+
+
+
{{ $t('navbar.automaticContributions') }}
-
-
+
+
{{ $t('navbar.instances') }}
-
- {{ $t('navbar.statistic') }}
- {{ $t('navbar.my-account') }}
- {{ $t('navbar.logout') }}
-
-
-
+
+
+ {{ $t('navbar.projectBranding') }}
+
+
+ {{ $t('navbar.statistic') }}
+
+ {{ $t('navbar.my-account') }}
+
+ {{ $t('navbar.logout') }}
+
+
+
-
-
+
+
diff --git a/admin/src/components/NotFoundPage.spec.js b/admin/src/components/NotFoundPage.spec.js
index 99eef569b..3cf1808ec 100644
--- a/admin/src/components/NotFoundPage.spec.js
+++ b/admin/src/components/NotFoundPage.spec.js
@@ -1,30 +1,33 @@
import { mount } from '@vue/test-utils'
-import NotFoundPage from './NotFoundPage'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import NotFoundPage from './NotFoundPage.vue'
+import { useI18n } from 'vue-i18n'
-const localVue = global.localVue
-
-const mocks = {
- $t: jest.fn((t) => t),
-}
+// Mock vue-i18n
+vi.mock('vue-i18n')
describe('NotFoundPage', () => {
let wrapper
- const Wrapper = () => {
- return mount(NotFoundPage, { localVue, mocks })
- }
+ beforeEach(() => {
+ // Mock the t function from useI18n
+ const mockT = vi.fn((key) => key)
+ useI18n.mockReturnValue({ t: mockT })
- describe('mount', () => {
- beforeEach(() => {
- wrapper = Wrapper()
- })
-
- it('has a svg', () => {
- expect(wrapper.find('svg').exists()).toBeTruthy()
- })
-
- it('has a back button', () => {
- expect(wrapper.find('.test-back').exists()).toBeTruthy()
+ wrapper = mount(NotFoundPage, {
+ global: {
+ mocks: {
+ $t: mockT,
+ },
+ },
})
})
+
+ it('renders an SVG', () => {
+ expect(wrapper.find('svg').exists()).toBe(true)
+ })
+
+ it('renders a back button', () => {
+ expect(wrapper.find('.test-back').exists()).toBe(true)
+ })
})
diff --git a/admin/src/components/NotFoundPage.vue b/admin/src/components/NotFoundPage.vue
index f01f76044..6c49222ef 100755
--- a/admin/src/components/NotFoundPage.vue
+++ b/admin/src/components/NotFoundPage.vue
@@ -1195,7 +1195,7 @@
diff --git a/admin/src/components/ProjectBranding/ListHumhubSpaces.vue b/admin/src/components/ProjectBranding/ListHumhubSpaces.vue
new file mode 100644
index 000000000..5f28f177f
--- /dev/null
+++ b/admin/src/components/ProjectBranding/ListHumhubSpaces.vue
@@ -0,0 +1,86 @@
+
+
-
+
+
+
+
+
+
diff --git a/admin/src/components/ProjectBranding/ProjectBrandingForm.vue b/admin/src/components/ProjectBranding/ProjectBrandingForm.vue
new file mode 100644
index 000000000..90e928c41
--- /dev/null
+++ b/admin/src/components/ProjectBranding/ProjectBrandingForm.vue
@@ -0,0 +1,171 @@
+
+ -
+
-
+ + + {{ space.name }} ++ + {{ $t('projectBranding.openSpaceInHumhub') }} + +
+
+
+
+ {{ selectedSpaceText }}
+
+
+
+ {{ $t('projectBranding.newUserToSpaceTooltip') }}
+
+
+
+ {{ errorMessage }}
+
+
+
+
+
+
+
+
diff --git a/admin/src/components/ProjectBranding/ProjectBrandingItem.vue b/admin/src/components/ProjectBranding/ProjectBrandingItem.vue
new file mode 100644
index 000000000..1a02286f7
--- /dev/null
+++ b/admin/src/components/ProjectBranding/ProjectBrandingItem.vue
@@ -0,0 +1,117 @@
+
+
+ {{ $t('save') }}
+ {{ $t('reset') }}
+
+
+
+
+ {{ item.name }}
+
+ {{ frontendLoginUrl }} +
+
+
+
+ {{ item.alias }}
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/admin/src/components/RowDetails.vue b/admin/src/components/RowDetails.vue
index 84dfebbb5..91c32c73c 100644
--- a/admin/src/components/RowDetails.vue
+++ b/admin/src/components/RowDetails.vue
@@ -1,5 +1,5 @@
- + {{ frontendLoginUrl }} +
-
-
-
+
+
+
-
+
diff --git a/admin/src/components/Tables/SearchUserTable.spec.js b/admin/src/components/Tables/SearchUserTable.spec.js
index a2d30e48a..319ebab45 100644
--- a/admin/src/components/Tables/SearchUserTable.spec.js
+++ b/admin/src/components/Tables/SearchUserTable.spec.js
@@ -1,10 +1,59 @@
import { mount } from '@vue/test-utils'
-import SearchUserTable from './SearchUserTable'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+import { createStore } from 'vuex'
+import SearchUserTable from './SearchUserTable.vue'
+import { BTable } from 'bootstrap-vue-next'
-const localVue = global.localVue
-
-const apolloMutateMock = jest.fn().mockResolvedValue({})
-const apolloQueryMock = jest.fn().mockResolvedValue({})
+vi.mock('../CreationFormular.vue', () => ({
+ default: {
+ template:
+ '',
+ methods: {
+ emitUpdateUserData() {
+ this.$emit('update-user-data', this.item, [250, 500, 750])
+ },
+ },
+ props: ['item'],
+ },
+}))
+vi.mock('../ConfirmRegisterMailFormular.vue', () => ({
+ default: {
+ template: '
-
-
+
@@ -33,101 +37,100 @@
-
-
-
-
+
-
-
+ style="color: #ffc107"
+ class="ps-1"
+ />
+
-
-
-
+
-
-
+
-
-
+
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
diff --git a/admin/src/components/Tables/StatisticTable.spec.js b/admin/src/components/Tables/StatisticTable.spec.js
index 99d1316fc..2e5946eed 100644
--- a/admin/src/components/Tables/StatisticTable.spec.js
+++ b/admin/src/components/Tables/StatisticTable.spec.js
@@ -1,50 +1,108 @@
import { mount } from '@vue/test-utils'
-import StatisticTable from './StatisticTable'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import StatisticTable from './StatisticTable.vue'
+import { useI18n } from 'vue-i18n'
+import { BTableSimple, BTbody, BTd, BTh, BThead, BTr } from 'bootstrap-vue-next'
-const localVue = global.localVue
-
-const propsData = {
- value: {
- totalUsers: 3113,
- activeUsers: 1057,
- deletedUsers: 35,
- totalGradidoCreated: '4083774.05000000000000000000',
- totalGradidoDecayed: '-1062639.13634129622923372197',
- totalGradidoAvailable: '2513565.869444365732411569',
- totalGradidoUnbookedDecayed: '-500474.6738366222166261272',
- },
-}
-
-const mocks = {
- $t: jest.fn((t) => t),
- $n: jest.fn((n) => n),
- $d: jest.fn((d) => d),
-}
+vi.mock('vue-i18n')
describe('StatisticTable', () => {
let wrapper
+ const mockT = vi.fn((key) => key)
+ const mockN = vi.fn((n) => n.toFixed(2))
- const Wrapper = () => {
- return mount(StatisticTable, { localVue, mocks, propsData })
- }
-
- describe('mount', () => {
- beforeEach(() => {
- wrapper = Wrapper()
+ beforeEach(() => {
+ useI18n.mockReturnValue({
+ t: mockT,
+ n: mockN,
})
- it('has a DIV element with the class .statistic-table', () => {
- expect(wrapper.find('div.statistic-table').exists()).toBe(true)
- })
-
- describe('renders the table', () => {
- it('with three colunms', () => {
- expect(wrapper.findAll('thead > tr > th')).toHaveLength(3)
- })
-
- it('with seven rows', () => {
- expect(wrapper.findAll('tbody > tr')).toHaveLength(7)
- })
+ wrapper = mount(StatisticTable, {
+ props: {
+ statistics: {
+ totalUsers: 3113,
+ activeUsers: 1057,
+ deletedUsers: 35,
+ totalGradidoCreated: '4083774.05000000000000000000',
+ totalGradidoDecayed: '-1062639.13634129622923372197',
+ totalGradidoAvailable: '2513565.869444365732411569',
+ totalGradidoUnbookedDecayed: '-500474.6738366222166261272',
+ },
+ },
+ global: {
+ stubs: {
+ BTableSimple,
+ BThead,
+ BTbody,
+ BTr,
+ BTh,
+ BTd,
+ },
+ },
})
})
+
+ it('renders the component', () => {
+ expect(wrapper.find('.statistic-table').exists()).toBe(true)
+ })
+
+ it('renders the table with correct structure', () => {
+ expect(wrapper.findAll('thead > tr > th')).toHaveLength(3)
+ expect(wrapper.findAll('tbody > tr')).toHaveLength(7)
+ })
+
+ it('displays correct column headers', () => {
+ const headers = wrapper.findAll('th')
+ expect(headers[1].text()).toBe('statistic.count')
+ expect(headers[2].text()).toBe('statistic.details')
+ })
+
+ it('displays total users correctly', () => {
+ const row = wrapper.findAll('tbody > tr')[0]
+ expect(row.findAll('td')[0].text()).toBe('statistic.totalUsers')
+ expect(row.findAll('td')[1].text()).toBe('3113')
+ })
+
+ it('displays active users correctly', () => {
+ const row = wrapper.findAll('tbody > tr')[1]
+ expect(row.findAll('td')[0].text()).toBe('statistic.activeUsers')
+ expect(row.findAll('td')[1].text()).toBe('1057')
+ })
+
+ it('displays deleted users correctly', () => {
+ const row = wrapper.findAll('tbody > tr')[2]
+ expect(row.findAll('td')[0].text()).toBe('statistic.deletedUsers')
+ expect(row.findAll('td')[1].text()).toBe('35')
+ })
+
+ it('displays total Gradido created correctly', () => {
+ const row = wrapper.findAll('tbody > tr')[3]
+ expect(row.findAll('td')[0].text()).toBe('statistic.totalGradidoCreated')
+ expect(row.findAll('td')[1].text()).toContain('4083774.05')
+ expect(row.findAll('td')[2].text()).toBe('4083774.05000000000000000000')
+ })
+
+ it('displays total Gradido decayed correctly', () => {
+ const row = wrapper.findAll('tbody > tr')[4]
+ expect(row.findAll('td')[0].text()).toBe('statistic.totalGradidoDecayed')
+ expect(row.findAll('td')[1].text()).toContain('-1062639.14')
+ expect(row.findAll('td')[1].text()).toContain('GDD')
+ expect(row.findAll('td')[2].text()).toBe('-1062639.13634129622923372197')
+ })
+
+ it('displays total Gradido available correctly', () => {
+ const row = wrapper.findAll('tbody > tr')[5]
+ expect(row.findAll('td')[0].text()).toBe('statistic.totalGradidoAvailable')
+ expect(row.findAll('td')[1].text()).toContain('2513565.87')
+ expect(row.findAll('td')[1].text()).toContain('GDD')
+ expect(row.findAll('td')[2].text()).toBe('2513565.869444365732411569')
+ })
+
+ it('displays total Gradido unbooked decayed correctly', () => {
+ const row = wrapper.findAll('tbody > tr')[6]
+ expect(row.findAll('td')[0].text()).toBe('statistic.totalGradidoUnbookedDecayed')
+ expect(row.findAll('td')[1].text()).toContain('-500474.67')
+ expect(row.findAll('td')[1].text()).toContain('GDD')
+ expect(row.findAll('td')[2].text()).toBe('-500474.6738366222166261272')
+ })
})
diff --git a/admin/src/components/Tables/StatisticTable.vue b/admin/src/components/Tables/StatisticTable.vue
index a72e007a3..f20a02177 100644
--- a/admin/src/components/Tables/StatisticTable.vue
+++ b/admin/src/components/Tables/StatisticTable.vue
@@ -1,84 +1,96 @@
-
-
-
-
-
-
+
-
+ 
+ 
+
+
+
+
+
-
- 
+
+
+
+ 
+
-
+
-
-
-
- {{ $t('statistic.count') }}
- {{ $t('statistic.details') }}
-
-
-
-
-
+
+
+
+ {{ $t('statistic.count') }}
+ {{ $t('statistic.details') }}
+
+
+
+
+
{{ $t('statistic.totalUsers') }}
-
- {{ value.totalUsers }}
-
-
-
+
+
+ {{ props.statistics.totalUsers }}
+
+
+
{{ $t('statistic.activeUsers') }}
-
- {{ value.activeUsers }}
-
-
-
+
+
+ {{ props.statistics.activeUsers }}
+
+
+
{{ $t('statistic.deletedUsers') }}
-
- {{ value.deletedUsers }}
-
-
-
+
+
+ {{ props.statistics.deletedUsers }}
+
+
+
{{ $t('statistic.totalGradidoCreated') }}
-
-
- {{ $n(value.totalGradidoCreated, 'decimal') }} {{ $t('GDD') }}
-
- {{ value.totalGradidoCreated }}
-
-
-
+
+
+ {{ getDecimal(props.statistics.totalGradidoCreated) }} {{ $t('GDD') }}
+
+
+ {{ props.statistics.totalGradidoCreated }}
+
+
+
+
{{ $t('statistic.totalGradidoDecayed') }}
-
-
- {{ $n(value.totalGradidoDecayed, 'decimal') }} {{ $t('GDD') }}
-
- {{ value.totalGradidoDecayed }}
-
-
-
+
+
+ {{ getDecimal(props.statistics.totalGradidoDecayed) }} {{ $t('GDD') }}
+
+ {{ props.statistics.totalGradidoDecayed }}
+
+
+
{{ $t('statistic.totalGradidoAvailable') }}
-
-
- {{ $n(value.totalGradidoAvailable, 'decimal') }} {{ $t('GDD') }}
-
- {{ value.totalGradidoAvailable }}
-
-
-
+
+
+ {{ getDecimal(props.statistics.totalGradidoAvailable) }} {{ $t('GDD') }}
+
+
+ {{ props.statistics.totalGradidoAvailable }}
+
+
+
+
{{ $t('statistic.totalGradidoUnbookedDecayed') }}
-
-
- {{ $n(value.totalGradidoUnbookedDecayed, 'decimal') }} {{ $t('GDD') }}
-
- {{ value.totalGradidoUnbookedDecayed }}
-
-
-
+
+
+ {{ getDecimal(props.statistics.totalGradidoUnbookedDecayed) }}
+ {{ $t('GDD') }}
+
+ {{ props.statistics.totalGradidoUnbookedDecayed }}
+
+
+
-
diff --git a/admin/src/components/TransactionLinkList.spec.js b/admin/src/components/TransactionLinkList.spec.js
index 486b53859..9f374c542 100644
--- a/admin/src/components/TransactionLinkList.spec.js
+++ b/admin/src/components/TransactionLinkList.spec.js
@@ -1,140 +1,162 @@
import { mount } from '@vue/test-utils'
-import TransactionLinkList from './TransactionLinkList'
-import { listTransactionLinksAdmin } from '../graphql/listTransactionLinksAdmin.js'
-import { toastErrorSpy } from '../../test/testSetup'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import { nextTick, ref } from 'vue'
+import TransactionLinkList from './TransactionLinkList.vue'
+import { useQuery } from '@vue/apollo-composable'
+import { useI18n } from 'vue-i18n'
+import { useAppToast } from '@/composables/useToast'
+import { BPagination, BTable } from 'bootstrap-vue-next'
-const localVue = global.localVue
+vi.mock('@vue/apollo-composable')
+vi.mock('vue-i18n')
+vi.mock('@/composables/useToast')
-const apolloQueryMock = jest.fn()
-apolloQueryMock.mockResolvedValue({
- data: {
- listTransactionLinksAdmin: {
- count: 8,
- links: [
- {
- amount: '19.99',
- code: '62ef8236ace7217fbd066c5a',
- createdAt: '2022-03-24T17:43:09.000Z',
- deletedAt: null,
- holdAvailableAmount: '20.51411720068412022949',
- id: 36,
- memo: 'Kein Trick, keine Zauberrei,\nbei Gradidio sei dabei!',
- redeemedAt: null,
- validUntil: '2022-04-07T17:43:09.000Z',
- },
- {
- amount: '19.99',
- code: '2b603f36521c617fbd066cef',
- createdAt: '2022-03-24T17:43:09.000Z',
- deletedAt: null,
- holdAvailableAmount: '20.51411720068412022949',
- id: 37,
- memo: 'Kein Trick, keine Zauberrei,\nbei Gradidio sei dabei!',
- redeemedAt: null,
- validUntil: '2022-04-07T17:43:09.000Z',
- },
- {
- amount: '19.99',
- code: '0bb789b5bd5b717fbd066eb5',
- createdAt: '2022-03-24T17:43:09.000Z',
- deletedAt: '2022-03-24T17:43:09.000Z',
- holdAvailableAmount: '20.51411720068412022949',
- id: 40,
- memo: 'Da habe ich mich wohl etwas übernommen.',
- redeemedAt: '2022-04-07T14:43:09.000Z',
- validUntil: '2022-04-07T17:43:09.000Z',
- },
- {
- amount: '19.99',
- code: '2d4a763e516b317fbd066a85',
- createdAt: '2022-01-01T00:00:00.000Z',
- deletedAt: null,
- holdAvailableAmount: '20.51411720068412022949',
- id: 33,
- memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
- redeemedAt: null,
- validUntil: '2022-01-15T00:00:00.000Z',
- },
- ],
- },
+const mockLinks = [
+ {
+ amount: '19.99',
+ code: '62ef8236ace7217fbd066c5a',
+ createdAt: '2022-03-24T17:43:09.000Z',
+ deletedAt: null,
+ holdAvailableAmount: '20.51411720068412022949',
+ id: 36,
+ memo: 'Kein Trick, keine Zauberrei,\nbei Gradidio sei dabei!',
+ redeemedAt: null,
+ validUntil: '2022-04-07T17:43:09.000Z',
},
-})
-
-const propsData = {
- userId: 42,
-}
-
-const mocks = {
- $apollo: {
- query: apolloQueryMock,
+ {
+ amount: '19.99',
+ code: '2b603f36521c617fbd066cef',
+ createdAt: '2022-03-24T17:43:09.000Z',
+ deletedAt: null,
+ holdAvailableAmount: '20.51411720068412022949',
+ id: 37,
+ memo: 'Kein Trick, keine Zauberrei,\nbei Gradidio sei dabei!',
+ redeemedAt: '2022-04-07T14:43:09.000Z',
+ validUntil: '2022-04-07T17:43:09.000Z',
},
- $t: jest.fn((t) => t),
- $d: jest.fn((d) => d),
-}
+ {
+ amount: '19.99',
+ code: '0bb789b5bd5b717fbd066eb5',
+ createdAt: '2022-03-24T17:43:09.000Z',
+ deletedAt: '2022-03-24T17:43:09.000Z',
+ holdAvailableAmount: '20.51411720068412022949',
+ id: 40,
+ memo: 'Da habe ich mich wohl etwas übernommen.',
+ redeemedAt: '2022-04-07T14:43:09.000Z',
+ validUntil: '2022-04-07T17:43:09.000Z',
+ },
+ {
+ amount: '19.99',
+ code: '2d4a763e516b317fbd066a85',
+ createdAt: '2022-01-01T00:00:00.000Z',
+ deletedAt: null,
+ holdAvailableAmount: '20.51411720068412022949',
+ id: 33,
+ memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
+ redeemedAt: null,
+ validUntil: '2022-01-15T00:00:00.000Z',
+ },
+]
describe('TransactionLinkList', () => {
+ const mockT = vi.fn((key) => key)
+ const mockD = vi.fn((date) => new Date(date).toISOString())
+ const mockToastError = vi.fn()
let wrapper
+ let mockResult
+ let mockError
+ let mockRefetch
- const Wrapper = () => {
- return mount(TransactionLinkList, { localVue, mocks, propsData })
- }
+ beforeEach(() => {
+ vi.useFakeTimers()
+ vi.setSystemTime(new Date('2022-04-01T00:00:00.000Z'))
- describe('mount', () => {
- beforeEach(() => {
- jest.clearAllMocks()
- wrapper = Wrapper()
+ useI18n.mockReturnValue({ t: mockT, d: mockD })
+ useAppToast.mockReturnValue({ toastError: mockToastError })
+
+ mockResult = ref(null)
+ mockError = ref(null)
+ mockRefetch = vi.fn()
+
+ useQuery.mockReturnValue({
+ result: mockResult,
+ error: mockError,
+ refetch: mockRefetch,
})
- it('calls the API', () => {
- expect(apolloQueryMock).toBeCalledWith(
- expect.objectContaining({
- query: listTransactionLinksAdmin,
- variables: {
- currentPage: 1,
- pageSize: 5,
- userId: 42,
- },
- }),
- )
- })
-
- it('has 4 items in the table', () => {
- expect(wrapper.findAll('tbody > tr')).toHaveLength(4)
- })
-
- it('has pagination buttons', () => {
- expect(wrapper.findComponent({ name: 'BPagination' }).exists()).toBe(true)
- })
-
- describe('next page', () => {
- beforeAll(async () => {
- jest.clearAllMocks()
- await wrapper.findComponent({ name: 'BPagination' }).vm.$emit('input', 2)
- })
-
- it('calls the API again', () => {
- expect(apolloQueryMock).toBeCalledWith(
- expect.objectContaining({
- query: listTransactionLinksAdmin,
- variables: {
- currentPage: 1,
- pageSize: 5,
- userId: 42,
- },
- }),
- )
- })
- })
-
- describe('server response with error', () => {
- beforeEach(() => {
- apolloQueryMock.mockRejectedValue({ message: 'Oh no!' })
- wrapper = Wrapper()
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Oh no!')
- })
+ wrapper = mount(TransactionLinkList, {
+ props: {
+ userId: 123,
+ },
+ global: {
+ stubs: {
+ BTable,
+ BPagination,
+ },
+ },
})
})
+
+ it('renders the component with mock data', async () => {
+ mockResult.value = {
+ listTransactionLinksAdmin: {
+ count: mockLinks.length,
+ links: mockLinks,
+ },
+ }
+ await nextTick()
+ expect(wrapper.find('.transaction-link-list').exists()).toBe(true)
+ expect(wrapper.vm.items).toHaveLength(4)
+ expect(wrapper.vm.rows).toBe(4)
+ })
+
+ it('formats amount correctly', () => {
+ const amountField = wrapper.vm.fields.find((f) => f.key === 'amount')
+ expect(amountField.formatter('19.99')).toBe('19.99 GDD')
+ })
+
+ it('formats status correctly for different scenarios', () => {
+ const statusField = wrapper.vm.fields.find((f) => f.key === 'status')
+
+ // Open transaction
+ expect(statusField.formatter(null, null, mockLinks[0])).toBe('open')
+
+ // Deleted transaction
+ expect(statusField.formatter(null, null, mockLinks[2])).toContain('deleted')
+ expect(statusField.formatter(null, null, mockLinks[2])).toContain('2022-03-24T17:43:09.000Z')
+
+ // Redeemed transaction
+ expect(statusField.formatter(null, null, mockLinks[1])).toContain('redeemed')
+ expect(statusField.formatter(null, null, mockLinks[1])).toContain('2022-04-07T14:43:09.000Z')
+
+ // Expired transaction
+ expect(statusField.formatter(null, null, mockLinks[3])).toContain('expired')
+ expect(statusField.formatter(null, null, mockLinks[3])).toContain('2022-01-15T00:00:00.000Z')
+ })
+
+ it('displays correct memo', () => {
+ const memoField = wrapper.vm.fields.find((f) => f.key === 'memo')
+ expect(memoField.label).toBe('transactionlist.memo')
+ expect(memoField.class).toBe('text-break')
+ })
+
+ it('formats dates correctly', () => {
+ const createdAtField = wrapper.vm.fields.find((f) => f.key === 'createdAt')
+ const validUntilField = wrapper.vm.fields.find((f) => f.key === 'validUntil')
+
+ expect(createdAtField.formatter('2022-03-24T17:43:09.000Z')).toBe('2022-03-24T17:43:09.000Z')
+ expect(validUntilField.formatter('2022-04-07T17:43:09.000Z')).toBe('2022-04-07T17:43:09.000Z')
+ })
+
+ it('refetches data when currentPage changes', async () => {
+ wrapper.vm.currentPage = 2
+ await nextTick()
+ expect(mockRefetch).toHaveBeenCalled()
+ })
+
+ it('refetches data when perPage changes', async () => {
+ wrapper.vm.perPage = 10
+ await nextTick()
+ expect(mockRefetch).toHaveBeenCalled()
+ })
})
diff --git a/admin/src/components/TransactionLinkList.vue b/admin/src/components/TransactionLinkList.vue
index eb58903c6..e967fdc81 100644
--- a/admin/src/components/TransactionLinkList.vue
+++ b/admin/src/components/TransactionLinkList.vue
@@ -1,106 +1,91 @@
-
- {{ $t('transactionlink.name') }}
- {{ t('transactionlink.name') }}
+
-
-
+
-
-
-
-
-
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/admin/src/components/input/EditableGroup.spec.js b/admin/src/components/input/EditableGroup.spec.js
new file mode 100644
index 000000000..865039f5e
--- /dev/null
+++ b/admin/src/components/input/EditableGroup.spec.js
@@ -0,0 +1,79 @@
+import { mount } from '@vue/test-utils'
+import { describe, it, expect } from 'vitest'
+import EditableGroup from './EditableGroup.vue'
+import { BButton, BFormGroup } from 'bootstrap-vue-next'
+
+const viewValue = 'test label value'
+const editValue = 'test edit value'
+
+describe('EditableGroup', () => {
+ const createWrapper = (props = {}) => {
+ return mount(EditableGroup, {
+ props,
+ global: {
+ mocks: {
+ $t: (key) => key,
+ },
+ stubs: {
+ BFormGroup,
+ BButton,
+ IBiPencilFill: true,
+ },
+ },
+ slots: {
+ view: `${viewValue}
`,
+ edit: `${editValue}
`,
+ },
+ })
+ }
+
+ it('renders the view slot when not editing', () => {
+ const wrapper = createWrapper({ allowEdit: true })
+ expect(wrapper.text()).toContain(viewValue)
+ })
+
+ it('renders the edit slot when editing', async () => {
+ const wrapper = createWrapper({ allowEdit: true })
+ await wrapper.find('button').trigger('click')
+ expect(wrapper.find('.test-edit').text()).toBe(editValue)
+ })
+
+ it('emits save event when clicking save button', async () => {
+ const wrapper = createWrapper({ allowEdit: true })
+ await wrapper.find('button').trigger('click')
+ await wrapper.vm.valueChanged()
+ await wrapper.find('.save-button').trigger('click')
+ expect(wrapper.emitted('save')).toBeTruthy()
+ })
+
+ it('disables save button when value is not changed', async () => {
+ const wrapper = createWrapper({ allowEdit: true })
+ await wrapper.find('button').trigger('click')
+ expect(wrapper.find('.save-button').attributes('disabled')).toBeDefined()
+ })
+
+ it('enables save button when value is changed', async () => {
+ const wrapper = createWrapper({ allowEdit: true })
+ await wrapper.find('button').trigger('click')
+ await wrapper.vm.valueChanged()
+ expect(wrapper.find('.save-button').attributes('disabled')).toBeFalsy()
+ })
+
+ it('updates variant to success when editing', async () => {
+ const wrapper = createWrapper({ allowEdit: true })
+ await wrapper.find('button').trigger('click')
+ expect(wrapper.vm.variant).toBe('success')
+ })
+
+ it('updates variant to prime when not editing', () => {
+ const wrapper = createWrapper({ allowEdit: true })
+ expect(wrapper.vm.variant).toBe('prime')
+ })
+
+ it('emits reset event when clicking close button', async () => {
+ const wrapper = createWrapper({ allowEdit: true })
+ await wrapper.find('button').trigger('click')
+ await wrapper.find('.close-button').trigger('click')
+ expect(wrapper.emitted('reset')).toBeTruthy()
+ })
+})
diff --git a/admin/src/components/input/EditableGroup.vue b/admin/src/components/input/EditableGroup.vue
new file mode 100644
index 000000000..06d1d7de4
--- /dev/null
+++ b/admin/src/components/input/EditableGroup.vue
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+ {{ $t('save') }}
+
+
+ {{ $t('close') }}
+
+
+
+
+
+
diff --git a/admin/src/components/input/EditableGroupableLabel.spec.js b/admin/src/components/input/EditableGroupableLabel.spec.js
new file mode 100644
index 000000000..81a409bad
--- /dev/null
+++ b/admin/src/components/input/EditableGroupableLabel.spec.js
@@ -0,0 +1,104 @@
+import { mount } from '@vue/test-utils'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import EditableGroupableLabel from './EditableGroupableLabel.vue'
+import { BFormGroup, BFormInput } from 'bootstrap-vue-next'
+
+const modelValue = 'test label value'
+const label = 'Test Label'
+const idName = 'test-id-name'
+
+describe('EditableGroupableLabel', () => {
+ let wrapper
+
+ const createWrapper = (props = {}, parentMethods = {}) => {
+ const Parent = {
+ template: '
+
+
+
+
+
+
diff --git a/admin/src/components/input/TimePicker.spec.js b/admin/src/components/input/TimePicker.spec.js
index 82f51a969..50e420023 100644
--- a/admin/src/components/input/TimePicker.spec.js
+++ b/admin/src/components/input/TimePicker.spec.js
@@ -1,11 +1,12 @@
import { mount } from '@vue/test-utils'
+import { describe, it, expect } from 'vitest'
import TimePicker from './TimePicker.vue'
describe('TimePicker', () => {
- it('updates timeValue on input and emits input event', async () => {
+ it('updates timeValue on input and emits update:modelValue event', async () => {
const wrapper = mount(TimePicker, {
- propsData: {
- value: '12:34', // Set an initial value for testing
+ props: {
+ modelValue: '12:34', // Set an initial value for testing
},
})
@@ -15,22 +16,26 @@ describe('TimePicker', () => {
await input.setValue('23:45')
// Check if timeValue is updated
- expect(wrapper.vm.timeValue).toBe('23:45')
+ expect(wrapper.vm.timeValue).toBe('23:45') // test for Vue 3 composition state directly, if possible
- // Check if input event is emitted with updated value
- expect(wrapper.emitted().input).toBeTruthy()
- expect(wrapper.emitted().input[0]).toEqual(['23:45'])
+ // Check if update:modelValue event is emitted with updated value
+ expect(wrapper.emitted('update:modelValue')).toBeTruthy()
+ expect(wrapper.emitted('update:modelValue')[0]).toEqual(['23:45'])
})
it('validates and corrects time format on blur', async () => {
- const wrapper = mount(TimePicker)
+ const wrapper = mount(TimePicker, {
+ props: {
+ modelValue: '99:99', // Set an invalid value initially
+ },
+ })
const input = wrapper.find('input[type="text"]')
// Simulate user input
await input.setValue('99:99')
- expect(wrapper.emitted().input).toBeTruthy()
- expect(wrapper.emitted().input[0]).toEqual(['99:99'])
+ expect(wrapper.emitted('update:modelValue')).toBeTruthy()
+ expect(wrapper.emitted('update:modelValue')[0]).toEqual(['99:99'])
// Trigger blur event
await input.trigger('blur')
@@ -38,26 +43,30 @@ describe('TimePicker', () => {
// Check if timeValue is corrected to valid format
expect(wrapper.vm.timeValue).toBe('23:59') // Maximum allowed value for hours and minutes
- // Check if input event is emitted with corrected value
- expect(wrapper.emitted().input).toBeTruthy()
- expect(wrapper.emitted().input[1]).toEqual(['23:59'])
+ // Check if update:modelValue event is emitted with corrected value
+ expect(wrapper.emitted('update:modelValue')).toBeTruthy()
+ expect(wrapper.emitted('update:modelValue')[1]).toEqual(['23:59'])
})
- it('check handling of empty input', async () => {
- const wrapper = mount(TimePicker)
+ it('checks handling of empty input', async () => {
+ const wrapper = mount(TimePicker, {
+ props: {
+ modelValue: '', // Set initial empty value
+ },
+ })
const input = wrapper.find('input[type="text"]')
- // Simulate user input with non-numeric characters
+ // Simulate user input with empty string
await input.setValue('')
// Trigger blur event
await input.trigger('blur')
- // Check if non-numeric characters are filtered out
+ // Check if empty input is handled correctly
expect(wrapper.vm.timeValue).toBe('00:00')
- // Check if input event is emitted with filtered value
- expect(wrapper.emitted().input).toBeTruthy()
- expect(wrapper.emitted().input[1]).toEqual(['00:00'])
+ // Check if update:modelValue event is emitted with default value
+ expect(wrapper.emitted('update:modelValue')).toBeTruthy()
+ expect(wrapper.emitted('update:modelValue')[1]).toEqual(['00:00'])
})
})
diff --git a/admin/src/components/input/TimePicker.vue b/admin/src/components/input/TimePicker.vue
index e8fb416ad..8db294005 100644
--- a/admin/src/components/input/TimePicker.vue
+++ b/admin/src/components/input/TimePicker.vue
@@ -1,48 +1,72 @@
-
-
diff --git a/admin/src/pages/ContributionLinks.spec.js b/admin/src/pages/ContributionLinks.spec.js
index 60b70c1c6..2570ae5cc 100644
--- a/admin/src/pages/ContributionLinks.spec.js
+++ b/admin/src/pages/ContributionLinks.spec.js
@@ -1,12 +1,27 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
import { mount } from '@vue/test-utils'
-import ContributionLinks from './ContributionLinks'
+import { ref } from 'vue'
+import { useQuery } from '@vue/apollo-composable'
import { listContributionLinks } from '@/graphql/listContributionLinks.js'
-import { toastErrorSpy } from '../../test/testSetup'
+import { useAppToast } from '@/composables/useToast'
+import ContributionLinks from '@/pages/ContributionLinks.vue'
-const localVue = global.localVue
+vi.mock('@vue/apollo-composable', () => ({
+ useQuery: vi.fn(),
+}))
-const apolloQueryMock = jest.fn().mockResolvedValue({
- data: {
+vi.mock('@/composables/useToast', () => ({
+ useAppToast: vi.fn(),
+}))
+
+describe('ContributionLink', () => {
+ let wrapper
+ let mockResult
+ let mockError
+ let mockRefetch
+ let mockToastError
+
+ const mockData = {
listContributionLinks: {
links: [
{
@@ -24,55 +39,74 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
],
count: 1,
},
- },
-})
-
-const mocks = {
- $t: jest.fn((t) => t),
- $d: jest.fn((d) => d),
- $apollo: {
- query: apolloQueryMock,
- },
-}
-
-describe('ContributionLinks', () => {
- // eslint-disable-next-line no-unused-vars
- let wrapper
-
- const Wrapper = () => {
- return mount(ContributionLinks, { localVue, mocks })
}
- describe('mount', () => {
- beforeEach(() => {
- wrapper = Wrapper()
+ beforeEach(() => {
+ mockResult = ref(null)
+ mockError = ref(null)
+ mockRefetch = vi.fn()
+ mockToastError = vi.fn()
+
+ vi.mocked(useQuery).mockReturnValue({
+ result: mockResult,
+ error: mockError,
+ refetch: mockRefetch,
})
- describe('apollo returns', () => {
- it('calls listContributionLinks', () => {
- expect(apolloQueryMock).toBeCalledWith(
- expect.objectContaining({
- query: listContributionLinks,
- }),
- )
- })
+ vi.mocked(useAppToast).mockReturnValue({
+ toastError: mockToastError,
})
- describe('query transaction with error', () => {
- beforeEach(() => {
- apolloQueryMock.mockRejectedValue({ message: 'OUCH!' })
- wrapper = Wrapper()
- })
-
- it('calls the API', () => {
- expect(apolloQueryMock).toBeCalled()
- })
-
- it('toast error', () => {
- expect(toastErrorSpy).toBeCalledWith(
- 'listContributionLinks has no result, use default data',
- )
- })
+ wrapper = mount(ContributionLinks, {
+ global: {
+ mocks: {
+ $t: (key) => key,
+ $d: (date) => date,
+ },
+ stubs: {
+ ContributionLink: true,
+ },
+ },
})
})
+
+ it('calls useQuery with listContributionLinks', () => {
+ expect(useQuery).toHaveBeenCalledWith(listContributionLinks, null, {
+ fetchPolicy: 'network-only',
+ })
+ })
+
+ it('renders the component', () => {
+ expect(wrapper.find('.contribution-link').exists()).toBe(true)
+ })
+
+ it('passes correct data to child component when query is successful', async () => {
+ mockResult.value = mockData
+ await wrapper.vm.$nextTick()
+ const childComponent = wrapper.findComponent({ name: 'ContributionLink' })
+ expect(childComponent.props('items')).toEqual(mockData.listContributionLinks.links)
+ expect(childComponent.props('count')).toBe(mockData.listContributionLinks.count)
+ })
+
+ it('passes empty data to child component when query result is null', async () => {
+ mockResult.value = null
+ await wrapper.vm.$nextTick()
+ const childComponent = wrapper.findComponent({ name: 'ContributionLink' })
+ expect(childComponent.props('items')).toEqual([])
+ expect(childComponent.props('count')).toBe(0)
+ })
+
+ it('calls toastError when there is an error', async () => {
+ mockError.value = new Error('OUCH!')
+ await wrapper.vm.$nextTick()
+ expect(mockToastError).toHaveBeenCalledWith(
+ 'listContributionLinks has no result, use default data',
+ )
+ })
+
+ it('calls refetch when get-contribution-links event is emitted', async () => {
+ wrapper.findComponent({ name: 'ContributionLink' }).vm.$emit('get-contribution-links')
+ await wrapper.vm.$nextTick()
+ expect(mockRefetch).toHaveBeenCalled()
+ })
})
diff --git a/admin/src/pages/ContributionLinks.vue b/admin/src/pages/ContributionLinks.vue
index 0a8436d73..80f4e5a1c 100644
--- a/admin/src/pages/ContributionLinks.vue
+++ b/admin/src/pages/ContributionLinks.vue
@@ -1,45 +1,31 @@
-
-
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index cba169655..092354f00 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -1,554 +1,208 @@
import { mount } from '@vue/test-utils'
-import CreationConfirm from './CreationConfirm'
-import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
-import { denyContribution } from '../graphql/denyContribution'
-import { adminListContributions } from '../graphql/adminListContributions'
-import { confirmContribution } from '../graphql/confirmContribution'
-import { getContribution } from '../graphql/getContribution'
-import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
-import VueApollo from 'vue-apollo'
-import { createMockClient } from 'mock-apollo-client'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import { nextTick, ref } from 'vue'
+import CreationConfirm from './CreationConfirm.vue'
+import { useQuery, useMutation } from '@vue/apollo-composable'
+import { createStore } from 'vuex'
+import { useI18n } from 'vue-i18n'
+import { useAppToast } from '@/composables/useToast'
+import { BBadge, BPagination, BTab, BTabs } from 'bootstrap-vue-next'
-const mockClient = createMockClient()
-const apolloProvider = new VueApollo({
- defaultClient: mockClient,
-})
+vi.mock('@vue/apollo-composable')
+vi.mock('vue-i18n')
+vi.mock('@/composables/useToast')
-const localVue = global.localVue
-
-localVue.use(VueApollo)
-
-const storeCommitMock = jest.fn()
-
-const mocks = {
- $t: jest.fn((t) => t),
- $d: jest.fn((d) => d),
- $store: {
- commit: storeCommitMock,
+const createVuexStore = () => {
+ return createStore({
state: {
- moderator: {
- firstName: 'Peter',
- lastName: 'Lustig',
- roles: ['ADMIN'],
- id: 263,
- language: 'de',
+ openCreations: 0,
+ },
+ mutations: {
+ setOpenCreations(state, count) {
+ state.openCreations = count
+ },
+ openCreationsMinus(state, count) {
+ state.openCreations -= count
},
},
- },
-}
-
-const defaultData = () => {
- return {
- adminListContributions: {
- contributionCount: 30,
- contributionList: [
- {
- id: 1,
- firstName: 'Bibi',
- lastName: 'Bloxberg',
- userId: 99,
- email: 'bibi@bloxberg.de',
- amount: 500,
- memo: 'Danke für alles',
- date: new Date(),
- moderator: 1,
- status: 'PENDING',
- creation: [500, 500, 500],
- messagesCount: 0,
- deniedBy: null,
- deniedAt: null,
- confirmedBy: null,
- confirmedAt: null,
- contributionDate: new Date(),
- deletedBy: null,
- deletedAt: null,
- updatedAt: null,
- updatedBy: null,
- createdAt: new Date(),
- },
- {
- id: 2,
- firstName: 'Räuber',
- lastName: 'Hotzenplotz',
- userId: 100,
- email: 'raeuber@hotzenplotz.de',
- amount: 1000000,
- memo: 'Gut Ergattert',
- date: new Date(),
- moderator: 1,
- status: 'PENDING',
- creation: [500, 500, 500],
- messagesCount: 0,
- deniedBy: null,
- deniedAt: null,
- confirmedBy: null,
- confirmedAt: null,
- contributionDate: new Date(),
- deletedBy: null,
- deletedAt: null,
- updatedAt: null,
- updatedBy: null,
- createdAt: new Date(),
- },
- ],
- },
- }
+ })
}
describe('CreationConfirm', () => {
let wrapper
- const adminListContributionsMock = jest.fn()
- const adminDeleteContributionMock = jest.fn()
- const adminDenyContributionMock = jest.fn()
- const confirmContributionMock = jest.fn()
- const getContributionMock = jest.fn()
+ let store
+ let mockResult
+ let mockRefetch
+ let mockOnResultCallback
+ const mockToastError = vi.fn()
+ const mockToastSuccess = vi.fn()
+ const mockT = vi.fn((key) => key)
+ const mockD = vi.fn((date) => date.toISOString())
- mockClient.setRequestHandler(
- adminListContributions,
- adminListContributionsMock
- .mockRejectedValueOnce({ message: 'Ouch!' })
- .mockResolvedValue({ data: defaultData() }),
- )
+ beforeEach(() => {
+ store = createVuexStore()
+ vi.spyOn(store, 'commit')
- mockClient.setRequestHandler(
- adminDeleteContribution,
- adminDeleteContributionMock.mockResolvedValue({ data: { adminDeleteContribution: true } }),
- )
+ mockResult = ref(null)
+ mockRefetch = vi.fn()
+ mockOnResultCallback = null
- mockClient.setRequestHandler(
- denyContribution,
- adminDenyContributionMock
- .mockRejectedValueOnce({ message: 'Ouch!' })
- .mockResolvedValue({ data: { denyContribution: true } }),
- )
-
- mockClient.setRequestHandler(
- confirmContribution,
- confirmContributionMock.mockResolvedValue({ data: { confirmContribution: true } }),
- )
-
- mockClient.setRequestHandler(getContribution, getContributionMock.mockResolvedValue({ data: {} }))
-
- const Wrapper = () => {
- return mount(CreationConfirm, { localVue, mocks, apolloProvider })
- }
-
- describe('mount', () => {
- beforeEach(() => {
- jest.clearAllMocks()
- wrapper = Wrapper()
+ useQuery.mockReturnValue({
+ onResult: (callback) => {
+ mockOnResultCallback = callback
+ },
+ onError: vi.fn(),
+ result: mockResult,
+ refetch: mockRefetch,
})
- describe('server response for get pending creations is error', () => {
- it('toast an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Ouch!')
- })
-
- it('has statusFilter ["IN_PROGRESS", "PENDING"]', () => {
- expect(wrapper.vm.statusFilter).toEqual(['IN_PROGRESS', 'PENDING'])
- })
+ useMutation.mockReturnValue({
+ mutate: vi.fn(),
+ onDone: vi.fn(),
+ onError: vi.fn(),
})
- describe('server response is success', () => {
- it('has a DIV element with the class.creation-confirm', () => {
- expect(wrapper.find('div.creation-confirm').exists()).toBeTruthy()
- })
-
- it('has two pending creations', () => {
- expect(wrapper.find('tbody').findAll('tr')).toHaveLength(2)
- })
+ useI18n.mockReturnValue({
+ t: mockT,
+ d: mockD,
})
- describe('actions in overlay', () => {
- describe('delete creation', () => {
- beforeEach(async () => {
- await wrapper.findAll('tr').at(1).findAll('button').at(0).trigger('click')
- })
-
- it('opens the overlay', () => {
- expect(wrapper.find('#overlay').isVisible()).toBeTruthy()
- })
-
- describe('with success', () => {
- describe('cancel deletion', () => {
- beforeEach(async () => {
- await wrapper.find('#overlay').findAll('button').at(0).trigger('click')
- })
-
- it('closes the overlay', async () => {
- expect(wrapper.find('#overlay').exists()).toBeFalsy()
- })
-
- it('still has 2 items in the table', () => {
- expect(wrapper.findAll('tbody > tr')).toHaveLength(2)
- })
- })
-
- describe('confirm deletion', () => {
- beforeEach(async () => {
- await wrapper.find('#overlay').findAll('button').at(1).trigger('click')
- })
-
- it('calls the adminDeleteContribution mutation', () => {
- expect(adminDeleteContributionMock).toBeCalledWith({ id: 1 })
- })
- it('commits openCreationsMinus to store', () => {
- expect(storeCommitMock).toBeCalledWith('openCreationsMinus', 1)
- })
-
- it('toasts a success message', () => {
- expect(toastSuccessSpy).toBeCalledWith('creation_form.toasted_delete')
- })
-
- it('has 1 item left in the table', () => {
- expect(wrapper.findAll('tbody > tr')).toHaveLength(1)
- })
- })
-
- describe('with error', () => {
- beforeEach(async () => {
- adminDeleteContributionMock.mockRejectedValue({ message: 'Ouchhh!' })
- await wrapper.find('#overlay').findAll('button').at(1).trigger('click')
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Ouchhh!')
- })
- })
- })
- })
-
- describe('confirm creation', () => {
- beforeEach(async () => {
- await wrapper.findAll('tr').at(2).findAll('button').at(3).trigger('click')
- })
-
- it('opens the overlay', () => {
- expect(wrapper.find('#overlay').isVisible()).toBeTruthy()
- })
-
- describe('with success', () => {
- describe('cancel confirmation', () => {
- beforeEach(async () => {
- await wrapper.find('#overlay').findAll('button').at(0).trigger('click')
- })
-
- it('closes the overlay', async () => {
- expect(wrapper.find('#overlay').exists()).toBeFalsy()
- })
-
- it('still has 2 items in the table', () => {
- expect(wrapper.findAll('tbody > tr')).toHaveLength(2)
- })
- })
-
- describe('confirm confirmation', () => {
- beforeEach(async () => {
- await wrapper.find('#overlay').findAll('button').at(1).trigger('click')
- })
-
- it('calls the confirmContribution mutation', () => {
- expect(confirmContributionMock).toBeCalledWith({ id: 2 })
- })
-
- it('commits openCreationsMinus to store', () => {
- expect(storeCommitMock).toBeCalledWith('openCreationsMinus', 1)
- })
-
- it('toasts a success message', () => {
- expect(toastSuccessSpy).toBeCalledWith('creation_form.toasted_created')
- })
-
- it('has 1 item left in the table', () => {
- expect(wrapper.findAll('tbody > tr')).toHaveLength(1)
- })
- })
- })
-
- describe('with error', () => {
- beforeEach(async () => {
- confirmContributionMock.mockRejectedValue({ message: 'Ouchhh!' })
- await wrapper.find('#overlay').findAll('button').at(1).trigger('click')
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Ouchhh!')
- })
- })
- })
-
- describe('deny creation', () => {
- beforeEach(async () => {
- await wrapper.findAll('tr').at(1).findAll('button').at(1).trigger('click')
- })
-
- it('opens the overlay', () => {
- expect(wrapper.find('#overlay').isVisible()).toBeTruthy()
- })
-
- describe('with success', () => {
- describe('cancel deny', () => {
- beforeEach(async () => {
- await wrapper.find('#overlay').findAll('button').at(0).trigger('click')
- })
-
- it('closes the overlay', async () => {
- expect(wrapper.find('#overlay').exists()).toBeFalsy()
- })
-
- it('still has 2 items in the table', () => {
- expect(wrapper.findAll('tbody > tr')).toHaveLength(2)
- })
- })
-
- describe('confirm deny', () => {
- beforeEach(async () => {
- await wrapper.find('#overlay').findAll('button').at(1).trigger('click')
- })
-
- it('calls the denyContribution mutation', () => {
- expect(adminDenyContributionMock).toBeCalledWith({ id: 1 })
- })
-
- it('commits openCreationsMinus to store', () => {
- expect(storeCommitMock).toBeCalledWith('openCreationsMinus', 1)
- })
-
- it('toasts a success message', () => {
- expect(toastSuccessSpy).toBeCalledWith('creation_form.toasted_denied')
- })
-
- it('has 1 item left in the table', () => {
- expect(wrapper.findAll('tbody > tr')).toHaveLength(1)
- })
- })
- })
-
- describe('with error', () => {
- beforeEach(async () => {
- adminDenyContributionMock.mockRejectedValue({ message: 'Ouchhh!' })
- await wrapper.find('#overlay').findAll('button').at(1).trigger('click')
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Ouchhh!')
- })
- })
- })
+ useAppToast.mockReturnValue({
+ toastError: mockToastError,
+ toastSuccess: mockToastSuccess,
})
- describe('filter tabs', () => {
- describe('click tab "confirmed"', () => {
- beforeEach(async () => {
- jest.clearAllMocks()
- await wrapper.find('a[data-test="confirmed"]').trigger('click')
- })
-
- it('refetches contributions with proper filter', () => {
- expect(adminListContributionsMock).toBeCalledWith({
- currentPage: 1,
- hideResubmission: false,
- noHashtag: null,
- order: 'DESC',
- pageSize: 25,
- query: '',
- statusFilter: ['CONFIRMED'],
- })
- })
-
- describe('click tab "open"', () => {
- beforeEach(async () => {
- jest.clearAllMocks()
- await wrapper.find('a[data-test="open"]').trigger('click')
- })
-
- it('refetches contributions with proper filter', () => {
- expect(adminListContributionsMock).toBeCalledWith({
- currentPage: 1,
- hideResubmission: true,
- noHashtag: null,
- order: 'DESC',
- pageSize: 25,
- query: '',
- statusFilter: ['IN_PROGRESS', 'PENDING'],
- })
- })
- })
-
- describe('click tab "denied"', () => {
- beforeEach(async () => {
- jest.clearAllMocks()
- await wrapper.find('a[data-test="denied"]').trigger('click')
- })
-
- it('refetches contributions with proper filter', () => {
- expect(adminListContributionsMock).toBeCalledWith({
- currentPage: 1,
- hideResubmission: false,
- noHashtag: null,
- order: 'DESC',
- pageSize: 25,
- query: '',
- statusFilter: ['DENIED'],
- })
- })
- })
-
- describe('click tab "deleted"', () => {
- beforeEach(async () => {
- jest.clearAllMocks()
- await wrapper.find('a[data-test="deleted"]').trigger('click')
- })
-
- it('refetches contributions with proper filter', () => {
- expect(adminListContributionsMock).toBeCalledWith({
- currentPage: 1,
- hideResubmission: false,
- noHashtag: null,
- order: 'DESC',
- pageSize: 25,
- query: '',
- statusFilter: ['DELETED'],
- })
- })
- })
-
- describe('click tab "all"', () => {
- beforeEach(async () => {
- jest.clearAllMocks()
- await wrapper.find('a[data-test="all"]').trigger('click')
- })
-
- it('refetches contributions with proper filter', () => {
- expect(adminListContributionsMock).toBeCalledWith({
- currentPage: 1,
- hideResubmission: false,
- noHashtag: null,
- order: 'DESC',
- pageSize: 25,
- query: '',
- statusFilter: ['IN_PROGRESS', 'PENDING', 'CONFIRMED', 'DENIED', 'DELETED'],
- })
- })
-
- describe('change pagination', () => {
- it('has pagination buttons', () => {
- expect(wrapper.findComponent({ name: 'BPagination' }).exists()).toBe(true)
- })
-
- describe('next page', () => {
- beforeEach(() => {
- jest.clearAllMocks()
- wrapper.findComponent({ name: 'BPagination' }).vm.$emit('input', 2)
- })
-
- it('calls the API again', () => {
- expect(adminListContributionsMock).toBeCalledWith({
- currentPage: 2,
- hideResubmission: false,
- noHashtag: null,
- order: 'DESC',
- pageSize: 25,
- query: '',
- statusFilter: ['IN_PROGRESS', 'PENDING', 'CONFIRMED', 'DENIED', 'DELETED'],
- })
- })
-
- describe('click tab "open" again', () => {
- beforeEach(async () => {
- jest.clearAllMocks()
- await wrapper.find('a[data-test="open"]').trigger('click')
- })
-
- it('refetches contributions with proper filter and current page = 1', () => {
- expect(adminListContributionsMock).toBeCalledWith({
- currentPage: 1,
- hideResubmission: true,
- noHashtag: null,
- order: 'DESC',
- pageSize: 25,
- query: '',
- statusFilter: ['IN_PROGRESS', 'PENDING'],
- })
- })
- })
- })
- })
- })
- })
- })
-
- describe('user query', () => {
- describe('with user query', () => {
- beforeEach(() => {
- wrapper.findComponent({ name: 'UserQuery' }).vm.$emit('input', 'query')
- })
-
- it('calls the API with query', () => {
- expect(adminListContributionsMock).toBeCalledWith({
- currentPage: 1,
- hideResubmission: true,
- noHashtag: null,
- order: 'DESC',
- pageSize: 25,
- query: 'query',
- statusFilter: ['IN_PROGRESS', 'PENDING'],
- })
- })
-
- describe('reset query', () => {
- beforeEach(() => {
- wrapper.findComponent({ name: 'UserQuery' }).vm.$emit('input', '')
- })
-
- it('calls the API with empty query', () => {
- expect(adminListContributionsMock).toBeCalledWith({
- currentPage: 1,
- hideResubmission: true,
- noHashtag: null,
- order: 'DESC',
- pageSize: 25,
- query: '',
- statusFilter: ['IN_PROGRESS', 'PENDING'],
- })
- })
- })
- })
- })
-
- describe('update status', () => {
- beforeEach(async () => {
- await wrapper.findComponent({ name: 'OpenCreationsTable' }).vm.$emit('update-status', 2)
- })
-
- it('updates the status', () => {
- expect(wrapper.vm.items.find((obj) => obj.id === 2).messagesCount).toBe(1)
- expect(wrapper.vm.items.find((obj) => obj.id === 2).status).toBe('IN_PROGRESS')
- })
- })
-
- describe('reload contribution', () => {
- beforeEach(async () => {
- await wrapper
- .findComponent({ name: 'OpenCreationsTable' })
- .vm.$emit('reload-contribution', 1)
- })
-
- it('reloaded contribution', () => {
- expect(getContributionMock).toBeCalledWith({
- id: 1,
- })
- })
- })
-
- describe('unknown variant', () => {
- beforeEach(async () => {
- await wrapper.setData({ variant: 'unknown' })
- })
-
- it('has overlay icon "info"', () => {
- expect(wrapper.vm.overlayIcon).toBe('info')
- })
+ wrapper = mount(CreationConfirm, {
+ global: {
+ plugins: [store],
+ stubs: {
+ UserQuery: true,
+ BButton: true,
+ BTabs,
+ BTab,
+ BBadge,
+ OpenCreationsTable: true,
+ BPagination,
+ Overlay: true,
+ IBiBellFill: true,
+ IBiCheck: true,
+ IBiXCircle: true,
+ IBiTrash: true,
+ IBiList: true,
+ },
+ mocks: {
+ $t: mockT,
+ $d: mockD,
+ },
+ },
})
})
+
+ const simulateQueryResult = async (data) => {
+ mockResult.value = data
+ if (mockOnResultCallback) {
+ mockOnResultCallback({ data })
+ }
+ await nextTick()
+ }
+
+ it('initializes with correct default values', () => {
+ expect(wrapper.vm.tabIndex).toBe(0)
+ expect(wrapper.vm.currentPage).toBe(1)
+ expect(wrapper.vm.pageSize).toBe(25)
+ expect(wrapper.vm.query).toBe('')
+ expect(wrapper.vm.noHashtag).toBe(null)
+ expect(wrapper.vm.hideResubmissionModel).toBe(true)
+ })
+
+ it('updates store and component state when open creations are fetched', async () => {
+ const mockData = {
+ adminListContributions: {
+ contributionCount: 5,
+ contributionList: Array(5)
+ .fill({})
+ .map((_, i) => ({ id: i + 1 })),
+ },
+ }
+
+ await simulateQueryResult(mockData)
+
+ expect(store.commit).toHaveBeenCalledWith('setOpenCreations', 5)
+ expect(wrapper.vm.rows).toBe(5)
+ expect(wrapper.vm.items).toEqual(mockData.adminListContributions.contributionList)
+ })
+
+ it('does not update store when not on the open tab', async () => {
+ wrapper.vm.tabIndex = 1
+ await nextTick()
+
+ const mockData = {
+ adminListContributions: {
+ contributionCount: 10,
+ contributionList: Array(10)
+ .fill({})
+ .map((_, i) => ({ id: i + 1 })),
+ },
+ }
+
+ await simulateQueryResult(mockData)
+
+ expect(store.commit).not.toHaveBeenCalledWith('setOpenCreations', 10)
+ expect(wrapper.vm.rows).toBe(10)
+ expect(wrapper.vm.items).toEqual(mockData.adminListContributions.contributionList)
+ })
+
+ it('refetches data when filters change', async () => {
+ wrapper.vm.query = 'test query'
+ await nextTick()
+
+ expect(mockRefetch).toHaveBeenCalledWith(
+ expect.objectContaining({
+ filter: expect.objectContaining({
+ query: 'test query',
+ }),
+ }),
+ )
+
+ wrapper.vm.noHashtag = true
+ await nextTick()
+
+ expect(mockRefetch).toHaveBeenCalledWith(
+ expect.objectContaining({
+ filter: expect.objectContaining({
+ noHashtag: true,
+ }),
+ }),
+ )
+ })
+
+ it('updates tabIndex and refetches when changing tabs', async () => {
+ wrapper.vm.tabIndex = 2
+ await nextTick()
+
+ expect(wrapper.vm.currentPage).toBe(1)
+ expect(mockRefetch).toHaveBeenCalledWith(
+ expect.objectContaining({
+ paginated: expect.objectContaining({
+ currentPage: 1,
+ }),
+ filter: expect.objectContaining({
+ statusFilter: ['DENIED'],
+ }),
+ }),
+ )
+ })
+
+ it('handles pagination changes', async () => {
+ wrapper.vm.currentPage = 2
+ await nextTick()
+
+ expect(mockRefetch).toHaveBeenCalledWith(
+ expect.objectContaining({
+ paginated: expect.objectContaining({
+ currentPage: 2,
+ }),
+ }),
+ )
+ })
})
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index a0cd9a8a3..006c463fb 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -1,77 +1,78 @@
-
-
+
diff --git a/admin/src/pages/FederationVisualize.spec.js b/admin/src/pages/FederationVisualize.spec.js
index 67d6dffde..7a48e7a6c 100644
--- a/admin/src/pages/FederationVisualize.spec.js
+++ b/admin/src/pages/FederationVisualize.spec.js
@@ -1,125 +1,110 @@
import { mount } from '@vue/test-utils'
-import FederationVisualize from './FederationVisualize'
-import VueApollo from 'vue-apollo'
-import { createMockClient } from 'mock-apollo-client'
-import { getCommunities } from '@/graphql/getCommunities'
-import { toastErrorSpy } from '../../test/testSetup'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import { nextTick, ref } from 'vue'
+import FederationVisualize from './FederationVisualize.vue'
+import { useQuery } from '@vue/apollo-composable'
+import { useAppToast } from '@/composables/useToast'
+import { BButton, BListGroup, BRow, BCol, BListGroupItem } from 'bootstrap-vue-next'
-const mockClient = createMockClient()
-const apolloProvider = new VueApollo({
- defaultClient: mockClient,
-})
-
-const localVue = global.localVue
-
-localVue.use(VueApollo)
-
-const mocks = {
- $t: (key) => key,
- $d: jest.fn((d) => d),
- $i18n: {
- locale: 'en',
- t: (key) => key,
- },
-}
-
-const defaultData = () => {
- return {
- getCommunities: [
- {
- id: 1776,
- foreign: true,
- publicKey: 'c7ca9e742421bb167b8666cb78f90b40c665b8f35db8f001988d44dbb3ce8527',
- url: 'http://localhost/api/2_0',
- lastAnnouncedAt: '2023-04-07T12:27:24.037Z',
- verifiedAt: null,
- lastErrorAt: null,
- createdAt: '2023-04-07T11:45:06.254Z',
- updatedAt: null,
- __typename: 'Community',
- },
- {
- id: 1775,
- foreign: true,
- publicKey: 'c7ca9e742421bb167b8666cb78f90b40c665b8f35db8f001988d44dbb3ce8527',
- url: 'http://localhost/api/1_1',
- lastAnnouncedAt: '2023-04-07T12:27:24.023Z',
- verifiedAt: null,
- lastErrorAt: null,
- createdAt: '2023-04-07T11:45:06.234Z',
- updatedAt: null,
- __typename: 'Community',
- },
- {
- id: 1774,
- foreign: true,
- publicKey: 'c7ca9e742421bb167b8666cb78f90b40c665b8f35db8f001988d44dbb3ce8527',
- url: 'http://localhost/api/1_0',
- lastAnnouncedAt: '2023-04-07T12:27:24.009Z',
- verifiedAt: null,
- lastErrorAt: null,
- createdAt: '2023-04-07T11:45:06.218Z',
- updatedAt: null,
- __typename: 'Community',
- },
- ],
- }
-}
+vi.mock('@vue/apollo-composable')
+vi.mock('@/composables/useToast')
describe('FederationVisualize', () => {
let wrapper
- const getCommunitiesMock = jest.fn()
+ let mockResult
+ let mockLoading
+ let mockRefetch
+ let mockError
+ const mockToastError = vi.fn()
- mockClient.setRequestHandler(
- getCommunities,
- getCommunitiesMock
- .mockRejectedValueOnce({ message: 'Ouch!' })
- .mockResolvedValue({ data: defaultData() }),
- )
+ beforeEach(() => {
+ mockResult = ref(null)
+ mockLoading = ref(false)
+ mockRefetch = vi.fn()
+ mockError = ref(null)
- const Wrapper = () => {
- return mount(FederationVisualize, { localVue, mocks, apolloProvider })
- }
-
- describe('mount', () => {
- beforeEach(() => {
- jest.clearAllMocks()
- wrapper = Wrapper()
+ useQuery.mockReturnValue({
+ result: mockResult,
+ loading: mockLoading,
+ refetch: mockRefetch,
+ error: mockError,
})
- describe('server error', () => {
- it('toast error', () => {
- expect(toastErrorSpy).toBeCalledWith('Ouch!')
- })
+ useAppToast.mockReturnValue({
+ toastError: mockToastError,
})
- describe('sever success', () => {
- it('sends query to Apollo when created', () => {
- expect(getCommunitiesMock).toBeCalled()
- })
-
- it('has a DIV element with the class "federation-visualize"', () => {
- expect(wrapper.find('div.federation-visualize').exists()).toBe(true)
- })
-
- it('has a refresh button', () => {
- expect(wrapper.find('[data-test="federation-communities-refresh-btn"]').exists()).toBe(true)
- })
-
- it('renders 3 community list items', () => {
- expect(wrapper.findAll('.list-group-item').length).toBe(3)
- })
-
- describe('cklicking the refresh button', () => {
- beforeEach(async () => {
- jest.clearAllMocks()
- await wrapper.find('[data-test="federation-communities-refresh-btn"]').trigger('click')
- })
-
- it('calls the API', async () => {
- expect(getCommunitiesMock).toBeCalled()
- })
- })
+ wrapper = mount(FederationVisualize, {
+ global: {
+ mocks: {
+ $t: (key) => key,
+ },
+ stubs: {
+ BButton,
+ BListGroup,
+ BRow,
+ BCol,
+ BListGroupItem,
+ IBiArrowClockwise: true,
+ 'community-visualize-item': true,
+ },
+ },
})
})
+
+ it('renders the component', () => {
+ expect(wrapper.find('.federation-visualize').exists()).toBe(true)
+ })
+
+ it('displays the correct header', () => {
+ expect(wrapper.find('.h2').text()).toBe('federation.gradidoInstances')
+ })
+
+ it('renders the refresh button', () => {
+ const refreshButton = wrapper.find('[data-test="federation-communities-refresh-btn"]')
+ expect(refreshButton.exists()).toBe(true)
+ })
+
+ it('calls refetch when refresh button is clicked', async () => {
+ const refreshButton = wrapper.find('[data-test="federation-communities-refresh-btn"]')
+ await refreshButton.trigger('click')
+ expect(mockRefetch).toHaveBeenCalled()
+ })
+
+ it('displays communities when data is loaded', async () => {
+ const mockCommunities = [
+ { publicKey: '1', foreign: true },
+ { publicKey: '2', foreign: false },
+ ]
+ mockResult.value = { allCommunities: mockCommunities }
+ await nextTick()
+
+ const listItems = wrapper.findAllComponents({ name: 'BListGroupItem' })
+ expect(listItems).toHaveLength(2)
+
+ expect(listItems[0].props('variant')).toBe('warning')
+ expect(listItems[1].props('variant')).toBe('primary')
+ })
+
+ it('shows loading animation when fetching data', async () => {
+ mockLoading.value = true
+ await nextTick()
+ const refreshButton = wrapper.find('[data-test="federation-communities-refresh-btn"]')
+ expect(refreshButton.attributes('animation')).toBe('spin')
+ })
+
+ it('displays error toast when query fails', async () => {
+ mockError.value = new Error('Test error')
+ await nextTick()
+ expect(mockToastError).toHaveBeenCalledWith('Test error')
+ })
+
+ it('renders correct column headers', () => {
+ const columns = wrapper.findAll('.list-group > .row > div')
+ expect(columns[0].text()).toBe('federation.verified')
+ expect(columns[1].text()).toBe('federation.url')
+ expect(columns[2].text()).toBe('federation.name')
+ expect(columns[3].text()).toBe('federation.lastAnnouncedAt')
+ expect(columns[4].text()).toBe('federation.createdAt')
+ })
})
diff --git a/admin/src/pages/FederationVisualize.vue b/admin/src/pages/FederationVisualize.vue
index 383cf064d..6be762d30 100644
--- a/admin/src/pages/FederationVisualize.vue
+++ b/admin/src/pages/FederationVisualize.vue
@@ -2,68 +2,53 @@
- - {{ $t('no_hashtag') }} + + {{ $t('no_hashtag') }}
-
-
-
+
+
+
{{ $t('hide_resubmission') }}
{{ $t(overlayQuestion) }}
-
-
{{ $t('federation.gradidoInstances') }}
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
diff --git a/admin/src/pages/ProjectBranding.vue b/admin/src/pages/ProjectBranding.vue
new file mode 100644
index 000000000..925a0f75e
--- /dev/null
+++ b/admin/src/pages/ProjectBranding.vue
@@ -0,0 +1,109 @@
+
+ {{ $store.state.openCreations }}
-{{ $store.state.openCreations }}
-
+
+
+ {{ $t('name') }} + {{ $t('link') }}
+ {{ $t('alias') }}
+
+ {{ $t('projectBranding.newUserToSpace') }}
+
+ {{ $t('logo') }}
+
+ {{ $t('actions') }}
+
+
+
+
+
+
+
+
+
diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js
index 09540b85a..6a1de70a8 100644
--- a/admin/src/pages/UserSearch.spec.js
+++ b/admin/src/pages/UserSearch.spec.js
@@ -1,280 +1,135 @@
import { mount } from '@vue/test-utils'
-import UserSearch from './UserSearch'
-import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import UserSearch from './UserSearch.vue'
+import { useQuery } from '@vue/apollo-composable'
-const localVue = global.localVue
+// Mock the composables and components
+vi.mock('@vue/apollo-composable')
+vi.mock('../composables/useCreationMonths', () => ({
+ default: () => ({
+ creationLabel: () => 'Creation Date',
+ }),
+}))
+vi.mock('@/composables/useToast', () => ({
+ useAppToast: () => ({
+ toastSuccess: vi.fn(),
+ }),
+}))
+vi.mock('vue-router', () => ({
+ useRoute: () => ({
+ query: {},
+ }),
+}))
-const apolloQueryMock = jest.fn().mockResolvedValue({
- data: {
- searchUsers: {
- userCount: 4,
- userList: [
- {
- userId: 4,
- firstName: 'New',
- lastName: 'User',
- email: 'new@user.ch',
- creation: [1000, 1000, 1000],
- emailChecked: false,
- roles: [],
- deletedAt: null,
- },
- {
- userId: 3,
- firstName: 'Peter',
- lastName: 'Lustig',
- email: 'peter@lustig.de',
- creation: [0, 0, 0],
- roles: ['ADMIN'],
- emailChecked: true,
- deletedAt: null,
- },
- {
- userId: 2,
- firstName: 'Benjamin',
- lastName: 'Blümchen',
- email: 'benjamin@bluemchen.de',
- creation: [1000, 1000, 1000],
- roles: [],
- emailChecked: true,
- deletedAt: new Date(),
- },
- {
- userId: 1,
- firstName: 'Bibi',
- lastName: 'Bloxberg',
- email: 'bibi@bloxberg.de',
- creation: [200, 400, 600],
- roles: [],
- emailChecked: true,
- deletedAt: null,
- },
- ],
+// Mock icon components
+const mockIconComponent = {
+ template: 'Icon',
+}
+
+const mockSearchUsers = {
+ userCount: 4,
+ userList: [
+ {
+ userId: 4,
+ firstName: 'New',
+ lastName: 'User',
+ email: 'new@user.ch',
+ creation: [1000, 1000, 1000],
+ emailChecked: false,
+ roles: [],
+ deletedAt: null,
},
- },
-})
-
-const mocks = {
- $t: jest.fn((t) => t),
- $d: jest.fn((d) => String(d)),
- $apollo: {
- query: apolloQueryMock,
- },
+ {
+ userId: 3,
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ email: 'peter@lustig.de',
+ creation: [0, 0, 0],
+ roles: ['ADMIN'],
+ emailChecked: true,
+ deletedAt: null,
+ },
+ {
+ userId: 2,
+ firstName: 'Benjamin',
+ lastName: 'Blümchen',
+ email: 'benjamin@bluemchen.de',
+ creation: [1000, 1000, 1000],
+ roles: [],
+ emailChecked: true,
+ deletedAt: new Date(),
+ },
+ {
+ userId: 1,
+ firstName: 'Bibi',
+ lastName: 'Bloxberg',
+ email: 'bibi@bloxberg.de',
+ creation: [200, 400, 600],
+ roles: [],
+ emailChecked: true,
+ deletedAt: null,
+ },
+ ],
}
describe('UserSearch', () => {
let wrapper
+ const mockT = vi.fn((key) => key) // Mock translation function
- const Wrapper = () => {
- return mount(UserSearch, { localVue, mocks })
- }
-
- describe('mount', () => {
- beforeEach(() => {
- jest.clearAllMocks()
- wrapper = Wrapper()
+ beforeEach(() => {
+ // Mock the useQuery composable
+ useQuery.mockReturnValue({
+ result: { value: { searchUsers: mockSearchUsers } },
+ refetch: vi.fn(),
})
- it('has a DIV element with the class.user-search', () => {
- expect(wrapper.find('div.user-search').exists()).toBeTruthy()
- })
-
- it('calls the API', () => {
- expect(apolloQueryMock).toBeCalledWith(
- expect.objectContaining({
- variables: {
- query: '',
- currentPage: 1,
- pageSize: 25,
- order: 'DESC',
- filters: {
- byActivated: null,
- byDeleted: null,
- },
- },
- }),
- )
- })
-
- describe('unconfirmed emails', () => {
- beforeEach(async () => {
- await wrapper.find('button.unconfirmedRegisterMails').trigger('click')
- })
-
- it('calls API with filter', () => {
- expect(apolloQueryMock).toBeCalledWith(
- expect.objectContaining({
- variables: {
- query: '',
- currentPage: 1,
- pageSize: 25,
- order: 'DESC',
- filters: {
- byActivated: false,
- byDeleted: null,
- },
- },
- }),
- )
- })
- })
-
- describe('deleted Users', () => {
- beforeEach(async () => {
- await wrapper.find('button.deletedUserSearch').trigger('click')
- })
-
- it('calls API with filter', () => {
- expect(apolloQueryMock).toBeCalledWith(
- expect.objectContaining({
- variables: {
- query: '',
- currentPage: 1,
- pageSize: 25,
- order: 'DESC',
- filters: {
- byActivated: null,
- byDeleted: true,
- },
- },
- }),
- )
- })
- })
-
- describe('pagination', () => {
- beforeEach(async () => {
- wrapper.setData({ currentPage: 2 })
- })
-
- it('calls the API with new page', () => {
- expect(apolloQueryMock).toBeCalledWith(
- expect.objectContaining({
- variables: {
- query: '',
- currentPage: 2,
- pageSize: 25,
- order: 'DESC',
- filters: {
- byActivated: null,
- byDeleted: null,
- },
- },
- }),
- )
- })
- })
-
- describe('user search', () => {
- beforeEach(async () => {
- wrapper.setData({ criteria: 'search string' })
- })
-
- it('calls the API with search string', () => {
- expect(apolloQueryMock).toBeCalledWith(
- expect.objectContaining({
- variables: {
- query: 'search string',
- currentPage: 1,
- pageSize: 25,
- order: 'DESC',
- filters: {
- byActivated: null,
- byDeleted: null,
- },
- },
- }),
- )
- })
-
- describe('reset the search field', () => {
- it('calls the API with empty criteria', async () => {
- jest.clearAllMocks()
- await wrapper.findComponent({ name: 'UserQuery' }).vm.$emit('input', '')
- expect(apolloQueryMock).toBeCalledWith(
- expect.objectContaining({
- variables: {
- query: '',
- currentPage: 1,
- pageSize: 25,
- order: 'DESC',
- filters: {
- byActivated: null,
- byDeleted: null,
- },
- },
- }),
- )
- })
- })
- })
-
- describe('change user role', () => {
- const userId = 4
-
- describe('to admin', () => {
- it('updates user role to admin', async () => {
- await wrapper
- .findComponent({ name: 'SearchUserTable' })
- .vm.$emit('updateRoles', userId, ['ADMIN'])
- expect(wrapper.vm.searchResult.find((obj) => obj.userId === userId).roles).toEqual([
- 'ADMIN',
- ])
- })
- })
-
- describe('to usual user', () => {
- it('updates user role to usual user', async () => {
- await wrapper
- .findComponent({ name: 'SearchUserTable' })
- .vm.$emit('updateRoles', userId, [])
- expect(wrapper.vm.searchResult.find((obj) => obj.userId === userId).roles).toEqual([])
- })
- })
- })
-
- describe('delete user', () => {
- const userId = 4
- beforeEach(() => {
- wrapper
- .findComponent({ name: 'SearchUserTable' })
- .vm.$emit('updateDeletedAt', userId, new Date())
- })
-
- it('marks the user as deleted', () => {
- expect(wrapper.vm.searchResult.find((obj) => obj.userId === userId).deletedAt).toEqual(
- expect.any(Date),
- )
- expect(wrapper.find('.test-deleted-icon').exists()).toBe(true)
- })
-
- it('toasts a success message', () => {
- expect(toastSuccessSpy).toBeCalledWith('user_deleted')
- })
- })
-
- describe('recover user', () => {
- const userId = 2
- beforeEach(() => {
- wrapper.findComponent({ name: 'SearchUserTable' }).vm.$emit('updateDeletedAt', userId, null)
- })
-
- it('toasts a success message', () => {
- expect(toastSuccessSpy).toBeCalledWith('user_recovered')
- })
- })
-
- describe('apollo returns error', () => {
- beforeEach(() => {
- apolloQueryMock.mockRejectedValue({
- message: 'Ouch',
- })
- wrapper = Wrapper()
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Ouch')
- })
+ wrapper = mount(UserSearch, {
+ global: {
+ stubs: {
+ UserQuery: true,
+ SearchUserTable: true,
+ BPagination: true,
+ BButton: true,
+ IBiEnvelope: mockIconComponent,
+ IBiXCircle: mockIconComponent,
+ },
+ mocks: {
+ $t: mockT,
+ },
+ },
})
})
+
+ it('renders the component', () => {
+ expect(wrapper.find('.user-search').exists()).toBe(true)
+ })
+
+ it('uses correct translation keys', async () => {
+ // Force a re-render
+ await wrapper.vm.$nextTick()
+
+ expect(mockT).toHaveBeenCalledWith('user_search')
+ })
+
+ it('renders unconfirmed emails button', () => {
+ const button = wrapper.find('.unconfirmedRegisterMails')
+ expect(button.exists()).toBe(true)
+ })
+
+ it('renders deleted user search button', () => {
+ const button = wrapper.find('.deletedUserSearch')
+ expect(button.exists()).toBe(true)
+ })
+
+ it('handles unconfirmed register mails button click', async () => {
+ const button = wrapper.find('.unconfirmedRegisterMails')
+ await button.trigger('click')
+ expect(useQuery().refetch).toHaveBeenCalled()
+ })
+
+ it('handles deleted user search button click', async () => {
+ const button = wrapper.find('.deletedUserSearch')
+ await button.trigger('click')
+ expect(useQuery().refetch).toHaveBeenCalled()
+ })
})
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index 58f5d009e..78bfc7e90 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -1,150 +1,171 @@
+ {{ $t('projectBranding.title') }}
+
+
+
+
+
+
+
+
-
-
+
-
-
+
+
- Complete registration
-Please click here to complete the registration and activate your Gradido account.
Activate account
- Or copy the link into your browser window.
http://localhost/checkEmail/6627633878930542284
+ Please click here to complete the registration and activate your Gradido account.
Activate account
+ Or copy the link into your browser window.
http://localhost/checkEmail/6627633878930542284
Request new valid link
-The link has a validity of 23 hours and 30 minutes.
+
@@ -160,7 +164,8 @@ If the validity of the link has already expired, you can have a new link sent to
The link has a validity of 23 hours and 30 minutes.
If the validity of the link has already expired, you can have a new link sent to you here.
New link
![\\"Gradido](\\"https://gdd.gradido.net/img/brand/green.png\\")
+ Reset password
-If you have forgotten your password, please click here.
reset
- Or copy the link into your browser window.
http://localhost/forgot-password
+ If you have forgotten your password, please click here.
reset
+ Or copy the link into your browser window.
http://localhost/forgot-password
Contact support
-If you did not try to register again, please contact our support:
support@supportmail.com
+ If you did not try to register again, please contact our support:
support@supportmail.com
Kind regards,
your Gradido team
@@ -329,7 +338,8 @@ exports[`sendEmailVariants sendAccountMultiRegistrationEmail calls "sendEmailTra
Read and reply to message
-To view and reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.
To account
- Please do not reply to this email.
+ To view and reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.
To account
+ Please do not reply to this email.
Kind regards,
your Gradido team
@@ -495,7 +509,8 @@ exports[`sendEmailVariants sendAddedContributionMessageEmail result has the corr
Contribution details
-To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.
To account
- Or copy the link into your browser window.
http://localhost/community/contributions
- Please do not reply to this email.
+ To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.
To account
+ Or copy the link into your browser window.
http://localhost/community/contributions
+ Please do not reply to this email.
Kind regards,
your Gradido team
@@ -662,7 +681,8 @@ exports[`sendEmailVariants sendContributionChangedByModeratorEmail result has th
Contribution details
-To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.
To account
- Or copy the link into your browser window.
http://localhost/community/contributions
- Please do not reply to this email.
+ To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.
To account
+ Or copy the link into your browser window.
http://localhost/community/contributions
+ Please do not reply to this email.
Kind regards,
your Gradido team
@@ -829,7 +853,8 @@ exports[`sendEmailVariants sendContributionConfirmedEmail result has the correct
Contribution details
-To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.
To account
- Or copy the link into your browser window.
http://localhost/community/contributions
- Please do not reply to this email.
+ To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.
To account
+ Or copy the link into your browser window.
http://localhost/community/contributions
+ Please do not reply to this email.
Kind regards,
your Gradido team
@@ -996,7 +1025,8 @@ exports[`sendEmailVariants sendContributionDeletedEmail result has the correct h
Contribution details
-To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.
To account
- Or copy the link into your browser window.
http://localhost/community/contributions
- Please do not reply to this email.
+ To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.
To account
+ Or copy the link into your browser window.
http://localhost/community/contributions
+ Please do not reply to this email.
Kind regards,
your Gradido team
@@ -1163,7 +1197,8 @@ exports[`sendEmailVariants sendContributionDeniedEmail result has the correct ht
Reset password
-If it was you, please click here.
reset
- Or copy the link into your browser window.
http://localhost/reset-password/3762660021544901417
+ If it was you, please click here.
reset
+ Or copy the link into your browser window.
http://localhost/reset-password/3762660021544901417
Request new valid link
-The link has a validity of 23 hours and 30 minutes.
+
@@ -1334,7 +1373,8 @@ If the validity of the link has already expired, you can have a new link sent to
The link has a validity of 23 hours and 30 minutes.
If the validity of the link has already expired, you can have a new link sent to you here.
New link
Transaction details
-Amount: 17.65 GDD
Message: You deserve it! 🙏🏼
You can find transaction details in your Gradido account. +
Message: You deserve it! 🙏🏼
You can find transaction details in your Gradido account. +
Amount: 17.65 GDD
Message: You deserve it! 🙏🏼
You can find transaction details in your Gradido account.
To account
- Message: You deserve it! 🙏🏼
You can find transaction details in your Gradido account.
Please do not reply to this email.
+ Please do not reply to this email.
Kind regards,
your Gradido team
@@ -1501,7 +1545,8 @@ exports[`sendEmailVariants sendTransactionLinkRedeemedEmail result has the corre
Bibi Bloxberg has sent you 37.40 Gradido
Hello Peter Lustig,
-You have just received 37.40 GDD from Bibi Bloxberg (bibi@bloxberg.de).
+You have just received 37.40 GDD from Bibi Bloxberg (bibi@bloxberg.de). +
-
+ Transaction details
-You can find transaction details in your Gradido account.
To account
- Please do not reply to this email.
- Message
+
+
+ Du bist schon lustiger ;)
+ Kind regards,
your Gradido team
$message
" >> "$UPDATE_HTML" # blue in html +} + # check for parameter if [ -z "$1" ]; then echo "Usage: Please provide a branch name as the first argument." @@ -16,6 +24,7 @@ set +o allexport # enable nvm export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" +nvm use default # NOTE: all config values will be in process.env when starting # the services and will therefore take precedence over the .env @@ -74,18 +83,18 @@ TODAY=$(date +"%Y-%m-%d") exec > >(tee -a $UPDATE_HTML) 2>&1 # configure nginx for the update-page -echo 'Configuring nginx to serve the update-page' >> $UPDATE_HTML +log_step 'Configuring nginx to serve the update-page' ln -sf $SCRIPT_DIR/nginx/sites-available/update-page.conf $SCRIPT_DIR/nginx/sites-enabled/default sudo /etc/init.d/nginx restart # stop all services -echo 'Stop and delete all Gradido services' >> $UPDATE_HTML +log_step "Stop and delete all Gradido services" pm2 delete all pm2 save # git BRANCH=$1 -echo "Starting with git pull - branch:$BRANCH" >> $UPDATE_HTML +log_step "Starting with git pull - branch:$BRANCH" cd $PROJECT_ROOT # TODO: this overfetches alot, but ensures we can use start.sh with tags git fetch --all @@ -98,7 +107,7 @@ export BUILD_COMMIT="$(git rev-parse HEAD)" # *** set FEDERATION_PORT from FEDERATION_COMMUNITY_APIS and create gradido-federation.conf file rm -f $NGINX_CONFIG_DIR/gradido.conf.tmp rm -f $NGINX_CONFIG_DIR/gradido-federation.conf.locations -echo "====================================================================================================" >> $UPDATE_HTML +log_step "====================================================================================================" IFS="," read -a API_ARRAY <<< $FEDERATION_COMMUNITY_APIS for api in "${API_ARRAY[@]}" do @@ -108,18 +117,18 @@ do FEDERATION_PORT=${FEDERATION_COMMUNITY_API_PORT:-5000} FEDERATION_PORT=$(($FEDERATION_PORT + $port)) export FEDERATION_PORT - echo "create ngingx config: location /api/$FEDERATION_APIVERSION to http://127.0.0.1:$FEDERATION_PORT" >> $UPDATE_HTML + log_step "create ngingx config: location /api/$FEDERATION_APIVERSION to http://127.0.0.1:$FEDERATION_PORT" envsubst '$FEDERATION_APIVERSION, $FEDERATION_PORT' < $NGINX_CONFIG_DIR/gradido-federation.conf.template >> $NGINX_CONFIG_DIR/gradido-federation.conf.locations done unset FEDERATION_APIVERSION unset FEDERATION_PORT -echo "====================================================================================================" >> $UPDATE_HTML +log_step "====================================================================================================" # *** 2nd read gradido-federation.conf file in env variable to be replaced in 3rd step export FEDERATION_NGINX_CONF=$(< $NGINX_CONFIG_DIR/gradido-federation.conf.locations) # *** 3rd generate gradido nginx config including federation modules per api-version -echo 'Generate new gradido nginx config' >> $UPDATE_HTML +log_step 'Generate new gradido nginx config' case "$URL_PROTOCOL" in 'https') TEMPLATE_FILE="gradido.conf.ssl.template" ;; *) TEMPLATE_FILE="gradido.conf.template" ;; @@ -131,19 +140,24 @@ rm $NGINX_CONFIG_DIR/gradido.conf.tmp rm $NGINX_CONFIG_DIR/gradido-federation.conf.locations # Generate update-page.conf from template -echo 'Generate new update-page nginx config' >> $UPDATE_HTML +log_step 'Generate new update-page nginx config' case "$URL_PROTOCOL" in 'https') TEMPLATE_FILE="update-page.conf.ssl.template" ;; *) TEMPLATE_FILE="update-page.conf.template" ;; esac envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/update-page.conf +log_step 'Clean tmp and yarn cache' # Clean tmp folder - remove yarn files find /tmp -name "yarn--*" -exec rm -r {} \; +# Clean user cache folder +rm -Rf ~/.cache/yarn +log_step 'Remove all node_modules and build folders' # Remove node_modules folders # we had problems with corrupted node_modules folder rm -Rf $PROJECT_ROOT/database/node_modules +rm -Rf $PROJECT_ROOT/config/node_modules rm -Rf $PROJECT_ROOT/backend/node_modules rm -Rf $PROJECT_ROOT/frontend/node_modules rm -Rf $PROJECT_ROOT/admin/node_modules @@ -153,12 +167,14 @@ rm -Rf $PROJECT_ROOT/federation/node_modules # Remove build folders # we had problems with corrupted incremtal builds rm -Rf $PROJECT_ROOT/database/build +rm -Rf $PROJECT_ROOT/config/build rm -Rf $PROJECT_ROOT/backend/build rm -Rf $PROJECT_ROOT/frontend/build rm -Rf $PROJECT_ROOT/admin/build rm -Rf $PROJECT_ROOT/dht-node/build rm -Rf $PROJECT_ROOT/federation/build +log_step 'Regenerate .env files' # Regenerate .env files cp -f $PROJECT_ROOT/database/.env $PROJECT_ROOT/database/.env.bak cp -f $PROJECT_ROOT/backend/.env $PROJECT_ROOT/backend/.env.bak @@ -174,7 +190,7 @@ envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/dht-node/.env envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/federation/.env.template > $PROJECT_ROOT/federation/.env # Install & build database -echo 'Updating database' >> $UPDATE_HTML +log_step 'Updating database' cd $PROJECT_ROOT/database yarn install yarn build @@ -185,8 +201,14 @@ else yarn up fi +# Install & build config +log_step 'Updating config' +cd $PROJECT_ROOT/config +yarn install +yarn build + # Install & build backend -echo 'Updating backend' >> $UPDATE_HTML +log_step 'Updating backend' cd $PROJECT_ROOT/backend # TODO maybe handle this differently? unset NODE_ENV @@ -200,7 +222,7 @@ export NODE_ENV=production # Install & build frontend -echo 'Updating frontend' >> $UPDATE_HTML +log_step 'Updating frontend' cd $PROJECT_ROOT/frontend # TODO maybe handle this differently? unset NODE_ENV @@ -210,7 +232,7 @@ yarn build export NODE_ENV=production # Install & build admin -echo 'Updating admin' >> $UPDATE_HTML +log_step 'Updating admin' cd $PROJECT_ROOT/admin # TODO maybe handle this differently? unset NODE_ENV @@ -220,7 +242,7 @@ yarn build export NODE_ENV=production # Install & build dht-node -echo 'Updating dht-node' >> $UPDATE_HTML +log_step 'Updating dht-node' cd $PROJECT_ROOT/dht-node # TODO maybe handle this differently? unset NODE_ENV @@ -230,7 +252,7 @@ yarn build export NODE_ENV=production # Install & build federation -echo 'Updating federation' >> $UPDATE_HTML +log_step 'Updating federation' cd $PROJECT_ROOT/federation # TODO maybe handle this differently? unset NODE_ENV @@ -239,43 +261,44 @@ yarn build # TODO maybe handle this differently? export NODE_ENV=production +nvm use default # start after building all to use up less ressources pm2 start --name gradido-backend "yarn --cwd $PROJECT_ROOT/backend start" -l $GRADIDO_LOG_PATH/pm2.backend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' -pm2 start --name gradido-frontend "yarn --cwd $PROJECT_ROOT/frontend start" -l $GRADIDO_LOG_PATH/pm2.frontend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' -pm2 start --name gradido-admin "yarn --cwd $PROJECT_ROOT/admin start" -l $GRADIDO_LOG_PATH/pm2.admin.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' +#pm2 start --name gradido-frontend "yarn --cwd $PROJECT_ROOT/frontend start" -l $GRADIDO_LOG_PATH/pm2.frontend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' +#pm2 start --name gradido-admin "yarn --cwd $PROJECT_ROOT/admin start" -l $GRADIDO_LOG_PATH/pm2.admin.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' pm2 save if [ ! -z $FEDERATION_DHT_TOPIC ]; then pm2 start --name gradido-dht-node "yarn --cwd $PROJECT_ROOT/dht-node start" -l $GRADIDO_LOG_PATH/pm2.dht-node.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' pm2 save else - echo "=====================================================================" >> $UPDATE_HTML - echo "WARNING: FEDERATION_DHT_TOPIC not configured. DHT-Node not started..." >> $UPDATE_HTML - echo "=====================================================================" >> $UPDATE_HTML -fi + log_step "=====================================================================" + log_step "WARNING: FEDERATION_DHT_TOPIC not configured. DHT-Node not started..." + log_step "=====================================================================" +fi # set FEDERATION_PORT from FEDERATION_COMMUNITY_APIS IFS="," read -a API_ARRAY <<< $FEDERATION_COMMUNITY_APIS for api in "${API_ARRAY[@]}" do export FEDERATION_API=$api - echo "FEDERATION_API=$FEDERATION_API" >> $UPDATE_HTML + log_step "FEDERATION_API=$FEDERATION_API" export MODULENAME=gradido-federation-$api - echo "MODULENAME=$MODULENAME" >> $UPDATE_HTML + log_step "MODULENAME=$MODULENAME" # calculate port by remove '_' and add value of api to baseport port=${api//_/} FEDERATION_PORT=${FEDERATION_COMMUNITY_API_PORT:-5000} FEDERATION_PORT=$(($FEDERATION_PORT + $port)) export FEDERATION_PORT - echo "====================================================" >> $UPDATE_HTML - echo " start $MODULENAME listening on port=$FEDERATION_PORT" >> $UPDATE_HTML - echo "====================================================" >> $UPDATE_HTML + log_step "====================================================" + log_step " start $MODULENAME listening on port=$FEDERATION_PORT" + log_step "====================================================" # pm2 delete $MODULENAME pm2 start --name $MODULENAME "yarn --cwd $PROJECT_ROOT/federation start" -l $GRADIDO_LOG_PATH/pm2.$MODULENAME.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' pm2 save done # let nginx showing gradido -echo 'Configuring nginx to serve gradido again' >> $UPDATE_HTML +log_step 'Configuring nginx to serve gradido again' ln -sf $SCRIPT_DIR/nginx/sites-available/gradido.conf $SCRIPT_DIR/nginx/sites-enabled/default sudo /etc/init.d/nginx restart diff --git a/deployment/hetzner_cloud/README.md b/deployment/hetzner_cloud/README.md index d2cd66a35..a0dfe79e3 100644 --- a/deployment/hetzner_cloud/README.md +++ b/deployment/hetzner_cloud/README.md @@ -1,3 +1,6 @@ +# Migration +[Migration from 2.2.0 to 2.2.1](migration/2_2_0-2_2_1/README.md) + # Setup on Hetzner Cloud Server Suggested OS: Debian 12 diff --git a/deployment/hetzner_cloud/install.sh b/deployment/hetzner_cloud/install.sh index 06b92ecaf..ac43c6421 100755 --- a/deployment/hetzner_cloud/install.sh +++ b/deployment/hetzner_cloud/install.sh @@ -104,14 +104,31 @@ ln -s $SCRIPT_PATH/nginx/common /etc/nginx/ rmdir /etc/nginx/conf.d ln -s $SCRIPT_PATH/nginx/conf.d /etc/nginx/ +# Make nginx restart automatic +mkdir /etc/systemd/system/nginx.service.d +# Define the content to be put into the override.conf file +CONFIG_CONTENT="[Unit] +StartLimitIntervalSec=500 +StartLimitBurst=5 + +[Service] +Restart=on-failure +RestartSec=5s" + +# Write the content to the override.conf file +echo "$CONFIG_CONTENT" | sudo tee /etc/systemd/system/nginx.service.d/override.conf >/dev/null + +# Reload systemd to apply the changes +sudo systemctl daemon-reload + # setup https with certbot certbot certonly --nginx --non-interactive --agree-tos --domains $COMMUNITY_HOST --email $COMMUNITY_SUPPORT_MAIL -# Install node 16. with nvm, with nodesource is depracted +# Install node 18 sudo -u gradido bash -c 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash' # Close and reopen your terminal to start using nvm or run the following to use it now: sudo -u gradido bash -c 'export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' -sudo -u gradido bash -c '. $HOME/.nvm/nvm.sh && nvm install 16' # first installed version will be set to default automatic +sudo -u gradido bash -c '. $HOME/.nvm/nvm.sh && nvm install v18.20.7' # first installed version will be set to default automatic # Install yarn sudo -u gradido bash -c '. $HOME/.nvm/nvm.sh && npm i -g yarn' @@ -127,7 +144,13 @@ cp $SCRIPT_PATH/logrotate/gradido.conf /etc/logrotate.d/gradido.conf export DB_USER=gradido # create a new password only if it not already exist if [ -z "${DB_PASSWORD}" ]; then - export DB_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo); + export DB_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c 32; echo); +fi + +# Check if DB_PASSWORD is still empty, then exit with an error +if [ -z "${DB_PASSWORD}" ]; then + echo "Error: Failed to generate DB_PASSWORD." + exit 1 fi mysql <
-
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/Auth/AuthCarousel.vue b/frontend/src/components/Auth/AuthCarousel.vue
index a050c1554..0099d9d68 100644
--- a/frontend/src/components/Auth/AuthCarousel.vue
+++ b/frontend/src/components/Auth/AuthCarousel.vue
@@ -1,19 +1,19 @@
-
-
diff --git a/frontend/src/components/ContentFooter.spec.js b/frontend/src/components/ContentFooter.spec.js
index 1066abf58..1fca50af2 100644
--- a/frontend/src/components/ContentFooter.spec.js
+++ b/frontend/src/components/ContentFooter.spec.js
@@ -1,8 +1,8 @@
import { mount } from '@vue/test-utils'
-
+import { describe, it, expect, beforeEach, vi } from 'vitest'
import ContentFooter from './ContentFooter'
-
-const localVue = global.localVue
+import CONFIG from '@/config'
+import { BCol, BNav, BNavItem, BRow } from 'bootstrap-vue-next'
describe('ContentFooter', () => {
let wrapper
@@ -11,11 +11,16 @@ describe('ContentFooter', () => {
$i18n: {
locale: 'en',
},
- $t: jest.fn((t, options) => (options ? [t, options] : t)),
+ $t: vi.fn((t, options) => (options ? [t, options] : t)),
}
const Wrapper = () => {
- return mount(ContentFooter, { localVue, mocks })
+ return mount(ContentFooter, {
+ global: {
+ mocks,
+ stubs: { BRow, BCol, BNav, BNavItem },
+ },
+ })
}
describe('mount', () => {
@@ -24,24 +29,26 @@ describe('ContentFooter', () => {
})
it('renders the content footer', () => {
- expect(wrapper.find('footer.footer').exists()).toBeTruthy()
+ expect(wrapper.find('footer.footer').exists()).toBe(true)
})
describe('copyright', () => {
it('shows the copyright', () => {
- expect(wrapper.find('div.copyright').exists()).toBeTruthy()
+ expect(wrapper.find('div.copyright').exists()).toBe(true)
})
it('renders the current year as copyright year', () => {
- expect(mocks.$t).toBeCalledWith('footer.copyright.year', { year: new Date().getFullYear() })
+ expect(mocks.$t).toHaveBeenCalledWith('footer.copyright.year', {
+ year: new Date().getFullYear(),
+ })
})
it('renders a link to Gradido-Akademie', () => {
- expect(wrapper.find('div.copyright').find('a').text()).toEqual('footer.copyright.link')
+ expect(wrapper.find('div.copyright').find('a').text()).toBe('footer.copyright.link')
})
it('links to the login page when clicked on copyright', () => {
- expect(wrapper.find('div.copyright').find('a').attributes('href')).toEqual(
+ expect(wrapper.find('div.copyright').find('a').attributes('href')).toBe(
'https://gradido.net/en',
)
})
@@ -49,91 +56,87 @@ describe('ContentFooter', () => {
describe('version', () => {
it('shows the current version', async () => {
- wrapper.setData({ version: 1.23 })
- await wrapper.vm.$nextTick()
- expect(mocks.$t).toBeCalledWith('footer.app_version', { version: 1.23 })
+ expect(mocks.$t).toHaveBeenCalledWith('footer.app_version', { version: CONFIG.APP_VERSION })
})
it('links to latest release on GitHub', () => {
- expect(wrapper.find('div.copyright').findAll('a').at(1).attributes('href')).toEqual(
+ expect(wrapper.find('div.copyright').findAll('a').at(1).attributes('href')).toBe(
'https://github.com/gradido/gradido/releases/latest',
)
})
- it('has last commit hash', async () => {
- wrapper.setData({ shortHash: 'ACCEDED' })
- wrapper.setData({ hash: 'ACCEDEDC001D00DC001D00DC001D00DC001CAFA' })
- await wrapper.vm.$nextTick()
- expect(mocks.$t).toBeCalledWith('footer.short_hash', { shortHash: 'ACCEDED' })
- })
-
- it('links to last release commit', async () => {
- wrapper.setData({ hash: 'ACCEDEDC001D00DC001D00DC001D00DC001CAFA' })
- await wrapper.vm.$nextTick()
- expect(wrapper.find('div.copyright').findAll('a').at(2).attributes('href')).toEqual(
- 'https://github.com/gradido/gradido/commit/ACCEDEDC001D00DC001D00DC001D00DC001CAFA',
- )
- })
+ // it('has last commit hash', () => {
+ // expect(mocks.$t).toHaveBeenCalledWith('footer.short_hash', {
+ // shortHash: CONFIG.BUILD_COMMIT_SHORT,
+ // })
+ // })
+ //
+ // it('links to last release commit', () => {
+ // expect(wrapper.find('div.copyright').findAll('a').at(2).attributes('href')).toBe(
+ // `https://github.com/gradido/gradido/commit/${CONFIG.BUILD_COMMIT}`,
+ // )
+ // })
})
describe('links to gradido.net', () => {
it('has a link to the legal notice', () => {
- expect(wrapper.findAll('a.nav-link').at(0).text()).toEqual('footer.imprint')
+ expect(wrapper.findAll('.nav-item a').at(0).text()).toBe('footer.imprint')
})
it('links to the https://gradido.net/en/impressum when locale is en', () => {
- expect(wrapper.findAll('a.nav-link').at(0).attributes('href')).toEqual(
+ expect(wrapper.findAll('.nav-item a').at(0).attributes('href')).toBe(
'https://gradido.net/en/impressum/',
)
})
it('has a link to the privacy policy', () => {
- expect(wrapper.findAll('a.nav-link').at(1).text()).toEqual('footer.privacy_policy')
+ expect(wrapper.findAll('.nav-item a').at(1).text()).toBe('footer.privacy_policy')
})
it('links to the https://gradido.net/en/datenschutz when locale is en', () => {
- expect(wrapper.findAll('a.nav-link').at(1).attributes('href')).toEqual(
+ expect(wrapper.findAll('.nav-item a').at(1).attributes('href')).toBe(
'https://gradido.net/en/datenschutz/',
)
})
it('links to the whitepaper', () => {
- expect(wrapper.findAll('a.nav-link').at(2).attributes('href')).toEqual(
+ expect(wrapper.findAll('.nav-item a').at(2).attributes('href')).toBe(
'https://docs.google.com/document/d/1kcX1guOi6tDgnFHD9tf7fB_MneKTx-0nHJxzdN8ygNs/edit?usp=sharing',
)
})
it('links to the support', () => {
- expect(wrapper.findAll('a.nav-link').at(3).attributes('href')).toEqual(
- 'mailto:support@supportmail.com',
+ expect(wrapper.findAll('.nav-item a').at(3).attributes('href')).toBe(
+ `mailto:${CONFIG.COMMUNITY_SUPPORT_MAIL}`,
)
})
describe('links are localized', () => {
beforeEach(() => {
mocks.$i18n.locale = 'de'
+ wrapper = Wrapper()
})
it('links to the https://gradido.net/de when locale is de', () => {
- expect(wrapper.find('div.copyright').find('a').attributes('href')).toEqual(
+ expect(wrapper.find('div.copyright').find('a').attributes('href')).toBe(
'https://gradido.net/de',
)
})
it('links to the https://gradido.net/de/impressum when locale is de', () => {
- expect(wrapper.findAll('a.nav-link').at(0).attributes('href')).toEqual(
+ expect(wrapper.findAll('.nav-item a').at(0).attributes('href')).toBe(
'https://gradido.net/de/impressum/',
)
})
it('links to the https://gradido.net/de/datenschutz when locale is de', () => {
- expect(wrapper.findAll('a.nav-link').at(1).attributes('href')).toEqual(
+ expect(wrapper.findAll('.nav-item a').at(1).attributes('href')).toBe(
'https://gradido.net/de/datenschutz/',
)
})
it('links to the German whitepaper when locale is de', () => {
- expect(wrapper.findAll('a.nav-link').at(2).attributes('href')).toEqual(
+ expect(wrapper.findAll('.nav-item a').at(2).attributes('href')).toBe(
'https://docs.google.com/document/d/1jZp-DiiMPI9ZPNXmjsvOQ1BtnfDFfx8BX7CDmA8KKjY/edit?usp=sharing',
)
})
diff --git a/frontend/src/components/ContentFooter.vue b/frontend/src/components/ContentFooter.vue
index 720c14e0a..e749d0cd9 100755
--- a/frontend/src/components/ContentFooter.vue
+++ b/frontend/src/components/ContentFooter.vue
@@ -1,17 +1,13 @@
+
+
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index 17fd44fe2..1f182218c 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -1,111 +1,130 @@
import { mount } from '@vue/test-utils'
-import ContributionMessagesFormular from './ContributionMessagesFormular'
-import { toastErrorSpy, toastSuccessSpy } from '../../../test/testSetup'
+import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest'
+import ContributionMessagesFormular from './ContributionMessagesFormular.vue'
+import { nextTick } from 'vue'
+import { BButton, BCol, BForm, BFormTextarea, BRow } from 'bootstrap-vue-next'
-const localVue = global.localVue
+// Mocks
+const mockMutate = vi.fn()
+vi.mock('@vue/apollo-composable', () => ({
+ useMutation: () => ({
+ mutate: mockMutate,
+ }),
+}))
-const apolloMutateMock = jest.fn().mockResolvedValue()
+vi.mock('vue-i18n', () => ({
+ useI18n: () => ({
+ t: (key) => key,
+ }),
+}))
+
+const mockToastSuccess = vi.fn()
+const mockToastError = vi.fn()
+vi.mock('@/composables/useToast', () => ({
+ useAppToast: () => ({
+ toastSuccess: mockToastSuccess,
+ toastError: mockToastError,
+ }),
+}))
describe('ContributionMessagesFormular', () => {
let wrapper
- const propsData = {
- contributionId: 42,
- }
-
- const mocks = {
- $t: jest.fn((t) => t),
- $apollo: {
- mutate: apolloMutateMock,
- },
- $i18n: {
- locale: 'en',
- },
- }
-
- const Wrapper = () => {
+ const createWrapper = (props = {}) => {
return mount(ContributionMessagesFormular, {
- localVue,
- mocks,
- propsData,
+ props: {
+ contributionId: 42,
+ ...props,
+ },
+ global: {
+ components: {
+ BForm,
+ BFormTextarea,
+ BRow,
+ BCol,
+ BButton,
+ },
+ mocks: {
+ $t: (msg) => msg,
+ },
+ },
})
}
- describe('mount', () => {
- beforeEach(() => {
- wrapper = Wrapper()
+ beforeEach(() => {
+ mockMutate.mockResolvedValue({})
+ wrapper = createWrapper()
+ })
+
+ afterEach(() => {
+ vi.clearAllMocks()
+ })
+
+ it('renders the component', () => {
+ expect(wrapper.find('.contribution-messages-formular').exists()).toBe(true)
+ })
+
+ it('resets the form on reset event', async () => {
+ await wrapper.find('form').trigger('reset')
+ expect(wrapper.vm.form.text).toBe('')
+ })
+
+ describe('form submission', () => {
+ beforeEach(async () => {
+ await wrapper.find('textarea#textarea').setValue('test message')
+ await wrapper.find('form').trigger('submit')
})
- it('has a DIV .contribution-messages-formular', () => {
- expect(wrapper.find('div.contribution-messages-formular').exists()).toBe(true)
- })
-
- describe('on trigger reset', () => {
- beforeEach(async () => {
- wrapper.setData({
- form: {
- text: 'text form message',
- },
- })
- await wrapper.find('form').trigger('reset')
- })
-
- it('form has empty text', () => {
- expect(wrapper.vm.form).toEqual({
- text: '',
- })
+ it('calls the mutation', () => {
+ expect(mockMutate).toHaveBeenCalledWith({
+ contributionId: 42,
+ message: 'test message',
})
})
- describe('on trigger submit', () => {
- beforeEach(async () => {
- wrapper.setData({
- form: {
- text: 'text form message',
- },
- })
- await wrapper.find('form').trigger('submit')
- })
-
- it('emitted "get-list-contribution-messages" with false', async () => {
- expect(wrapper.emitted('get-list-contribution-messages')).toEqual(
- expect.arrayContaining([expect.arrayContaining([false])]),
- )
- })
-
- it('emitted "update-status" with data', async () => {
- expect(wrapper.emitted('update-status')).toEqual(
- expect.arrayContaining([expect.arrayContaining([42])]),
- )
- })
+ it('emits get-list-contribution-messages event', async () => {
+ await nextTick()
+ expect(wrapper.emitted('get-list-contribution-messages')).toEqual([[false]])
})
- describe('send contribution message with error', () => {
- beforeEach(async () => {
- apolloMutateMock.mockRejectedValue({ message: 'OUCH!' })
- wrapper = Wrapper()
- await wrapper.find('form').trigger('submit')
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('OUCH!')
- })
+ it('emits update-status event', async () => {
+ await nextTick()
+ expect(wrapper.emitted('update-status')).toEqual([[42]])
})
- describe('send contribution message with success', () => {
- beforeEach(async () => {
- wrapper.setData({
- form: {
- text: 'text form message',
- },
- })
- wrapper = Wrapper()
- await wrapper.find('form').trigger('submit')
- })
+ it('resets the form text', async () => {
+ await nextTick()
+ expect(wrapper.vm.form.text).toBe('')
+ })
- it('toasts an success message', () => {
- expect(toastSuccessSpy).toBeCalledWith('message.reply')
- })
+ it('shows success toast', async () => {
+ await nextTick()
+ expect(mockToastSuccess).toHaveBeenCalledWith('message.reply')
})
})
+
+ describe('form submission with error', () => {
+ beforeEach(async () => {
+ mockMutate.mockRejectedValue(new Error('OUCH!'))
+ await wrapper.find('textarea#textarea').setValue('test message')
+ await wrapper.find('form').trigger('submit')
+ })
+
+ it('shows error toast', async () => {
+ await nextTick()
+ expect(mockToastError).toHaveBeenCalledWith('OUCH!')
+ })
+ })
+
+ it('disables submit button when form is empty', async () => {
+ const submitButton = wrapper.find('button[type="submit"]')
+ expect(submitButton.attributes('diabled')).toBeUndefined()
+ })
+
+ it('enables submit button when form has text', async () => {
+ await wrapper.find('textarea#textarea').setValue('test message')
+ await nextTick()
+ const submitButton = wrapper.find('button[type="submit"]')
+ expect(submitButton.attributes('disabled')).toBeUndefined()
+ })
})
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index e84f9273b..85363665f 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -1,78 +1,82 @@
-
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
index 2caef666f..12079a1f7 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
@@ -1,35 +1,56 @@
import { mount } from '@vue/test-utils'
-import ContributionMessagesList from './ContributionMessagesList'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import ContributionMessagesList from './ContributionMessagesList.vue'
+import { BButton } from 'bootstrap-vue-next'
-const localVue = global.localVue
+// Mock child components
+vi.mock('@/components/ContributionMessages/ContributionMessagesListItem', () => ({
+ default: {
+ name: 'ContributionMessagesListItem',
+ template: '',
+ props: ['message'],
+ },
+}))
+
+vi.mock('@/components/ContributionMessages/ContributionMessagesFormular', () => ({
+ default: {
+ name: 'ContributionMessagesFormular',
+ template: '',
+ props: ['contributionId'],
+ },
+}))
describe('ContributionMessagesList', () => {
let wrapper
- const propsData = {
- contributionId: 42,
- status: 'IN_PROGRESS',
- messages: [],
- }
-
- const mocks = {
- $t: jest.fn((t) => t),
- $i18n: {
- locale: 'en',
- },
- }
-
- const Wrapper = () => {
+ const createWrapper = (props = {}) => {
return mount(ContributionMessagesList, {
- localVue,
- mocks,
- propsData,
+ props: {
+ contributionId: 42,
+ status: 'IN_PROGRESS',
+ messages: [],
+ ...props,
+ },
+ global: {
+ components: {
+ BButton,
+ },
+ mocks: {
+ $t: (key) => key,
+ },
+ stubs: {
+ IBiArrowUpShort: true,
+ },
+ directives: {
+ bToggle: {},
+ },
+ },
})
}
describe('mount', () => {
beforeEach(() => {
- wrapper = Wrapper()
+ wrapper = createWrapper()
})
it('has a DIV .contribution-messages-list', () => {
@@ -40,14 +61,32 @@ describe('ContributionMessagesList', () => {
expect(wrapper.findComponent({ name: 'ContributionMessagesFormular' }).exists()).toBe(true)
})
- describe('update Status', () => {
- beforeEach(() => {
- wrapper.vm.updateStatus()
+ it('renders ContributionMessagesListItem for each message', async () => {
+ await wrapper.setProps({
+ messages: [{ id: 1 }, { id: 2 }],
})
+ expect(wrapper.findAll('.contribution-messages-list-item-mock').length).toBe(2)
+ })
- it('emits getListContributionMessages', async () => {
- expect(wrapper.vm.$emit('update-status')).toBeTruthy()
- })
+ it('does not render ContributionMessagesFormular when status is not PENDING or IN_PROGRESS', async () => {
+ await wrapper.setProps({ status: 'COMPLETED' })
+ expect(wrapper.findComponent({ name: 'ContributionMessagesFormular' }).exists()).toBe(false)
+ })
+
+ it('renders close button', () => {
+ expect(wrapper.find('button').text()).toContain('form.close')
+ })
+ })
+
+ describe('events', () => {
+ beforeEach(() => {
+ wrapper = createWrapper()
+ })
+
+ it('emits update-status event when updateStatus method is called', async () => {
+ await wrapper.vm.updateStatus(42)
+ expect(wrapper.emitted('update-status')).toBeTruthy()
+ expect(wrapper.emitted('update-status')[0]).toEqual([42])
})
})
})
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index 28e37dbb7..b7f97daff 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -1,24 +1,24 @@
+
+ {{ computedInitials }}
+
+
+
+
+
diff --git a/frontend/src/components/AppModal.vue b/frontend/src/components/AppModal.vue
new file mode 100644
index 000000000..2276b6e6a
--- /dev/null
+++ b/frontend/src/components/AppModal.vue
@@ -0,0 +1,86 @@
+
+
-
-
+
+
-
+
+
-
+
+
-
+
+
@@ -27,7 +27,7 @@ export default {
.carousel-caption {
color: #fff;
top: 317px;
- text-shadow: 2px 2px 8px #000000;
+ text-shadow: 2px 2px 8px #000;
font-size: xx-large;
}
@@ -48,10 +48,7 @@ export default {
.carousel-inner {
height: 100%;
border-radius: 0% 49% 49% 0% / 0% 51% 49% 0%;
- -webkit-border-radius: 0% 49% 49% 0% / 0% 51% 49% 0%;
backface-visibility: hidden;
- -webkit-backface-visibility: hidden;
transform: translate3d(0, 0, 0);
- -webkit-transform: translate3d(0, 0, 0);
}
diff --git a/frontend/src/components/Auth/AuthFooter.vue b/frontend/src/components/Auth/AuthFooter.vue
index d74593e36..99ec027ab 100644
--- a/frontend/src/components/Auth/AuthFooter.vue
+++ b/frontend/src/components/Auth/AuthFooter.vue
@@ -1,34 +1,34 @@
-
-
diff --git a/frontend/src/components/CommunitySwitch.vue b/frontend/src/components/CommunitySwitch.vue
index ac9ce3182..cd50789dd 100644
--- a/frontend/src/components/CommunitySwitch.vue
+++ b/frontend/src/components/CommunitySwitch.vue
@@ -1,109 +1,93 @@
{{ $t('auth.left.gratitude') }}
{{ $t('auth.left.oneGratitude') }}
- {{ $t('auth.left.dignity') }}
{{ $t('auth.left.oneDignity') }}
- {{ $t('auth.left.donation') }}
{{ $t('auth.left.oneDonation') }}
-
-
-
+
{{ community.name }}
-
-
+
+
-
- {{ value.name }}
-
+
+ {{ modelValue.name }}
+