diff options
| author | dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2021-07-15 12:46:14 +0000 |
|---|---|---|
| committer | MichaIng <micha@dietpi.com> | 2021-07-23 15:56:28 +0200 |
| commit | 6e5191b7021b448a48d741233bd17ab3c222119f (patch) | |
| tree | 26c353643f5d1dd764d512e1fd15e15168d54346 /apps/settings/src/service | |
| parent | 229bfcbab56e2de473d2d34bb7d86b5665d4ab35 (diff) | |
| download | nextcloud-server-6e5191b7021b448a48d741233bd17ab3c222119f.tar.gz nextcloud-server-6e5191b7021b448a48d741233bd17ab3c222119f.zip | |
Bump @nextcloud/router from 1.2.0 to 2.0.0
Bumps [@nextcloud/router](https://github.com/nextcloud/nextcloud-router) from 1.2.0 to 2.0.0.
- [Release notes](https://github.com/nextcloud/nextcloud-router/releases)
- [Changelog](https://github.com/nextcloud/nextcloud-router/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/nextcloud-router/compare/v1.2.0...v2.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
Diffstat (limited to 'apps/settings/src/service')
| -rw-r--r-- | apps/settings/src/service/PersonalInfoService.js | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/apps/settings/src/service/PersonalInfoService.js b/apps/settings/src/service/PersonalInfoService.js index d033666817f..f5c010f5377 100644 --- a/apps/settings/src/service/PersonalInfoService.js +++ b/apps/settings/src/service/PersonalInfoService.js @@ -35,8 +35,7 @@ import { ACCOUNT_PROPERTY_ENUM, SCOPE_SUFFIX } from '../constants/AccountPropert */ export const savePrimaryEmail = async(email) => { const userId = getCurrentUser().uid - // TODO upgrade @nextcloud/router to v2.0 so we can remove the .slice() trailing slash hacks (same below) - const url = generateOcsUrl(`cloud/users/${userId}`, 2).slice(0, -1) + const url = generateOcsUrl('cloud/users/{userId}', { userId }) await confirmPassword() @@ -58,7 +57,7 @@ export const savePrimaryEmail = async(email) => { */ export const saveAdditionalEmail = async(email) => { const userId = getCurrentUser().uid - const url = generateOcsUrl(`cloud/users/${userId}`, 2).slice(0, -1) + const url = generateOcsUrl('cloud/users/{userId}', { userId }) await confirmPassword() @@ -78,7 +77,7 @@ export const saveAdditionalEmail = async(email) => { */ export const removeAdditionalEmail = async(email) => { const userId = getCurrentUser().uid - const url = generateOcsUrl(`cloud/users/${userId}/${ACCOUNT_PROPERTY_ENUM.EMAIL_COLLECTION}`, 2).slice(0, -1) + const url = generateOcsUrl('cloud/users/{userId}/{collection}', { userId, collection: ACCOUNT_PROPERTY_ENUM.EMAIL_COLLECTION }) await confirmPassword() @@ -99,7 +98,7 @@ export const removeAdditionalEmail = async(email) => { */ export const updateAdditionalEmail = async(prevEmail, newEmail) => { const userId = getCurrentUser().uid - const url = generateOcsUrl(`cloud/users/${userId}/${ACCOUNT_PROPERTY_ENUM.EMAIL_COLLECTION}`, 2).slice(0, -1) + const url = generateOcsUrl('cloud/users/{userId}/{collection}', { userId, collection: ACCOUNT_PROPERTY_ENUM.EMAIL_COLLECTION }) await confirmPassword() @@ -119,7 +118,7 @@ export const updateAdditionalEmail = async(prevEmail, newEmail) => { */ export const savePrimaryEmailScope = async(scope) => { const userId = getCurrentUser().uid - const url = generateOcsUrl(`cloud/users/${userId}`, 2).slice(0, -1) + const url = generateOcsUrl('cloud/users/{userId}', { userId }) await confirmPassword() @@ -140,7 +139,7 @@ export const savePrimaryEmailScope = async(scope) => { */ export const saveAdditionalEmailScope = async(email, scope) => { const userId = getCurrentUser().uid - const url = generateOcsUrl(`cloud/users/${userId}/${ACCOUNT_PROPERTY_ENUM.EMAIL_COLLECTION}${SCOPE_SUFFIX}`, 2).slice(0, -1) + const url = generateOcsUrl('cloud/users/{userId}/{collectionScope}', { userId, collectionScope: `${ACCOUNT_PROPERTY_ENUM.EMAIL_COLLECTION}${SCOPE_SUFFIX}` }) await confirmPassword() |