From 091c5bcf88ca816f583a51e9f6fb439b911e9105 Mon Sep 17 00:00:00 2001
From: "Felix W. Dekker" <felix@fwdekker.com>
Date: Tue, 12 May 2020 13:04:45 +0200
Subject: [PATCH] Ensure safe cookies

---
 Gruntfile.js        | 54 ++++++++++++++++++++++-----------------------
 README.md           | 12 ++--------
 package.json        |  2 +-
 src/main/js/Main.js |  2 +-
 4 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 53cfdc8..a5354c0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,12 +7,12 @@ module.exports = grunt => {
             default: ["dist/"],
         },
         copy: {
-            html: {
-                files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/"}]
-            },
             css: {
                 files: [{expand: true, cwd: "src/main/", src: "**/*.css", dest: "dist/"}]
             },
+            html: {
+                files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/"}]
+            },
         },
         focus: {
             dev: {
@@ -41,6 +41,24 @@ module.exports = grunt => {
                 overwrite: true
             },
         },
+        watch: {
+            css: {
+                files: ["src/main/**/*.css"],
+                tasks: ["copy:css"],
+            },
+            html: {
+                files: ["src/main/**/*.html"],
+                tasks: ["copy:html"],
+            },
+            js: {
+                files: ["src/main/**/*.js"],
+                tasks: ["webpack:dev", "replace:dev"],
+            },
+            link: {
+                files: ["node_modules/@fwdekker/*/dist/**"],
+                tasks: ["webpack:dev", "replace:dev"],
+            },
+        },
         webpack: {
             options: {
                 entry: "./src/main/js/Main.js",
@@ -68,24 +86,6 @@ module.exports = grunt => {
                 mode: "production",
             },
         },
-        watch: {
-            css: {
-                files: ["src/main/**/*.css"],
-                tasks: ["copy:css"],
-            },
-            html: {
-                files: ["src/main/**/*.html"],
-                tasks: ["copy:html"],
-            },
-            js: {
-                files: ["src/main/**/*.js"],
-                tasks: ["webpack:dev", "replace:dev"],
-            },
-            link: {
-                files: ["node_modules/@fwdekker/*/dist/**"],
-                tasks: ["webpack:dev", "replace:dev"],
-            },
-        },
     });
 
     grunt.loadNpmTasks("grunt-contrib-clean");
@@ -99,24 +99,22 @@ module.exports = grunt => {
         // Pre
         "clean",
         // Copy files
-        "copy:html",
         "copy:css",
-        // Compile
+        "copy:html",
+        // Compile JS
         "webpack:dev",
-        // Post
-        "replace:dev"
+        "replace:dev",
     ]);
     grunt.registerTask("dev:server", ["dev", "focus:dev"]);
     grunt.registerTask("deploy", [
         // Pre
         "clean",
         // Copy files
-        "copy:html",
         "copy:css",
+        "copy:html",
         // Compile JS
         "webpack:deploy",
-        // Post
-        "replace:deploy"
+        "replace:deploy",
     ]);
 
     grunt.registerTask("default", ["dev"]);
diff --git a/README.md b/README.md
index ff6f523..b01f847 100644
--- a/README.md
+++ b/README.md
@@ -35,18 +35,10 @@ $> npm ci
 
 ### Building
 ```shell script
-# Build the template in `dist/` for development
+# Build the tool in `dist/` for development
 $> npm run dev
 # Same as above, but automatically rerun it whenever files are changed
 $> npm run dev:server
-# Build the template in `dist/` for deployment
+# Build the tool in `dist/` for deployment
 $> npm run deploy
 ```
-
-### Publishing
-```shell script
-# Log in to npm
-$> npm login
-# Push to npm
-$> npm publish --access public
-```
diff --git a/package.json b/package.json
index 6096df7..8c27aba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "interlanguage-checker",
-    "version": "1.10.8",
+    "version": "1.10.9",
     "description": "Check the consistency of MediaWiki interlanguage links in a simple overview.",
     "author": "Felix W. Dekker",
     "browser": "dist/bundle.js",
diff --git a/src/main/js/Main.js b/src/main/js/Main.js
index 731cb61..f188c7c 100644
--- a/src/main/js/Main.js
+++ b/src/main/js/Main.js
@@ -57,7 +57,7 @@ doAfterLoad(async () => {
     let mwm = undefined;
 
     const submit = async () => {
-        Cookies.set("api-url", urlInput.getValue(), {expires: 10 * 365});
+        Cookies.set("api-url", urlInput.getValue(), {expires: 10 * 365, secure: true, sameSite: "lax"});
 
         // Clean up
         urlInput.showBlank();