From ad11d482e0f1e5593bbbdef1fa661f9a6964d4b9 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 13 Oct 2021 13:35:58 +0200
Subject: [PATCH] Missing files..

---
 .github/workflows/test.yml                    |  4 +--
 frontend/.env.dist                            |  1 +
 .../components/SidebarPlugin/SideBar.spec.js  |  2 +-
 .../src/components/SidebarPlugin/SideBar.vue  | 12 ++++++---
 frontend/src/config/index.js                  |  1 +
 frontend/src/graphql/mutations.js             |  2 ++
 frontend/src/graphql/queries.js               |  5 ++--
 frontend/src/store/store.js                   |  6 ++++-
 frontend/src/store/store.test.js              | 25 ++++++++++++++++---
 frontend/src/views/Pages/Login.spec.js        |  2 ++
 frontend/src/views/Pages/Login.vue            |  1 +
 frontend/src/views/Pages/Register.spec.js     |  2 ++
 frontend/src/views/Pages/Register.vue         |  1 +
 13 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index de9939101..e7578dc11 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -386,7 +386,7 @@ jobs:
           report_name: Coverage Backend
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 4
+          min_coverage: 3
           token: ${{ github.token }}
 
   ##############################################################################
@@ -541,4 +541,4 @@ jobs:
       - name: database | up
         run: docker-compose -f docker-compose.yml run -T database yarn up
       - name: database | reset
-        run: docker-compose -f docker-compose.yml run -T database yarn reset
\ No newline at end of file
+        run: docker-compose -f docker-compose.yml run -T database yarn reset
diff --git a/frontend/.env.dist b/frontend/.env.dist
index a7d67f970..90f968bd0 100644
--- a/frontend/.env.dist
+++ b/frontend/.env.dist
@@ -1,3 +1,4 @@
 ALLOW_REGISTER=true
 GRAPHQL_URI=http://localhost:4000/graphql
+DEFAULT_PUBLISHER_ID=2896
 //BUILD_COMMIT=0000000
\ No newline at end of file
diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
index 993fdf195..e42369e50 100644
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js
@@ -109,7 +109,7 @@ describe('SideBar', () => {
           })
         })
 
