From f8ddb53dba2e06a2e87833aea7c07227723609f6 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 14 Oct 2021 17:19:41 +0200
Subject: [PATCH] refactor: Activate Registration

---
 frontend/.env.dist                     |  1 -
 frontend/src/config/index.js           |  4 +---
 frontend/src/routes/router.js          |  8 --------
 frontend/src/routes/router.test.js     | 15 ++++++++-------
 frontend/src/routes/routes.js          |  4 ++++
 frontend/src/views/Pages/Login.spec.js |  4 +---
 frontend/src/views/Pages/Login.vue     | 10 ++--------
 7 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/frontend/.env.dist b/frontend/.env.dist
index 90f968bd0..8d4025a5d 100644
--- a/frontend/.env.dist
+++ b/frontend/.env.dist
@@ -1,4 +1,3 @@
-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/config/index.js b/frontend/src/config/index.js
index f04251029..1f1819c62 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -22,9 +22,7 @@ const server = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
 }
 
-const options = {
-  ALLOW_REGISTER: process.env.ALLOW_REGISTER !== 'false',
-}
+const options = {}
 
 const CONFIG = {
   ...version,
diff --git a/frontend/src/routes/router.js b/frontend/src/routes/router.js
index f32c15fc1..b44c8ab7e 100644
--- a/frontend/src/routes/router.js
+++ b/frontend/src/routes/router.js
@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
 import routes from './routes'
-import CONFIG from '../config'
 
 Vue.use(VueRouter)
 
@@ -21,11 +20,4 @@ const router = new VueRouter({
   },
 })
 
-if (CONFIG.ALLOW_REGISTER) {
-  router.addRoute({
-    path: '/register',
-    component: () => import('../views/Pages/Register.vue'),
-  })
-}
-
 export default router
diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index 5e2e16005..23d2e71b6 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -44,19 +44,13 @@ describe('router', () => {
       })
     })
 
-    describe('register page', () => {
-      it('is not present', () => {
-        expect(routes.find((r) => r.path === '/register')).toBe(undefined)
-      })
-    })
-
     describe('routes', () => {
       it('has "/login" as default', () => {
         expect(routes.find((r) => r.path === '/').redirect()).toEqual({ path: '/login' })
       })
 
       it('has twelve routes defined', () => {
-        expect(routes).toHaveLength(12)
+        expect(routes).toHaveLength(13)
       })
 
       describe('overview', () => {
@@ -99,6 +93,13 @@ describe('router', () => {
         })
       })
 
+      describe('register', () => {
+        it('loads the "register" component', async () => {
+          const component = await routes.find((r) => r.path === '/register').component()
+          expect(component.default.name).toBe('register')
+        })
+      })
+
       describe('thx', () => {
         const thx = routes.find((r) => r.path === '/thx/:comingFrom')
 
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index 71315da9e..8cc4d313d 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -32,6 +32,10 @@ const routes = [
     path: '/login',
     component: () => import('../views/Pages/Login.vue'),
   },
+  {
+    path: '/register',
+    component: () => import('../views/Pages/Register.vue'),
+  },
   {
     path: '/thx/:comingFrom',
     component: () => import('../views/Pages/thx.vue'),
diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/views/Pages/Login.spec.js
index 82f92da91..13d12df85 100644
--- a/frontend/src/views/Pages/Login.spec.js
+++ b/frontend/src/views/Pages/Login.spec.js
@@ -136,9 +136,7 @@ describe('Login', () => {
       })
 
       it('links to /register when clicking "Create new account"', () => {
-        expect(wrapper.findAllComponents(RouterLinkStub).at(1).props().to).toBe(
-          '/register-community',
-        )
+        expect(wrapper.findAllComponents(RouterLinkStub).at(1).props().to).toBe('/register')
       })
     })
 
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 6695242e6..0cdbeb942 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -48,12 +48,8 @@
                 {{ $t('settings.password.forgot_pwd') }}
               </router-link>
             </b-col>
-            <b-col
-              cols="6"
-              class="text-center text-sm-right col-12 col-sm-6"
-              v-show="allowRegister"
-            >
-              <router-link to="/register-community" class="mt-3">
+            <b-col cols="6" class="text-center text-sm-right col-12 col-sm-6">
+              <router-link to="/register" class="mt-3">
                 {{ $t('site.login.new_wallet') }}
               </router-link>
             </b-col>
@@ -64,7 +60,6 @@
   </div>
 </template>
 <script>
-import CONFIG from '../../config'
 import InputPassword from '../../components/Inputs/InputPassword'
 import InputEmail from '../../components/Inputs/InputEmail'
 import { login, communityInfo } from '../../graphql/queries'
@@ -81,7 +76,6 @@ export default {
         email: '',
         password: '',
       },
-      allowRegister: CONFIG.ALLOW_REGISTER,
       passwordVisible: false,
     }
   },