Correct userids handling in session auth idp

h/static/scripts/auth/auth.coffee

@@ -14,7 +14,9 @@ configure = [
     identityProvider.checkAuthorization = [
       'session',
       (session) ->
-        session.load().$promise
+        session.load().$promise.then (data) ->
+          certificate: data.csrf
+          userid: data.userid
     ]
 
     identityProvider.forgetAuthorization = [
@@ -27,7 +29,12 @@ configure = [
       '$q', '$rootScope',
       ($q,   $rootScope) ->
         deferred = $q.defer()
-        $rootScope.$on 'session', (event, data) -> deferred.resolve data
+
+        $rootScope.$on 'session', (event, data) ->
+          deferred.resolve
+            certificate: data.csrf
+            userid: data.userid
+
         deferred.promise
     ]
 ]

h/static/scripts/identity.coffee

@@ -62,6 +62,7 @@ identityProvider = ->
 
       invokeCallbacks = (grant={}) ->
         {userid, certificate} = grant
+        userid or= null
         # Fire callbacks as appropriate.
         # Consult the state matrix in the `navigator.id.watch` documentation.
         # https://developer.mozilla.org/en-US/docs/Web/API/navigator.id.watch