Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions apps/federatedfilesharing/src/components/AdminSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwit
import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'
import logger from '../services/logger.ts'
import '@nextcloud/password-confirmation/dist/style.css'
export default {
name: 'AdminSettings',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'
import logger from '../../logger.ts'

import '@nextcloud/password-confirmation/dist/style.css'

const lastCron = loadState('settings', 'lastCron')
const cronMaxAge = loadState('settings', 'cronMaxAge', '')
const backgroundJobsMode = loadState('settings', 'backgroundJobsMode', 'cron')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,8 @@ import {
startRegistration,
} from '../../service/WebAuthnRegistrationSerice.ts'

import '@nextcloud/password-confirmation/dist/style.css'

/**
* @param {string} text
* @param {string} text The text to log
*/
function logAndPass(text) {
return (data) => {
Expand Down
2 changes: 0 additions & 2 deletions apps/settings/src/components/WebAuthn/WebAuthnSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ import WebAuthnDevice from './WebAuthnDevice.vue'
import logger from '../../logger.ts'
import { removeRegistration } from '../../service/WebAuthnRegistrationSerice.js'
import '@nextcloud/password-confirmation/dist/style.css'
const sortByName = sortBy('name')
export default {
Expand Down
2 changes: 0 additions & 2 deletions apps/settings/src/main-personal-security.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import VTooltipPlugin from 'v-tooltip'
import Vue from 'vue'
import AuthTokenSection from './components/AuthTokenSection.vue'

import '@nextcloud/password-confirmation/dist/style.css'

__webpack_nonce__ = getCSPNonce()

const pinia = createPinia()
Expand Down
2 changes: 0 additions & 2 deletions apps/settings/src/service/PersonalInfo/EmailService.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import { confirmPassword } from '@nextcloud/password-confirmation'
import { generateOcsUrl } from '@nextcloud/router'
import { ACCOUNT_PROPERTY_ENUM, SCOPE_SUFFIX } from '../../constants/AccountPropertyConstants.ts'

import '@nextcloud/password-confirmation/dist/style.css'

/**
* Save the primary email of the user
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import { confirmPassword } from '@nextcloud/password-confirmation'
import { generateOcsUrl } from '@nextcloud/router'
import { SCOPE_SUFFIX } from '../../constants/AccountPropertyConstants.ts'

import '@nextcloud/password-confirmation/dist/style.css'

/**
* Save the primary account property value for the user
*
Expand Down
2 changes: 0 additions & 2 deletions apps/settings/src/service/ProfileService.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ import axios from '@nextcloud/axios'
import { confirmPassword } from '@nextcloud/password-confirmation'
import { generateOcsUrl } from '@nextcloud/router'

import '@nextcloud/password-confirmation/dist/style.css'

/**
* Save the visibility of the profile parameter
*
Expand Down
4 changes: 1 addition & 3 deletions apps/settings/src/store/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@
import axios from '@nextcloud/axios'
import { confirmPassword } from '@nextcloud/password-confirmation'

import '@nextcloud/password-confirmation/dist/style.css'

/**
* @param url
* @param {string} url - The url to sanitize
*/
function sanitize(url) {
return url.replace(/\/$/, '') // Remove last url slash
Expand Down
2 changes: 0 additions & 2 deletions apps/settings/src/store/authtoken.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import { generateUrl } from '@nextcloud/router'
import { defineStore } from 'pinia'
import logger from '../logger.ts'

import '@nextcloud/password-confirmation/dist/style.css'

const BASE_URL = generateUrl('/settings/personal/authtokens')

/**
Expand Down
2 changes: 0 additions & 2 deletions apps/sharebymail/src/components/AdminSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwit
import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'
import { logger } from '../logger.ts'
import '@nextcloud/password-confirmation/dist/style.css'
export default {
name: 'AdminSettings',
components: {
Expand Down
2 changes: 0 additions & 2 deletions apps/twofactor_backupcodes/src/views/PersonalSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
import { logger } from '../logger.ts'
import { print } from '../service/PrintService.js'
import '@nextcloud/password-confirmation/dist/style.css'
export default {
name: 'PersonalSettings',
components: {
Expand Down
2 changes: 0 additions & 2 deletions apps/workflowengine/src/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import Vue from 'vue'
import Vuex, { Store } from 'vuex'
import { getApiUrl } from './helpers/api.js'

import '@nextcloud/password-confirmation/dist/style.css'

Vue.use(Vuex)

const store = new Store({
Expand Down
2 changes: 1 addition & 1 deletion core/css/server.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/css/server.css.map

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion core/css/server.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
@use 'mobile';
@use 'tooltip';
// If you include .css, it will be imported as url
@use '../../node_modules/@nextcloud/dialogs/dist/style';
@use '../../node_modules/@nextcloud/dialogs/dist/style' as *;
@use '../../node_modules/@nextcloud/password-confirmation/dist/style' as *;
@use 'public';
7 changes: 5 additions & 2 deletions core/src/OC/password-confirmation.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@

import { confirmPassword, isPasswordConfirmationRequired } from '@nextcloud/password-confirmation'

import '@nextcloud/password-confirmation/dist/style.css'

/**
* @namespace OC.PasswordConfirmation
*/
export default {

/**
* @deprecated 28.0.0 use methods from '@nextcloud/password-confirmation'
*/
requiresPasswordConfirmation() {
return isPasswordConfirmationRequired()
},
Expand All @@ -20,6 +21,8 @@ export default {
* @param {Function} callback success callback function
* @param {object} options options currently not used by confirmPassword
* @param {Function} rejectCallback error callback function
*
* @deprecated 28.0.0 use methods from '@nextcloud/password-confirmation'
*/
requirePasswordConfirmation(callback, options, rejectCallback) {
confirmPassword().then(callback, rejectCallback)
Expand Down
13 changes: 0 additions & 13 deletions core/src/jquery/css/jquery.ocdialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,3 @@ body.theme--dark .oc-dialog-dim {
width: 100%;
max-width: 550px;
}

.oc-dialog.password-confirmation {
.oc-dialog-content {
width: auto;

input[type=password] {
width: 100%;
}
label {
display: none;
}
}
}
4 changes: 2 additions & 2 deletions cypress/e2e/files_external/files-user-credentials.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ describe('Files user credentials', { testIsolation: true }, () => {
cy.get('@storageDialog').should('not.exist')

// Storage dialog now closed, the user auth dialog should be visible
cy.findByRole('dialog', { name: 'Confirm your password' }).as('authDialog')
cy.findByRole('dialog', { name: 'Authentication required' }).as('authDialog')
cy.get('@authDialog').should('be.visible')
handlePasswordConfirmation(user1.password)

Expand Down Expand Up @@ -108,7 +108,7 @@ describe('Files user credentials', { testIsolation: true }, () => {
cy.get('@storageDialog').should('not.exist')

// Storage dialog now closed, the user auth dialog should be visible
cy.findByRole('dialog', { name: 'Confirm your password' }).as('authDialog')
cy.findByRole('dialog', { name: 'Authentication required' }).as('authDialog')
cy.get('@authDialog').should('be.visible')
handlePasswordConfirmation(user2.password)

Expand Down
6 changes: 3 additions & 3 deletions cypress/e2e/files_external/settings.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ describe('files_external settings', () => {
.click()
})

cy.findByRole('dialog', { name: 'Confirm your password' })
cy.findByRole('dialog', { name: 'Authentication required' })
.should('not.exist')
})

Expand All @@ -79,7 +79,7 @@ describe('files_external settings', () => {
.click()
})

cy.findByRole('dialog', { name: 'Confirm your password' })
cy.findByRole('dialog', { name: 'Authentication required' })
.should('not.exist')
})

Expand All @@ -98,7 +98,7 @@ describe('files_external settings', () => {
.click()
})

cy.findByRole('dialog', { name: 'Confirm your password' })
cy.findByRole('dialog', { name: 'Authentication required' })
.should('be.visible')
})
})
Expand Down
Loading
Loading