Add OCS sharing info to capabilities - take 2 #13964

rullzer · 2015-02-07T16:39:12Z

Since the previous request was already merged (which was a bit to soon). Here is another take. It is still a patch for #13673.

rullzer · 2015-02-07T16:46:44Z

apps/files_sharing/lib/capabilities.php

+	public function getCaps() {
+		$res = array();
+
+		$public = false;


@LukasReschke in reply to your comments on the previous PR.

I did it like this to have the json return format make a bit more sense. So it is false if public sharing is disabled. And an array if not. The same is done for the expire_date.

Another, maybe more elegant solution is to have an enabled element in the array. So that the format is always the same.

rullzer · 2015-02-26T07:45:35Z

cc @PVince81 @LukasReschke @DeepDiver1975

Could you have another look at this? Would be nice to be able to allow checking for this in the client(s).

PeterPablo · 2015-02-26T07:51:22Z

apps/files_sharing/lib/capabilities.php

@@ -0,0 +1,87 @@
+<?php
+/**
+ * @author Not Committed Yet <not.committed.yet>


Accidental leftover?

Ah you are right.
Fixed.

PVince81 · 2015-02-26T08:22:35Z

@DeepDiver1975 should this be moved to the OCS Sharing API as discussed on IRC ? (instead of the capabilities)

DeepDiver1975 · 2015-03-09T08:22:23Z

@DeepDiver1975 should this be moved to the OCS Sharing API as discussed on IRC ? (instead of the capabilities)

Well - I had a chat with @dragotin and he actually likes the idea to have one call to get all capabilities instead of calling multiple apis ....

DeepDiver1975 · 2015-03-09T08:23:30Z

@rullzer this pr by itself looks good - we finally have to decide on how to move on ...

PVince81 · 2015-03-09T09:25:01Z

@DeepDiver1975 small reminder: one issue remains is that if we use the app framework for getcapabilities in the future it won't be possible to combine responses from multiple apps that respond to the same call. (which I believe is one of the reason this discussion started)

Display the capabilities regarding file sharing in the capabilities API. This will allow the clients to provide users a better experince.

This change allows for more generic parsing for the capabilities.

MorrisJobke · 2015-03-11T15:05:31Z

apps/files_sharing/tests/capabilities.php

+	 * @param string[] $data Capabilities
+	 * @return string[]
+	 */
+	function getFilesSharingPart(array $data) {


public, protected or private

scrutinizer-notifier · 2015-03-11T15:31:31Z

A new inspection was created.

ghost · 2015-03-11T16:02:55Z

Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng-simple/10363/
Test PASSed.

rullzer · 2015-03-11T16:05:23Z

A possible solution for the capabilities issue described by @PVince81 is in #14805. However I would prefer not to wait with this PR. It would be great to have this in 8.1.

rullzer · 2015-03-18T08:34:37Z

@DeepDiver1975 @PVince81 how to we want to proceed here? As I would really like to have a feature like this in 8.1 so the client can provide a better UX.

PVince81 · 2015-03-18T10:04:14Z

I like the idea of the capabilities manager

rullzer · 2015-03-24T08:56:10Z

PR for Capabilities manager is in #15093 . Once that is in place adding the capabilities here should be a bit nicer.

dragotin · 2015-03-24T09:23:45Z

@DeepDiver1975 yes, please give this a priority, as it blocks functionality in the client. Would be great :-)

DeepDiver1975 · 2015-03-30T07:25:53Z

The capabilities manager is for sure a nicer approach - but we simply cannot use it yet on the ocs/v1.php endpoint.

👍 for moving on using the current ocs approach

rullzer · 2015-03-30T07:28:31Z

@DeepDiver1975 well the code is rather easy to understand. So it would be not to hard to move this capabilities class also to the capabilities manager for 8.2.

So one more +1 and I can make the users of the client a bit happier ;)

DeepDiver1975 · 2015-03-30T07:44:55Z

@MorrisJobke @nickvergessen please review - thx

MorrisJobke · 2015-03-30T08:06:00Z

Tested 👍

Add OCS sharing info to capabilities - take 2

MorrisJobke · 2015-03-30T08:07:13Z

Before:

<?xml version="1.0"?>
<ocs>
 <meta>
  <status>ok</status>
  <statuscode>100</statuscode>
  <message/>
 </meta>
 <data>
  <capabilities>
   <files>
    <versioning>1</versioning>
    <undelete>1</undelete>
    <bigfilechunking>1</bigfilechunking>
   </files>
   <core>
    <pollinterval>60</pollinterval>
   </core>
  </capabilities>
  <version>
   <major>8</major>
   <minor>1</minor>
   <micro>0</micro>
   <string>8.1 pre alpha</string>
   <edition></edition>
  </version>
 </data>
</ocs>

After:

<?xml version="1.0"?>
<ocs>
 <meta>
  <status>ok</status>
  <statuscode>100</statuscode>
  <message/>
 </meta>
 <data>
  <capabilities>
   <files>
    <versioning>1</versioning>
    <undelete>1</undelete>
    <bigfilechunking>1</bigfilechunking>
   </files>
   <files_sharing>
    <public>
     <enabled>1</enabled>
     <password>
      <enforced>1</enforced>
     </password>
     <expire_date>
      <enabled>1</enabled>
      <days>7</days>
      <enforced>1</enforced>
     </expire_date>
     <send_mail>1</send_mail>
    </public>
    <user>
     <send_mail>1</send_mail>
    </user>
    <resharing>1</resharing>
   </files_sharing>
   <core>
    <pollinterval>60</pollinterval>
   </core>
  </capabilities>
  <version>
   <major>8</major>
   <minor>1</minor>
   <micro>0</micro>
   <string>8.1 pre alpha</string>
   <edition></edition>
  </version>
 </data>
