feat(core): failsave should now be correct

Author: balthazar

actions/auth.js

@@ -1,15 +1,8 @@
 'use strict';
 
-export function login (context) {
+export function login (context, payload) {
   context.dispatch('START_LOGIN');
-
-  const data = {
-    wpm: 10,
-    accuracy: 80,
-    textId: 1
-  };
-
-  window.location.href = `/api/auth?data=${JSON.stringify(data)}`;
+  window.location.href = `/api/auth${ payload ? `data=${JSON.stringify(payload)}` : '' }`;
 }
 
 export function checkSession (context, payload, done) {

actions/game.js

@@ -59,6 +59,8 @@ export function loadText (context, textId, done) {
 }
 
 export function submitStats (context, payload, done) {
+  if (!payload.isLogged) { return context.dispatch('OVERRIDE_FAILSAVE', payload); }
+
   superagent.post(`${context.api._getUrl()}/users/me/game`)
     .set('Authorization', `Bearer ${context.api._getToken()}`)
     .send(payload)

components/game/index.js

@@ -5,7 +5,7 @@ import React from 'react';
 import connectToStores from 'fluxible-addons-react/connectToStores';
 
 // stores
-import GameStore from '../../stores/GameStore';
+import { AuthStore, GameStore } from '../../stores';
 
 // components
 import SourceCode from './SourceCode';
@@ -39,6 +39,7 @@ class Game extends React.Component {
   }
 
   componentDidUpdate () {
+
     if (this.props.isFinished) {
 
       // clear tick at the end of the test
@@ -60,7 +61,6 @@ class Game extends React.Component {
       this._hasRestartListener = false;
     }
 
-
   }
 
   componentWillUnmount () {
@@ -98,7 +98,8 @@ class Game extends React.Component {
     if (this.props.currentWordIndex === this.props.text.words.length - 1) {
       this.props.context.executeAction(submitStats, {
         textId: this.props.textId,
-        ...this.props.stats
+        ...this.props.stats,
+        isLogged: this.props.isLogged
       });
     }
   }
@@ -170,8 +171,9 @@ class Game extends React.Component {
   }
 }
 
-export default connectToStores(Game, [GameStore], context => {
+export default connectToStores(Game, [AuthStore, GameStore], context => {
   const gameStore = context.getStore(GameStore);
+  const authStore = context.getStore(AuthStore);
   return {
     stats: gameStore.getStats(),
     text: gameStore.getText(),
@@ -180,6 +182,7 @@ export default connectToStores(Game, [GameStore], context => {
     typedWord: gameStore.typedWord(),
     isPlaying: gameStore.isPlaying(),
     isFinished: gameStore.isFinished(),
-    isFocused: gameStore.isFocused()
+    isFocused: gameStore.isFocused(),
+    isLogged: authStore.isLogged()
   };
 });

components/ui/GithubButton.js

@@ -3,16 +3,16 @@
 import React from 'react';
 import { connectToStores } from 'fluxible-addons-react';
 
-import { AuthStore } from '../../stores';
+import { AuthStore, GameStore } from '../../stores';
 import { login, logout } from '../../actions/auth';
 
 class GithubButton extends React.Component {
 
   handleClick () {
-    const { isLogged, isLogging } = this.props;
+    const { isLogged, isLogging, failsave } = this.props;
     if (isLogging) { return; }
     if (!isLogged) {
-      this.props.context.executeAction(login);
+      this.props.context.executeAction(login, failsave);
     } else {
       this.props.context.executeAction(logout);
     }
@@ -45,12 +45,13 @@ class GithubButton extends React.Component {
 
 export default connectToStores(
   GithubButton,
-  [AuthStore],
+  [AuthStore, GameStore],
   context => {
     const authStore = context.getStore(AuthStore);
     return {
       isLogged: authStore.isLogged(),
-      isLogging: authStore.isLogging()
+      isLogging: authStore.isLogging(),
+      failsave: context.getStore(GameStore).getFailsave()
     };
   }
 );

stores/GameStore.js

@@ -21,7 +21,8 @@ class GameStore extends BaseStore {
       _isPlaying: false,
       _isFinished: false,
       _isFocused: false,
-      _startDate: null
+      _startDate: null,
+      _failsave: null
     });
   }
 
@@ -77,6 +78,7 @@ class GameStore extends BaseStore {
     if (!this._startDate) { return 0; }
     return moment().diff(this._startDate);
   }
+  getFailsave () { return this._failsave; }
   typedLetters () { return this._typedLetters; }
   isFetching () { return this._isFetching; }
   isPlaying () { return this._isPlaying; }
@@ -178,6 +180,11 @@ class GameStore extends BaseStore {
     this.emitChange();
   }
 
+  handleFailsave (failsave) {
+    this._failsave = failsave;
+    this.emitChange();
+  }
+
 }
 
 GameStore.storeName = 'GameStore';
@@ -192,7 +199,8 @@ GameStore.handlers = {
   INPUT_SET_FOCUS: 'handleSetFocus',
   BEGIN_TEST: 'handleBeginTest',
   UPDATE_WORD: 'handleUpdateWord',
-  TYPE_WORD: 'handleTypeWord'
+  TYPE_WORD: 'handleTypeWord',
+  OVERRIDE_FAILSAVE: 'handleFailsave'
 };
 
 export default GameStore;