fix admin page getRequestToken() call

Signed-off-by: Devlin Junker <devlin.junker@gmail.com>

1 files changed, 118 insertions, 94 deletions

diff --git a/package-lock.json b/package-lock.json
index 7de5669eb..e092af48f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,6 +7,7 @@
       "name": "nextcloud-news",
       "license": "AGPL-3.0",
       "dependencies": {
+        "@nextcloud/auth": "^2.0.0",
         "@nextcloud/axios": "^1.11.0",
         "@nextcloud/dialogs": "^3.1.2",
         "@nextcloud/initial-state": "^2.0.0",
@@ -3141,12 +3142,11 @@
       "peer": true
     },
     "node_modules/@nextcloud/auth": {
-      "version": "1.3.0",
-      "license": "GPL-3.0-or-later",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.0.0.tgz",
+      "integrity": "sha512-v8K8tvjkOsGt1+gKydVeMiEwWLXlfPWSptXnMqP21Xd6pFAQxNuNNCY679XKU4MNaKzpZqLstCCxv/KrjeQv8A==",
       "dependencies": {
-        "@nextcloud/event-bus": "^1.1.3",
-        "@nextcloud/typings": "^0.2.2",
-        "core-js": "^3.6.4"
+        "@nextcloud/event-bus": "^3.0.0"
       }
     },
     "node_modules/@nextcloud/axios": {
@@ -3162,6 +3162,26 @@
         "npm": "^7.0.0 || ^8.0.0"
       }
     },
+    "node_modules/@nextcloud/axios/node_modules/@nextcloud/auth": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-1.3.0.tgz",
+      "integrity": "sha512-GfwRM9W7hat4psNdAt74UHEV+drEXQ53klCVp6JpON66ZLPeK5eJ1LQuiQDkpUxZpqNeaumXjiB98h5cug/uQw==",
+      "dependencies": {
+        "@nextcloud/event-bus": "^1.1.3",
+        "@nextcloud/typings": "^0.2.2",
+        "core-js": "^3.6.4"
+      }
+    },
+    "node_modules/@nextcloud/axios/node_modules/@nextcloud/event-bus": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-1.3.0.tgz",
+      "integrity": "sha512-+U5MnCvfnNWvf0lvdqJg8F+Nm8wN+s9ayuBjtiEQxTAcootv7lOnlMgfreqF3l2T0Wet2uZh4JbFVUWf8l3w7g==",
+      "dependencies": {
+        "@types/semver": "^7.3.5",
+        "core-js": "^3.11.2",
+        "semver": "^7.3.5"
+      }
+    },
     "node_modules/@nextcloud/axios/node_modules/axios": {
       "version": "0.27.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
@@ -3299,12 +3319,15 @@
       }
     },
     "node_modules/@nextcloud/event-bus": {
-      "version": "1.3.0",
-      "license": "GPL-3.0-or-later",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-3.0.2.tgz",
+      "integrity": "sha512-svXCZa4UkoZKsBiGzTi0cVcbPFUOhCm7pMKjGumRwBvHywX+8by478IQ8Grw75PFHxajMJZ0KrOTTM8WnzzEAw==",
       "dependencies": {
-        "@types/semver": "^7.3.5",
-        "core-js": "^3.11.2",
-        "semver": "^7.3.5"
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^16.0.0",
+        "npm": "^7.0.0 || ^8.0.0"
       }
     },
     "node_modules/@nextcloud/focus-trap": {
@@ -3343,6 +3366,26 @@
         "npm": "^7.0.0 || ^8.0.0"
       }
     },
+    "node_modules/@nextcloud/logger/node_modules/@nextcloud/auth": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-1.3.0.tgz",
+      "integrity": "sha512-GfwRM9W7hat4psNdAt74UHEV+drEXQ53klCVp6JpON66ZLPeK5eJ1LQuiQDkpUxZpqNeaumXjiB98h5cug/uQw==",
+      "dependencies": {
+        "@nextcloud/event-bus": "^1.1.3",
+        "@nextcloud/typings": "^0.2.2",
+        "core-js": "^3.6.4"
+      }
+    },
+    "node_modules/@nextcloud/logger/node_modules/@nextcloud/event-bus": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-1.3.0.tgz",
+      "integrity": "sha512-+U5MnCvfnNWvf0lvdqJg8F+Nm8wN+s9ayuBjtiEQxTAcootv7lOnlMgfreqF3l2T0Wet2uZh4JbFVUWf8l3w7g==",
+      "dependencies": {
+        "@types/semver": "^7.3.5",
+        "core-js": "^3.11.2",
+        "semver": "^7.3.5"
+      }
+    },
     "node_modules/@nextcloud/password-confirmation": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/@nextcloud/password-confirmation/-/password-confirmation-4.0.2.tgz",
@@ -3360,15 +3403,6 @@
         "npm": "^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/@nextcloud/password-confirmation/node_modules/@nextcloud/auth": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.0.0.tgz",
