1 files changed, 14 insertions, 27 deletions

diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 297ea1121..d6a2e5fde 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -8,12 +8,11 @@ import { isDevMode } from '../environment';
 import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
-import { gaEvent } from '../lib/analytics';
 import { sleep } from '../helpers/async-helpers';
 import { getPlan } from '../helpers/plan-helpers';
 import { PLANS } from '../config';
 
-const debug = require('debug')('Franz:UserStore');
+const debug = require('debug')('Ferdi:UserStore');
 
 // TODO: split stores into UserStore and AuthStore
 export default class UserStore extends Store {
@@ -57,6 +56,8 @@ export default class UserStore extends Store {
 
   @observable isImportLegacyServicesCompleted = false;
 
+  @observable isLoggingOut = false;
+
   @observable id;
 
   @observable authToken = localStorage.getItem('authToken') || null;
@@ -96,7 +97,7 @@ export default class UserStore extends Store {
 
     // Reactions
     this.registerReactions([
-      this._requireAuthenticatedUser,
+      // this._requireAuthenticatedUser,
       this._getUserData.bind(this),
       this._resetTrialActivationState.bind(this),
     ]);
@@ -159,7 +160,7 @@ export default class UserStore extends Store {
   }
 
   @computed get isPremium() {
-    return !!this.data.isPremium;
+    return true;
   }
 
   @computed get isPremiumOverride() {
@@ -174,12 +175,13 @@ export default class UserStore extends Store {
   }
 
   @computed get isPro() {
-    if (this.isPremiumOverride) return true;
+    return true;
+    // if (this.isPremiumOverride) return true;
 
-    if (!this.team || (!this.team.plan || this.team.state === 'expired')) return false;
-    const plan = getPlan(this.team.plan);
+    // if (!this.team || (!this.team.plan || this.team.state === 'expired')) return false;
+    // const plan = getPlan(this.team.plan);
 
-    return plan === PLANS.PRO || plan === PLANS.LEGACY;
+    // return plan === PLANS.PRO || plan === PLANS.LEGACY;
   }
 
   @computed get legacyServices() {
@@ -192,16 +194,12 @@ export default class UserStore extends Store {
     this._setUserData(authToken);
 
     this.stores.router.push('/');
-
-    gaEvent('User', 'login');
   }
 
   @action _tokenLogin(authToken) {
     this._setUserData(authToken);
 
     this.stores.router.push('/');
-
-    gaEvent('User', 'tokenLogin');
   }
 
   @action async _signup({
@@ -219,13 +217,11 @@ export default class UserStore extends Store {
       currency,
     });
 
-    this.hasCompletedSignup = false;
+    this.hasCompletedSignup = true;
 
     this._setUserData(authToken);
 
-    this.stores.router.push(this.PRICING_ROUTE);
-
-    gaEvent('User', 'signup');
+    this.stores.router.push('/');
   }
 
   @action async _retrievePassword({ email }) {
@@ -233,8 +229,6 @@ export default class UserStore extends Store {
 
     await request._promise;
     this.actionStatus = request.result.status || [];
-
-    gaEvent('User', 'retrievePassword');
   }
 
   @action async _activateTrial({ planId }) {
@@ -250,9 +244,6 @@ export default class UserStore extends Store {
 
     this.stores.features.featuresRequest.invalidate({ immediately: true });
     this.stores.user.getUserInfoRequest.invalidate({ immediately: true });
-
-
-    gaEvent('User', 'activateTrial');
   }
 
   @action async _invite({ invites }) {
@@ -266,8 +257,6 @@ export default class UserStore extends Store {
     if (this.stores.router.location.pathname.includes(this.INVITE_ROUTE)) {
       this.stores.router.push('/');
     }
-
-    gaEvent('User', 'inviteUsers');
   }
 
   @action async _update({ userData }) {
@@ -277,8 +266,6 @@ export default class UserStore extends Store {
 
     this.getUserInfoRequest.patch(() => response.data);
     this.actionStatus = response.status || [];
-
-    gaEvent('User', 'update');
   }
 
   @action _resetStatus() {
@@ -301,12 +288,12 @@ export default class UserStore extends Store {
     const recipes = services.filter((obj, pos, arr) => arr.map(mapObj => mapObj.recipe.id).indexOf(obj.recipe.id) === pos).map(s => s.recipe.id);
 
     // Install recipes
-    for (const recipe of recipes) {
+    for (const recipe of recipes) { // eslint-disable-line no-unused-vars
       // eslint-disable-next-line
       await this.stores.recipes._install({ recipeId: recipe });
     }
 
-    for (const service of services) {
+    for (const service of services) { // eslint-disable-line no-unused-vars
       this.actions.service.createFromLegacyService({
         data: service,
       });