From 67f15aebedbd47d2b14fb5eb6074f7349477b41c Mon Sep 17 00:00:00 2001
From: AJ ONeal <aj@daplie.com>
Date: Fri, 10 Feb 2017 22:23:21 -0500
Subject: [PATCH] bugfix

---
 oauth3.core.js          | 17 ++++-------------
 oauth3.core.provider.js |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/oauth3.core.js b/oauth3.core.js
index 9845a21..9ee7e30 100644
--- a/oauth3.core.js
+++ b/oauth3.core.js
@@ -334,17 +334,16 @@
     var type = 'authorization_dialog';
     var responseType = 'token';
 
-    var redirectUri = opts.redirectUri;
+    var redirectUri = opts.redirect_uri;
     var scope = opts.scope || directive.authn_scope;
-    var clientId = opts.appId || opts.clientId || opts.clientUri;
     var args = directive[type];
     var uri = args.url;
     var state = core.utils.randomState();
     var params = {
       debug: opts.debug || undefined
     , client_uri: opts.client_uri || opts.clientUri || undefined
+    , client_id: opts.client_id || opts.client_uri || undefined
     };
-    var loc;
     var result;
 
     params.state = state;
@@ -352,17 +351,9 @@
     if (scope) {
       params.scope = core.stringifyscope(scope);
     }
-    if (clientId) {
-      // In OAuth3 client_id is optional for implicit grant
-      params.client_id = clientId;
-    }
     if (!redirectUri) {
-      loc = window.location;
-      redirectUri = loc.protocol + '//' + loc.host + loc.pathname;
-      if ('/' !== redirectUri[redirectUri.length - 1]) {
-        redirectUri += '/';
-      }
-      redirectUri += 'oauth3.html';
+      // TODO consider making this optional
+      console.error('missing redirect_uri');
     }
     params.redirect_uri = redirectUri;
 
diff --git a/oauth3.core.provider.js b/oauth3.core.provider.js
index 1b0b405..6f657f8 100644
--- a/oauth3.core.provider.js
+++ b/oauth3.core.provider.js
@@ -157,7 +157,7 @@
     }
 
     var url = core.urls.resolve(directive.issuer, directive.grants.url)
-      .replace(/(:azp|:client_id)/g, opts.client_id || opts.client_uri)
+      .replace(/(:azp|:client_id)/g, core.normalizeUri(opts.client_id || opts.client_uri))
       .replace(/(:sub|:account_id)/g, opts.session.meta.sub)
       ;
     var data = {