Merge branch 'v1.2' into playground

CHANGELOG

@@ -0,0 +1,5 @@
+v1.2.1 - Authorization Dialog for ID Issuer
+  * Resource Owner Password token exchange
+  * Public / Private Keypair generation
+  * Public key (remember device) syncing
+  * BUG: Remember me is not operational

LICENSE

@@ -0,0 +1,41 @@
+Copyright 2017 Daplie, Inc
+
+This is open source software; you can redistribute it and/or modify it under the
+terms of either:
+
+   a) the "MIT License"
+   b) the "Apache-2.0 License"
+
+MIT License
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in all
+   copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+
+Apache-2.0 License Summary
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,17 +1,30 @@
-This is a WALNUT module representing the html package for the oauth3.org popup.
+issuer.html
+===========
 
-It must be installed to `/srv/walnut/packages/pages/issuer@oauth3.org`
+| [oauth3.js](https://git.oauth3.org/OAuth3/oauth3.js)
+| *issuer.html*
+| [issuer.rest.walnut.js](https://git.oauth3.org/OAuth3/issuer.rest.walnut.js)
+| [issuer.srv](https://git.oauth3.org/OAuth3/issuer.srv)
+| Sponsored by [Daplie](https://daplie.com)
+
+
+This is a browser application which implements the issuer side of the *authorization_dialog* flow for OAuth3.
+
+It may be used client-side only (public key or granted scope syncing will be disabled),
+or will the *issuer.rest.walnut.js* APIs on the backend for full functionality.
+
+For use with walnut it must be installed to `/opt/walnut/packages/pages/issuer@oauth3.org`
 
 ```bash
-git clone git@git.daplie.com:OAuth3/org.oauth3.git /srv/walnut/packages/pages/issuer@oauth3.org
-pushd /srv/walnut/packages/pages/issuer@oauth3.org
+git clone git@git.oauth3.org:OAuth3/org.oauth3.git /opt/walnut/packages/pages/issuer@oauth3.org
+pushd /opt/walnut/packages/pages/issuer@oauth3.org
 bash ./install.sh
 popd
 ```
 
 ```bash
-echo "issuer@oauth3.org" >> /srv/walnut/packages/sites/EXAMPLE.COM
+echo "issuer@oauth3.org" >> /opt/walnut/var/sites/EXAMPLE.COM
 ```
 
 This uses the OAuth3 JavaScript SDK `oauth3.js` as a subpackage in
-`/srv/walnut/packages/pages/issuer@oauth3.org/assets/oauth3.org`.
+`/opt/walnut/packages/pages/issuer@oauth3.org/assets/oauth3.org`.

install.sh

@@ -2,11 +2,12 @@
 
 set -e
 set -u
-# git clone https://git.daplie.com/OAuth3/org.oauth3.git /srv/walnut/packages/pages/azp@oauth3.org
+# git clone https://git.oauth3.org/OAuth3/issuer.html.git /srv/walnut/packages/pages/issuer@oauth3.org
+# git clone https://git.oauth3.org/OAuth3/azp.html.git /srv/walnut/packages/pages/azp@oauth3.org
 
 mkdir -p assets
 if ! [ -d ./assets/oauth3.org ]; then
-  git clone https://git.daplie.com/OAuth3/oauth3.js.git ./assets/oauth3.org
+  git clone https://git.oauth3.org/OAuth3/oauth3.js.git ./assets/oauth3.org
 fi
 pushd ./assets/oauth3.org
   git checkout v1.2

js/issuer.js

@@ -93,10 +93,12 @@ $(function () {
     var grantDescriptions = {
       // deprecated
       'oauth3_authn': "Basic secure authentication"
+    , 'auth@oauth3.org': "Basic secure authentication"
     , 'wallet': "Access to payments and subscriptions"
     , 'bucket': "Access to file storage"
     , 'db': "Access to app data"
     , 'domains': "Domain registration (and Glue and NS records)" // TODO make an alias
+    , 'domains@oauth3.org': "Domain registration (and Glue and NS records)" // TODO make an alias
     , 'domains:glue': "Glue Record management (for vanity nameservers)"
     , 'domains:ns': "Name Server management"
     , 'dns': "DNS records (A/AAAA, TXT, SRV, MX, etc)"
@@ -111,6 +113,8 @@ $(function () {
     , 'domains:glue@oauth3.org': "Glue Record management (for vanity nameservers)"
     , 'domains:ns@oauth3.org': "Name Server management"
     , 'dns@oauth3.org': "DNS records (A/AAAA, TXT, SRV, MX, etc)"
+    , 'www@daplie.com': "Websites and webapps"
+
     , '*': "FULL ACCOUNT ACCESS"
     };