Fix unresponsive legacy password confirmation dialog with new dialog in Vue

Signed-off-by: Christopher Ng <chrng8@gmail.com>
2022-09-13 18:38:36 +00:00 · 2022-09-13 18:38:36 +00:00 · 26535e4856
parent 204a700f85
commit 26535e4856
39 changed files with 176 additions and 22 deletions
--- a/apps/federatedfilesharing/src/components/AdminSettings.vue
+++ b/apps/federatedfilesharing/src/components/AdminSettings.vue
@ -71,7 +71,8 @@ import { loadState } from '@nextcloud/initial-state'
 import { showError } from '@nextcloud/dialogs'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
-import confirmPassword from '@nextcloud/password-confirmation'
+import { confirmPassword } from '@nextcloud/password-confirmation'
+import '@nextcloud/password-confirmation/dist/style.css'

 export default {
 	name: 'AdminSettings',
--- a/apps/settings/src/components/AuthTokenSection.vue
+++ b/apps/settings/src/components/AuthTokenSection.vue
@ -36,7 +36,8 @@

 <script>
 import axios from '@nextcloud/axios'
-import confirmPassword from '@nextcloud/password-confirmation'
+import { confirmPassword } from '@nextcloud/password-confirmation'
+import '@nextcloud/password-confirmation/dist/style.css'
 import { generateUrl } from '@nextcloud/router'

 import AuthTokenList from './AuthTokenList'
--- a/apps/settings/src/components/AuthTokenSetupDialogue.vue
+++ b/apps/settings/src/components/AuthTokenSetupDialogue.vue
@ -81,7 +81,8 @@

 <script>
 import QR from '@chenfengyuan/vue-qrcode'
-import confirmPassword from '@nextcloud/password-confirmation'
+import { confirmPassword } from '@nextcloud/password-confirmation'
+import '@nextcloud/password-confirmation/dist/style.css'
 import { getRootUrl } from '@nextcloud/router'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton'

--- a/apps/settings/src/components/BasicSettings/BackgroundJob.vue
+++ b/apps/settings/src/components/BasicSettings/BackgroundJob.vue
@ -92,7 +92,8 @@ import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
 import moment from '@nextcloud/moment'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
-import confirmPassword from '@nextcloud/password-confirmation'
+import { confirmPassword } from '@nextcloud/password-confirmation'
+import '@nextcloud/password-confirmation/dist/style.css'

 const lastCron = loadState('settings', 'lastCron')
 const cronMaxAge = loadState('settings', 'cronMaxAge', '')
--- a/apps/settings/src/components/Encryption.vue
+++ b/apps/settings/src/components/Encryption.vue
@ -84,7 +84,8 @@ import { loadState } from '@nextcloud/initial-state'
 import { getLoggerBuilder } from '@nextcloud/logger'

 import { generateOcsUrl } from '@nextcloud/router'
-import confirmPassword from '@nextcloud/password-confirmation'
+import { confirmPassword } from '@nextcloud/password-confirmation'
+import '@nextcloud/password-confirmation/dist/style.css'
 import { showError } from '@nextcloud/dialogs'

 const logger = getLoggerBuilder()
--- a/apps/settings/src/components/WebAuthn/AddDevice.vue
+++ b/apps/settings/src/components/WebAuthn/AddDevice.vue
@ -61,7 +61,8 @@
 </template>

 <script>
-import confirmPassword from '@nextcloud/password-confirmation'
+import { confirmPassword } from '@nextcloud/password-confirmation'
+import '@nextcloud/password-confirmation/dist/style.css'

 import logger from '../../logger'
 import {
--- a/apps/settings/src/components/WebAuthn/Section.vue
+++ b/apps/settings/src/components/WebAuthn/Section.vue
@ -48,7 +48,8 @@
 </template>

 <script>
-import confirmPassword from '@nextcloud/password-confirmation'
+import { confirmPassword } from '@nextcloud/password-confirmation'
+import '@nextcloud/password-confirmation/dist/style.css'
 import sortBy from 'lodash/fp/sortBy'

 import AddDevice from './AddDevice'
--- a/apps/settings/src/service/PersonalInfo/EmailService.js
+++ b/apps/settings/src/service/PersonalInfo/EmailService.js
@ -23,7 +23,8 @@
 import axios from '@nextcloud/axios'
 import { getCurrentUser } from '@nextcloud/auth'
 import { generateOcsUrl } from '@nextcloud/router'
-import confirmPassword from '@nextcloud/password-confirmation'
+import { confirmPassword } from '@nextcloud/password-confirmation'
+import '@nextcloud/password-confirmation/dist/style.css'

 import { ACCOUNT_PROPERTY_ENUM, SCOPE_SUFFIX } from '../../constants/AccountPropertyConstants'

--- a/apps/settings/src/service/PersonalInfo/PersonalInfoService.js
+++ b/apps/settings/src/service/PersonalInfo/PersonalInfoService.js
@ -23,7 +23,8 @@
 import axios from '@nextcloud/axios'
 import { getCurrentUser } from '@nextcloud/auth'
 import { generateOcsUrl } from '@nextcloud/router'
-import confirmPassword from '@nextcloud/password-confirmation'
+import { confirmPassword } from '@nextcloud/password-confirmation'
+import '@nextcloud/password-confirmation/dist/style.css'

 import { SCOPE_SUFFIX } from '../../constants/AccountPropertyConstants'

--- a/apps/settings/src/service/ProfileService.js
+++ b/apps/settings/src/service/ProfileService.js
@ -23,7 +23,8 @@
 import axios from '@nextcloud/axios'
 import { getCurrentUser } from '@nextcloud/auth'
 import { generateOcsUrl } from '@nextcloud/router'
-import confirmPassword from '@nextcloud/password-confirmation'
+import { confirmPassword } from '@nextcloud/password-confirmation'
+import '@nextcloud/password-confirmation/dist/style.css'

 /**
 * Save the visibility of the profile parameter
--- a/apps/settings/src/store/api.js
+++ b/apps/settings/src/store/api.js
@ -25,7 +25,8 @@
 */

 import axios from '@nextcloud/axios'
-import confirmPassword from '@nextcloud/password-confirmation'
+import { confirmPassword } from '@nextcloud/password-confirmation'
+import '@nextcloud/password-confirmation/dist/style.css'

 const sanitize = function(url) {
 	return url.replace(/\/$/, '') // Remove last url slash
--- a/apps/sharebymail/src/components/AdminSettings.vue
+++ b/apps/sharebymail/src/components/AdminSettings.vue
@ -44,7 +44,8 @@ import { loadState } from '@nextcloud/initial-state'
 import { showError } from '@nextcloud/dialogs'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
-import confirmPassword from '@nextcloud/password-confirmation'
+import { confirmPassword } from '@nextcloud/password-confirmation'
+import '@nextcloud/password-confirmation/dist/style.css'

 export default {
 	name: 'AdminSettings',
--- a/apps/twofactor_backupcodes/src/views/PersonalSettings.vue
+++ b/apps/twofactor_backupcodes/src/views/PersonalSettings.vue
@ -44,7 +44,8 @@
 </template>

 <script>
-import confirmPassword from '@nextcloud/password-confirmation'
+import { confirmPassword } from '@nextcloud/password-confirmation'
+import '@nextcloud/password-confirmation/dist/style.css'
 import { print } from '../service/PrintService'

 export default {
--- a/apps/workflowengine/src/store.js
+++ b/apps/workflowengine/src/store.js
@ -28,7 +28,8 @@ import Vue from 'vue'
 import Vuex, { Store } from 'vuex'
 import axios from '@nextcloud/axios'
 import { getApiUrl } from './helpers/api'
-import confirmPassword from '@nextcloud/password-confirmation'
+import { confirmPassword } from '@nextcloud/password-confirmation'
+import '@nextcloud/password-confirmation/dist/style.css'
 import { loadState } from '@nextcloud/initial-state'

 Vue.use(Vuex)
--- a/dist/core-common.js
+++ b/dist/core-common.js
--- a/dist/core-common.js.LICENSE.txt
+++ b/dist/core-common.js.LICENSE.txt
--- a/dist/core-common.js.map
+++ b/dist/core-common.js.map
--- a/dist/federatedfilesharing-vue-settings-admin.js
+++ b/dist/federatedfilesharing-vue-settings-admin.js
--- a/dist/federatedfilesharing-vue-settings-admin.js.map
+++ b/dist/federatedfilesharing-vue-settings-admin.js.map
--- a/dist/settings-vue-settings-admin-basic-settings.js
+++ b/dist/settings-vue-settings-admin-basic-settings.js
--- a/dist/settings-vue-settings-admin-basic-settings.js.map
+++ b/dist/settings-vue-settings-admin-basic-settings.js.map
--- a/dist/settings-vue-settings-admin-security.js
+++ b/dist/settings-vue-settings-admin-security.js
--- a/dist/settings-vue-settings-admin-security.js.map
+++ b/dist/settings-vue-settings-admin-security.js.map
--- a/dist/settings-vue-settings-apps-users-management.js
+++ b/dist/settings-vue-settings-apps-users-management.js
--- a/dist/settings-vue-settings-apps-users-management.js.map
+++ b/dist/settings-vue-settings-apps-users-management.js.map
--- a/dist/settings-vue-settings-personal-info.js
+++ b/dist/settings-vue-settings-personal-info.js
--- a/dist/settings-vue-settings-personal-info.js.map
+++ b/dist/settings-vue-settings-personal-info.js.map
--- a/dist/settings-vue-settings-personal-security.js
+++ b/dist/settings-vue-settings-personal-security.js
--- a/dist/settings-vue-settings-personal-security.js.map
+++ b/dist/settings-vue-settings-personal-security.js.map
--- a/dist/settings-vue-settings-personal-webauthn.js
+++ b/dist/settings-vue-settings-personal-webauthn.js
--- a/dist/settings-vue-settings-personal-webauthn.js.map
+++ b/dist/settings-vue-settings-personal-webauthn.js.map
--- a/dist/sharebymail-vue-settings-admin-sharebymail.js
+++ b/dist/sharebymail-vue-settings-admin-sharebymail.js
--- a/dist/sharebymail-vue-settings-admin-sharebymail.js.map
+++ b/dist/sharebymail-vue-settings-admin-sharebymail.js.map
--- a/dist/twofactor_backupcodes-settings.js
+++ b/dist/twofactor_backupcodes-settings.js
--- a/dist/twofactor_backupcodes-settings.js.map
+++ b/dist/twofactor_backupcodes-settings.js.map
--- a/dist/workflowengine-workflowengine.js
+++ b/dist/workflowengine-workflowengine.js
--- a/dist/workflowengine-workflowengine.js.map
+++ b/dist/workflowengine-workflowengine.js.map
--- a/package-lock.json
+++ b/package-lock.json
@ -21,7 +21,7 @@
        "@nextcloud/l10n": "^1.4.1",
        "@nextcloud/logger": "^2.1.0",
        "@nextcloud/moment": "^1.2.0",
-        "@nextcloud/password-confirmation": "^1.0.1",
+        "@nextcloud/password-confirmation": "^4.0.0",
        "@nextcloud/paths": "^2.1.0",
        "@nextcloud/router": "^2.0.0",
        "@nextcloud/sharing": "^0.1.0",
@ -3186,9 +3186,87 @@
      }
    },
    "node_modules/@nextcloud/password-confirmation": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@nextcloud/password-confirmation/-/password-confirmation-1.0.1.tgz",
-      "integrity": "sha512-qsyzc8uKcMqssBkm5O1qdV7pL4EJWOMnj036w0UmhLozaoPlla5nUvC51uC1N9ONREEtN0Q/xEEOskNn1qD1hQ=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/password-confirmation/-/password-confirmation-4.0.0.tgz",
+      "integrity": "sha512-LdbuxTbYFs89Wnbw8EHEOJ7itiQxeu7lDyD0iUys4qxpuYaNYcs/VmNnDO+6w5cHKkgEA1ouD9s1TYpWV71iZg==",
+      "dependencies": {
+        "@nextcloud/axios": "^2.0.0",
+        "@nextcloud/capabilities": "^1.0.4",
+        "@nextcloud/l10n": "^1.6.0",
+        "@nextcloud/router": "^2.0.0",
+        "@nextcloud/vue": "^7.0.0-beta.2",
+        "vue": "^2.7.10"
+      },
+      "engines": {
+        "node": "^16.0.0",
+        "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==",
+      "dependencies": {
+        "@nextcloud/event-bus": "^3.0.0"
+      }
+    },
+    "node_modules/@nextcloud/password-confirmation/node_modules/@nextcloud/axios": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/axios/-/axios-2.0.0.tgz",
+      "integrity": "sha512-Pgg0QtA+phxYbe3kMWwhN03ltMZU3x2SfPLRbOPJGP29DgULKBS6YH3U4ev2M8T0drrwCcRnB7esb+FSrW+D5g==",
+      "dependencies": {
+        "@nextcloud/auth": "^2.0.0",
+        "axios": "^0.27.2",
+        "tslib": "^2.4.0"
+      },
+      "engines": {
+        "node": "^16.0.0",
+        "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==",
+      "dependencies": {
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^16.0.0",
+        "npm": "^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@nextcloud/password-confirmation/node_modules/@nextcloud/l10n": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.6.0.tgz",
+      "integrity": "sha512-aKGlgrwN9OiafN791sYus0shfwNeU3PlrH6Oi9ISma6iJSvN6a8aJM8WGKCJ9pqBaTR5PrDuckuM/WnybBWb6A==",
+      "dependencies": {
+        "core-js": "^3.6.4",
+        "node-gettext": "^3.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",
+      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+      "dependencies": {
+        "follow-redirects": "^1.14.9",
+        "form-data": "^4.0.0"
+      }
+    },
+    "node_modules/@nextcloud/password-confirmation/node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
    },
    "node_modules/@nextcloud/paths": {
      "version": "2.1.0",
@ -34421,9 +34499,71 @@
      }
    },
    "@nextcloud/password-confirmation": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@nextcloud/password-confirmation/-/password-confirmation-1.0.1.tgz",
-      "integrity": "sha512-qsyzc8uKcMqssBkm5O1qdV7pL4EJWOMnj036w0UmhLozaoPlla5nUvC51uC1N9ONREEtN0Q/xEEOskNn1qD1hQ=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/password-confirmation/-/password-confirmation-4.0.0.tgz",
+      "integrity": "sha512-LdbuxTbYFs89Wnbw8EHEOJ7itiQxeu7lDyD0iUys4qxpuYaNYcs/VmNnDO+6w5cHKkgEA1ouD9s1TYpWV71iZg==",
+      "requires": {
+        "@nextcloud/axios": "^2.0.0",
+        "@nextcloud/capabilities": "^1.0.4",
+        "@nextcloud/l10n": "^1.6.0",
+        "@nextcloud/router": "^2.0.0",
+        "@nextcloud/vue": "^7.0.0-beta.2",
+        "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==",
+          "requires": {
+            "@nextcloud/event-bus": "^3.0.0"
+          }
+        },
+        "@nextcloud/axios": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/@nextcloud/axios/-/axios-2.0.0.tgz",
+          "integrity": "sha512-Pgg0QtA+phxYbe3kMWwhN03ltMZU3x2SfPLRbOPJGP29DgULKBS6YH3U4ev2M8T0drrwCcRnB7esb+FSrW+D5g==",
+          "requires": {
+            "@nextcloud/auth": "^2.0.0",
+            "axios": "^0.27.2",
+            "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==",
+          "requires": {
+            "semver": "^7.3.7"
+          }
+        },
+        "@nextcloud/l10n": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.6.0.tgz",
+          "integrity": "sha512-aKGlgrwN9OiafN791sYus0shfwNeU3PlrH6Oi9ISma6iJSvN6a8aJM8WGKCJ9pqBaTR5PrDuckuM/WnybBWb6A==",
+          "requires": {
+            "core-js": "^3.6.4",
+            "node-gettext": "^3.0.0"
+          }
+        },
+        "axios": {
+          "version": "0.27.2",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
+          "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+          "requires": {
+            "follow-redirects": "^1.14.9",
+            "form-data": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
    },
    "@nextcloud/paths": {
      "version": "2.1.0",
--- a/package.json
+++ b/package.json
@ -41,7 +41,7 @@
    "@nextcloud/l10n": "^1.4.1",
    "@nextcloud/logger": "^2.1.0",
    "@nextcloud/moment": "^1.2.0",
-    "@nextcloud/password-confirmation": "^1.0.1",
+    "@nextcloud/password-confirmation": "^4.0.0",
    "@nextcloud/paths": "^2.1.0",
    "@nextcloud/router": "^2.0.0",
    "@nextcloud/sharing": "^0.1.0",