From 9303bd5d36181d4516a31a4521a05d5003337a47 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Sat, 15 Dec 2018 03:05:47 +0300
Subject: [PATCH 1/6] Base support for CAPTCHA (kocaptcha)

---
 src/components/registration/registration.js  | 12 +++++++++++-
 src/components/registration/registration.vue | 12 ++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index e5ead8bc..c4e96b3c 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -11,7 +11,8 @@ const registration = {
       username: '',
       password: '',
       confirm: ''
-    }
+    },
+    captcha: {}
   }),
   validations: {
     user: {
@@ -29,6 +30,13 @@ const registration = {
     if ((!this.registrationOpen && !this.token) || this.signedIn) {
       this.$router.push('/main/all')
     }
+
+    fetch("/api/pleroma/captcha")
+      .then(resp => resp.json())
+      .then(resp => {
+        // TODO: check for errors
+        this.captcha = resp
+      })
   },
   computed: {
     token () { return this.$route.params.token },
@@ -45,6 +53,8 @@ const registration = {
     async submit () {
       this.user.nickname = this.user.username
       this.user.token = this.token
+      this.user.captcha_solution = this.captcha.solution;
+      this.user.captcha_token = this.captcha.token;
 
       this.$v.$touch()
 
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index 8cb1392b..d4fb1ad0 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -75,6 +75,18 @@
               </ul>
             </div>
 
+            <div class="form-group" id="captcha-group">
+              <template v-if="captcha.type == 'kocaptcha'">
+                <img v-bind:src="captcha.url">
+
+                <label class='form--label' for='captcha-label'>CAPTCHA</label>
+
+                <input :disabled="isPending"
+                  v-model='captcha.solution'
+                  class='form-control' id='captcha-answer' type='text'>
+              </template>
+            </div>
+
             <div class='form-group' v-if='token' >
               <label for='token'>{{$t('registration.token')}}</label>
               <input disabled='true' v-model='token' class='form-control' id='token' type='text'>

From 92de235f4e15f7cd69e150e07d5251305a3c251c Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Sat, 15 Dec 2018 03:06:21 +0300
Subject: [PATCH 2/6] Support disabling captcha

---
 src/components/registration/registration.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index d4fb1ad0..be0084dd 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -75,7 +75,7 @@
               </ul>
             </div>
 
-            <div class="form-group" id="captcha-group">
+            <div class="form-group" id="captcha-group" v-if="captcha.type != 'none'">
               <template v-if="captcha.type == 'kocaptcha'">
                 <img v-bind:src="captcha.url">
 

From a525df32c9bbba873ecca2939b013985c51d27bc Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Sun, 16 Dec 2018 20:53:41 +0300
Subject: [PATCH 3/6] Separate captcha into the backendInteractor

---
 src/components/registration/registration.js              | 9 ++-------
 src/modules/users.js                                     | 4 ++++
 src/services/api/api.service.js                          | 3 +++
 .../backend_interactor_service.js                        | 2 ++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index c4e96b3c..7a742b3d 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -31,12 +31,7 @@ const registration = {
       this.$router.push('/main/all')
     }
 
-    fetch("/api/pleroma/captcha")
-      .then(resp => resp.json())
-      .then(resp => {
-        // TODO: check for errors
-        this.captcha = resp
-      })
+    this.getCaptcha().then(cpt => this.captcha = cpt)
   },
   computed: {
     token () { return this.$route.params.token },
@@ -49,7 +44,7 @@ const registration = {
     })
   },
   methods: {
-    ...mapActions(['signUp']),
+    ...mapActions(['signUp', 'getCaptcha']),
     async submit () {
       this.user.nickname = this.user.username
       this.user.token = this.token
diff --git a/src/modules/users.js b/src/modules/users.js
index 25d1c81f..65b172bc 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -142,6 +142,10 @@ const users = {
         throw Error(errors)
       }
     },
+    async getCaptcha (store) {
+      return await store.rootState.api.backendInteractor.getCaptcha()
+    },
+
     logout (store) {
       store.commit('clearCurrentUser')
       store.commit('setToken', false)
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index ae876b7f..b509c905 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -167,6 +167,8 @@ const register = (params) => {
   })
 }
 
+const getCaptcha = () => fetch('/api/pleroma/captcha').then(resp => resp.json())
+
 const authHeaders = (accessToken) => {
   if (accessToken) {
     return { 'Authorization': `Bearer ${accessToken}` }
@@ -496,6 +498,7 @@ const apiService = {
   setUserMute,
   fetchMutes,
   register,
+  getCaptcha,
   updateAvatar,
   updateBg,
   updateProfile,
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index c84373ac..cc72f607 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -71,6 +71,7 @@ const backendInteractorService = (credentials) => {
   const fetchMutes = () => apiService.fetchMutes({credentials})
   const fetchFollowRequests = () => apiService.fetchFollowRequests({credentials})
 
+  const getCaptcha = () => apiService.getCaptcha()
   const register = (params) => apiService.register(params)
   const updateAvatar = ({params}) => apiService.updateAvatar({credentials, params})
   const updateBg = ({params}) => apiService.updateBg({credentials, params})
@@ -100,6 +101,7 @@ const backendInteractorService = (credentials) => {
     setUserMute,
     fetchMutes,
     register,
+    getCaptcha,
     updateAvatar,
     updateBg,
     updateBanner,

From 3c9c8052f7c0f55940033a787e48578d38ab06ac Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Sun, 16 Dec 2018 20:55:09 +0300
Subject: [PATCH 4/6] Fix style

---
 src/components/registration/registration.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index 7a742b3d..0c65ac5d 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -31,7 +31,7 @@ const registration = {
       this.$router.push('/main/all')
     }
 
-    this.getCaptcha().then(cpt => this.captcha = cpt)
+    this.getCaptcha().then(cpt => { this.captcha = cpt })
   },
   computed: {
     token () { return this.$route.params.token },
@@ -48,8 +48,8 @@ const registration = {
     async submit () {
       this.user.nickname = this.user.username
       this.user.token = this.token
-      this.user.captcha_solution = this.captcha.solution;
-      this.user.captcha_token = this.captcha.token;
+      this.user.captcha_solution = this.captcha.solution
+      this.user.captcha_token = this.captcha.token
 
       this.$v.$touch()
 

From ab6f1904fae8fad7e4a5de89d6d613285283f28e Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Sun, 16 Dec 2018 22:47:52 +0300
Subject: [PATCH 5/6] Add a way to get new captcha on click

---
 src/components/registration/registration.js  | 5 ++++-
 src/components/registration/registration.vue | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index 0c65ac5d..6b79469c 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -31,7 +31,7 @@ const registration = {
       this.$router.push('/main/all')
     }
 
-    this.getCaptcha().then(cpt => { this.captcha = cpt })
+    this.setCaptcha()
   },
   computed: {
     token () { return this.$route.params.token },
@@ -61,6 +61,9 @@ const registration = {
           console.warn('Registration failed: ' + error)
         }
       }
+    },
+    setCaptcha() {
+      this.getCaptcha().then(cpt => { this.captcha = cpt })
     }
   }
 }
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index be0084dd..f187e215 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -77,8 +77,9 @@
 
             <div class="form-group" id="captcha-group" v-if="captcha.type != 'none'">
               <template v-if="captcha.type == 'kocaptcha'">
-                <img v-bind:src="captcha.url">
+                <img v-bind:src="captcha.url" v-on:click="setCaptcha">
 
+                <sub>Click the image to get a new captcha</sub>
                 <label class='form--label' for='captcha-label'>CAPTCHA</label>
 
                 <input :disabled="isPending"

From d2984b9bc50a2565e8e83eaff36ce44239062e41 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Sun, 16 Dec 2018 22:55:11 +0300
Subject: [PATCH 6/6] Fix style

---
 src/components/registration/registration.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index 6b79469c..a6c79e87 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -62,7 +62,7 @@ const registration = {
         }
       }
     },
-    setCaptcha() {
+    setCaptcha () {
       this.getCaptcha().then(cpt => { this.captcha = cpt })
     }
   }