add make format and run it

silinternational · Sep 27, 2024 · 189ef94 · 189ef94
1 parent 1f3015e
commit 189ef94
Show file tree

Hide file tree

Showing 30 changed files with 249 additions and 237 deletions.
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ dist: deps
 logs:
 	docker-compose logs
 	docker-compose exec idp cat /var/log/apache2/error.log
-	
+
 phpmyadmin:
 	docker-compose up -d brokerPhpmyadmin profilePhpmyadmin
 
@@ -26,3 +26,6 @@ clean:
 	docker-compose run --rm node npm run clean
 	docker-compose kill
 	docker-compose rm -f
+
+format:
+	npm run format
diff --git a/package.json b/package.json
@@ -12,7 +12,8 @@
     "serve": "vite --port=8000",
     "serve:prod": "vite preview --port=8000",
     "build": "vite build",
-    "clean": "rimraf dist"
+    "clean": "rimraf dist",
+    "format": "prettier --write ./src/**/*.{js,vue}"
   },
   "dependencies": {
     "@simplewebauthn/browser": "^4.1.0",

diff --git a/src/2sv/Change.vue b/src/2sv/Change.vue
@@ -13,13 +13,13 @@
     </p>
 
     <ButtonBar>
-      <v-btn to="/profile" outlined> 
+      <v-btn to="/profile" outlined>
         {{ $vuetify.lang.t('$vuetify.global.button.no') }}
       </v-btn>
 
       <v-spacer></v-spacer>
-      
-      <v-btn @click.once="yes(requested.id)" color="primary" outlined> 
+
+      <v-btn @click.once="yes(requested.id)" color="primary" outlined>
         {{ $vuetify.lang.t('$vuetify.global.button.yes') }}
       </v-btn>
     </ButtonBar>
@@ -32,17 +32,16 @@ import { find, remove, removeWebauthn, mfa, retrieve } from '@/global/mfa'
 export default {
   data: () => ({
     requested: {},
-  isLastOne: mfa.numVerified === 1
+    isLastOne: mfa.numVerified === 1,
   }),
   computed: {
-    label: vm => vm.requested?.label || '2SV',
+    label: (vm) => vm.requested?.label || '2SV',
   },
   methods: {
     async yes(id) {
       if (mfa.keys.id === id) {
         await removeWebauthn(id, mfa.keys.data[0].id)
-      }
-      else {
+      } else {
         await remove(id)
       }
 
@@ -54,4 +53,4 @@ export default {
     this.requested = find(this.$route.params.id)
   },
 }
-</script>
+</script>
diff --git a/src/2sv/Removed.vue b/src/2sv/Removed.vue
@@ -9,13 +9,13 @@
     </p>
 
     <ButtonBar>
-      <v-btn to="/profile" color="warning" outlined> 
+      <v-btn to="/profile" color="warning" outlined>
         {{ $vuetify.lang.t('$vuetify.2sv.removed.button.later') }}
       </v-btn>
 
       <v-spacer></v-spacer>
-      
-      <v-btn to="/2sv/intro" color="primary" outlined> 
+
+      <v-btn to="/2sv/intro" color="primary" outlined>
         {{ $vuetify.lang.t('$vuetify.global.button.yes') }}
       </v-btn>
     </ButtonBar>

diff --git a/src/global/BasePage.vue b/src/global/BasePage.vue
@@ -4,7 +4,7 @@
       <header class="display-1 d-flex align-center justify-center text-center">
         <slot name="header" />
       </header>
-    
+
       <main class="body-1 py-4">
         <slot />
       </main>
@@ -16,7 +16,7 @@
 export default {
   mounted() {
     document.title = this.$vuetify.lang.t('$vuetify.app.title', this.$slots.header[0].text.trim())
-  }
+  },
 }
 </script>
 

diff --git a/src/global/BaseTextField.vue b/src/global/BaseTextField.vue
@@ -1,10 +1,5 @@
 <template>
-  <v-text-field 
-    ref="tf" 
-    :value="value" 
-    v-bind="$attrs" 
-    outlined
-    v-on="$listeners" />
+  <v-text-field ref="tf" :value="value" v-bind="$attrs" outlined v-on="$listeners" />
 </template>
 
 <script>
@@ -19,7 +14,6 @@ export default {
     if (this.$refs.tf.autofocus) {
       this.$nextTick(this.$refs.tf.focus)
     }
-  }
+  },
 }
 </script>
