Skip to content

Commit bd03c79

Browse files
authored
Merge pull request #34044 from nextcloud/fix/password-confirmation
2 parents af35ea3 + 26535e4 commit bd03c79

39 files changed

+255
-55
lines changed

apps/federatedfilesharing/src/components/AdminSettings.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ import { loadState } from '@nextcloud/initial-state'
7171
import { showError } from '@nextcloud/dialogs'
7272
import axios from '@nextcloud/axios'
7373
import { generateOcsUrl } from '@nextcloud/router'
74-
import confirmPassword from '@nextcloud/password-confirmation'
74+
import { confirmPassword } from '@nextcloud/password-confirmation'
75+
import '@nextcloud/password-confirmation/dist/style.css'
7576
7677
export default {
7778
name: 'AdminSettings',

apps/settings/src/components/AuthTokenSection.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636

3737
<script>
3838
import axios from '@nextcloud/axios'
39-
import confirmPassword from '@nextcloud/password-confirmation'
39+
import { confirmPassword } from '@nextcloud/password-confirmation'
40+
import '@nextcloud/password-confirmation/dist/style.css'
4041
import { generateUrl } from '@nextcloud/router'
4142
4243
import AuthTokenList from './AuthTokenList'

apps/settings/src/components/AuthTokenSetupDialogue.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@
8181

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

apps/settings/src/components/BasicSettings/BackgroundJob.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
9292
import moment from '@nextcloud/moment'
9393
import axios from '@nextcloud/axios'
9494
import { generateOcsUrl } from '@nextcloud/router'
95-
import confirmPassword from '@nextcloud/password-confirmation'
95+
import { confirmPassword } from '@nextcloud/password-confirmation'
96+
import '@nextcloud/password-confirmation/dist/style.css'
9697
9798
const lastCron = loadState('settings', 'lastCron')
9899
const cronMaxAge = loadState('settings', 'cronMaxAge', '')

apps/settings/src/components/Encryption.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ import { loadState } from '@nextcloud/initial-state'
8484
import { getLoggerBuilder } from '@nextcloud/logger'
8585
8686
import { generateOcsUrl } from '@nextcloud/router'
87-
import confirmPassword from '@nextcloud/password-confirmation'
87+
import { confirmPassword } from '@nextcloud/password-confirmation'
88+
import '@nextcloud/password-confirmation/dist/style.css'
8889
import { showError } from '@nextcloud/dialogs'
8990
9091
const logger = getLoggerBuilder()

apps/settings/src/components/WebAuthn/AddDevice.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
</template>
6262

6363
<script>
64-
import confirmPassword from '@nextcloud/password-confirmation'
64+
import { confirmPassword } from '@nextcloud/password-confirmation'
65+
import '@nextcloud/password-confirmation/dist/style.css'
6566
6667
import logger from '../../logger'
6768
import {

apps/settings/src/components/WebAuthn/Section.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
</template>
4949

5050
<script>
51-
import confirmPassword from '@nextcloud/password-confirmation'
51+
import { confirmPassword } from '@nextcloud/password-confirmation'
52+
import '@nextcloud/password-confirmation/dist/style.css'
5253
import sortBy from 'lodash/fp/sortBy'
5354
5455
import AddDevice from './AddDevice'

apps/settings/src/service/PersonalInfo/EmailService.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
import axios from '@nextcloud/axios'
2424
import { getCurrentUser } from '@nextcloud/auth'
2525
import { generateOcsUrl } from '@nextcloud/router'
26-
import confirmPassword from '@nextcloud/password-confirmation'
26+
import { confirmPassword } from '@nextcloud/password-confirmation'
27+
import '@nextcloud/password-confirmation/dist/style.css'
2728

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

apps/settings/src/service/PersonalInfo/PersonalInfoService.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
import axios from '@nextcloud/axios'
2424
import { getCurrentUser } from '@nextcloud/auth'
2525
import { generateOcsUrl } from '@nextcloud/router'
26-
import confirmPassword from '@nextcloud/password-confirmation'
26+
import { confirmPassword } from '@nextcloud/password-confirmation'
27+
import '@nextcloud/password-confirmation/dist/style.css'
2728

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

apps/settings/src/service/ProfileService.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
import axios from '@nextcloud/axios'
2424
import { getCurrentUser } from '@nextcloud/auth'
2525
import { generateOcsUrl } from '@nextcloud/router'
26-
import confirmPassword from '@nextcloud/password-confirmation'
26+
import { confirmPassword } from '@nextcloud/password-confirmation'
27+
import '@nextcloud/password-confirmation/dist/style.css'
2728

2829
/**
2930
* Save the visibility of the profile parameter

0 commit comments

Comments
 (0)