ci: Stage blocking changes

2 files changed, 44 insertions, 38 deletions

diff --git a/front-end/src/views/Login/components/Social.vue b/front-end/src/views/Login/components/Social.vue
index 3c93d0e..2087524 100644
--- a/front-end/src/views/Login/components/Social.vue
+++ b/front-end/src/views/Login/components/Social.vue
@@ -1,13 +1,29 @@
 <script setup lang="ts">
-import { shallowRef } from 'vue'
 import { apiCall, useWait, type OAuthMethod } from '@vnuge/vnlib.browser'
-import { capitalize } from 'lodash-es';
+import { capitalize, map } from 'lodash-es';
 import { useStore } from '../../../store';
+import { useAsyncState } from '@vueuse/core';
+import { shallowRef } from 'vue';
+import { Mutable } from '@vueuse/core';
 
 const { waiting } = useWait()
 const store = useStore()
+const buttonCont = shallowRef<HTMLDivElement | null>(null)
+
+const filterSvgIcon = (oauth: OAuthMethod[]) => {
+    return map(oauth, (method: Mutable<OAuthMethod>) => {
+        //parse the base64 icon as an svg
+        if (method.icon) {
+            return{
+                ...method,
+                icon: atob(method.icon).replace(/(width|height)="[^"]*"/g, '')
+            }
+        }
+        return method;
+    })
+}
 
-const methods = shallowRef<OAuthMethod[]>([])
+const { state: methods, isReady } = useAsyncState(store.socialOauth().then(p => filterSvgIcon(p.methods)), []);
 
 //Invoke login wrapped in api call
 const submitLogin = (method: OAuthMethod) => apiCall(async () => {
@@ -15,34 +31,24 @@ const submitLogin = (method: OAuthMethod) => apiCall(async () => {
     await beginLoginFlow(method)
 })
 
-const getIcon = (method: OAuthMethod): string[] => {
-    switch (method.id) {
-        case 'auth0':
-            return ['fa', 'certificate']
-        default:
-            return ['fab', method.id]
-    }
-}
-
-//Load methods once the fetch completes
-store.socialOauth().then(m => methods.value = m.methods);
-
 </script>
 
 <template>
 
-    <div class="flex flex-col gap-3">
+    <div ref="buttonCont" v-if="isReady" class="flex flex-col gap-3">
         <div v-for="method in methods" :key="method.id" class="">
-            <button 
-            type="submit" 
-            class="btn social-button" 
-            :disabled="waiting" 
-            @click.prevent="submitLogin(method)"
-            >
-                <fa-icon :icon="getIcon(method)" size="xl" />
+            <button type="submit" class="btn social-button" :disabled="waiting" @click.prevent="submitLogin(method)">
+
+                <div v-html="method.icon" class="w-6 h-6" >
+                </div>
+
                 Login with {{ capitalize(method.id) }}
             </button>
         </div>
     </div>
 
+    <div v-else class="my-8">
+        <fa-icon icon="spinner" size="2xl" spin />
+    </div>
+
 </template>
diff --git a/front-end/src/views/Login/index.vue b/front-end/src/views/Login/index.vue
index 476ebf4..8532390 100644
--- a/front-end/src/views/Login/index.vue
+++ b/front-end/src/views/Login/index.vue
@@ -38,7 +38,7 @@ const submitLogout = async () => {
     <div class="login-container">
 
       <div v-if="!loggedIn">
-        <UserPass/>
+        <UserPass />
       </div>
 
       <div v-else>
@@ -46,13 +46,13 @@ const submitLogout = async () => {
         <p class="mt-3 mb-5 text-lg">
           You are currently logged-in.
         </p>
-         <div class="">
-            <button form="user-pass-submit-form" class="btn primary" @click="submitLogout" :disabled="waiting">
-                <!-- Display spinner if waiting, otherwise the sign-in icon -->
-                <fa-icon :class="{'animate-spin':waiting}" :icon="waiting ? 'spinner' : 'sign-in-alt'"/>
-                Log-out
-            </button>
-         </div>
+        <div class="">
+          <button form="user-pass-submit-form" class="btn primary" @click="submitLogout" :disabled="waiting">
+            <!-- Display spinner if waiting, otherwise the sign-in icon -->
+            <fa-icon :class="{'animate-spin':waiting}" :icon="waiting ? 'spinner' : 'sign-in-alt'" />
+            Log-out
+          </button>
+        </div>
       </div>
 
       <div v-if="!loggedIn" class="w-full mt-6">
@@ -62,9 +62,13 @@ const submitLogout = async () => {
         <!-- pki button, forward to the pki route -->
         <div v-if="pkiEnabled" class="mt-4">
           <router-link to="/login/pki">
-            <button type="submit" class="btn red social-button" :disabled="waiting">
-              <fa-icon :icon="['fa','certificate']" size="xl" />
-              Login with PKI Credential
+            <button type="submit" class="btn social-button" :disabled="waiting">
+              <span>
+                <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 256 256">
+                  <path fill="currentColor" d="M248 128a56 56 0 1 0-96 39.14V224a8 8 0 0 0 11.58 7.16L192 216.94l28.42 14.22A8 8 0 0 0 232 224v-56.86A55.81 55.81 0 0 0 248 128Zm-56-40a40 40 0 1 1-40 40a40 40 0 0 1 40-40Zm3.58 112.84a8 8 0 0 0-7.16 0L168 211.06v-32.47a55.94 55.94 0 0 0 48 0v32.47ZM136 192a8 8 0 0 1-8 8H40a16 16 0 0 1-16-16V56a16 16 0 0 1 16-16h176a16 16 0 0 1 16 16a8 8 0 0 1-16 0H40v128h88a8 8 0 0 1 8 8Zm-16-56a8 8 0 0 1-8 8H72a8 8 0 0 1 0-16h40a8 8 0 0 1 8 8Zm0-32a8 8 0 0 1-8 8H72a8 8 0 0 1 0-16h40a8 8 0 0 1 8 8Z" />
+                </svg>
+              </span>
+              Login with OTP
             </button>
           </router-link>
         </div>
@@ -90,9 +94,5 @@ const submitLogout = async () => {
     @apply flex flex-row justify-center gap-3 items-center;
   }
 
-  a {
-    @apply ease-in-out duration-100;
-    @apply hover:text-primary-600 dark:hover:text-primary-500;
-  }
 }
 </style>