-
diff --git a/src/global/Loading.vue b/src/global/Loading.vue
@@ -5,27 +5,27 @@
 <script>
 export default {
   data: () => ({
-    loading: 0
+    loading: 0,
   }),
   beforeCreate() {
-    this.$API.interceptors.request.use(config => {
+    this.$API.interceptors.request.use((config) => {
       this.loading++
 
       return config
     })
 
     this.$API.interceptors.response.use(
-      response => {
+      (response) => {
         this.loading--
 
         return response
       },
-      error => {
+      (error) => {
         this.loading--
 
         throw error
       }
     )
-  }
+  },
 }
 </script>
diff --git a/src/global/PageNotFound.vue b/src/global/PageNotFound.vue
@@ -4,6 +4,6 @@
       {{ $vuetify.lang.t('$vuetify.pageNotFound.header') }}
     </template>
 
-    <img src="@/assets/riddler-geeky-world.jpg">
+    <img src="@/assets/riddler-geeky-world.jpg" />
   </BasePage>
 </template>
diff --git a/src/global/filters.js b/src/global/filters.js
@@ -1,9 +1,5 @@
 import Vue from 'vue'
 import { format, parseISO } from 'date-fns'
 
-Vue.filter('format', (date, fmt = 'iiii, LLLL do yyyy') =>
-  date ? format(parseISO(date), fmt) : '–'
-)
-Vue.filter('formatLong', (date, fmt = 'iiii, LLLL do yyyy, h:mm:ss a') =>
-  date ? format(date, fmt) : '–'
-)
+Vue.filter('format', (date, fmt = 'iiii, LLLL do yyyy') => (date ? format(parseISO(date), fmt) : '–'))
+Vue.filter('formatLong', (date, fmt = 'iiii, LLLL do yyyy, h:mm:ss a') => (date ? format(date, fmt) : '–'))
diff --git a/src/global/mfa.js b/src/global/mfa.js
@@ -5,7 +5,7 @@ export const mfa = {
   u2f: {},
   keys: {},
   backup: {},
-  numVerified: 0
+  numVerified: 0,
 }
 export default mfa
 
@@ -16,14 +16,14 @@ export const newKeyName = {
   },
   set: function (value) {
     this._value = value
-  }
+  },
 }
 
 export const add = async (type) => await Vue.prototype.$API.post('mfa', { type })
 
 export const verify = async (id, verification = '') => {
   const verifiedMfa = await Vue.prototype.$API.put(`mfa/${id}/verify`, {
-    value: verification
+    value: verification,
   })
 
   mfa[verifiedMfa.type] = Object.assign({}, verifiedMfa)
@@ -32,10 +32,22 @@ export const verify = async (id, verification = '') => {
 export const retrieve = async () => {
   const all = await Vue.prototype.$API.get('mfa')
 
-  mfa.totp = Object.assign({}, [...all]?.find(m => m.type === 'totp'))
-  mfa.u2f = Object.assign({}, [...all]?.find(m => m.type === 'u2f'))
-  mfa.keys = Object.assign({}, [...all]?.find(m => m.type === 'webauthn'))
-  mfa.backup = Object.assign({}, [...all]?.find(m => m.type === 'backupcode'))
+  mfa.totp = Object.assign(
+    {},
+    [...all]?.find((m) => m.type === 'totp')
+  )
+  mfa.u2f = Object.assign(
+    {},
+    [...all]?.find((m) => m.type === 'u2f')
+  )
+  mfa.keys = Object.assign(
+    {},
+    [...all]?.find((m) => m.type === 'webauthn')
+  )
+  mfa.backup = Object.assign(
+    {},
+    [...all]?.find((m) => m.type === 'backupcode')
+  )
 
   mfa.numVerified = numOfVerifiedMfas(mfa) // currently, the api only returns verified mfas
 }
@@ -53,21 +65,21 @@ function numOfVerifiedMfas(mfa) {
 export const remove = async (id) => {
   await Vue.prototype.$API.delete(`mfa/${id}`)
 
-  const type = Object.keys(mfa).find(key => mfa[key].id === id)
+  const type = Object.keys(mfa).find((key) => mfa[key].id === id)
   mfa[type] = {}
 }
 
 export const change = async (id, updates) => {
   return await Vue.prototype.$API.put(`mfa/${id}`, updates)
 }
 
-export const find = id => {
-  const type = Object.keys(mfa).find(key => mfa[key].id == id)
+export const find = (id) => {
+  const type = Object.keys(mfa).find((key) => mfa[key].id == id)
 
   return mfa[type]
 }
 
-export const verifyWebauthn = async (id,  verification = '', label = '') => {
+export const verifyWebauthn = async (id, verification = '', label = '') => {
   const verifiedMfa = await Vue.prototype.$API.put(`mfa/${id}/verify/registration`, {
     value: verification,
     label: label,
@@ -77,8 +89,8 @@ export const verifyWebauthn = async (id,  verification = '', label = '') => {
 
 export const removeWebauthn = async (mfaId, webauthnId) => {
   const response = await Vue.prototype.$API.delete(`mfa/${mfaId}/webauthn/${webauthnId}`)
-  const index = mfa.keys.data.findIndex(m => m.id === mfaId)
-  if(index > -1) {
+  const index = mfa.keys.data.findIndex((m) => m.id === mfaId)
+  if (index > -1) {
     mfa.keys.data.splice(index, 1)
   }
 }

diff --git a/src/global/recoveryMethods.js b/src/global/recoveryMethods.js
@@ -8,7 +8,7 @@ export default recoveryMethods
 
 export const add = async (email) => {
   const newMethod = await Vue.prototype.$API.post('method', {
-    value: email
+    value: email,
   })
 
   recoveryMethods.alternates.push(newMethod)
@@ -19,8 +19,8 @@ export const retrieve = async () => {
 
   const all = await Vue.prototype.$API.get('method')
 
-  recoveryMethods.system.push([...all]?.filter(m => m.type != 'email'))
-  recoveryMethods.alternates.push([...all]?.filter(m => m.type == 'email'))
+  recoveryMethods.system.push([...all]?.filter((m) => m.type != 'email'))
+  recoveryMethods.alternates.push([...all]?.filter((m) => m.type == 'email'))
 }
 
 function clear() {
@@ -31,12 +31,12 @@ function clear() {
 export const remove = async (id) => {
   await Vue.prototype.$API.delete(`method/${id}`)
 
-  const i = recoveryMethods.alternates.findIndex(m => m.id == id)
+  const i = recoveryMethods.alternates.findIndex((m) => m.id == id)
   recoveryMethods.alternates.splice(i, 1)
 }
 
 export const verify = async (id, verificationCode = '') => {
   await Vue.prototype.$API.put(`method/${id}/verify`, {
-    code: verificationCode
+    code: verificationCode,
   })
 }
diff --git a/src/global/token.js b/src/global/token.js
@@ -25,7 +25,7 @@ function get(key) {
   // TODO: currently no IE support for URLSearchParams (https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams#Browser_compatibility)
   // check this out for further info:  https://developers.google.com/web/updates/2016/01/urlsearchparams
   // polyfill if needed (https://github.com/jerrybendy/url-search-params-polyfill) or the WebReflection one...
-  const defragged = new URL(location.href.replace('#',''))
+  const defragged = new URL(location.href.replace('#', ''))
   const params = new URLSearchParams(defragged.search)
 
   return sessionStorage.getItem(key) || params.get(key)
@@ -42,4 +42,4 @@ function reset() {
 
 function apiToken() {
   return get('key') + get('access_token')
-}
+}
diff --git a/src/help/HelpButton.vue b/src/help/HelpButton.vue
@@ -1,27 +1,31 @@
 <template>
-  <v-dialog v-if="$root.idpConfig.support" v-model="isOpen" width="initial"> <!-- making it initial so card grows with content -->
+  <v-dialog v-if="$root.idpConfig.support" v-model="isOpen" width="initial">
+    <!-- making it initial so card grows with content -->
     <template v-slot:activator="{ on }">
-      <v-btn v-on="on" text dark :icon="mobile" class="mx-1">{{ !mobile ? $vuetify.lang.t('$vuetify.help.button.help') : '' }}<v-icon v-if="mobile">mdi-help</v-icon></v-btn>
-
+      <v-btn v-on="on" text dark :icon="mobile" class="mx-1"
+        >{{ !mobile ? $vuetify.lang.t('$vuetify.help.button.help') : '' }}<v-icon v-if="mobile">mdi-help</v-icon></v-btn
+      >
     </template>
     <v-card>
       <v-card-title class="headline primary white--text">{{ $vuetify.lang.t('$vuetify.help.title') }}</v-card-title>
-      
+
       <v-card-text>
         <p v-if="$root.idpConfig.support.phone">
-          {{ $vuetify.lang.t('$vuetify.help.phone') }}<span class="subtitle-1"> {{ $root.idpConfig.support.phone }}</span>
+          {{ $vuetify.lang.t('$vuetify.help.phone')
+          }}<span class="subtitle-1"> {{ $root.idpConfig.support.phone }}</span>
         </p>
         <p v-if="$root.idpConfig.support.email">
-          {{ $vuetify.lang.t('$vuetify.help.email') }}<span class="subtitle-1"> {{ $root.idpConfig.support.email }}</span>
+          {{ $vuetify.lang.t('$vuetify.help.email')
+          }}<span class="subtitle-1"> {{ $root.idpConfig.support.email }}</span>
         </p>
         <p v-if="$root.idpConfig.support.url">
-          {{ $vuetify.lang.t('$vuetify.help.site') }} 
+          {{ $vuetify.lang.t('$vuetify.help.site') }}
           <a :href="$root.idpConfig.support.url" target="_blank" class="subtitle-1">
             {{ $root.idpConfig.support.url }}
           </a>
         </p>
         <p v-if="$root.idpConfig.support.feedbackUrl">
-          {{ $vuetify.lang.t('$vuetify.help.feedback') }} 
+          {{ $vuetify.lang.t('$vuetify.help.feedback') }}
           <a :href="$root.idpConfig.support.feedbackUrl" target="_blank" class="subtitle-1">
             {{ $root.idpConfig.support.feedbackUrl }}
           </a>
@@ -34,7 +38,7 @@
         <v-spacer></v-spacer>
         <v-btn color="primary" text @click="isOpen = false">{{ $vuetify.lang.t('$vuetify.help.button.ok') }}</v-btn>
       </v-card-actions>
-    </v-card>    
+    </v-card>
   </v-dialog>
 </template>
 
@@ -44,12 +48,14 @@ export default {
     isOpen: false,
   }),
   computed: {
-    mobile () {
-        switch (this.$vuetify.breakpoint.name) {
-          case 'xs': return true
-          default: return false
-        }
-      },
+    mobile() {
+      switch (this.$vuetify.breakpoint.name) {
+        case 'xs':
+          return true
+        default:
+          return false
+      }
+    },
   },
 }
 </script>