Skip to content

Commit

Permalink
Fix unresponsive legacy password confirmation dialog with new dialog …
Browse files Browse the repository at this point in the history
…in Vue

Signed-off-by: Christopher Ng <[email protected]>
  • Loading branch information
Pytal committed Sep 14, 2022
1 parent 204a700 commit 26535e4
Show file tree
Hide file tree
Showing 39 changed files with 255 additions and 55 deletions.
3 changes: 2 additions & 1 deletion apps/federatedfilesharing/src/components/AdminSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 2 additions & 1 deletion apps/settings/src/components/AuthTokenSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 2 additions & 1 deletion apps/settings/src/components/AuthTokenSetupDialogue.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 2 additions & 1 deletion apps/settings/src/components/BasicSettings/BackgroundJob.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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', '')
Expand Down
3 changes: 2 additions & 1 deletion apps/settings/src/components/Encryption.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
3 changes: 2 additions & 1 deletion apps/settings/src/components/WebAuthn/AddDevice.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion apps/settings/src/components/WebAuthn/Section.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 2 additions & 1 deletion apps/settings/src/service/PersonalInfo/EmailService.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
3 changes: 2 additions & 1 deletion apps/settings/src/service/ProfileService.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion apps/settings/src/store/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion apps/sharebymail/src/components/AdminSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 2 additions & 1 deletion apps/twofactor_backupcodes/src/views/PersonalSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion apps/workflowengine/src/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions dist/core-common.js

Large diffs are not rendered by default.

46 changes: 46 additions & 0 deletions dist/core-common.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,8 @@

/*! For license information please see excludeClickOutsideClasses.js.LICENSE.txt */

/*! For license information please see ncvuecomponents.js.LICENSE.txt */

/*! Hammer.JS - v2.0.7 - 2016-04-22
* http://hammerjs.github.io/
*
Expand Down Expand Up @@ -650,6 +652,28 @@
*
*/

/**
* @copyright Copyright (c) 2020 Georg Ehrke
*
* @author Georg Ehrke <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

/**
* @copyright Copyright (c) 2020 Georg Ehrke <[email protected]>
*
Expand Down Expand Up @@ -760,6 +784,28 @@
*
*/

/**
* @copyright Copyright (c) 2021 Christoph Wurst
*
* @author Christoph Wurst <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

/**
* @license
* Lodash <https://lodash.com/>
Expand Down
2 changes: 1 addition & 1 deletion dist/core-common.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit 26535e4

Please sign in to comment.