When the network is unavailable, fall back to the previous account st…

…atus
kactus-io · Jan 3, 2019 · 7d82a86 · 7d82a86
1 parent b3c0917
commit 7d82a86
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 27 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -3,7 +3,7 @@
   "productName": "Kactus",
   "bundleID": "io.kactus.KactusClient",
   "companyName": "Kactus.io",
-  "version": "0.3.15",
+  "version": "0.3.16",
   "main": "./main.js",
   "repository": {
     "type": "git",

diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts
@@ -763,11 +763,21 @@ export async function createAuthorization(
   return { kind: AuthorizationResponseKind.Error, response }
 }
 
+type KactusState = {
+  enterprise: boolean
+  enterpriseFromOrg: boolean
+  enterpriseFromOrgAdmin: boolean
+  premium: boolean
+  premiumFromOrg: boolean
+  premiumFromOrgAdmin: boolean
+}
+
 /** Fetch the user authenticated by the token. */
 export async function fetchUser(
   provider: Provider,
   endpoint: string,
-  token: string
+  token: string,
+  kactusState?: KactusState
 ): Promise<Account> {
   const api = new API(provider, endpoint, token)
   try {
@@ -793,7 +803,7 @@ export async function fetchUser(
       avatarURL,
       user.id,
       user.name || user.login,
-      unlockedKactusStatus
+      unlockedKactusStatus || kactusState || null
     )
   } catch (e) {
     log.warn(`fetchUser: failed with endpoint ${endpoint}`, e)
@@ -966,14 +976,7 @@ export async function checkUnlockedKactus(
   user: IAPIUser,
   emails: ReadonlyArray<IAPIEmail>,
   endpoint: string
-): Promise<{
-  enterprise: boolean
-  enterpriseFromOrg: boolean
-  enterpriseFromOrgAdmin: boolean
-  premium: boolean
-  premiumFromOrg: boolean
-  premiumFromOrgAdmin: boolean
-} | null> {
+): Promise<KactusState | null> {
   try {
     const path = `${KactusAPIEndpoint}/checkUnlocked`
     const response = await fetch(path, {

diff --git a/app/src/lib/stores/accounts-store.ts b/app/src/lib/stores/accounts-store.ts
@@ -282,5 +282,10 @@ async function updatedAccount(account: Account): Promise<Account> {
     )
   }
 
-  return fetchUser(account.provider, account.endpoint, account.token)
+  return fetchUser(
+    account.provider,
+    account.endpoint,
+    account.token,
+    account.getKactusStatus()
+  )
 }
diff --git a/app/src/models/account.ts b/app/src/models/account.ts
@@ -82,6 +82,17 @@ export class Account {
       : false
   }
 
+  public getKactusStatus() {
+    return {
+      premium: this.unlockedKactus,
+      enterprise: this.unlockedEnterpriseKactus,
+      premiumFromOrg: this.unlockedKactusFromOrg,
+      enterpriseFromOrg: this.unlockedEnterpriseKactusFromOrg,
+      premiumFromOrgAdmin: this.unlockedKactusFromOrgAdmin,
+      enterpriseFromOrgAdmin: this.unlockedEnterpriseKactusFromOrgAdmin,
+    }
+  }
+
   public withToken(token: string): Account {
     return new Account(
       this.provider,
@@ -92,14 +103,7 @@ export class Account {
       this.avatarURL,
       this.id,
       this.name,
-      {
-        premium: this.unlockedKactus,
-        enterprise: this.unlockedEnterpriseKactus,
-        premiumFromOrg: this.unlockedKactusFromOrg,
-        enterpriseFromOrg: this.unlockedEnterpriseKactusFromOrg,
-        premiumFromOrgAdmin: this.unlockedKactusFromOrgAdmin,
-        enterpriseFromOrgAdmin: this.unlockedEnterpriseKactusFromOrgAdmin,
-      }
+      this.getKactusStatus()
     )
   }
 
@@ -114,6 +118,7 @@ export class Account {
       this.id,
       this.name,
       {
+        ...this.getKactusStatus(),
         premium: enterprise
           ? this.unlockedKactusFromOrg
             ? this.unlockedKactus
@@ -124,10 +129,6 @@ export class Account {
           : this.unlockedEnterpriseKactusFromOrg
           ? this.unlockedEnterpriseKactus
           : false,
-        premiumFromOrg: this.unlockedKactusFromOrg,
-        enterpriseFromOrg: this.unlockedEnterpriseKactusFromOrg,
-        premiumFromOrgAdmin: this.unlockedKactusFromOrgAdmin,
-        enterpriseFromOrgAdmin: this.unlockedEnterpriseKactusFromOrgAdmin,
       }
     )
   }

diff --git a/changelog.json b/changelog.json
@@ -1,6 +1,9 @@
 {
   "unreleased": [],
   "releases": {
+    "0.3.16": [
+      "[Fixed] When the network is unavailable, fall back to the previous account status"
+    ],
     "0.3.15": [
       "[New] When an update is available for Kactus, release notes can be viewed in Kactus",
       "[Fixed] Authenticating to GitHub Enterprise fails when user has no emails defined",

diff --git a/plugin/package-lock.json b/plugin/package-lock.json
diff --git a/plugin/package.json b/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kactus",
-  "version": "0.3.15",
+  "version": "0.3.16",
   "skpm": {
     "description": "A proper version control tool for designers",
     "main": "../out/plugin.sketchplugin",