From 7e4f5eea04da85178f2612c133bfefeb4e296374 Mon Sep 17 00:00:00 2001
From: "Michiel@unhosted" <michiel@unhosted.org>
Date: Mon, 5 May 2014 13:52:59 +0200
Subject: [PATCH] switch to datastores-access syntax, fix #53

---
 CHANGELOG.md                      |   1 +
 draft-dejong-remotestorage-03.txt | Bin 82394 -> 83098 bytes
 source.txt                        |  23 ++++++++++++++---------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf67cc3..e36d1ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Breaking for servers as well as clients:
 * The content-type for folder listings was corrected to application/ld+json
 * The version string in the webfinger announcement was updated from -02 to -03
+* Switch to the datastores-access syntax in open web app manifest format
 
 ## Breaking for servers:
 * Serving folder listings with zero items is no longer allowed; serve a 404 instead.
diff --git a/draft-dejong-remotestorage-03.txt b/draft-dejong-remotestorage-03.txt
index 057a2b0fee6e49165894c55b23d60df65c732dbc..6b99c9e90a51c9ed82588e153d26162b318ccc79 100644
GIT binary patch
delta 893
zcmah{-Aj{U6hCKs9kwZL4jtZ%w;9=DPA6*)YwF5^1kutI`Vh2D$<|ua9F`G%AQTbB
z5grKfqO01nkG;?f-PFAbiz3Lsz`Us&q3$~G<Bau1JUr(;@ALf5?{}Va&g#vwhqudK
z%q;GR!7xnno?v?c(hz5_f&b6&GW-d$wb#<K#d(^~Tgh~|ibn6-uQfm$s8A1Az*CCl
zzg9l?NS<McF=G-EFwG}d8Lh&o)Tjh2`<rV&-^XE!ccRFdmPjL)e=78sNMsmzmXnYF
zCZfXMs54CNV`AgMrD>!fO~a1b>XXn3QRwI0$F>KK!67(J7t>CmdeB0J_cdDh`TBMm
z%H5^>n=JWPtlG%iDH{#s=IGXPmQu&dso=FdXi})R%R*n56s>t>&8E3Og^<=m722s)
zQ>8@jUdvL|_nkEUWk_>>9<WJHWh1L)H=as_m{Bk<hRk?J-&KYm?M9SvyZB70!CA3f
zf#rI^g-M70%8PASlvYHS7gPGTJvb+`68RQ<E#^abgDerdo(SUyYz#u9eA+?o^*EQp
z=u-oCAjY;Cnjio{X#)^qq)%MmhqV|KF9TSuFSO!<Y1;v~#AW9Q(G$V?y1fiERtqnq
zzER+cN`SgWD5D*Jl$YKuxyC#&$PFCfuwFRAik;jbV=DW8PNhfEc5|keC2fLl2iZHv
z+YmG+cT!4jPE(A}x*0Rg->nz<2_w})?Lhm{Ofl3C=YOH}%K;tZ6#kb`oup4P&nQbz
lP}J<yL+uzw{c!|mQBQWD59vhio|)yz;e29rUp$Ip_y=;X+Nl5l

delta 481
zcmZ9IO(;ZB6vxkzVdQg=p&llwsi814c=^bXB#SXo78XA9RSZ26dP%IrLY>Je3t4J>
zP4gD7D6A~RMi!c-jgJLVtR(ln+39v~=l=fxbMEcGvu=s4St9BYUpY~ty`yOVAk2aT
z2F31xZs-KRc~d|UY*EzHFe=Vjm=k0If-olPazRFfJ`CgkGzSa`CGInNgJj!ql2?;x
zbEAk9C7XQrl6HLZnn}F}TU2@(*6uFVRBm@;7Wq4@)N>G`$D1%Yz7w_m+vil%CdI-W
zv15kz5c^4^?3X%|jz1f=H2Qt_X`z>%xOM(3%syER3p^E(_q|Vxd`s!%2;_5#1(%HR
zJdlV{dONe~hZelbqU%@&pWAW8)ROEN)!XthXyZ>8s>VCq?n3iFdaw*b@vm|~##OUn
zyB1INM;Y%i*#i|2fG)nM!-8TDREbpy)dCuE`9&D>BAO{PAcdzJuvpKn$K8aSR)Gy^
zQdnl<+3{H;I#awLgBv_h!?tQH<b?*z)8~AsBB_d1cQ>Jo`bRUCBQLjL9?!I*>kn%%
Bpe+CZ

diff --git a/source.txt b/source.txt
index 170602e..6b0c808 100644
--- a/source.txt
+++ b/source.txt
@@ -437,10 +437,11 @@ Table of Contents
     'accept' in the dialog of the application-first flow. Removing one
     is considered equivalent to revoking its access token.
 
-    As an equivalent to OAuth's 'scope' parameter, a 'remotestorage'
+    As an equivalent to OAuth's 'scope' parameter, a 'datastores-access'
     field SHOULD be present in the root of such an application manifest
-    document, as a JSON array of strings, each string being one access
-    scope of the form <module> <level>.
+    document, with entries <module> -> '{"access": "readonly"}' for
+    <level> 'r' or '{"access": "readwrite"}' for <level> 'rw', as
+    prescribed in [DATASTORE].
 
     When the user gestures they want to use a certain application whose
     manifest is present on the dashboard, the dashboard SHOULD redirect
@@ -828,7 +829,7 @@ ge.io/spec/modules/myfavoritedrinks/drink"}
     [JSON-LD]
         M. Sporny, G. Kellogg, M. Lanthaler, "JSON-LD 1.0", W3C
         Proposed Recommendation,
-        http://www.w3.org/TR/2013/PR-json-ld-20131105/, November 2013.
+        http://www.w3.org/TR/2014/REC-json-ld-20140116/, January 2014.
 
     [CORS]
         van Kesteren, Anne (ed), "Cross-Origin Resource Sharing --
@@ -838,18 +839,22 @@ ge.io/spec/modules/myfavoritedrinks/drink"}
     [MANIFEST]
         Mozilla Developer Network (ed), "App manifest -- Revision
         330541", https://developer.mozilla.org/en-
-        US/Apps/Developing/Manifest$revision/482369, October 2013.
+        US/Apps/Build/Manifest$revision/566677, April 2014.
 
-    [BEARER]
-        M. Jones, D. Hardt, "The OAuth 2.0 Authorization Framework:
-        Bearer Token Usage", RFC6750,
-        http://tools.ietf.org/html/rfc6750#section-2.3, October 2012.
+    [DATASTORE]
+        "WebAPI/DataStore", MozillaWiki, retrieved May 2014.
+        https://wiki.mozilla.org/WebAPI/DataStore#Manifest
 
     [KERBEROS]
         C. Neuman et al., "The Kerberos Network Authentication Service
         (V5)", RFC4120,
         https://tools.ietf.org/html/rfc4120
 
+    [BEARER]
+        M. Jones, D. Hardt, "The OAuth 2.0 Authorization Framework:
+        Bearer Token Usage", RFC6750,
+        http://tools.ietf.org/html/rfc6750#section-2.3, October 2012.
+
 18. Authors' addresses
 
     Michiel B. de Jong