-      "integrity": "sha512-v8K8tvjkOsGt1+gKydVeMiEwWLXlfPWSptXnMqP21Xd6pFAQxNuNNCY679XKU4MNaKzpZqLstCCxv/KrjeQv8A==",
-      "dev": true,
-      "dependencies": {
-        "@nextcloud/event-bus": "^3.0.0"
-      }
-    },
     "node_modules/@nextcloud/password-confirmation/node_modules/@nextcloud/axios": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@nextcloud/axios/-/axios-2.1.0.tgz",
@@ -3385,19 +3419,6 @@
         "npm": "^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/@nextcloud/password-confirmation/node_modules/@nextcloud/event-bus": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-3.0.2.tgz",
-      "integrity": "sha512-svXCZa4UkoZKsBiGzTi0cVcbPFUOhCm7pMKjGumRwBvHywX+8by478IQ8Grw75PFHxajMJZ0KrOTTM8WnzzEAw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^7.3.7"
-      },
-      "engines": {
-        "node": "^16.0.0",
-        "npm": "^7.0.0 || ^8.0.0"
-      }
-    },
     "node_modules/@nextcloud/password-confirmation/node_modules/axios": {
       "version": "0.27.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
@@ -3431,7 +3452,8 @@
     },
     "node_modules/@nextcloud/typings": {
       "version": "0.2.4",
-      "license": "GPL-3.0-or-later",
+      "resolved": "https://registry.npmjs.org/@nextcloud/typings/-/typings-0.2.4.tgz",
+      "integrity": "sha512-49M8XUDQH27VIQE+13KrqSOYcyOsDUk6Yfw17jbBVtXFoDJ3YBSYYq8YaKeAM3Lz2JVbEpqQW9suAT+EyYSb6g==",
       "dependencies": {
         "@types/jquery": "2.0.54"
       }
@@ -3475,13 +3497,6 @@
         "npm": "^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/@nextcloud/vue/node_modules/@nextcloud/auth": {
-      "version": "2.0.0",
-      "license": "GPL-3.0-or-later",
-      "dependencies": {
-        "@nextcloud/event-bus": "^3.0.0"
-      }
-    },
     "node_modules/@nextcloud/vue/node_modules/@nextcloud/axios": {
       "version": "2.1.0",
       "license": "GPL-3.0",
@@ -3496,17 +3511,6 @@
         "npm": "^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/@nextcloud/vue/node_modules/@nextcloud/event-bus": {
-      "version": "3.0.2",
-      "license": "GPL-3.0-or-later",
-      "dependencies": {
-        "semver": "^7.3.7"
-      },
-      "engines": {
-        "node": "^16.0.0",
-        "npm": "^7.0.0 || ^8.0.0"
-      }
-    },
     "node_modules/@nextcloud/vue/node_modules/axios": {
       "version": "0.27.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
@@ -3805,7 +3809,8 @@
     },
     "node_modules/@types/jquery": {
       "version": "2.0.54",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.54.tgz",
+      "integrity": "sha512-D/PomKwNkDfSKD13DEVQT/pq2TUjN54c6uB341fEZanIzkjfGe7UaFuuaLZbpEiS5j7Wk2MUHAZqZIoECw29lg=="
     },
     "node_modules/@types/jsdom": {
       "version": "20.0.0",
@@ -3881,8 +3886,9 @@
       "peer": true
     },
     "node_modules/@types/semver": {
-      "version": "7.3.12",
-      "license": "MIT"
+      "version": "7.3.13",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
+      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw=="
     },
     "node_modules/@types/serve-index": {
       "version": "1.9.1",
@@ -18471,11 +18477,11 @@
       "peer": true
     },
     "@nextcloud/auth": {
-      "version": "1.3.0",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.0.0.tgz",
+      "integrity": "sha512-v8K8tvjkOsGt1+gKydVeMiEwWLXlfPWSptXnMqP21Xd6pFAQxNuNNCY679XKU4MNaKzpZqLstCCxv/KrjeQv8A==",
       "requires": {
-        "@nextcloud/event-bus": "^1.1.3",
-        "@nextcloud/typings": "^0.2.2",
-        "core-js": "^3.6.4"
+        "@nextcloud/event-bus": "^3.0.0"
       }
     },
     "@nextcloud/axios": {
@@ -18486,6 +18492,26 @@
         "core-js": "^3.6.4"
       },
       "dependencies": {
+        "@nextcloud/auth": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-1.3.0.tgz",
+          "integrity": "sha512-GfwRM9W7hat4psNdAt74UHEV+drEXQ53klCVp6JpON66ZLPeK5eJ1LQuiQDkpUxZpqNeaumXjiB98h5cug/uQw==",
+          "requires": {
+            "@nextcloud/event-bus": "^1.1.3",
+            "@nextcloud/typings": "^0.2.2",
+            "core-js": "^3.6.4"
+          }
+        },
+        "@nextcloud/event-bus": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-1.3.0.tgz",
+          "integrity": "sha512-+U5MnCvfnNWvf0lvdqJg8F+Nm8wN+s9ayuBjtiEQxTAcootv7lOnlMgfreqF3l2T0Wet2uZh4JbFVUWf8l3w7g==",
+          "requires": {
+            "@types/semver": "^7.3.5",
+            "core-js": "^3.11.2",
+            "semver": "^7.3.5"
+          }
+        },
         "axios": {
           "version": "0.27.2",
           "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
@@ -18571,11 +18597,11 @@
       }
     },
     "@nextcloud/event-bus": {
-      "version": "1.3.0",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-3.0.2.tgz",
+      "integrity": "sha512-svXCZa4UkoZKsBiGzTi0cVcbPFUOhCm7pMKjGumRwBvHywX+8by478IQ8Grw75PFHxajMJZ0KrOTTM8WnzzEAw==",
       "requires": {
-        "@types/semver": "^7.3.5",
-        "core-js": "^3.11.2",
-        "semver": "^7.3.5"
+        "semver": "^7.3.7"
       }
     },
     "@nextcloud/focus-trap": {
@@ -18601,6 +18627,28 @@
       "requires": {
         "@nextcloud/auth": "^1.2.2",
         "core-js": "^3.6.4"
+      },
+      "dependencies": {
+        "@nextcloud/auth": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-1.3.0.tgz",
+          "integrity": "sha512-GfwRM9W7hat4psNdAt74UHEV+drEXQ53klCVp6JpON66ZLPeK5eJ1LQuiQDkpUxZpqNeaumXjiB98h5cug/uQw==",
+          "requires": {
+            "@nextcloud/event-bus": "^1.1.3",
+            "@nextcloud/typings": "^0.2.2",
+            "core-js": "^3.6.4"
+          }
+        },
+        "@nextcloud/event-bus": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-1.3.0.tgz",
+          "integrity": "sha512-+U5MnCvfnNWvf0lvdqJg8F+Nm8wN+s9ayuBjtiEQxTAcootv7lOnlMgfreqF3l2T0Wet2uZh4JbFVUWf8l3w7g==",
+          "requires": {
+            "@types/semver": "^7.3.5",
+            "core-js": "^3.11.2",
+            "semver": "^7.3.5"
+          }
+        }
       }
     },
     "@nextcloud/password-confirmation": {
@@ -18616,15 +18664,6 @@
         "vue": "^2.7.10"
       },
       "dependencies": {
-        "@nextcloud/auth": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.0.0.tgz",
-          "integrity": "sha512-v8K8tvjkOsGt1+gKydVeMiEwWLXlfPWSptXnMqP21Xd6pFAQxNuNNCY679XKU4MNaKzpZqLstCCxv/KrjeQv8A==",
-          "dev": true,
-          "requires": {
-            "@nextcloud/event-bus": "^3.0.0"
-          }
-        },
         "@nextcloud/axios": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/@nextcloud/axios/-/axios-2.1.0.tgz",
