From 6443f5d95c912f2c604c66a99f786ce2b7173c24 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Wed, 14 Oct 2015 11:14:36 +1030
Subject: [PATCH] Clean up

---
 .../src/Forum/Controller/AuthenticateUserTrait.php  | 13 ++++++-------
 framework/core/stubs/extension/.gitignore           |  2 ++
 framework/core/stubs/extension/js/.gitignore        |  3 ---
 3 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 framework/core/stubs/extension/js/.gitignore

diff --git a/framework/core/src/Forum/Controller/AuthenticateUserTrait.php b/framework/core/src/Forum/Controller/AuthenticateUserTrait.php
index 0791456c1..c0d8eedac 100644
--- a/framework/core/src/Forum/Controller/AuthenticateUserTrait.php
+++ b/framework/core/src/Forum/Controller/AuthenticateUserTrait.php
@@ -54,8 +54,6 @@ trait AuthenticateUserTrait
         // unique token for these attributes and add it to the response, along
         // with the suggested account information.
         if ($user) {
-            $accessToken = $this->bus->dispatch(new GenerateAccessToken($user->id));
-
             $payload = ['authenticated' => true];
         } else {
             $token = AuthToken::generate($identification);
@@ -64,16 +62,17 @@ trait AuthenticateUserTrait
             $payload = array_merge($identification, $suggestions, ['token' => $token->id]);
         }
 
-        $content = sprintf('<script>
-window.opener.app.authenticationComplete(%s);
-window.close();
-</script>', json_encode($payload));
+        $content = sprintf(
+            '<script>window.opener.app.authenticationComplete(%s); window.close();</script>',
+            json_encode($payload)
+        );
 
         $response = new HtmlResponse($content);
 
-        if (isset($accessToken)) {
+        if ($user) {
             // Extend the token's expiry to 2 weeks so that we can set a
             // remember cookie
+            $accessToken = $this->bus->dispatch(new GenerateAccessToken($user->id));
             $accessToken::unguard();
             $accessToken->update(['expires_at' => new DateTime('+2 weeks')]);
 
diff --git a/framework/core/stubs/extension/.gitignore b/framework/core/stubs/extension/.gitignore
index a4f3b125e..4181b9dca 100644
--- a/framework/core/stubs/extension/.gitignore
+++ b/framework/core/stubs/extension/.gitignore
@@ -2,3 +2,5 @@
 composer.phar
 .DS_Store
 Thumbs.db
+node_modules
+bower_components
\ No newline at end of file
diff --git a/framework/core/stubs/extension/js/.gitignore b/framework/core/stubs/extension/js/.gitignore
deleted file mode 100644
index 372e20a51..000000000
--- a/framework/core/stubs/extension/js/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bower_components
-node_modules
-dist