From 4d80074046d71c0dffdcca4893b5a3c0bd96603a Mon Sep 17 00:00:00 2001
From: aj <aj@daplie.com>
Date: Tue, 15 Aug 2017 20:21:54 +0000
Subject: [PATCH] org.oauth3 -> oauth3.org

---
 bin/cli.js       | 4 ++--
 oauth3.core.js   | 6 +++---
 oauth3.crypto.js | 2 +-
 oauth3.issuer.js | 6 +++---
 oauth3.tunnel.js | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/cli.js b/bin/cli.js
index da3be23..5319555 100644
--- a/bin/cli.js
+++ b/bin/cli.js
@@ -131,8 +131,8 @@ parseArgs(process.argv, {
 
     // authn / authz
   , [ 'devices', 'manages devices for your account(s)' ]
-  , [ 'devices:new', 'create a new device (default name is hostname, default ip is the result of :provider/api/org.oauth3.tunnel/checkip)'.replace(/\b:provider\b/, defaults.provider) ]
-  , [ 'devices:set', 'set the ip address of the device (defaults ip is the result of :provider/api/org.oauth3.tunnel/checkip)'.replace(/\b:provider\b/, defaults.provider) ]
+  , [ 'devices:new', 'create a new device (default name is hostname, default ip is the result of :provider/api/tunnel@oauth3.org/checkip)'.replace(/\b:provider\b/, defaults.provider) ]
+  , [ 'devices:set', 'set the ip address of the device (defaults ip is the result of :provider/api/tunnel@oauth3.org/checkip)'.replace(/\b:provider\b/, defaults.provider) ]
   , [ 'devices:attach', "attach a device to a domain's DNS record" ]
   , [ 'devices:detach', "detach an account from a domain's DNS record" ]
   , [ 'devices:select', '(re)claim the specified device as this device (i.e. you re-installed your OS or deleted your ~/.oauth3)' ]
diff --git a/oauth3.core.js b/oauth3.core.js
index d5ec46e..7658c0f 100644
--- a/oauth3.core.js
+++ b/oauth3.core.js
@@ -328,7 +328,7 @@
         // Example Implicit Grant Request
         // (for generating a browser-only session, not a session on your server)
         //
-        // GET https://example.com/api/org.oauth3.provider/authorization_dialog
+        // GET https://example.com/api/issuer@oauth3.org/authorization_dialog
         //  ?response_type=token
         //  &scope=`encodeURIComponent('profile.login profile.email')`
         //  &state=`cryptoutil.random().toString('hex')`
@@ -1210,7 +1210,7 @@
     , _resourceProviderUri: null
     , _identityProviderDirectives: null
     , _resourceProviderDirectives: null
-    //, _resourceProviderMap: null // map between xyz.com and org.oauth3.domains
+    //, _resourceProviderMap: null // map between xyz.com and domains@oauth3.org
     , _init: function (location, opts) {
         var me = this;
         if (location) {
@@ -1266,7 +1266,7 @@
         var me = this;
         return me.init().then(function () {
           return me.setIdentityProvider(providerUri).then(function () {
-            // TODO how to say "Use xyz.com for org.oauth3.domains, but abc.com for org.oauth3.dns"?
+            // TODO how to say "Use xyz.com for domains@oauth3.org, but abc.com for dns@oauth3.org"?
             return me.setResourceProvider(providerUri);
           });
         });
diff --git a/oauth3.crypto.js b/oauth3.crypto.js
index 85479fc..d87a158 100644
--- a/oauth3.crypto.js
+++ b/oauth3.crypto.js
@@ -97,7 +97,7 @@
               resolve();
             }
           };
-          script.src = '/assets/org.oauth3/oauth3.crypto.fallback.js';
+          script.src = '/assets/oauth3.org/oauth3.crypto.fallback.js';
           body.appendChild(script);
         });
         return prom;
diff --git a/oauth3.issuer.js b/oauth3.issuer.js
index 5848b74..f70b0ae 100644
--- a/oauth3.issuer.js
+++ b/oauth3.issuer.js
@@ -97,7 +97,7 @@ OAUTH3.urls.resourceOwnerPassword = function (directive, opts) {
   // Example Resource Owner Password Request
   // (generally for 1st party and direct-partner mobile apps, and webapps)
   //
-  // POST https://example.com/api/org.oauth3.provider/access_token
+  // POST https://example.com/api/issuer@oauth3.org/access_token
   //    { "grant_type": "password", "client_id": "<<id>>", "scope": "<<scope>>"
   //    , "username": "<<username>>", "password": "password" }
   //
@@ -569,7 +569,7 @@ OAUTH3.requests.accounts = {};
 OAUTH3.requests.accounts.update = function (directive, session, opts) {
   var dir = directive.update_account || {
     method: 'POST'
-  , url: OAUTH3.url.normalize(directive.api) + '/api/org.oauth3.provider/accounts/:accountId'
+  , url: OAUTH3.url.normalize(directive.api) + '/api/issuer@oauth3.org/accounts/:accountId'
   , bearer: 'Bearer'
   };
   var url = dir.url
@@ -593,7 +593,7 @@ OAUTH3.requests.accounts.update = function (directive, session, opts) {
 OAUTH3.requests.accounts.create = function (directive, session, account) {
   var dir = directive.create_account || {
     method: 'POST'
-  , url: OAUTH3.url.normalize(directive.api) + '/api/org.oauth3.provider/accounts'
+  , url: OAUTH3.url.normalize(directive.api) + '/api/issuer@oauth3.org/accounts'
   , bearer: 'Bearer'
   };
   var data = {
diff --git a/oauth3.tunnel.js b/oauth3.tunnel.js
index 3ef5cbc..38bf827 100644
--- a/oauth3.tunnel.js
+++ b/oauth3.tunnel.js
@@ -9,7 +9,7 @@ OAUTH3.api['tunnel.token'] = function (providerUri, opts) {
   return OAUTH3.request({
     method: 'POST'
   , url: OAUTH3.url.normalize(providerUri)
-      + '/api/org.oauth3.tunnel/accounts/' + session.token.sub + '/token'
+      + '/api/tunnel@oauth3.org/accounts/' + session.token.sub + '/token'
   , session: session
   , data: {
       domains: opts.data.domains