From cb85217751df11fc1a6d0fa1d4450ae23a9bb4ea Mon Sep 17 00:00:00 2001
From: Julien Calixte <juliencalixte@gmail.com>
Date: Thu, 28 Nov 2019 19:55:59 +0100
Subject: [PATCH] Async remote database link

---
 src/App.vue                  |  1 -
 src/main.ts                  |  3 ---
 src/services/AdminService.ts | 10 ----------
 src/services/CouchService.ts | 32 +++++++++++++++++++++++++++-----
 src/services/UserService.ts  | 30 ++++++++++++++++++++++++++++++
 5 files changed, 57 insertions(+), 19 deletions(-)
 delete mode 100644 src/services/AdminService.ts

diff --git a/src/App.vue b/src/App.vue
index a7ee551..147bb03 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,7 +42,6 @@
         @click="hideMenu"
       >
         <div class="navbar-end">
-          <install-app />
           <router-link
             class="navbar-item"
             :to="{ name: 'about' }"
diff --git a/src/main.ts b/src/main.ts
index 4d5f872..93d6536 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -9,14 +9,11 @@ import './registerServiceWorker'
 import filters from './utils/filters'
 import './utils/icons'
 import messages from './messages'
-import '@pwabuilder/pwainstall'
 
 Vue.use(VueI18n)
 
 Vue.config.productionTip = false
 
-Vue.config.ignoredElements = ['pwa-install']
-
 for (const filter of Object.keys(filters)) {
   Vue.filter(filter, filters[filter])
 }
diff --git a/src/services/AdminService.ts b/src/services/AdminService.ts
deleted file mode 100644
index 0a997b0..0000000
--- a/src/services/AdminService.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import couchService from '@/services/CouchService'
-
-class AdminService {
-  public async getAccountList(): Promise<any[]> {
-    const result = await couchService.remote.allDocs()
-    return result.rows
-  }
-}
-
-export default new AdminService()
diff --git a/src/services/CouchService.ts b/src/services/CouchService.ts
index 0ea76a4..60fa625 100644
--- a/src/services/CouchService.ts
+++ b/src/services/CouchService.ts
@@ -28,11 +28,18 @@ const remoteConfig = {
 const LOCALE_DB: string = 'LOCALE_DB'
 const REMOTE: string = 'https://juliencalixte.ddns.net/database'
 
+const initRemote = () => {
+  return new Promise<PouchDB.Database>((resolve, reject) => {
+    try {
+      resolve(new PouchDb(`${REMOTE}/vaquant`, remoteConfig))
+    } catch (error) {
+      reject(error)
+    }
+  })
+}
+
 class CouchService {
-  public remote: PouchDB.Database = new PouchDb(
-    `${REMOTE}/vaquant`,
-    remoteConfig
-  )
+  public remote: PouchDB.Database | null = null
   public db: PouchDB.Database | null = new PouchDb(LOCALE_DB)
   public remoteUserDb: PouchDB.Database | null = null
   public userDb: PouchDB.Database | null = null
@@ -53,6 +60,13 @@ class CouchService {
         this.cancelSync()
       })
     }
+    this.initRemote()
+  }
+
+  public async initRemote() {
+    if (!this.remote) {
+      this.remote = await initRemote()
+    }
   }
 
   public async initLive(): Promise<boolean> {
@@ -68,11 +82,19 @@ class CouchService {
         })
         .on('change', (result: PouchDB.Replication.SyncResult<any>) => {
           if (result.direction === 'pull') {
-            emit(SYNC, result.change.docs.map((doc: any) => doc._id))
+            emit(
+              SYNC,
+              result.change.docs.map((doc: any) => doc._id)
+            )
           }
         })
     }
 
+    if (!this.remote) {
+      await this.initRemote()
+      return false
+    }
+
     this.sync = this.db
       .sync(this.remote, {
         live: true,
diff --git a/src/services/UserService.ts b/src/services/UserService.ts
index 8a5acc8..d78d01e 100644
--- a/src/services/UserService.ts
+++ b/src/services/UserService.ts
@@ -4,6 +4,12 @@ import IResponse from '@/models/IResponse'
 
 class UserService {
   public async signup(user: IUser, password: string): Promise<IResponse> {
+    if (!couchService.remote) {
+      return {
+        ok: false,
+        message: 'no remote'
+      }
+    }
     try {
       const response = await couchService.remote.signUp(user.userId, password, {
         metadata: user
@@ -24,6 +30,12 @@ class UserService {
   }
 
   public async login(userId: string, password: string): Promise<IResponse> {
+    if (!couchService.remote) {
+      return {
+        ok: false,
+        message: 'no remote'
+      }
+    }
     try {
       const response = await couchService.remote.logIn(userId, password)
       return {
@@ -45,6 +57,12 @@ class UserService {
   }
 
   public async logout(): Promise<IResponse> {
+    if (!couchService.remote) {
+      return {
+        ok: false,
+        message: 'no remote'
+      }
+    }
     try {
       const { ok } = await couchService.remote.logOut()
       return {
@@ -59,6 +77,12 @@ class UserService {
   }
 
   public async deleteUser(userId: string): Promise<IResponse> {
+    if (!couchService.remote) {
+      return {
+        ok: false,
+        message: 'no remote'
+      }
+    }
     try {
       const { ok } = await couchService.remote.deleteUser(userId)
       return {
@@ -72,6 +96,9 @@ class UserService {
   }
 
   public async getUser(current: IUser | null): Promise<IUser | null> {
+    if (!couchService.remote) {
+      return null
+    }
     try {
       const session = await couchService.remote.getSession()
       if (session.ok && session.userCtx && session.userCtx.name) {
@@ -91,6 +118,9 @@ class UserService {
   }
 
   public async updateUser(user: IUser): Promise<boolean> {
+    if (!couchService.remote) {
+      return false
+    }
     try {
       const result = await couchService.remote.putUser(user.userId, {
         metadata: user