feat: split out api function from api definition

define login and register routes

Author: boka-slickage

src/api/index.js

@@ -1,18 +1,24 @@
+import { inject } from 'vue'
 const AUTH_KEY = 'auth'
 
-export default (appCache) => {
-  return (path, opts) => {
-    opts = opts || {}
-    let auth = appCache.get(AUTH_KEY)
-    let user = auth && auth.data ? auth.data : undefined
-    if (user && user.token) {
-      opts.headers = {
-        ...opts.headers,
-        Authorization: `BEARER ${user.token}`
-      }
+export default {
+  login: opts => { return api('/api/login', opts) },
+  register: opts => { return api('/api/register', opts)}
+}
+
+const api = (path, opts) => {
+  const $appCache = inject('$appCache')
+
+  opts = opts || {}
+  let auth = $appCache.get(AUTH_KEY)
+  let user = auth && auth.data ? auth.data : undefined
+  if (user && user.token) {
+    opts.headers = {
+      ...opts.headers,
+      Authorization: `BEARER ${user.token}`
     }
-    console.log(path, opts.headers)
-    return fetch(`http://localhost:8080${path}`, opts)
-    .then(res => res.ok ? res.json() : res)
   }
+  console.log(path, opts.headers)
+  return fetch(`http://localhost:8080${path}`, opts)
+  .then(res => res.ok ? res.json() : res)
 }

src/composables/stores/auth.js

@@ -37,7 +37,7 @@ export default {
         })
       }
 
-      $api('/api/login', opts)
+      $api.login(opts)
       .then(dbUser => {
         $appCache.set(AUTH_KEY, dbUser)
         Object.assign(user, dbUser)
@@ -66,7 +66,7 @@ export default {
         })
       }
 
-      $api('/api/register', opts)
+      $api.register(opts)
       .then(dbUser => {
         // Set user session if account is already confirmed (log the user in)
         if (!dbUser.confirm_token) {