Merge branch 'feature/21-user_deletion' of git.odit.services:lfk/selfservice into feature/21-user_deletion

ref #21

CHANGELOG.md

@@ -2,8 +2,17 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [0.4.5](https://git.odit.services/lfk/selfservice/compare/0.4.4...0.4.5)
+
+- Merge pull request 'feature/32-registration-language' (#33) from feature/32-registration-language into dev [`#32`](https://git.odit.services/lfk/selfservice/issues/32)
+- 🐞 fix /profile/ router on register [`52a0828`](https://git.odit.services/lfk/selfservice/commit/52a082841d47d1ed9c0997776a0784285a3f6ba7)
+- pass browser locale to api/runners/register/ [`e3f7497`](https://git.odit.services/lfk/selfservice/commit/e3f7497af5860b2472b6cdfd33090b9d68b9fb49)
+
 #### [0.4.4](https://git.odit.services/lfk/selfservice/compare/0.4.3...0.4.4)
 
+> 31 March 2021
+
+- 🚀Bumped version to v0.4.4 [`9b62962`](https://git.odit.services/lfk/selfservice/commit/9b62962758f8a73d669bca69b77f2c09a13c9e7a)
 - 🚑 hotfix - baseurl_selfservice -> baseurl [`84dc33b`](https://git.odit.services/lfk/selfservice/commit/84dc33bf14ace839261aea02ffbcac5d627f8200)
 
 #### [0.4.3](https://git.odit.services/lfk/selfservice/compare/0.4.2...0.4.3)

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-selfservice",
-	"version": "0.4.4",
+	"version": "0.4.5",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",

src/views/Profile.vue

@@ -12,29 +12,105 @@
           <p class="text-md whitespace-nowrap">{{ state.group }}</p>
         </div>
         <div class="inline-flex md:ml-auto md:mr-0 mx-auto items-center">
-          <button
-            type="button"
-            class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-blue-500 hover:bg-blue-600 hover:shadow-lg"
-          >
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="24"
-              height="24"
-              viewBox="0 0 24 24"
-              fill="none"
-              stroke="currentColor"
-              stroke-width="2"
-              stroke-linecap="round"
-              stroke-linejoin="round"
-              class="feather feather-download"
-              style="display: inline;height: 1rem;vertical-align: sub;"
+          <div v-if="(state.delete_active === false)">
+            <button
+              type="button"
+              class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-blue-500 hover:bg-blue-600 hover:shadow-lg"
             >
-              <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
-              <polyline points="7 10 12 15 17 10" />
-              <line x1="12" y1="15" x2="12" y2="3" />
-            </svg>
-            {{ $t('download_certificate') }}
-          </button>
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="24"
+                height="24"
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke="currentColor"
+                stroke-width="2"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                class="feather feather-download"
+                style="display: inline;height: 1rem;vertical-align: sub;"
+              >
+                <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
+                <polyline points="7 10 12 15 17 10" />
+                <line x1="12" y1="15" x2="12" y2="3" />
+              </svg>
+              {{ $t('download_certificate') }}
+            </button>
+            <button
+              type="button"
+              class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-red-600 hover:bg-red-700 hover:shadow-lg ml-1"
+              @click="() => { state.delete_active = true }"
+            >
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="24"
+                height="24"
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke="currentColor"
+                stroke-width="2"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                class="feather feather-download"
+                style="display: inline;height: 1rem;vertical-align: sub;"
+              >
+                <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
+                <polyline points="7 10 12 15 17 10" />
+                <line x1="12" y1="15" x2="12" y2="3" />
+              </svg>
+              {{ $t('delete-all-of-my-data') }}
+            </button>
+          </div>
+          <div v-if="(state.delete_active === true)">
+            <button
+              type="button"
+              class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-blue-500 hover:bg-blue-600 hover:shadow-lg"
+              @click="() => { state.delete_active = false }"
+            >
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="24"
+                height="24"
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke="currentColor"
+                stroke-width="2"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                class="feather feather-download"
+                style="display: inline;height: 1rem;vertical-align: sub;"
+              >
+                <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
+                <polyline points="7 10 12 15 17 10" />
+                <line x1="12" y1="15" x2="12" y2="3" />
+              </svg>
+              Cancel, keep my data
+            </button>
+            <button
+              type="button"
+              class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-red-600 hover:bg-red-700 hover:shadow-lg ml-1"
+              @click="delete_me"
+            >
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="24"
+                height="24"
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke="currentColor"
+                stroke-width="2"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                class="feather feather-download"
+                style="display: inline;height: 1rem;vertical-align: sub;"
+              >
+                <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
+                <polyline points="7 10 12 15 17 10" />
+                <line x1="12" y1="15" x2="12" y2="3" />
+              </svg>
+              Confirm, delete all of my data
+            </button>
+          </div>
         </div>
       </div>
     </section>
@@ -178,6 +254,7 @@ const state = reactive({
   scans: [],
   group: "",
   activetab: "profile",
+  delete_active: false,
 })
 const toast = useToast();
 const props = defineProps({
@@ -206,4 +283,16 @@ axios.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
   }).catch((error) => {
     toast.error("An error occured while loading your profile data");
   })
+function delete_me() {
+  toast("deletion in progress...");
+  const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
+  let url = `${config.baseurl}api/runners/me/${accesstoken}?force=true`
+  axios.delete(url)
+    .then(() => {
+      location.replace(`${config.baseurl_selfservice}`);
+    })
+    .catch((error) => {
+      console.log(error);
+    });
+}
 </script>

src/views/Register.vue

@@ -261,8 +261,6 @@ import isEmail from 'validator/es/lib/isEmail';
 import isMobilePhone from 'validator/es/lib/isMobilePhone';
 import isPostalCode from 'validator/es/lib/isPostalCode';
 import { useToast } from "vue-toastification";
-// import { router } from '../router';
-import { i18n } from '../language';
 
 const props = defineProps({
   token: String
@@ -320,14 +318,16 @@ function login() {
         postdata.team = org_team.value;
       }
       toast("registration in progress...");
-      let url = `${config.baseurl}api/runners/register`;
+      const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
+      let url = `${config.baseurl}api/runners/register/?locale=${browserlocale}`;
       if (props.token) {
-        url = `${config.baseurl}api/runners/register/${props.token}`
+        url = `${config.baseurl}api/runners/register/${props.token}/?locale=${browserlocale}`
       }
       axios.post(url, postdata)
         .then(({ data }) => {
           const token = btoa(data.token);
-          // router.push(`${config.baseurl_selfservice}/profile/${token}`);
+          // alert(token);
+          location.replace(`${config.baseurl_selfservice}profile/${token}`);
         })
         .catch((error) => {
           console.log(error);