fix revoke code to make more sense

Author: wasin-waeosri

Article.md

@@ -720,7 +720,8 @@ This revocation mechanism allows an application to invalidate its tokens if the
 
 The API requires the following HTTP Header and Credential parameter information:
 - Header: 
-    * Authorization = ```Authorization: Basic <App Key+":" in Base64>```
+    * Authorization = ```Basic <App Key+":" in Base64 format>```
+
 - Body parameter
     * token: The current ```Access Token``` value from the previous RDP Authentication call
 
@@ -745,15 +746,14 @@ token={current_Access_token}
 - Please be noticed **":"** string after the **App Key**. 
 - The ```/revoke``` endpoint does not use the ```password``` in a Basic Authorization, so we need to send empty password in ```AppKey:``` format.
 
+I am demonstrating with the Python [requests](https://requests.readthedocs.io/) library. We can use the ```auth(clientid,'')``` to the ```requests.post``` function, and the library handles the base64 conversion for us.
+
+If you are using other languages or libraries (like C#), you may need to convert the ```App-Key:``` to based64 ascii string by your self.
+
 Python code:
 
 ```Python
 #step 7 - Revoking Token
-import base64
-
-clientId_bytes = f'{clientId}:'.encode('ascii') #Please be noticed ":" string after the app-key
-base64_bytes = base64.b64encode(clientId_bytes)
-clientId_base64 = base64_bytes.decode('ascii')
 
 # Send HTTP Request
 auth_url = f'{RDP_HOST}/auth/oauth2/v1/revoke'
@@ -763,10 +763,10 @@ auth_response = None
 try:
     auth_response = requests.post(auth_url, 
                              headers = {
-                                 'Content-Type':'application/x-www-form-urlencoded',
-                                 'Authorization': f'Basic {clientId_base64}'
+                                 'Content-Type':'application/x-www-form-urlencoded'
                              }, 
-                             data = payload
+                             data = payload,
+                            auth = (clientId, '')
                 )
 except requests.exceptions.RequestException as exp:
     print(f'Caught exception: {exp}')

RDP-Generic-CFS.html

@@ -8772,7 +8772,7 @@ <h3 id="Step-7:-Revoke-Token-to-ending-the-session.">Step 7: Revoke Token to end
 <ul>
 <li><p>Header:</p>
 <ul>
-<li>Authorization = <code>Basic &lt;App Key+":" in Base64&gt;</code></li>
+<li>Authorization = <code>Basic &lt;App Key+":" in Base64 format&gt;</code></li>
 </ul>
 </li>
 <li><p>Body parameter</p>
@@ -8801,6 +8801,8 @@ <h3 id="Step-7:-Revoke-Token-to-ending-the-session.">Step 7: Revoke Token to end
 <li>Please be noticed <strong>":"</strong> string after the <strong>App Key</strong>.</li>
 <li>The <code>/revoke</code> endpoint does not use the <code>password</code> in a Basic Authorization, so we need to send empty password in <code>AppKey:</code> format.</li>
 </ul>
+<p>I am demonstrating with the Python <a href="https://requests.readthedocs.io/">requests</a> library. We can use the <code>auth(clientid,'')</code> to the <code>requests.post</code> function, and the library handles the base64 conversion for us.</p>
+<p>If you are using other languages or libraries (like C#), you may need to convert the <code>App-Key:</code> to based64 ascii string by your self.</p>
 </div>
 </div>
 </div>
@@ -8814,24 +8816,18 @@ <h3 id="Step-7:-Revoke-Token-to-ending-the-session.">Step 7: Revoke Token to end
 <div class="cm-editor cm-s-jupyter">
 <div class="highlight hl-ipython3"><pre><span></span><span class="c1">#step 7 - Revoking Token</span>
 
-<span class="kn">import</span><span class="w"> </span><span class="nn">base64</span>
-
-<span class="n">clientId_bytes</span> <span class="o">=</span> <span class="sa">f</span><span class="s1">'</span><span class="si">{</span><span class="n">clientId</span><span class="si">}</span><span class="s1">:'</span><span class="o">.</span><span class="n">encode</span><span class="p">(</span><span class="s1">'ascii'</span><span class="p">)</span> <span class="c1">#Please be noticed ":" string after the app-key</span>
-<span class="n">base64_bytes</span> <span class="o">=</span> <span class="n">base64</span><span class="o">.</span><span class="n">b64encode</span><span class="p">(</span><span class="n">clientId_bytes</span><span class="p">)</span>
-<span class="n">clientId_base64</span> <span class="o">=</span> <span class="n">base64_bytes</span><span class="o">.</span><span class="n">decode</span><span class="p">(</span><span class="s1">'ascii'</span><span class="p">)</span>
-
 <span class="c1"># Send HTTP Request</span>
 <span class="n">auth_url</span> <span class="o">=</span> <span class="sa">f</span><span class="s1">'</span><span class="si">{</span><span class="n">RDP_HOST</span><span class="si">}</span><span class="s1">/auth/oauth2/v1/revoke'</span>
 <span class="n">payload</span> <span class="o">=</span> <span class="sa">f</span><span class="s1">'token=</span><span class="si">{</span><span class="n">access_token</span><span class="si">}</span><span class="s1">'</span>
 <span class="n">auth_response</span> <span class="o">=</span> <span class="kc">None</span>
 
 <span class="k">try</span><span class="p">:</span>
     <span class="n">auth_response</span> <span class="o">=</span> <span class="n">requests</span><span class="o">.</span><span class="n">post</span><span class="p">(</span><span class="n">auth_url</span><span class="p">,</span> 
-                             <span class="n">headers</span> <span class="o">=</span> <span class="p">{</span>
-                                 <span class="s1">'Content-Type'</span><span class="p">:</span><span class="s1">'application/x-www-form-urlencoded'</span><span class="p">,</span>
-                                 <span class="s1">'Authorization'</span><span class="p">:</span> <span class="sa">f</span><span class="s1">'Basic </span><span class="si">{</span><span class="n">clientId_base64</span><span class="si">}</span><span class="s1">'</span>
-                             <span class="p">},</span> 
-                             <span class="n">data</span> <span class="o">=</span> <span class="n">payload</span>
+                                <span class="n">headers</span> <span class="o">=</span> <span class="p">{</span>
+                                      <span class="s1">'Content-Type'</span><span class="p">:</span><span class="s1">'application/x-www-form-urlencoded'</span>
+                                      <span class="p">},</span> 
+                                <span class="n">data</span> <span class="o">=</span> <span class="n">payload</span><span class="p">,</span>
+                                <span class="n">auth</span> <span class="o">=</span> <span class="p">(</span><span class="n">clientId</span><span class="p">,</span> <span class="s1">''</span><span class="p">)</span>
                 <span class="p">)</span>
 <span class="k">except</span> <span class="n">requests</span><span class="o">.</span><span class="n">exceptions</span><span class="o">.</span><span class="n">RequestException</span> <span class="k">as</span> <span class="n">exp</span><span class="p">:</span>
     <span class="nb">print</span><span class="p">(</span><span class="sa">f</span><span class="s1">'Caught exception: </span><span class="si">{</span><span class="n">exp</span><span class="si">}</span><span class="s1">'</span><span class="p">)</span>

RDP-Generic-CFS.ipynb

@@ -1077,7 +1077,7 @@
     "\n",
     "The API requires the following HTTP Header and Credential parameter information:\n",
     "- Header: \n",
-    "    * Authorization = ```Basic <App Key+\":\" in Base64>```\n",
+    "    * Authorization = ```Basic <App Key+\":\" in Base64 format>```\n",
     "\n",
     "- Body parameter\n",
     "    * token: The current ```Access Token``` value from the previous RDP Authentication call\n",
@@ -1101,7 +1101,11 @@
     "\n",
     "**Note**: \n",
     "- Please be noticed **\":\"** string after the **App Key**. \n",
-    "- The ```/revoke``` endpoint does not use the ```password``` in a Basic Authorization, so we need to send empty password in ```AppKey:``` format."
+    "- The ```/revoke``` endpoint does not use the ```password``` in a Basic Authorization, so we need to send empty password in ```AppKey:``` format.\n",
+    "\n",
+    "I am demonstrating with the Python [requests](https://requests.readthedocs.io/) library. We can use the ```auth(clientid,'')``` to the ```requests.post``` function, and the library handles the base64 conversion for us.\n",
+    "\n",
+    "If you are using other languages or libraries (like C#), you may need to convert the ```App-Key:``` to based64 ascii string by your self.\n"
    ]
   },
   {
@@ -1121,24 +1125,18 @@
    "source": [
     "#step 7 - Revoking Token\n",
     "\n",
-    "import base64\n",
-    "\n",
-    "clientId_bytes = f'{clientId}:'.encode('ascii') #Please be noticed \":\" string after the app-key\n",
-    "base64_bytes = base64.b64encode(clientId_bytes)\n",
-    "clientId_base64 = base64_bytes.decode('ascii')\n",
-    "\n",
     "# Send HTTP Request\n",
     "auth_url = f'{RDP_HOST}/auth/oauth2/v1/revoke'\n",
     "payload = f'token={access_token}'\n",
     "auth_response = None\n",
     "\n",
     "try:\n",
     "    auth_response = requests.post(auth_url, \n",
-    "                             headers = {\n",
-    "                                 'Content-Type':'application/x-www-form-urlencoded',\n",
-    "                                 'Authorization': f'Basic {clientId_base64}'\n",
-    "                             }, \n",
-    "                             data = payload\n",
+    "                                headers = {\n",
+    "                                      'Content-Type':'application/x-www-form-urlencoded'\n",
+    "                                      }, \n",
+    "                                data = payload,\n",
+    "                                auth = (clientId, '')\n",
     "                )\n",
     "except requests.exceptions.RequestException as exp:\n",
     "    print(f'Caught exception: {exp}')\n",