:recycle: trim down auth service

frontend/src/router/guards.js

@@ -15,7 +15,7 @@ async function log(to) {
 }
 
 const loginIfToken = async () => {
-    const sessionData = await authenticator.checkSessionValid()
+    const sessionData = await authenticator.isValidSession()
     if (
         sessionData?.profileId &&
         sessionData?.sessionToken &&
@@ -40,10 +40,7 @@ const checkLoginStatus = async (destination, nextCb) => {
         !currentProfile.isComplete
     ) {
         nextCb('/onboarding')
-    } else if (
-        destination.meta.requiresAuth &&
-        !currentProfile.isLoggedIn
-    ) {
+    } else if (destination.meta.requiresAuth && !currentProfile.isLoggedIn) {
         nextCb('/login')
     } else {
         nextCb()

frontend/src/services/auth.service.js

@@ -19,13 +19,13 @@ class Authenticator {
         return await db.post('/user/token', req, true)
     }
     /** Check if session still active in backend */
-    async #isValidSession() {
-        const hash = this.#getHashedToken()
+    async isValidSession() {
+        const hash = this.getHashedToken()
         let validation
         try {
             validation = await db.post('/user/validate-session', hash, true)
         } catch (error) {
-            console.error(error)
+            console.error(`Invalid session: ${error}`)
         }
         console.log('valid Session :>> ', validation)
         return validation
@@ -34,10 +34,10 @@ class Authenticator {
         return await db.post('/user/login', credentials)
     }
     async removeSession() {
-        const hash = this.#getHashedToken()
+        const hash = this.getHashedToken()
         return await db.post('/user/remove-session', hash, true)
     }
-    #getHashedToken(cookieKey = 'siimee_session') {
+    getHashedToken(cookieKey = 'siimee_session') {
         const cookies = document.cookie.split('; ').reduce((prev, current) => {
             const [name, ...value] = current.split('=')
             prev[name] = value.join('=')
@@ -49,12 +49,6 @@ class Authenticator {
             )
         return cookies[cookieKey]
     }
-    async checkSessionValid() {
-        const validation = await this.#isValidSession()
-        if (validation.error)
-            return console.error('ERROR :=>', validation.error)
-        return validation
-    }
 }
 const authenticator = new Authenticator()
 

frontend/src/views/OnboardingView.vue

@@ -60,7 +60,7 @@ export default {
         // TODO: Troubleshoot bug where not all responses are returned at SurveyCompleteView
         this.survey = await surveyFactory.createSurvey()
         try {
-            const sessionData = await authenticator.checkSessionValid()
+            const sessionData = await authenticator.isValidSession()
             if (sessionData) {
                 this.responses = this.formatResponses(
                     currentProfile._profile.responses,
@@ -113,7 +113,7 @@ export default {
                 )
                 currentProfile._profile.responses = this.responses
                 try {
-                    await authenticator.checkSessionValid()
+                    await authenticator.isValidSession()
                 } catch (err) {
                     this.currentStep = 0
                     this.goToStep(this.currentStep)