IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2952 from gradido/remove-email-in-frontend

Browse Source 
refactor(frontend): remove email in wallet
This commit is contained in:
Moriz Wahl 2023-05-08 08:54:56 +02:00 committed by GitHub
commit 7dbfff7bfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 37 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/LanguageSwitch.spec.js
View File

@ -15,7 +15,7 @@ describe('LanguageSwitch', () => {
let wrapper
const state = {
email: 'he@ho.he',
gradidoID: 'current-user-id',
language: null,
}

2
frontend/src/components/LanguageSwitch.vue
View File

@ -31,7 +31,7 @@ export default {
async saveLocale(locale) {
// if (this.$i18n.locale === locale) return
this.setLocale(locale)
if (this.$store.state.email) {
if (this.$store.state.gradidoID) {
this.$apollo
.mutate({
mutation: updateUserInfos,

2
frontend/src/components/LanguageSwitch2.spec.js
View File

@ -15,7 +15,7 @@ describe('LanguageSwitch', () => {
let wrapper
const state = {
email: 'he@ho.he',
gradidoID: 'current-user-id',
language: null,
}

2
frontend/src/components/LanguageSwitch2.vue
View File

@ -59,7 +59,7 @@ export default {
async saveLocale(locale) {
if (this.$i18n.locale === locale) return
this.setLocale(locale)
if (this.$store.state.email) {
if (this.$store.state.gradidoID) {
this.$apollo
.mutate({
mutation: updateUserInfos,

6
frontend/src/components/Menu/Navbar.spec.js
View File

@ -20,7 +20,7 @@ const mocks = {
state: {
firstName: 'Testy',
lastName: 'User',
email: 'testy.user@example.com',
gradidoID: 'current-user-id',
},
},
}
@ -64,8 +64,8 @@ describe('AuthNavbar', () => {
)
})
it('has the email address', () => {
// expect(wrapper.find('div.small:nth-child(2)').text()).toBe(wrapper.vm.$store.state.email)
// I think this should be username
it.skip('has the email address', () => {
expect(wrapper.find('div[data-test="navbar-item-email"]').text()).toBe(
wrapper.vm.$store.state.email,
)

32
frontend/src/components/TransactionRows/AmountAndNameRow.spec.js
View File

@ -39,37 +39,5 @@ describe('AmountAndNameRow', () => {
expect(wrapper.find('div.gdd-transaction-list-item-name').find('a').exists()).toBe(false)
})
})
describe('with linked user', () => {
beforeEach(async () => {
await wrapper.setProps({
linkedUser: { firstName: 'Bibi', lastName: 'Bloxberg', email: 'bibi@bloxberg.de' },
})
})
it('has a link with first and last name', () => {
expect(wrapper.find('div.gdd-transaction-list-item-name').text()).toBe('Bibi Bloxberg')
})
it('has a link', () => {
expect(wrapper.find('div.gdd-transaction-list-item-name').find('a').exists()).toBe(true)
})
describe('click link', () => {
beforeEach(async () => {
await wrapper.find('div.gdd-transaction-list-item-name').find('a').trigger('click')
})
it('emits set tunneled email', () => {
expect(wrapper.emitted('set-tunneled-email')).toEqual([['bibi@bloxberg.de']])
})
it('pushes the route with query for email', () => {
expect(mocks.$router.push).toBeCalledWith({
path: '/send',
})
})
})
})
})
})

40
frontend/src/components/TransactionRows/AmountAndNameRow.vue
View File

@ -10,21 +10,7 @@
</b-col>
<b-col cols="7">
<div class="gdd-transaction-list-item-name">
<span v-if="linkedUser && linkedUser.email">
<b-link @click.stop="tunnelEmail">
{{ itemText }}
</b-link>
</span>
<span v-else>{{ itemText }}</span>
<span v-if="linkId">
{{ $t('via_link') }}
<b-icon
icon="link45deg"
variant="muted"
class="m-mb-1"
:title="$t('gdd_per_link.redeemed-title')"
/>
</span>
<span>{{ text }}</span>
</div>
</b-col>
</b-row>
@ -38,31 +24,9 @@ export default {
type: String,
required: true,
},
linkedUser: {
type: Object,
required: false,
},
text: {
type: String,
required: false,
},
linkId: {
type: Number,
required: false,
default: null,
},
},
methods: {
tunnelEmail() {
this.$emit('set-tunneled-email', this.linkedUser.email)
this.$router.push({ path: '/send' })
},
},
computed: {
itemText() {
return this.linkedUser
? this.linkedUser.firstName + ' ' + this.linkedUser.lastName
: this.text
required: true,
},
},
}

1
frontend/src/components/UserSettings/UserNewsletter.spec.js
View File

@ -18,7 +18,6 @@ describe('UserCard_Newsletter', () => {
$store: {
state: {
language: 'de',
email: 'peter@lustig.de',
newsletterState: true,
},
commit: storeCommitMock,

1
frontend/src/graphql/mutations.js
View File

@ -145,7 +145,6 @@ export const login = gql`
mutation($email: String!, $password: String!, $publisherId: Int) {
login(email: $email, password: $password, publisherId: $publisherId) {
gradidoID
email
firstName
lastName
language

5
frontend/src/graphql/queries.js
View File

@ -3,7 +3,7 @@ import gql from 'graphql-tag'
export const verifyLogin = gql`
query {
verifyLogin {
email
gradidoID
firstName
lastName
language
@ -40,7 +40,6 @@ export const transactionsQuery = gql`
firstName
lastName
gradidoID
email
}
decay {
decay
@ -102,9 +101,9 @@ export const queryTransactionLink = gql`
redeemedAt
deletedAt
user {
gradidoID
firstName
publisherId
email
}
}
... on ContributionLink {

29
frontend/src/layouts/DashboardLayout.spec.js
View File

@ -43,7 +43,6 @@ const mocks = {
$store: {
dispatch: storeDispatchMock,
state: {
email: 'user@example.org',
publisherId: 123,
firstName: 'User',
lastName: 'Example',
@ -260,34 +259,6 @@ describe('DashboardLayout', () => {
})
})
describe.skip('elopage URI', () => {
describe('user has no publisher ID and no elopage', () => {
beforeEach(() => {
mocks.$store.state.publisherId = null
mocks.$store.state.hasElopage = false
wrapper = Wrapper()
})
it('links to basic-de', () => {
expect(wrapper.vm.elopageUri).toBe(
'https://elopage.com/s/gradido/basic-de/payment?locale=en&prid=111&pid=2896&firstName=User&lastName=Example&email=user@example.org',
)
})
})
describe('user has elopage', () => {
beforeEach(() => {
mocks.$store.state.publisherId = '123'
mocks.$store.state.hasElopage = true
wrapper = Wrapper()
})
it('links to sign in for elopage', () => {
expect(wrapper.vm.elopageUri).toBe('https://elopage.com/s/gradido/sign_in?locale=en')
})
})
})
describe.skip('admin method', () => {
const windowLocationMock = jest.fn()
beforeEach(() => {

18
frontend/src/pages/TransactionLink.spec.js
View File

@ -32,7 +32,7 @@ apolloQueryMock.mockResolvedValue({
validUntil: transactionLinkValidExpireDate(),
redeemedAt: '2022-03-18T10:08:43.000Z',
deletedAt: null,
user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de' },
user: { firstName: 'Bibi', publisherId: 0, gradidoID: 'other-user-id' },
},
},
})
@ -44,7 +44,7 @@ const mocks = {
state: {
token: null,
tokenTime: null,
email: 'bibi@bloxberg.de',
gradidoID: 'current-user-id',
},
},
$apollo: {
@ -101,7 +101,7 @@ describe('TransactionLink', () => {
validUntil: transactionLinkValidExpireDate(),
redeemedAt: '2022-03-18T10:08:43.000Z',
deletedAt: now,
user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de' },
user: { firstName: 'Bibi', publisherId: 0, gradidoID: 'other-user-id' },
},
},
})
@ -132,7 +132,7 @@ describe('TransactionLink', () => {
validUntil: '2020-03-18T10:08:43.000Z',
redeemedAt: '2022-03-18T10:08:43.000Z',
deletedAt: null,
user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de' },
user: { firstName: 'Bibi', publisherId: 0, gradidoID: 'other-user-id' },
},
},
})
@ -163,7 +163,7 @@ describe('TransactionLink', () => {
validUntil: transactionLinkValidExpireDate(),
redeemedAt: '2022-03-18T10:08:43.000Z',
deletedAt: null,
user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de' },
user: { firstName: 'Bibi', publisherId: 0, gradidoID: 'other-user-id' },
},
},
})
@ -195,7 +195,7 @@ describe('TransactionLink', () => {
validUntil: transactionLinkValidExpireDate(),
redeemedAt: null,
deletedAt: null,
user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de' },
user: { firstName: 'Bibi', publisherId: 0, gradidoID: 'other-user-id' },
},
},
})
@ -239,7 +239,7 @@ describe('TransactionLink', () => {
validUntil: transactionLinkValidExpireDate(),
redeemedAt: null,
deletedAt: null,
user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de' },
user: { firstName: 'Bibi', publisherId: 0, gradidoID: 'current-user-id' },
},
},
})
@ -275,7 +275,7 @@ describe('TransactionLink', () => {
validUntil: transactionLinkValidExpireDate(),
redeemedAt: null,
deletedAt: null,
user: { firstName: 'Peter', publisherId: 0, email: 'peter@listig.de' },
user: { firstName: 'Peter', publisherId: 0, gradidoID: 'other-user-id' },
},
},
})
@ -351,7 +351,7 @@ describe('TransactionLink', () => {
validUntil: transactionLinkValidExpireDate(),
redeemedAt: null,
deletedAt: null,
user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de' },
user: { firstName: 'Bibi', publisherId: 0, gradidoID: 'other-user-id' },
},
},
})

2
frontend/src/pages/TransactionLink.vue
View File

@ -139,7 +139,7 @@ export default {
if (this.tokenExpiresInSeconds < 5) return `LOGGED_OUT`
// logged in, nicht berechtigt einzulösen, eigener link
if (this.linkData.user && this.$store.state.email === this.linkData.user.email) {
if (this.linkData.user && this.$store.state.gradidoID === this.linkData.user.gradidoID) {
return `SELF_CREATOR`
}

10
frontend/src/store/store.js
View File

@ -13,8 +13,8 @@ export const mutations = {
localeChanged(language)
state.language = language
},
email: (state, email) => {
state.email = email
gradidoID: (state, gradidoID) => {
state.gradidoID = gradidoID
},
// username: (state, username) => {
// state.username = username
@ -57,7 +57,7 @@ export const mutations = {
export const actions = {
login: ({ dispatch, commit }, data) => {
commit('email', data.email)
commit('gradidoID', data.gradidoID)
commit('language', data.language)
// commit('username', data.username)
commit('firstName', data.firstName)
@ -71,8 +71,8 @@ export const actions = {
},
logout: ({ commit, state }) => {
commit('token', null)
commit('email', null)
// commit('username', '')
commit('gradidoID', null)
commit('firstName', '')
commit('lastName', '')
commit('newsletterState', null)
@ -95,8 +95,8 @@ try {
}),
],
state: {
email: '',
language: null,
gradidoID: null,
firstName: '',
lastName: '',
// username: '',

22
frontend/src/store/store.test.js
View File

@ -22,7 +22,7 @@ i18n.locale = 'blubb'
const {
language,
email,
gradidoID,
token,
firstName,
lastName,
@ -53,11 +53,11 @@ describe('Vuex store', () => {
})
})
describe('email', () => {
it('sets the state of email', () => {
const state = { email: 'nobody@knows.tv' }
email(state, 'someone@there.is')
expect(state.email).toEqual('someone@there.is')
describe('gradidoID', () => {
it('sets the state of gradidoID', () => {
const state = { gradidoID: 'old-id' }
gradidoID(state, 'new-id')
expect(state.gradidoID).toEqual('new-id')
})
})
@ -164,7 +164,7 @@ describe('Vuex store', () => {
const commit = jest.fn()
const state = {}
const commitedData = {
email: 'user@example.org',
gradidoID: 'my-gradido-id',
language: 'de',
firstName: 'Peter',
lastName: 'Lustig',
@ -183,9 +183,9 @@ describe('Vuex store', () => {
expect(commit).toHaveBeenCalledTimes(10)
})
it('commits email', () => {
it('commits gradidoID', () => {
login({ commit, state }, commitedData)
expect(commit).toHaveBeenNthCalledWith(1, 'email', 'user@example.org')
expect(commit).toHaveBeenNthCalledWith(1, 'gradidoID', 'my-gradido-id')
})
it('commits language', () => {
@ -248,9 +248,9 @@ describe('Vuex store', () => {
expect(commit).toHaveBeenNthCalledWith(1, 'token', null)
})
it('commits email', () => {
it('commits gradidoID', () => {
logout({ commit, state })
expect(commit).toHaveBeenNthCalledWith(2, 'email', null)
expect(commit).toHaveBeenNthCalledWith(2, 'gradidoID', null)
})
it('commits firstName', () => {