</ocs>

Command:

curl http://admin:pwd@localhost/master/ocs/v1.php/cloud/capabilities

dragotin · 2015-03-30T08:41:33Z

Looks very sufficient 👍

DeepDiver1975 · 2015-03-30T21:46:38Z

@carlaschroder I guess we have to update the api docs on this - THX

rullzer added this to the 8.1-next milestone Feb 7, 2015

rullzer added 3 - To Review enhancement labels Feb 7, 2015

rullzer reviewed Feb 7, 2015
View reviewed changes

dragotin mentioned this pull request Feb 11, 2015

When you enable the option of " Set default expiration date", you can share by link without knowing it owncloud/client#2815

Closed

PeterPablo reviewed Feb 26, 2015
View reviewed changes

rullzer mentioned this pull request Mar 11, 2015

[WIP] Initial commit to use the capabilities api for better UX owncloud/client#2943

Closed

rullzer added 6 commits March 11, 2015 15:02

Add file_sharing info to capabilities

39b0f07

Display the capabilities regarding file sharing in the capabilities API. This will allow the clients to provide users a better experince.

Added route again

0bf1152

Now added enabled element

af76716

This change allows for more generic parsing for the capabilities.

Added new header

c985186

New array syntax

09ee297

Slight better formatting

e9a003f

MorrisJobke reviewed Mar 11, 2015
View reviewed changes

MorrisJobke added 2 - Developing and removed 3 - To Review labels Mar 11, 2015

Mark functions private

ec31ee9

rullzer mentioned this pull request Mar 11, 2015

Add CapabilitiesManager to allow (easier) migration to the AppFramework #14805

Closed

rullzer mentioned this pull request Mar 21, 2015

Capabilities manager #15093

Merged

DeepDiver1975 added 3 - To Review and removed 2 - Developing labels Mar 30, 2015

MorrisJobke added a commit that referenced this pull request Mar 30, 2015

Merge pull request #13964 from rullzer/capabilities

cfe241a

Add OCS sharing info to capabilities - take 2

MorrisJobke merged commit cfe241a into owncloud:master Mar 30, 2015

rullzer mentioned this pull request Apr 12, 2015

Add OCS capability to advertise whether a server allows public links #13673

Closed

rullzer deleted the capabilities branch May 22, 2015 11:51

lock bot locked as resolved and limited conversation to collaborators Aug 12, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add OCS sharing info to capabilities - take 2 #13964

Add OCS sharing info to capabilities - take 2 #13964

rullzer commented Feb 7, 2015

rullzer Feb 7, 2015

rullzer commented Feb 26, 2015

PeterPablo Feb 26, 2015

rullzer Feb 26, 2015

PVince81 commented Feb 26, 2015

DeepDiver1975 commented Mar 9, 2015

DeepDiver1975 commented Mar 9, 2015

PVince81 commented Mar 9, 2015

MorrisJobke Mar 11, 2015

scrutinizer-notifier commented Mar 11, 2015

ghost commented Mar 11, 2015

rullzer commented Mar 11, 2015

rullzer commented Mar 18, 2015

PVince81 commented Mar 18, 2015

rullzer commented Mar 24, 2015

dragotin commented Mar 24, 2015

DeepDiver1975 commented Mar 30, 2015

rullzer commented Mar 30, 2015

DeepDiver1975 commented Mar 30, 2015

MorrisJobke commented Mar 30, 2015

MorrisJobke commented Mar 30, 2015

dragotin commented Mar 30, 2015

DeepDiver1975 commented Mar 30, 2015

Add OCS sharing info to capabilities - take 2 #13964

Add OCS sharing info to capabilities - take 2 #13964

Conversation

rullzer commented Feb 7, 2015

rullzer Feb 7, 2015

Choose a reason for hiding this comment

rullzer commented Feb 26, 2015

PeterPablo Feb 26, 2015

Choose a reason for hiding this comment

rullzer Feb 26, 2015

Choose a reason for hiding this comment

PVince81 commented Feb 26, 2015

DeepDiver1975 commented Mar 9, 2015

DeepDiver1975 commented Mar 9, 2015

PVince81 commented Mar 9, 2015

MorrisJobke Mar 11, 2015

Choose a reason for hiding this comment

scrutinizer-notifier commented Mar 11, 2015

ghost commented Mar 11, 2015

rullzer commented Mar 11, 2015

rullzer commented Mar 18, 2015

PVince81 commented Mar 18, 2015

rullzer commented Mar 24, 2015

dragotin commented Mar 24, 2015

DeepDiver1975 commented Mar 30, 2015

rullzer commented Mar 30, 2015

DeepDiver1975 commented Mar 30, 2015

MorrisJobke commented Mar 30, 2015

MorrisJobke commented Mar 30, 2015

dragotin commented Mar 30, 2015

DeepDiver1975 commented Mar 30, 2015