hcaptcha, upgrade

Author: subdavis

.github/ISSUE_TEMPLATE/issue-report.md

@@ -29,7 +29,7 @@ If applicable, add screenshots to help explain your problem.
 **Desktop (please complete the following information):**
  - OS: [e.g.  MacOS]
 -  Install method and python version: [eg. docker, python 3.9]
- - Kobodl Version [e.g. 0.5.1]
+ - Kobodl Version [e.g. 0.6.0]
 
 **Additional context**
 Add any other context about the problem here.

kobodl/commands/user.py

@@ -50,21 +50,25 @@ def add(ctx, email, password):
     user = User(Email=email)
     click.echo(
         """
-    Open https://authorize.kobo.com/signin in a private/incognito window in your browser, wait till the page
-    loads (do not login!) then open the developer tools (use F12 in Firefox/Chrome), select the console tab,
-    and paste the following code there and then press Enter there in the browser.
+    1. Open https://authorize.kobo.com/signin in a private/incognito window in your browser.
+    2. wait till the page loads (do not login!)
+    3. open the developer tools (use F12 in Firefox/Chrome, or right-click and choose "inspect")
+    4. select the console tab,
+    5. copy-paste the following code to the console there and then press Enter.
 
-    var newCaptchaDiv = document.createElement( "div" );
-    newCaptchaDiv.id = "new-grecaptcha-container";
-    document.getElementById( "grecaptcha-container" ).insertAdjacentElement( "afterend", newCaptchaDiv );
-    grecaptcha.render( newCaptchaDiv.id, {
-        sitekey: "6Le_Hc8ZAAAAAO6IMIG5zdDmANbljtXY4EHK0wzD",
-        callback: function( response ) { console.log( "Captcha response:" ); console.log( response ); }
-    } );
+    var newCaptchaDiv = document.createElement("div");
+    newCaptchaDiv.id = "new-hcaptcha-container";
+    var siteKey = document.getElementById('hcaptcha-container').getAttribute('data-sitekey');
+    document.body.replaceChildren(newCaptchaDiv);
+    grecaptcha.render(newCaptchaDiv.id, {
+        sitekey: siteKey,
+        callback: function(r) {console.log("Captcha response:");console.log(r);}
+    });
+    console.log('Click the checkbox to get the code');
 
     A captcha should show up below the Sign-in form. Once you solve the captcha its response will be written
     below the pasted code in the browser's console. Copy the response (the line below "Captcha response:")
-    and paste it here.
+    and paste it here.  It will be very long!
     """
     )
     captcha = input('Captcha response: ').strip()

kobodl/templates/instructions.html

@@ -18,17 +18,19 @@ <h1 class="text-2xl py-2">CAPTCHA Code Instructions</h1>
   <div class="flex flex-wrap items-start">
     <img class="mr-4" width="580px" src="https://raw.githubusercontent.com/subdavis/kobo-book-downloader/master/docs/captcha.gif">
     <div class="flex-shrink rounded px-4 overflow-x-auto text-xs whitespace-pre font-mono" style="background-color: #f5f2f0; min-width: 420px;">
-var newCaptchaDiv = document.createElement( "div" );
-newCaptchaDiv.id = "new-grecaptcha-container";
-document.getElementById( "grecaptcha-container" )
-  .insertAdjacentElement( "afterend", newCaptchaDiv );
+var newCaptchaDiv = document.createElement("div");
+newCaptchaDiv.id = "new-hcaptcha-container";
+var siteKey = document.getElementById('hcaptcha-container')
+  .getAttribute('data-sitekey');
+document.body.replaceChildren(newCaptchaDiv);
 grecaptcha.render( newCaptchaDiv.id, {
-  sitekey: "6Le_Hc8ZAAAAAO6IMIG5zdDmANbljtXY4EHK0wzD",
-  callback: function( response ) {
-    console.log( "Captcha response:" );
-    console.log( response );
-  }
-});</code></pre>
+    sitekey: siteKey,
+    callback: function(r) {
+      console.log("Captcha response:");
+      console.log(r);
+    }
+});
+console.log('Click the checkbox to get the code');</code></pre>
     </div>
   </div>
 </div>

setup.py

@@ -9,7 +9,7 @@
 setup(
     name='kobodl',
     author='Brandon Davis',
-    version='0.5.1',
+    version='0.6.0',
     author_email='[email protected]',
     url="https://github.com/subdavis/kobo-book-downloader",
     long_description=long_description,