Skip to content

Commit f14a9bd

Browse files
committed
Further fixes and clarifications following cs3org#244
1 parent eea0498 commit f14a9bd

File tree

2 files changed

+12
-20
lines changed

2 files changed

+12
-20
lines changed

IETF-RFC.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,8 @@ field of an Invite Acceptance Request.
463463

464464
Step 1: In case it has an OCM Address, it SHOULD first extract `<fqdn>`
465465
from it (the part after the last `@` sign).
466-
Step 2: The Discovering Server SHOULD attempt OCM API Discovery a HTTP
467-
GET request to `https://<fqdn>/.well-known/ocm`.
466+
Step 2: The Discovering Server SHOULD attempt OCM API Discovery via a
467+
HTTP GET request to `https://<fqdn>/.well-known/ocm`.
468468
Step 3: If that results in a valid HTTP response with a valid JSON
469469
response body within reasonable time, go to step 7.
470470
Step 4: If not, try a HTTP GET with `https://<fqdn>/ocm-provider` as
@@ -613,10 +613,9 @@ with the fields as described below
613613

614614
* REQUIRED shareWith (string)
615615
Consumer specific identifier of the user, group or federation
616-
the provider wants to share the Resource with. This is known
617-
in advance. Please note that the consumer service endpoint is
618-
known in advance as well, so this is no part of the request
619-
body.
616+
the provider wants to share the Resource with. This MUST be
617+
known in advance, either via a previous Invitation or through
618+
other means.
620619
Example: "[email protected]"
621620
* REQUIRED name (string)
622621
Name of the Resource (file or folder).
@@ -637,9 +636,7 @@ with the fields as described below
637636
Example: "[email protected]"
638637
* REQUIRED sender (string) -
639638
Provider specific identifier of the user that wants to share
640-
the Resource. Please note that the requesting provider is
641-
being identified on a higher level, so the former `remote`
642-
property is not part of the request body.
639+
the Resource.
643640
Example: "[email protected]"
644641
* OPTIONAL ownerDisplayName (string)
645642
Display name of the owner of the Resource
@@ -649,7 +646,7 @@ with the fields as described below
649646
Example: "John Doe"
650647
* REQUIRED shareType (string)
651648
SHOULD have a value of "user", "group", or "federation", to
652-
indicated that the first part of the `shareWith` OCM Address
649+
indicate that the first part of the `shareWith` OCM Address
653650
refers to a Receiving Party who is a single user of the
654651
Receiving Server, a group of users at the Receiving Servers, or
655652
a group of users that is spread out over various servers,

spec.yaml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -490,10 +490,8 @@ components:
490490
type: string
491491
description: >
492492
Consumer specific identifier of the user, group or federation the
493-
provider
494-
wants to share the resource with. This is known in advance.
495-
Please note that the consumer service endpoint is known in advance
496-
as well, so this is no part of the request body.
493+
provider wants to share the Resource with. This MUST be known
494+
in advance, either via a previous Invitation or through other means.
497495
498496
name:
499497
type: string
@@ -509,9 +507,8 @@ components:
509507
type: string
510508
description: >
511509
Identifier to identify the shared resource at the provider side.
512-
This is
513-
unique per provider such that if the same resource is shared twice,
514-
this providerId will not be repeated.
510+
This is unique per provider such that if the same resource is shared
511+
twice, this providerId will not be repeated.
515512
example: 7c084226-d9a1-11e6-bf26-cec0c932ce01
516513
owner:
517514
description: |
@@ -521,9 +518,7 @@ components:
521518
sender:
522519
description: |
523520
Provider specific identifier of the user that wants to share the
524-
resource. Please note that the requesting provider is being
525-
identified on a higher level, so the former `remote` property
526-
is not part of the request body.
521+
resource.
527522
type: string
528523
529524
ownerDisplayName:

0 commit comments

Comments
 (0)