Add /logout route, enable logout for CodePlay

codecombat · Mar 20, 2017 · 7266e92 · 7266e92
1 parent cc85c2b
commit 7266e92
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/core/Router.coffee b/app/core/Router.coffee
@@ -139,6 +139,8 @@ module.exports = class CocoRouter extends Backbone.Router
     'il-signup': go('account/IsraelSignupView')
 
     'legal': go('LegalView')
+
+    'logout': 'logout'
 
     'play(/)': go('play/CampaignView', { redirectStudents: true, redirectTeachers: true }) # extra slash is to get Facebook app to work
     'play/ladder/:levelID/:leagueType/:leagueID': go('ladder/LadderView')
@@ -352,3 +354,7 @@ module.exports = class CocoRouter extends Backbone.Router
 
   reload: ->
     document.location.reload()
+
+  logout: ->
+    me.logout()
+    @navigate('/', { trigger: true })
diff --git a/app/models/User.coffee b/app/models/User.coffee
@@ -277,12 +277,11 @@ module.exports = class User extends CocoModel
     @fetch(options)
 
   logout: (options={}) ->
-    return if features.codePlay
     options.type = 'POST'
     options.url = '/auth/logout'
     FB?.logout?()
     options.success ?= ->
-      location = _.result(currentView, 'logoutRedirectURL')
+      location = _.result(window.currentView, 'logoutRedirectURL')
       if location
         window.location = location
       else