-        describe('member's area with publisher ID', () => {
+        describe("member's area with publisher ID", () => {
           beforeEach(() => {
             mocks.$store.state.hasElopage = true
           })
diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 5971b7b4e..8f153cb11 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -68,6 +68,7 @@
 <script>
 import NavbarToggleButton from '@/components/NavbarToggleButton'
 import VueQrcode from 'vue-qrcode'
+import { CONFIG } from '../../config'
 
 export default {
   name: 'sidebar',
@@ -112,9 +113,14 @@ export default {
       this.$emit('logout')
     },
     getElopageLink() {
-      return this.$store.state.hasElopage
-        ? `https://elopage.com/s/gradido/sign_in?locale=${this.$i18n.locale}`
-        : encodeURL(`https://elopage.com/s/gradido/basic-de/payment?locale=${this.$i18n.locale}&prid=111&pid=${this.$store.state.publisherId}&firstName=${this.$store.state.firstName}&lastName=${this.$store.state.lastName}&email=${this.$store.state.email})`
+      const pId = this.$store.state.publisherId
+        ? this.$store.state.publisherId
+        : CONFIG.DEFAULT_PUBLISHER_ID
+      return encodeURI(
+        this.$store.state.hasElopage
+          ? `https://elopage.com/s/gradido/sign_in?locale=${this.$i18n.locale}`
+          : `https://elopage.com/s/gradido/basic-de/payment?locale=${this.$i18n.locale}&prid=111&pid=${pId}&firstName=${this.$store.state.firstName}&lastName=${this.$store.state.lastName}&email=${this.$store.state.email}`,
+      )
     },
   },
 }
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 96f7795ce..f04251029 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -15,6 +15,7 @@ const environment = {
   NODE_ENV: process.env.NODE_ENV,
   DEBUG: process.env.NODE_ENV !== 'production' || false,
   PRODUCTION: process.env.NODE_ENV === 'production' || false,
+  DEFAULT_PUBLISHER_ID: process.env.DEFAULT_PUBLISHER_ID || 2896,
 }
 
 const server = {
diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js
index d5e9c4228..480576caf 100644
--- a/frontend/src/graphql/mutations.js
+++ b/frontend/src/graphql/mutations.js
@@ -51,6 +51,7 @@ export const registerUser = gql`
     $email: String!
     $password: String!
     $language: String!
+    $publisherId: Int!
   ) {
     createUser(
       email: $email
@@ -58,6 +59,7 @@ export const registerUser = gql`
       lastName: $lastName
       password: $password
       language: $language
+      publisherId: $publisherId
     )
   }
 `
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 40cc359cf..2ee381dd8 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -1,8 +1,8 @@
 import gql from 'graphql-tag'
 
 export const login = gql`
-  query($email: String!, $password: String!) {
-    login(email: $email, password: $password) {
+  query($email: String!, $password: String!, $publisherId: Int) {
+    login(email: $email, password: $password, publisherId: $publisherId) {
       email
       username
       firstName
@@ -14,6 +14,7 @@ export const login = gql`
         newsletterState
       }
       hasElopage
+      publisherId
     }
   }
 `
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index cb2c7b42a..040760148 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -30,7 +30,9 @@ export const mutations = {
     state.newsletterState = newsletterState
   },
   publisherId: (state, publisherId) => {
-    state.publisherId = publisherId
+    let pubId = parseInt(publisherId)
+    if (isNaN(pubId)) pubId = null
+    state.publisherId = pubId
   },
   community: (state, community) => {
     state.community = community
@@ -54,6 +56,7 @@ export const actions = {
     commit('coinanimation', data.coinanimation)
     commit('newsletterState', data.klickTipp.newsletterState)
     commit('hasElopage', data.hasElopage)
+    commit('publisherId', data.publisherId)
   },
   logout: ({ commit, state }) => {
     commit('token', null)
@@ -65,6 +68,7 @@ export const actions = {
     commit('coinanimation', true)
     commit('newsletterState', null)
     commit('hasElopage', false)
+    commit('publisherId', null)
     localStorage.clear()
   },
 }
diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js
index ecdfb9f11..bdb98d03b 100644
--- a/frontend/src/store/store.test.js
+++ b/frontend/src/store/store.test.js
@@ -96,6 +96,12 @@ describe('Vuex store', () => {
         publisherId(state, 42)
         expect(state.publisherId).toEqual(42)
       })
+
+      it('sets publisherId to null with NaN', () => {
+        const state = {}
+        publisherId(state, 'abc')
+        expect(state.publisherId).toEqual(null)
+      })
     })
 
     describe('community', () => {
@@ -141,11 +147,12 @@ describe('Vuex store', () => {
           newsletterState: true,
         },
         hasElopage: false,
+        publisherId: 1234,
       }
 
-      it('calls nine commits', () => {
+      it('calls ten commits', () => {
         login({ commit, state }, commitedData)
-        expect(commit).toHaveBeenCalledTimes(9)
+        expect(commit).toHaveBeenCalledTimes(10)
       })
 
       it('commits email', () => {
@@ -192,15 +199,20 @@ describe('Vuex store', () => {
         login({ commit, state }, commitedData)
         expect(commit).toHaveBeenNthCalledWith(9, 'hasElopage', false)
       })
+
+      it('commits publisherId', () => {
+        login({ commit, state }, commitedData)
+        expect(commit).toHaveBeenNthCalledWith(10, 'publisherId', 1234)
+      })
     })
 
     describe('logout', () => {
       const commit = jest.fn()
       const state = {}
 
-      it('calls nine commits', () => {
+      it('calls ten commits', () => {
         logout({ commit, state })
-        expect(commit).toHaveBeenCalledTimes(9)
+        expect(commit).toHaveBeenCalledTimes(10)
       })
 
       it('commits token', () => {
@@ -248,6 +260,11 @@ describe('Vuex store', () => {
         expect(commit).toHaveBeenNthCalledWith(9, 'hasElopage', false)
       })
 
+      it('commits publisherId', () => {
+        logout({ commit, state })
+        expect(commit).toHaveBeenNthCalledWith(10, 'publisherId', null)
+      })
+
       // how to get this working?
       it.skip('calls localStorage.clear()', () => {
         const clearStorageMock = jest.fn()
diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/views/Pages/Login.spec.js
index 6aac3fda2..82f92da91 100644
--- a/frontend/src/views/Pages/Login.spec.js
+++ b/frontend/src/views/Pages/Login.spec.js
@@ -44,6 +44,7 @@ describe('Login', () => {
           registerUrl: 'http://localhost/vue/register',
           description: 'Die lokale Entwicklungsumgebung von Gradido.',
         },
+        publisherId: 12345,
       },
     },
     $loading: {
@@ -199,6 +200,7 @@ describe('Login', () => {
               variables: {
                 email: 'user@example.org',
                 password: '1234',
+                publisherId: 12345,
               },
             }),
           )
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index db8789002..aea91085c 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -96,6 +96,7 @@ export default {
           variables: {
             email: this.form.email,
             password: this.form.password,
+            publisherId: parseInt(this.$store.state.publisherId),
           },
           fetchPolicy: 'network-only',
         })
diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js
index 388a96746..98db5e18c 100644
--- a/frontend/src/views/Pages/Register.spec.js
+++ b/frontend/src/views/Pages/Register.spec.js
@@ -32,6 +32,7 @@ describe('Register', () => {
           registerUrl: 'http://localhost/vue/register',
           description: 'Die lokale Entwicklungsumgebung von Gradido.',
         },
+        publisherId: 12345,
       },
     },
   }
@@ -216,6 +217,7 @@ describe('Register', () => {
                 lastName: 'Mustermann',
                 password: 'Aa123456_',
                 language: 'en',
+                publisherId: 12345,
               },
             }),
           )
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index 8e1a5d26d..68613bf12 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -199,6 +199,7 @@ export default {
             lastName: this.form.lastname,
             password: this.form.password.password,
             language: this.language,
+            publisherId: parseInt(this.$store.state.publisherId),
           },
         })
         .then(() => {