Add double check along with hash to see if share game is valid

sf-interns · Sep 3, 2015 · 01c2fc2 · 01c2fc2
1 parent 2bea8a5
commit 01c2fc2
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 11 deletions.
diff --git a/app/controllers/MathSwipeController.coffee b/app/controllers/MathSwipeController.coffee
@@ -32,20 +32,23 @@ class MathSwipeController
     else
       TrackingService.desktopView()
       @cursorToPointer()
-    @initialize window.location.hash
+    while not @initialize window.location.hash
+      continue
 
     # # Uncomment the following line to perform general tests
     # GeneralTests.tests @board
 
   initialize: (hash) ->
-    goals = []
-    solutionPlacements = []
-
+    hasCompleteBoard = false
     if hash? and hash isnt ''
+      solutionPlacements = []
+      goals = []
       boardValues = []
-      ShareGameService.decode boardValues, goals, solutionPlacements
-    else
+      hasCompleteBoard = ShareGameService.decode boardValues, goals, solutionPlacements
+    unless hasCompleteBoard
       length = 3
+      goals = []
+      solutionPlacements = []
       inputs = []
       inputLengths = RandomizedFitLength.generate length * length
       @generateInputs inputLengths, inputs, goals
@@ -59,7 +62,10 @@ class MathSwipeController
                         Colors, ClickHandler, SolutionService,
                         BoardSolvedService, RunningSum
     ResetButton.bindClick @board
-    ShareGameService.reloadPageWithHash @board, solutionPlacements
+    unless ShareGameService.reloadPageWithHash @board, solutionPlacements
+      @goalContainer.clearGoals()
+      return false
+    true
 
   isMobile: () ->
     Android: () ->

diff --git a/app/services/ShareGameService.coffee b/app/services/ShareGameService.coffee
@@ -4,7 +4,10 @@ SolutionService = require './SolutionService'
 class ShareGameService
 
   @reloadPageWithHash: (board, solutionPlacements) ->
-    console.log @checkSolutionPlacements board, solutionPlacements
+    unless @checkSolutionPlacements board, solutionPlacements
+      window.location.hash = ''
+      console.log window.location.hash
+      return false
     hash = @encode board.initialValues, board.goals, solutionPlacements
     window.location.hash = hash
 
@@ -19,9 +22,13 @@ class ShareGameService
     btoa(JSON.stringify {b: boardValues, g: goals, p: slnPlacements})
 
   @decode: (boardValues, goals, slnPlacements) ->
-    decoded = JSON.parse atob window.location.hash
-    return false if not decoded?
-    decoded.substr(1, window.location.hash.length)
+    try
+      decoded = atob window.location.hash.substr(1, window.location.hash.length)
+      decoded = JSON.parse decoded
+    catch e
+      return false
+    return false unless decoded? and @isValidDecode decoded
+    return false unless decoded.b? and decoded.g? and decoded.p?
     length = Math.sqrt decoded.b.length
     index = 0
 
@@ -40,6 +47,17 @@ class ShareGameService
         expression.push [(Math.floor decoded.p[placement][coord] / length), (decoded.p[placement][coord] % length)]
       slnPlacements.push expression
 
+    true
+
+  @isValidDecode: (decoded) ->
+    alphabet = ['"', '{', '}', '[', ']', ',', ':',
+                'b', 'g', 'p', '1', '2', '3', '4',
+                '5', '6', '7', '8', '9', '0',
+                '+', '-', '*']
+    for char in decoded
+      return false if alphabet.indexOf(char) is -1
+    true
+
   @checkSolutionPlacements: (board, solutionPlacements) ->
     @tempBoard = {}
     @tempBoard.boardValues = []