upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-11 14:54:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #27281 from nextcloud/dependabot/npm_and_yarn/nextcloud/router-2.0.0

Browse source
This commit is contained in:
John Molakvoæ 2021-07-24 13:11:53 +02:00 committed by GitHub
commit a6d91c2ccf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
142 changed files with 616 additions and 49299 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/accessibility/js/accessibility.js
View file

File diff suppressed because one or more lines are too long

2
apps/accessibility/js/accessibility.js.map
View file

File diff suppressed because one or more lines are too long

2
apps/accessibility/js/accessibilityoca.js
View file

File diff suppressed because one or more lines are too long

2
apps/accessibility/js/accessibilityoca.js.map
View file

File diff suppressed because one or more lines are too long

2
apps/accessibility/src/Accessibility.vue
View file

@ -125,7 +125,7 @@ export default {
try {
const isDelete = id === ''
await axios({
url: generateOcsUrl('apps/accessibility/api/v1/config', 2) + type,
url: generateOcsUrl('apps/accessibility/api/v1/config/{type}', { type }),
method: isDelete ? 'DELETE' : 'PUT',
data: {
value: id,

40
apps/comments/js/comments-app.js
View file

File diff suppressed because one or more lines are too long

2
apps/comments/js/comments-app.js.map
View file

File diff suppressed because one or more lines are too long

2
apps/comments/js/comments-tab.js
View file

@ -1,4 +1,4 @@
!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/js/",t(t.s=682)}({682:function(e,n){function r(e,n,t,r,o,i,u){try{var c=e[i](u),a=c.value}catch(e){return void t(e)}c.done?n(a):Promise.resolve(a).then(r,o)}
!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/js/",t(t.s=683)}({683:function(e,n){function r(e,n,t,r,o,i,u){try{var c=e[i](u),a=c.value}catch(e){return void t(e)}c.done?n(a):Promise.resolve(a).then(r,o)}
/**
* @copyright Copyright (c) 2020 John Molakvoæ <skjnldsv@protonmail.com>
*

2
apps/comments/js/comments-tab.js.map
View file

File diff suppressed because one or more lines are too long

6
apps/comments/js/comments.js
View file

@ -1,4 +1,4 @@
!function(e){var n={};function t(o){if(n[o])return n[o].exports;var i=n[o]={i:o,l:!1,exports:{}};return e[o].call(i.exports,i,i.exports,t),i.l=!0,i.exports}t.m=e,t.c=n,t.d=function(e,n,o){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:o})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(t.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var i in e)t.d(o,i,function(n){return e[n]}.bind(null,i));return o},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/js/",t(t.s=422)}({422:function(e,n,t){"use strict";t.r(n);t(423),t(424),t(425),t(426);
!function(e){var n={};function t(o){if(n[o])return n[o].exports;var i=n[o]={i:o,l:!1,exports:{}};return e[o].call(i.exports,i,i.exports,t),i.l=!0,i.exports}t.m=e,t.c=n,t.d=function(e,n,o){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:o})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(t.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var i in e)t.d(o,i,function(n){return e[n]}.bind(null,i));return o},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/js/",t(t.s=423)}({423:function(e,n,t){"use strict";t.r(n);t(424),t(425),t(426),t(427);
/**
* @copyright Copyright (c) 2016 Roeland Jago Douma <roeland@famdouma.nl>
*
@ -21,7 +21,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
window.OCA.Comments=OCA.Comments},423:function(e,n){
window.OCA.Comments=OCA.Comments},424:function(e,n){
/**
* Copyright (c) 2016 Vincent Petry <pvince81@owncloud.com>
*
@ -44,5 +44,5 @@ window.OCA.Comments=OCA.Comments},423:function(e,n){
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
OCA.Comments||(OCA.Comments={})},424:function(e,n){function t(e){return(t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}var o;o=Handlebars.template,(OCA.Comments.Templates=OCA.Comments.Templates||{}).filesplugin=o({compiler:[8,">= 4.3.0"],main:function(e,n,o,i,r){var s,a=null!=n?n:e.nullContext||{},l=e.hooks.helperMissing,m=e.escapeExpression,c=e.lookupProperty||function(e,n){if(Object.prototype.hasOwnProperty.call(e,n))return e[n]};return'<a class="action action-comment permanent" title="'+m("function"===t(s=null!=(s=c(o,"countMessage")||(null!=n?c(n,"countMessage"):n))?s:l)?s.call(a,{name:"countMessage",hash:{},data:r,loc:{start:{line:1,column:50},end:{line:1,column:66}}}):s)+'" href="#">\n\t<img class="svg" src="'+m("function"===t(s=null!=(s=c(o,"iconUrl")||(null!=n?c(n,"iconUrl"):n))?s:l)?s.call(a,{name:"iconUrl",hash:{},data:r,loc:{start:{line:2,column:23},end:{line:2,column:34}}}):s)+'"/>\n</a>\n'},useData:!0})},425:function(e,o){_.extend(OC.Files.Client,{PROPERTY_COMMENTS_UNREAD:"{"+OC.Files.Client.NS_OWNCLOUD+"}comments-unread"}),OCA.Comments=_.extend({},OCA.Comments),OCA.Comments||(OCA.Comments={}),OCA.Comments.FilesPlugin={ignoreLists:["trashbin","files.public"],_formatCommentCount:function(e){return OCA.Comments.Templates.filesplugin({count:e,countMessage:n("comments","%n unread comment","%n unread comments",e),iconUrl:OC.imagePath("core","actions/comment")})},attach:function(e){var o=this;if(!(this.ignoreLists.indexOf(e.id)>=0)){var i=e._getWebdavProperties;e._getWebdavProperties=function(){var e=i.apply(this,arguments);return e.push(OC.Files.Client.PROPERTY_COMMENTS_UNREAD),e},e.filesClient.addFileInfoParser((function(e){var n={},t=e.propStat[0].properties[OC.Files.Client.PROPERTY_COMMENTS_UNREAD];return _.isUndefined(t)||""===t||(n.commentsUnread=parseInt(t,10)),n})),e.$el.addClass("has-comments");var r=e._createRow;e._createRow=function(e){var n=r.apply(this,arguments);return e.commentsUnread&&n.attr("data-comments-unread",e.commentsUnread),n},e.fileActions.registerAction({name:"Comment",displayName:function(e){if(e&&e.$file){var o=parseInt(e.$file.data("comments-unread"),10);if(o>=0)return n("comments","1 new comment","{unread} new comments",o,{unread:o})}return t("comments","Comment")},mime:"all",order:-140,iconClass:"icon-comment",permissions:OC.PERMISSION_READ,type:OCA.Files.FileActions.TYPE_INLINE,render:function(e,n,t){var i=t.$file.data("comments-unread");if(i){var r=$(o._formatCommentCount(i));return t.$file.find("a.name>span.fileactions").append(r),r}return""},actionHandler:function(e,n){n.$file.find(".action-comment").tooltip("hide"),OCA.Files.Sidebar.setActiveTab("comments"),OCA.Files.Sidebar.open("/"+e)}});var s=e.elementToFile;e.elementToFile=function(e){var n=s.apply(this,arguments),t=e.data("comments-unread");return t&&(n.commentsUnread=t),n}}}},OC.Plugins.register("OCA.Files.FileList",OCA.Comments.FilesPlugin)},426:function(e,n){OCA.Comments.ActivityTabViewPlugin={prepareModelForDisplay:function(e,n,t){if("comments"===e.get("app")&&"comments"===e.get("type")&&"ActivityTabView"===t&&(n.addClass("comment"),e.get("message")&&this._isLong(e.get("message")))){n.addClass("collapsed");var o=$("<div>").addClass("message-overlay");n.find(".activitymessage").after(o),n.on("click",this._onClickCollapsedComment)}},_onClickCollapsedComment:function(e){var n=$(e.target);n.is(".comment")||(n=n.closest(".comment")),n.removeClass("collapsed")},_isLong:function(e){return e.length>250||(e.match(/\n/g)||[]).length>1}},OC.Plugins.register("OCA.Activity.RenderingPlugins",OCA.Comments.ActivityTabViewPlugin)}});
OCA.Comments||(OCA.Comments={})},425:function(e,n){function t(e){return(t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}var o;o=Handlebars.template,(OCA.Comments.Templates=OCA.Comments.Templates||{}).filesplugin=o({compiler:[8,">= 4.3.0"],main:function(e,n,o,i,r){var s,a=null!=n?n:e.nullContext||{},l=e.hooks.helperMissing,m=e.escapeExpression,c=e.lookupProperty||function(e,n){if(Object.prototype.hasOwnProperty.call(e,n))return e[n]};return'<a class="action action-comment permanent" title="'+m("function"===t(s=null!=(s=c(o,"countMessage")||(null!=n?c(n,"countMessage"):n))?s:l)?s.call(a,{name:"countMessage",hash:{},data:r,loc:{start:{line:1,column:50},end:{line:1,column:66}}}):s)+'" href="#">\n\t<img class="svg" src="'+m("function"===t(s=null!=(s=c(o,"iconUrl")||(null!=n?c(n,"iconUrl"):n))?s:l)?s.call(a,{name:"iconUrl",hash:{},data:r,loc:{start:{line:2,column:23},end:{line:2,column:34}}}):s)+'"/>\n</a>\n'},useData:!0})},426:function(e,o){_.extend(OC.Files.Client,{PROPERTY_COMMENTS_UNREAD:"{"+OC.Files.Client.NS_OWNCLOUD+"}comments-unread"}),OCA.Comments=_.extend({},OCA.Comments),OCA.Comments||(OCA.Comments={}),OCA.Comments.FilesPlugin={ignoreLists:["trashbin","files.public"],_formatCommentCount:function(e){return OCA.Comments.Templates.filesplugin({count:e,countMessage:n("comments","%n unread comment","%n unread comments",e),iconUrl:OC.imagePath("core","actions/comment")})},attach:function(e){var o=this;if(!(this.ignoreLists.indexOf(e.id)>=0)){var i=e._getWebdavProperties;e._getWebdavProperties=function(){var e=i.apply(this,arguments);return e.push(OC.Files.Client.PROPERTY_COMMENTS_UNREAD),e},e.filesClient.addFileInfoParser((function(e){var n={},t=e.propStat[0].properties[OC.Files.Client.PROPERTY_COMMENTS_UNREAD];return _.isUndefined(t)||""===t||(n.commentsUnread=parseInt(t,10)),n})),e.$el.addClass("has-comments");var r=e._createRow;e._createRow=function(e){var n=r.apply(this,arguments);return e.commentsUnread&&n.attr("data-comments-unread",e.commentsUnread),n},e.fileActions.registerAction({name:"Comment",displayName:function(e){if(e&&e.$file){var o=parseInt(e.$file.data("comments-unread"),10);if(o>=0)return n("comments","1 new comment","{unread} new comments",o,{unread:o})}return t("comments","Comment")},mime:"all",order:-140,iconClass:"icon-comment",permissions:OC.PERMISSION_READ,type:OCA.Files.FileActions.TYPE_INLINE,render:function(e,n,t){var i=t.$file.data("comments-unread");if(i){var r=$(o._formatCommentCount(i));return t.$file.find("a.name>span.fileactions").append(r),r}return""},actionHandler:function(e,n){n.$file.find(".action-comment").tooltip("hide"),OCA.Files.Sidebar.setActiveTab("comments"),OCA.Files.Sidebar.open("/"+e)}});var s=e.elementToFile;e.elementToFile=function(e){var n=s.apply(this,arguments),t=e.data("comments-unread");return t&&(n.commentsUnread=t),n}}}},OC.Plugins.register("OCA.Files.FileList",OCA.Comments.FilesPlugin)},427:function(e,n){OCA.Comments.ActivityTabViewPlugin={prepareModelForDisplay:function(e,n,t){if("comments"===e.get("app")&&"comments"===e.get("type")&&"ActivityTabView"===t&&(n.addClass("comment"),e.get("message")&&this._isLong(e.get("message")))){n.addClass("collapsed");var o=$("<div>").addClass("message-overlay");n.find(".activitymessage").after(o),n.on("click",this._onClickCollapsedComment)}},_onClickCollapsedComment:function(e){var n=$(e.target);n.is(".comment")||(n=n.closest(".comment")),n.removeClass("collapsed")},_isLong:function(e){return e.length>250||(e.match(/\n/g)||[]).length>1}},OC.Plugins.register("OCA.Activity.RenderingPlugins",OCA.Comments.ActivityTabViewPlugin)}});
//# sourceMappingURL=comments.js.map

2
apps/comments/js/comments.js.map
View file

File diff suppressed because one or more lines are too long

2
apps/comments/src/views/Comments.vue
View file

@ -221,7 +221,7 @@ export default {
* @param {Function} callback the callback to process the results with
*/
async autoComplete(search, callback) {
const results = await axios.get(generateOcsUrl('core', 2) + 'autocomplete/get', {
const results = await axios.get(generateOcsUrl('core/autocomplete/get'), {
params: {
search,
itemType: 'files',

20
apps/dashboard/js/dashboard.js
View file

File diff suppressed because one or more lines are too long

2
apps/dashboard/js/dashboard.js.map
View file

File diff suppressed because one or more lines are too long

4
apps/dav/js/settings-admin-caldav.js
View file

File diff suppressed because one or more lines are too long

2
apps/dav/js/settings-admin-caldav.js.map
View file

File diff suppressed because one or more lines are too long

4
apps/files/js/dist/files-app-settings.js vendored
View file

File diff suppressed because one or more lines are too long

2
apps/files/js/dist/files-app-settings.js.map vendored
View file

File diff suppressed because one or more lines are too long

24
apps/files/js/dist/personal-settings.js vendored
View file

File diff suppressed because one or more lines are too long

2
apps/files/js/dist/personal-settings.js.map vendored
View file

File diff suppressed because one or more lines are too long

20
apps/files/js/dist/sidebar.js vendored
View file

File diff suppressed because one or more lines are too long

2
apps/files/js/dist/sidebar.js.map vendored
View file

File diff suppressed because one or more lines are too long

18
apps/files/js/dist/templates.js vendored
View file

File diff suppressed because one or more lines are too long

2
apps/files/js/dist/templates.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
apps/files/src/components/TransferOwnershipDialogue.vue
View file

@ -162,7 +162,7 @@ export default {
this.loadingUsers = true
try {
const response = await axios.get(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'sharees', {
const response = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees'), {
params: {
format: 'json',
itemType: 'file',
@ -197,7 +197,7 @@ export default {
}
logger.debug('submit transfer ownership form', data)
const url = generateOcsUrl('apps/files/api/v1/', 2) + 'transferownership'
const url = generateOcsUrl('apps/files/api/v1//transferownership')
axios.post(url, data)
.then(resp => resp.data)

2
apps/files/src/services/Templates.js
View file

@ -24,6 +24,6 @@ import { generateOcsUrl } from '@nextcloud/router'
import axios from '@nextcloud/axios'
export const getTemplates = async function() {
const response = await axios.get(generateOcsUrl('apps/files/api/v1', 2) + 'templates')
const response = await axios.get(generateOcsUrl('apps/files/api/v1/templates'))
return response.data.ocs.data
}

2
apps/files/src/templates.js
View file

@ -127,7 +127,7 @@ const initTemplatesFolder = async function(name) {
const templatePath = (getCurrentDirectory() + `/${name}`).replace('//', '/')
try {
logger.debug('Initializing the templates directory', { templatePath })
const response = await axios.post(generateOcsUrl('apps/files/api/v1/templates', 2) + 'path', {
const response = await axios.post(generateOcsUrl('apps/files/api/v1/templates/path'), {
templatePath,
copySystemTemplates: true,
})

2
apps/files/src/views/TemplatePicker.vue
View file

@ -199,7 +199,7 @@ export default {
const fileList = OCA?.Files?.App?.currentFileList
try {
const response = await axios.post(generateOcsUrl('apps/files/api/v1/templates', 2) + 'create', {
const response = await axios.post(generateOcsUrl('apps/files/api/v1/templates/create'), {
filePath: `${currentDirectory}/${this.name}`,
templatePath: this.selectedTemplate?.filename,
templateType: this.selectedTemplate?.templateType,

2
apps/files_external/js/mountsfilelist.js
View file

@ -92,7 +92,7 @@
this._setCurrentDir('/', false);
this._reloadCall = $.ajax({
url: OC.linkToOCS('apps/files_external/api/v1') + 'mounts',
url: OC.linkToOCS('apps/files_external/api/v1/mounts'),
data: {
format: 'json'
},

2
apps/files_external/js/statusmanager.js
View file

@ -141,7 +141,7 @@ OCA.Files_External.StatusManager = {
self.isGetMountPointListRunning = true;
$.ajax({
type: 'GET',
url: OC.linkToOCS('apps/files_external/api/v1') + 'mounts?format=json',
url: OC.linkToOCS('apps/files_external/api/v1/mounts?format=json'),
success: function (response) {
self.mountPointList = [];
_.each(response.ocs.data, function (mount) {

3
apps/files_external/tests/js/mountsfilelistSpec.js
View file

@ -117,8 +117,7 @@ describe('OCA.Files_External.FileList tests', function() {
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
expect(request.url).toEqual(
OC.linkToOCS('apps/files_external/api/v1') +
'mounts?format=json'
OC.linkToOCS('apps/files_external/api/v1/mounts?format=json')
);
fakeServer.requests[0].respond(

6
apps/files_sharing/js/app.js
View file

@ -274,7 +274,7 @@ OCA.Sharing.App = {
type: OCA.Files.FileActions.TYPE_INLINE,
actionHandler(fileName, context) {
const shareId = context.$file.data('shareId')
$.post(OC.linkToOCS('apps/files_sharing/api/v1/deletedshares', 2) + shareId)
$.post(OC.linkToOCS('apps/files_sharing/api/v1/deletedshares/{shareId}', { shareId }))
.success(function(result) {
context.fileList.remove(context.fileInfoModel.attributes.name)
}).fail(function() {
@ -296,7 +296,7 @@ OCA.Sharing.App = {
type: OCA.Files.FileActions.TYPE_INLINE,
actionHandler(fileName, context) {
const shareId = context.$file.data('shareId')
$.post(OC.linkToOCS('apps/files_sharing/api/v1/shares/pending', 2) + shareId)
$.post(OC.linkToOCS('apps/files_sharing/api/v1/shares/pending/{shareId}', { shareId }))
.success(function(result) {
context.fileList.remove(context.fileInfoModel.attributes.name)
}).fail(function() {
@ -314,7 +314,7 @@ OCA.Sharing.App = {
actionHandler(fileName, context) {
const shareId = context.$file.data('shareId')
$.ajax({
url: OC.linkToOCS('apps/files_sharing/api/v1/shares', 2) + shareId,
url: OC.linkToOCS('apps/files_sharing/api/v1/shares/{shareId}', { shareId }),
type: 'DELETE',
}).success(function(result) {
context.fileList.remove(context.fileInfoModel.attributes.name)

8
apps/files_sharing/js/dist/additionalScripts.js vendored
View file

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/additionalScripts.js.map vendored
View file

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/collaboration.js vendored
View file

@ -1,4 +1,4 @@
!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/js/",t(t.s=154)}({154:function(e,n,r){
!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/js/",t(t.s=152)}({152:function(e,n,r){
/**
* @copyright Copyright (c) 2016 John Molakvoæ <skjnldsv@protonmail.com>
*

2
apps/files_sharing/js/dist/collaboration.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
apps/files_sharing/js/dist/files_sharing.js vendored
View file

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/files_sharing.js.map vendored
View file

File diff suppressed because one or more lines are too long

102
apps/files_sharing/js/dist/files_sharing_tab.js vendored
View file

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/files_sharing_tab.js.map vendored
View file

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/main.js vendored
View file

@ -1,4 +1,4 @@
!function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="/js/",r(r.s=470)}({470:function(e,t){
!function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="/js/",r(r.s=471)}({471:function(e,t){
/**
* @copyright Copyright (c) 2019 John Molakvoæ <skjnldsv@protonmail.com>
*

2
apps/files_sharing/js/dist/main.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
apps/files_sharing/js/dist/personal-settings.js vendored
View file

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/personal-settings.js.map vendored
View file

File diff suppressed because one or more lines are too long

8
apps/files_sharing/js/sharedfilelist.js
View file

@ -188,7 +188,7 @@
var promises = []
var deletedShares = {
url: OC.linkToOCS('apps/files_sharing/api/v1', 2) + 'deletedshares',
url: OC.linkToOCS('apps/files_sharing/api/v1/deletedshares'),
/* jshint camelcase: false */
data: {
format: 'json',
@ -201,7 +201,7 @@
}
var pendingShares = {
url: OC.linkToOCS('apps/files_sharing/api/v1/shares', 2) + 'pending',
url: OC.linkToOCS('apps/files_sharing/api/v1/shares/pending'),
/* jshint camelcase: false */
data: {
format: 'json'
@ -213,7 +213,7 @@
}
var shares = {
url: OC.linkToOCS('apps/files_sharing/api/v1') + 'shares',
url: OC.linkToOCS('apps/files_sharing/api/v1/shares'),
/* jshint camelcase: false */
data: {
format: 'json',
@ -227,7 +227,7 @@
}
var remoteShares = {
url: OC.linkToOCS('apps/files_sharing/api/v1') + 'remote_shares',
url: OC.linkToOCS('apps/files_sharing/api/v1/remote_shares'),
/* jshint camelcase: false */
data: {
format: 'json',

4
apps/files_sharing/src/components/SharingInput.vue
View file

@ -199,7 +199,7 @@ export default {
let request = null
try {
request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'sharees', {
request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees'), {
params: {
format: 'json',
itemType: this.fileInfo.type === 'dir' ? 'folder' : 'file',
@ -290,7 +290,7 @@ export default {
let request = null
try {
request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'sharees_recommended', {
request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees_recommended'), {
params: {
format: 'json',
itemType: this.fileInfo.type,

2
apps/files_sharing/src/mixins/ShareRequests.js
View file

@ -30,7 +30,7 @@ import { generateOcsUrl } from '@nextcloud/router'
import axios from '@nextcloud/axios'
import Share from '../models/Share'
const shareUrl = generateOcsUrl('apps/files_sharing/api/v1', 2) + 'shares'
const shareUrl = generateOcsUrl('apps/files_sharing/api/v1/shares')
const headers = {
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
}

4
apps/files_sharing/src/views/SharingInherited.vue
View file

@ -128,8 +128,8 @@ export default {
async fetchInheritedShares() {
this.loading = true
try {
const url = generateOcsUrl(`apps/files_sharing/api/v1/shares/inherited?format=json&path=${encodeURIComponent(this.fullPath)}`, 2)
const shares = await axios.get(url.replace(/\/$/, ''))
const url = generateOcsUrl('apps/files_sharing/api/v1/shares/inherited?format=json&path={path}', { path: this.fullPath })
const shares = await axios.get(url)
this.shares = shares.data.ocs.data
.map(share => new Share(share))
.sort((a, b) => b.createdTime - a.createdTime)

2
apps/files_sharing/src/views/SharingTab.vue
View file

@ -175,7 +175,7 @@ export default {
this.loading = true
// init params
const shareUrl = generateOcsUrl('apps/files_sharing/api/v1', 2) + 'shares'
const shareUrl = generateOcsUrl('apps/files_sharing/api/v1/shares')
const format = 'json'
// TODO: replace with proper getFUllpath implementation of our own FileInfo model
const path = (this.fileInfo.path + '/' + this.fileInfo.name).replace('//', '/')

4
apps/oauth2/js/oauth2.js
View file

File diff suppressed because one or more lines are too long

2
apps/oauth2/js/oauth2.js.map
View file

File diff suppressed because one or more lines are too long

2
apps/settings/js/apps.js
View file

@ -2,7 +2,7 @@
OC.Settings = OC.Settings || {};
OC.Settings.Apps = OC.Settings.Apps || {
rebuildNavigation: function() {
$.getJSON(OC.linkToOCS('core/navigation', 2) + 'apps?format=json').done(function(response){
$.getJSON(OC.linkToOCS('core/navigation/apps?format=json')).done(function(response){
if(response.ocs.meta.status === 'ok') {
var addedApps = {};
var navEntries = response.ocs.data;

2
apps/settings/js/settings.js
View file

@ -35,7 +35,7 @@ OC.Settings = _.extend(OC.Settings, {
if ($elements.length > 0) {
// Let's load the data and THEN init our select
$.ajax({
url: OC.linkToOCS('cloud/groups', 2) + 'details',
url: OC.linkToOCS('cloud/groups/details'),
dataType: 'json',
success: function(data) {
var results = [];

4
apps/settings/js/settings/personalInfo.js
View file

@ -222,7 +222,7 @@ window.addEventListener('DOMContentLoaded', function () {
user = OC.getCurrentUser();
$.ajax({
url: OC.linkToOCS('cloud/users', 2) + user['uid'],
url: OC.linkToOCS('cloud/users/{uid}', { uid: user.uid }),
method: 'PUT',
data: {
key: 'language',
@ -248,7 +248,7 @@ window.addEventListener('DOMContentLoaded', function () {
user = OC.getCurrentUser();
$.ajax({
url: OC.linkToOCS('cloud/users', 2) + user['uid'],
url: OC.linkToOCS('cloud/users/{uid}', { uid: user.uid }),
method: 'PUT',
data: {
key: 'locale',

24
apps/settings/js/vue-settings-admin-security.js
View file

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-settings-admin-security.js.map
View file

File diff suppressed because one or more lines are too long

4
apps/settings/js/vue-settings-apps-c40bdf96fd75e3177062.js → apps/settings/js/vue-settings-apps-369074b0c04241a9da7c.js
View file

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-settings-apps-c40bdf96fd75e3177062.js.map → apps/settings/js/vue-settings-apps-369074b0c04241a9da7c.js.map
View file

File diff suppressed because one or more lines are too long

3641
apps/settings/js/vue-settings-apps-813af194525808bb5199.js
View file

File diff suppressed because it is too large Load diff

1
apps/settings/js/vue-settings-apps-813af194525808bb5199.js.map
View file

File diff suppressed because one or more lines are too long

10
apps/settings/js/vue-settings-apps-users-management.js
View file

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-settings-apps-users-management.js.map
View file

File diff suppressed because one or more lines are too long

4
apps/settings/js/vue-settings-nextcloud-pdf.js
View file

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-settings-nextcloud-pdf.js.map
View file

File diff suppressed because one or more lines are too long

24
apps/settings/js/vue-settings-personal-info.js
View file

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-settings-personal-info.js.map
View file

File diff suppressed because one or more lines are too long

60
apps/settings/js/vue-settings-personal-security.js
View file

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-settings-personal-security.js.map
View file

File diff suppressed because one or more lines are too long

22
apps/settings/js/vue-settings-personal-webauthn.js
View file

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-settings-personal-webauthn.js.map
View file

File diff suppressed because one or more lines are too long

5046
apps/settings/js/vue-settings-users-5319ff40d0c0722ede29.js
View file

File diff suppressed because it is too large Load diff

1
apps/settings/js/vue-settings-users-5319ff40d0c0722ede29.js.map
View file

File diff suppressed because one or more lines are too long

6
apps/settings/js/vue-settings-users-1562cc22cc8debf36126.js → apps/settings/js/vue-settings-users-5e2b31904af8fdf747d3.js
View file

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-settings-users-1562cc22cc8debf36126.js.map → apps/settings/js/vue-settings-users-5e2b31904af8fdf747d3.js.map
View file

File diff suppressed because one or more lines are too long

25
apps/settings/js/vue-settings-users-8f20d276d7f90eefba3b.js
View file

File diff suppressed because one or more lines are too long

1
apps/settings/js/vue-settings-users-8f20d276d7f90eefba3b.js.map
View file

File diff suppressed because one or more lines are too long

5054
apps/settings/js/vue-settings-users-970c79d730513bbc0cb7.js
View file

File diff suppressed because it is too large Load diff

1
apps/settings/js/vue-settings-users-970c79d730513bbc0cb7.js.map
View file

File diff suppressed because one or more lines are too long

12
apps/settings/js/vue-vendors-settings-apps-2117eac14733cf446305.js → apps/settings/js/vue-vendors-settings-apps-3ddb1330e314bc7d85d7.js
View file

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-vendors-settings-apps-2117eac14733cf446305.js.map → apps/settings/js/vue-vendors-settings-apps-3ddb1330e314bc7d85d7.js.map
View file

File diff suppressed because one or more lines are too long

4549
apps/settings/js/vue-vendors-settings-apps-ac32580e7750da6e7402.js
View file

File diff suppressed because one or more lines are too long

1
apps/settings/js/vue-vendors-settings-apps-ac32580e7750da6e7402.js.map
View file

File diff suppressed because one or more lines are too long

22336
apps/settings/js/vue-vendors-settings-apps-settings-users-1d706fbbfc1e01b88326.js
View file

File diff suppressed because one or more lines are too long

1
apps/settings/js/vue-vendors-settings-apps-settings-users-1d706fbbfc1e01b88326.js.map
View file

File diff suppressed because one or more lines are too long

30
apps/settings/js/vue-vendors-settings-apps-settings-users-fb9182a2c9e533a6f900.js → apps/settings/js/vue-vendors-settings-apps-settings-users-c49169f7e498201b4a02.js
View file

File diff suppressed because one or more lines are too long

1
apps/settings/js/vue-vendors-settings-apps-settings-users-c49169f7e498201b4a02.js.map Normal file
View file

File diff suppressed because one or more lines are too long

1
apps/settings/js/vue-vendors-settings-apps-settings-users-fb9182a2c9e533a6f900.js.map
View file

File diff suppressed because one or more lines are too long

8060
apps/settings/js/vue-vendors-settings-users-17e94c3ee0cd7b077ae0.js
View file

File diff suppressed because one or more lines are too long

1
apps/settings/js/vue-vendors-settings-users-17e94c3ee0cd7b077ae0.js.map
View file

File diff suppressed because one or more lines are too long

42
apps/settings/js/vue-vendors-settings-users-a869065d736b7445875c.js → apps/settings/js/vue-vendors-settings-users-e8590d3870fc8df05e65.js
View file

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-vendors-settings-users-a869065d736b7445875c.js.map → apps/settings/js/vue-vendors-settings-users-e8590d3870fc8df05e65.js.map
View file

File diff suppressed because one or more lines are too long

2
apps/settings/src/components/AdminTwoFactor.vue
View file

@ -125,7 +125,7 @@ export default {
methods: {
searchGroup: _.debounce(function(query) {
this.loadingGroups = true
axios.get(generateOcsUrl(`cloud/groups?offset=0&search=${encodeURIComponent(query)}&limit=20`, 2))
axios.get(generateOcsUrl('cloud/groups?offset=0&search={query}&limit=20', { query }))
.then(res => res.data.ocs)
.then(ocs => ocs.data.groups)
.then(groups => { this.groups = _.sortedUniq(_.uniq(this.groups.concat(groups))) })

13
apps/settings/src/service/PersonalInfoService.js
View file

@ -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()

2
apps/settings/src/store/oc.js
View file

@ -40,7 +40,7 @@ const actions = {
*/
setAppConfig(context, { app, key, value }) {
return api.requireAdmin().then((response) => {
return api.post(generateOcsUrl(`apps/provisioning_api/api/v1/config/apps/${app}/${key}`, 2), { value })
return api.post(generateOcsUrl('apps/provisioning_api/api/v1/config/apps/{app}/{key}', { app, key }), { value })
.catch((error) => { throw error })
}).catch((error) => context.commit('API_FAILURE', { app, key, value, error }))
},

36
apps/settings/src/store/users.js
View file

@ -220,7 +220,7 @@ const actions = {
search = typeof search === 'string' ? search : ''
group = typeof group === 'string' ? group : ''
if (group !== '') {
return api.get(generateOcsUrl(`cloud/groups/${encodeURIComponent(encodeURIComponent(group))}/users/details?offset=${offset}&limit=${limit}&search=${search}`, 2), {
return api.get(generateOcsUrl('cloud/groups/{group}/users/details?offset={offset}&limit={limit}&search={search}', { group: encodeURIComponent(group), offset, limit, search }), {
cancelToken: searchRequestCancelSource.token,
})
.then((response) => {
@ -237,7 +237,7 @@ const actions = {
})
}
return api.get(generateOcsUrl(`cloud/users/details?offset=${offset}&limit=${limit}&search=${search}`, 2), {
return api.get(generateOcsUrl('cloud/users/details?offset={offset}&limit={limit}&search={search}', { offset, limit, search }), {
cancelToken: searchRequestCancelSource.token,
})
.then((response) => {
@ -257,7 +257,7 @@ const actions = {
getGroups(context, { offset, limit, search }) {
search = typeof search === 'string' ? search : ''
const limitParam = limit === -1 ? '' : `&limit=${limit}`
return api.get(generateOcsUrl(`cloud/groups?offset=${offset}&search=${search}${limitParam}`, 2))
return api.get(generateOcsUrl('cloud/groups?offset={offset}&search={search}', { offset, search }) + limitParam)
.then((response) => {
if (Object.keys(response.data.ocs.data.groups).length > 0) {
response.data.ocs.data.groups.forEach(function(group) {
@ -281,7 +281,7 @@ const actions = {
*/
getUsersFromList(context, { offset, limit, search }) {
search = typeof search === 'string' ? search : ''
return api.get(generateOcsUrl(`cloud/users/details?offset=${offset}&limit=${limit}&search=${search}`, 2))
return api.get(generateOcsUrl('cloud/users/details?offset={offset}&limit={limit}&search={search}', { offset, limit, search }))
.then((response) => {
if (Object.keys(response.data.ocs.data.users).length > 0) {
context.commit('appendUsers', response.data.ocs.data.users)
@ -302,7 +302,7 @@ const actions = {
* @returns {Promise}
*/
getUsersFromGroup(context, { groupid, offset, limit }) {
return api.get(generateOcsUrl(`cloud/users/${encodeURIComponent(encodeURIComponent(groupid))}/details?offset=${offset}&limit=${limit}`, 2))
return api.get(generateOcsUrl('cloud/users/{groupId}/details?offset={offset}&limit={limit}', { groupId: encodeURIComponent(groupid), offset, limit }))
.then((response) => context.commit('getUsersFromList', response.data.ocs.data.users))
.catch((error) => context.commit('API_FAILURE', error))
},
@ -324,7 +324,7 @@ const actions = {
*/
addGroup(context, gid) {
return api.requireAdmin().then((response) => {
return api.post(generateOcsUrl('cloud/groups', 2), { groupid: gid })
return api.post(generateOcsUrl('cloud/groups'), { groupid: gid })
.then((response) => {
context.commit('addGroup', { gid, displayName: gid })
return { gid, displayName: gid }
@ -347,7 +347,7 @@ const actions = {
*/
removeGroup(context, gid) {
return api.requireAdmin().then((response) => {
return api.delete(generateOcsUrl(`cloud/groups/${encodeURIComponent(encodeURIComponent(gid))}`, 2))
return api.delete(generateOcsUrl('cloud/groups/{groupId}', { groupId: encodeURIComponent(gid) }))
.then((response) => context.commit('removeGroup', gid))
.catch((error) => { throw error })
}).catch((error) => context.commit('API_FAILURE', { gid, error }))
@ -364,7 +364,7 @@ const actions = {
*/
addUserGroup(context, { userid, gid }) {
return api.requireAdmin().then((response) => {
return api.post(generateOcsUrl(`cloud/users/${userid}/groups`, 2), { groupid: gid })
return api.post(generateOcsUrl('cloud/users/{userid}/groups', { userid }), { groupid: gid })
.then((response) => context.commit('addUserGroup', { userid, gid }))
.catch((error) => { throw error })
}).catch((error) => context.commit('API_FAILURE', { userid, error }))
@ -381,7 +381,7 @@ const actions = {
*/
removeUserGroup(context, { userid, gid }) {
return api.requireAdmin().then((response) => {
return api.delete(generateOcsUrl(`cloud/users/${userid}/groups`, 2), { groupid: gid })
return api.delete(generateOcsUrl('cloud/users/{userid}/groups', { userid }), { groupid: gid })
.then((response) => context.commit('removeUserGroup', { userid, gid }))
.catch((error) => { throw error })
}).catch((error) => {
@ -403,7 +403,7 @@ const actions = {
*/
addUserSubAdmin(context, { userid, gid }) {
return api.requireAdmin().then((response) => {
return api.post(generateOcsUrl(`cloud/users/${userid}/subadmins`, 2), { groupid: gid })
return api.post(generateOcsUrl('cloud/users/{userid}/subadmins', { userid }), { groupid: gid })
.then((response) => context.commit('addUserSubAdmin', { userid, gid }))
.catch((error) => { throw error })
}).catch((error) => context.commit('API_FAILURE', { userid, error }))
@ -420,7 +420,7 @@ const actions = {
*/
removeUserSubAdmin(context, { userid, gid }) {
return api.requireAdmin().then((response) => {
return api.delete(generateOcsUrl(`cloud/users/${userid}/subadmins`, 2), { groupid: gid })
return api.delete(generateOcsUrl('cloud/users/{userid}/subadmins', { userid }), { groupid: gid })
.then((response) => context.commit('removeUserSubAdmin', { userid, gid }))
.catch((error) => { throw error })
}).catch((error) => context.commit('API_FAILURE', { userid, error }))
@ -435,7 +435,7 @@ const actions = {
*/
wipeUserDevices(context, userid) {
return api.requireAdmin().then((response) => {
return api.post(generateOcsUrl(`cloud/users/${userid}/wipe`, 2))
return api.post(generateOcsUrl('cloud/users/{userid}/wipe', { userid }))
.catch((error) => { throw error })
}).catch((error) => context.commit('API_FAILURE', { userid, error }))
},
@ -449,7 +449,7 @@ const actions = {
*/
deleteUser(context, userid) {
return api.requireAdmin().then((response) => {
return api.delete(generateOcsUrl(`cloud/users/${userid}`, 2))
return api.delete(generateOcsUrl('cloud/users/{userid}', { userid }))
.then((response) => context.commit('deleteUser', userid))
.catch((error) => { throw error })
}).catch((error) => context.commit('API_FAILURE', { userid, error }))
@ -471,7 +471,7 @@ const actions = {
*/
addUser({ commit, dispatch }, { userid, password, displayName, email, groups, subadmin, quota, language }) {
return api.requireAdmin().then((response) => {
return api.post(generateOcsUrl('cloud/users', 2), { userid, password, displayName, email, groups, subadmin, quota, language })
return api.post(generateOcsUrl('cloud/users'), { userid, password, displayName, email, groups, subadmin, quota, language })
.then((response) => dispatch('addUserData', userid || response.data.ocs.data.id))
.catch((error) => { throw error })
}).catch((error) => {
@ -489,7 +489,7 @@ const actions = {
*/
addUserData(context, userid) {
return api.requireAdmin().then((response) => {
return api.get(generateOcsUrl(`cloud/users/${userid}`, 2))
return api.get(generateOcsUrl('cloud/users/{userid}', { userid }))
.then((response) => context.commit('addUserData', response))
.catch((error) => { throw error })
}).catch((error) => context.commit('API_FAILURE', { userid, error }))
@ -506,7 +506,7 @@ const actions = {
enableDisableUser(context, { userid, enabled = true }) {
const userStatus = enabled ? 'enable' : 'disable'
return api.requireAdmin().then((response) => {
return api.put(generateOcsUrl(`cloud/users/${userid}/${userStatus}`, 2))
return api.put(generateOcsUrl('cloud/users/{userid}/{userStatus}', { userid, userStatus }))
.then((response) => context.commit('enableDisableUser', { userid, enabled }))
.catch((error) => { throw error })
}).catch((error) => context.commit('API_FAILURE', { userid, error }))
@ -533,7 +533,7 @@ const actions = {
)
) {
return api.requireAdmin().then((response) => {
return api.put(generateOcsUrl(`cloud/users/${userid}`, 2), { key, value })
return api.put(generateOcsUrl('cloud/users/{userid}', { userid }), { key, value })
.then((response) => context.commit('setUserData', { userid, key, value }))
.catch((error) => { throw error })
}).catch((error) => context.commit('API_FAILURE', { userid, error }))
@ -551,7 +551,7 @@ const actions = {
*/
sendWelcomeMail(context, userid) {
return api.requireAdmin().then((response) => {
return api.post(generateOcsUrl(`cloud/users/${userid}/welcome`, 2))
return api.post(generateOcsUrl('cloud/users/{userid}/welcome', { userid }))
.then(response => true)
.catch((error) => { throw error })
}).catch((error) => context.commit('API_FAILURE', { userid, error }))

10
apps/twofactor_backupcodes/js/settings.js
View file

File diff suppressed because one or more lines are too long

2
apps/twofactor_backupcodes/js/settings.js.map
View file

File diff suppressed because one or more lines are too long

30
apps/updatenotification/js/updatenotification.js
View file

File diff suppressed because one or more lines are too long

2
apps/updatenotification/js/updatenotification.js.map
View file

File diff suppressed because one or more lines are too long

4
apps/updatenotification/src/components/UpdateNotification.vue
View file

@ -298,7 +298,7 @@ export default {
}
$.ajax({
url: generateOcsUrl('apps/updatenotification/api/v1/applist', 2) + this.newVersion,
url: generateOcsUrl('apps/updatenotification/api/v1/applist/{newVersion}', { newVersion: this.newVersion }),
type: 'GET',
beforeSend(request) {
request.setRequestHeader('Accept', 'application/json')
@ -356,7 +356,7 @@ export default {
}.bind(this))
$.ajax({
url: generateOcsUrl('cloud', 2) + '/groups',
url: generateOcsUrl('cloud/groups'),
dataType: 'json',
success: function(data) {
const results = []

Some files were not shown because too many files have changed in this diff Show more