Remove XSRF workaround & open WebCAT in new tab

README.md

@@ -19,13 +19,6 @@ Follow these steps if you are running Jupyter Notebooks through Anaconda:
 3. jupyter serverextension enable --py webcatjupyterplugin
 4. jupyter nbextension install --py webcatjupyterplugin
 5. jupyter nbextension enable --py webcatjupyterplugin
-7. Download the file env.sh or clone the repository and run the command below
-8. sh env.sh
-
-You can skip the 7<sup>th</sup> and 8<sup>th</sup> steps and manually run the following commands:
-1. jupyter notebook --generate-config
-2. Add the following line at the end of ~/.jupyter/jupyter_notebook_config.py
-    - c.NotebookApp.disable_check_xsrf = True 
 
 ##### With pip:
 
@@ -35,15 +28,7 @@ If you are not using Anaconda, use the following commands:
 2. jupyter serverextension enable --py webcatjupyterplugin
 3. jupyter nbextension install --py webcatjupyterplugin
 4. jupyter nbextension enable --py webcatjupyterplugin
-5. Download the file env.sh or clone the repository and run the command below
-6. sh env.sh
-
 
-You can skip the 5<sup>th</sup> and 6<sup>th</sup> steps and manually run the following commands:
-1. jupyter notebook --generate-config
-2. Add the following line at the end of ~/.jupyter/jupyter_notebook_config.py
-    - c.NotebookApp.disable_check_xsrf = True 
-
 ## Windows
 
 If you have Windows operating system, follow these steps:
@@ -55,15 +40,6 @@ If you have Windows operating system, follow these steps:
 5. jupyter serverextension enable --py webcatjupyterplugin
 6. jupyter nbextension install --py webcatjupyterplugin
 7. jupyter nbextension enable --py webcatjupyterplugin
-8. jupyter notebook --generate-config
-
-This will generate a default config file and you will get the output like "Writing default config to: C:\Users\UserName\\.jupyter\jupyter_notebook_config.py"
-
-Run the following command but make sure to change the path to the ones returned by the above command
-
-9. echo c.NotebookApp.disable_check_xsrf = True >> C:\Users\UserName\\.jupyter\jupyter_notebook_config.py
-
-
 
 # Assignment Indentification
 

webcatjupyterplugin/static/main.js

@@ -7,14 +7,6 @@ define([
         var submitActionName = 'submit-to-webcat';
 
         function load_ipython_extension() {
-            $('<link/>')
-                .attr({
-                    id: 'collapsible_headings_css',
-                    rel: 'stylesheet',
-                    type: 'text/css',
-                    href: requirejs.toUrl('./main.css')
-                })
-                .appendTo('head');
 
             var action = {
                 span: 'Submit to Web-CAT',
@@ -63,26 +55,24 @@ define([
                 url: '/webcat/push',
                 processData: false,
                 type: "PUT",
+                headers: {},
                 dataType: "json",
                 data: JSON.stringify(payload),
                 contentType: 'application/json',
                 success: function (data) {
-                    var iframe_html = '<iframe src="' + data.redirectLink +
-                        '" width = 650 height = 500></iframe>';
-                    dialog.modal({
-                        title: "Web-CAT",
-                        body: iframe_html,
-                        sanitize: false,
-                        buttons: {
-                            'Close': {}
-                        }
-                    });
+                    window.open(data.redirectLink);
                 },
                 error: function (data) {
                     alert("Error while submitting to Web-CAT");
                 }
             };
 
+            // https://blog.jupyter.org/security-release-jupyter-notebook-4-3-1-808e1f3bb5e2
+            var xsrf_token = document.cookie.match("\\b_xsrf=([^;]*)\\b")?.[1]
+            if (xsrf_token) {
+                settings.headers['X-XSRFToken'] = xsrf_token
+            }
+
             // commit and push
             $.ajax(settings);
         }