better support for implicit

bshaffer · bshaffer · commit f46a5b5cf0ed · 2014-01-19T22:34:26.000-07:00
diff --git a/src/OAuth2Demo/Server/Controllers/Authorize.php b/src/OAuth2Demo/Server/Controllers/Authorize.php
@@ -31,7 +31,10 @@ public function authorize(Application $app)
         }
 
         // dispaly the "do you want to authorize?" form
-        return $app['twig']->render('server/authorize.twig', array('client_id' => $app['request']->query->get('client_id')));
+        return $app['twig']->render('server/authorize.twig', array(
+            'client_id' => $app['request']->query->get('client_id'),
+            'response_type' => $app['request']->query->get('response_type')
+        ));
     }
 
     /**
diff --git a/views/client/show_implicit_token.twig b/views/client/show_implicit_token.twig
@@ -3,7 +3,22 @@
 {% block content %}
     <h3>Token Retrieved!</h3>
 
-    <pre><code>  Access Token: <span id="access_token_display"><a onclick="showAccessToken();">(click here to pull from URL fragment)</a></span></code></pre>
+    <pre><code>  Access Token: <span id="access_token_display"><a onclick="showAccessToken();">(click here to pull from URL fragment)</a></span> </code></pre>
+
+<p>The following code snippet will be run to pull the token data from the URL fragment:</p>
+    <pre>
+<code>  // function to parse fragment and return access token
+  function getAccessToken() {
+      var queryString = window.location.hash.substr(1);
+      var queries = queryString.split("&");
+      var params = {}
+      for (var i = 0; i < queries.length; i++) {
+          pair = queries[i].split('=');
+          params[pair[0]] = pair[1];
+      }
+
+      return params.access_token;
+  };</code></pre>
 
     <div id="request_resource" style="display:none">
 
@@ -21,28 +36,21 @@
 
     <!-- Javascript for pulling the access token from the URL fragment -->
     <script>
-        // function to parse fragment parameters
-        var parseQueryString = function( queryString ) {
-            var params = {}, queries, temp, i, l;
-
-            // Split into key/value pairs
-            queries = queryString.split("&");
-
-            // Convert the array of strings into an object
-            for ( i = 0, l = queries.length; i < l; i++ ) {
-                temp = queries[i].split('=');
-                params[temp[0]] = temp[1];
+        function getAccessToken() {
+            var queryString = window.location.hash.substr(1);
+            var queries = queryString.split("&");
+            var params = {}
+            for (var i = 0; i < queries.length; i++) {
+                pair = queries[i].split('=');
+                params[pair[0]] = pair[1];
             }
 
-            return params;
+            return params.access_token;
         };
 
-        // get token params from URL fragment
-        var tokenParams = parseQueryString(window.location.hash.substr(1));
-
         // show the token parsed from the fragment, and show the next step
         var showAccessToken = function (e) {
-            document.getElementById('access_token_display').innerHTML = tokenParams.access_token;
+            document.getElementById('access_token_display').innerHTML = getAccessToken();
             document.getElementById('request_resource').style.display = 'block';
         }
     </script>
diff --git a/views/server/authorize.twig b/views/server/authorize.twig
@@ -19,7 +19,7 @@
         <li>make your life better</li>
         <li>miscellaneous nefarious purposes</li>
     </ul>
-    <p>Click the button below to complete the authorize request and grant an <code>Authoriation Code</code> to {{client_id}}.
+    <p>Click the button below to complete the authorize request and grant an <code>{{ response_type == 'code' ? 'Authoriation Code' : 'Access Token' }}</code> to {{client_id}}.
     <ul class="authorize_options">
         <li>
             <form action="{{ path('authorize_post') ~ '?' ~ app.request.queryString }}" method="post">

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,10 @@ public function authorize(Application $app)`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`// dispaly the "do you want to authorize?" form`
`34`		`- return $app['twig']->render('server/authorize.twig', array('client_id' => $app['request']->query->get('client_id')));`
	`34`	`+ return $app['twig']->render('server/authorize.twig', array(`
	`35`	`+ 'client_id' => $app['request']->query->get('client_id'),`
	`36`	`+ 'response_type' => $app['request']->query->get('response_type')`
	`37`	`+ ));`
`35`	`38`	`}`
`36`	`39`
`37`	`40`	`/**`