@@ -18637,15 +18676,6 @@
             "tslib": "^2.4.0"
           }
         },
-        "@nextcloud/event-bus": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-3.0.2.tgz",
-          "integrity": "sha512-svXCZa4UkoZKsBiGzTi0cVcbPFUOhCm7pMKjGumRwBvHywX+8by478IQ8Grw75PFHxajMJZ0KrOTTM8WnzzEAw==",
-          "dev": true,
-          "requires": {
-            "semver": "^7.3.7"
-          }
-        },
         "axios": {
           "version": "0.27.2",
           "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
@@ -18671,6 +18701,8 @@
     },
     "@nextcloud/typings": {
       "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@nextcloud/typings/-/typings-0.2.4.tgz",
+      "integrity": "sha512-49M8XUDQH27VIQE+13KrqSOYcyOsDUk6Yfw17jbBVtXFoDJ3YBSYYq8YaKeAM3Lz2JVbEpqQW9suAT+EyYSb6g==",
       "requires": {
         "@types/jquery": "2.0.54"
       }
@@ -18709,12 +18741,6 @@
         "vue2-datepicker": "^3.11.0"
       },
       "dependencies": {
-        "@nextcloud/auth": {
-          "version": "2.0.0",
-          "requires": {
-            "@nextcloud/event-bus": "^3.0.0"
-          }
-        },
         "@nextcloud/axios": {
           "version": "2.1.0",
           "requires": {
@@ -18724,12 +18750,6 @@
             "tslib": "^2.4.0"
           }
         },
-        "@nextcloud/event-bus": {
-          "version": "3.0.2",
-          "requires": {
-            "semver": "^7.3.7"
-          }
-        },
         "axios": {
           "version": "0.27.2",
           "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
@@ -18977,7 +18997,9 @@
       }
     },
     "@types/jquery": {
-      "version": "2.0.54"
+      "version": "2.0.54",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.54.tgz",
+      "integrity": "sha512-D/PomKwNkDfSKD13DEVQT/pq2TUjN54c6uB341fEZanIzkjfGe7UaFuuaLZbpEiS5j7Wk2MUHAZqZIoECw29lg=="
     },
     "@types/jsdom": {
       "version": "20.0.0",
@@ -19045,7 +19067,9 @@
       "peer": true
     },
     "@types/semver": {
-      "version": "7.3.12"
+      "version": "7.3.13",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
+      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw=="
     },
     "@types/serve-index": {
       "version": "1.9.1",