From ca5632342ee00ff31e1a5072be674a4cdc30beaa Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Fri, 3 Feb 2017 22:11:40 +0900
Subject: [PATCH] Re-enable window.eval()

Close #333
---
 CHANGELOG.md                      | 1 +
 src/browser/webview/mattermost.js | 4 ----
 test/specs/security_test.js       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77f68acf..3ee26b2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ Release date: TBD
 - Remove remaining badges after logging out of the team
 - Fixed an issue where context menu appears many times after reloading
 - Fixed an issue where minimum window size is not set
+- Fixed an issue where Google login form is not working
 
 #### Windows
 - Fixed an issue where an unexpected window appears while install/uninstalling
diff --git a/src/browser/webview/mattermost.js b/src/browser/webview/mattermost.js
index d7497bec..ccfe66e7 100644
--- a/src/browser/webview/mattermost.js
+++ b/src/browser/webview/mattermost.js
@@ -4,10 +4,6 @@ const electron = require('electron');
 const ipc = electron.ipcRenderer;
 const notification = require('../js/notification');
 
-window.eval = global.eval = () => {
-  throw new Error('Sorry, Mattermost does not support window.eval() for security reasons.');
-};
-
 Reflect.deleteProperty(global.Buffer); // http://electron.atom.io/docs/tutorial/security/#buffer-global
 
 function hasClass(element, className) {
diff --git a/test/specs/security_test.js b/test/specs/security_test.js
index 5f056fbe..d8bbc84c 100644
--- a/test/specs/security_test.js
+++ b/test/specs/security_test.js
@@ -99,8 +99,6 @@ describe('application', function desc() {
     };
     return Promise.all([
       tryEval(0),
-      tryEval(1),
-      tryEval(2),
       tryEvalInSettingsPage()
     ]);
   });