Fix webform for new auth method (#145)

* Fix webform for new auth method

* Remove old instructions

* Release 0.10.1

Author: subdavis

README.md

@@ -125,7 +125,6 @@ General usage documentation.
 
 ``` bash
 # Get started by adding one or more users
-# See `Getting a reCAPTCHA code` below for more help
 kobodl user add
 
 # List users

kobodl/actions.py

@@ -160,7 +160,6 @@ def ListBooks(users: List[User], listAll: bool, exportFile: Union[TextIO, None])
                 Owner=user,
             )
 
-
 def Login(user: User) -> None:
     '''perform device initialization and get token'''
     kobo = Kobo(user)
@@ -169,6 +168,26 @@ def Login(user: User) -> None:
     kobo.Login()
 
 
+def InitiateLogin(user: User) -> Tuple[str, str]:
+    """Start the login process and return activation details"""
+    kobo = Kobo(user)
+    return kobo._Kobo__ActivateOnWeb()
+
+
+def CheckActivation(user: User, check_url: str) -> bool:
+    """Check if activation is complete and setup user if so"""
+    kobo = Kobo(user)
+    try:
+        email, user_id, user_key = kobo._Kobo__CheckActivation(check_url)
+        user.Email = email
+        user.UserId = user_id
+        kobo.AuthenticateDevice(user_key)
+        kobo.LoadInitializationSettings()
+        return True
+    except Exception:
+        return False
+
+
 def GetBookOrBooks(
     user: User,
     outputPath: str,

kobodl/app.py

@@ -1,7 +1,7 @@
 import json.decoder
 import os
 
-from flask import Flask, abort, redirect, render_template, request, send_from_directory
+from flask import Flask, abort, jsonify, redirect, render_template, request, send_from_directory
 from requests import Request, Session
 from requests.auth import HTTPBasicAuth
 from requests.exceptions import HTTPError
@@ -22,25 +22,45 @@ def index():
 def users():
     error = None
     if request.method == 'POST':
-        print(request.form)
         email = request.form.get('email')
-        password = request.form.get('password')
-        captcha = request.form.get('captcha')
-        print(email, password, captcha)
-        if email and password and captcha:
+        if email:
             user = User(Email=email)
             try:
-                actions.Login(user, password, captcha)
-                Globals.Settings.UserList.users.append(user)
-                Globals.Settings.Save()
+                activation_url, activation_code = actions.InitiateLogin(user)
+                return jsonify({
+                    'activation_url': 'https://www.kobo.com/activate',
+                    'activation_code': activation_code,
+                    'check_url': activation_url,
+                    'email': email
+                })
             except Exception as err:
                 error = str(err)
         else:
-            error = 'email, password, or captcha missing'
+            error = 'email is required'
     users = Globals.Settings.UserList.users
     return render_template('users.j2', users=users, error=error)
 
 
+@app.route('/user/check-activation', methods=['POST'])
+def check_activation():
+    data = request.get_json()
+    check_url = data.get('check_url')
+    email = data.get('email')
+    
+    if not check_url or not email:
+        return jsonify({'error': 'Missing required parameters'}), 400
+
+    user = User(Email=email)
+    try:
+        if actions.CheckActivation(user, check_url):
+            Globals.Settings.UserList.users.append(user)
+            Globals.Settings.Save()
+            return jsonify({'success': True})
+        return jsonify({'success': False})
+    except Exception as err:
+        return jsonify({'error': str(err)}), 400
+
+
 @app.route('/user/<userid>/remove', methods=['POST'])
 def deleteUser(userid):
     user = Globals.Settings.UserList.getUser(userid)

kobodl/kobo.py

@@ -73,16 +73,21 @@ def __GetHeaderWithAccessToken(self) -> dict:
         headers = {"Authorization": authorization}
         return headers
 
+    def __CheckActivation(self, activationCheckUrl) -> Tuple[str, str, str] | None:
+        response = self.Session.get(activationCheckUrl)
+        response.raise_for_status()
+        jsonResponse = response.json()
+        if jsonResponse["Status"] == "Complete":
+            return (jsonResponse["UserEmail"], jsonResponse["UserId"], jsonResponse["UserKey"])
+        return None
+
     def __WaitTillActivation(self, activationCheckUrl) -> Tuple[str, str]:
         while True:
             print("Waiting for you to finish the activation...")
             time.sleep(5)
-
-            response = self.Session.get(activationCheckUrl)
-            response.raise_for_status()
-            jsonResponse = response.json()
-            if jsonResponse["Status"] == "Complete":
-                return jsonResponse["UserEmail"], jsonResponse["UserId"], jsonResponse["UserKey"]
+            response = self.__CheckActivation(activationCheckUrl)
+            if response:
+                return response
 
     def __ActivateOnWeb(self) -> Tuple[str, str]:
         print("Initiating web-based activation")

kobodl/templates/activation_form.html

@@ -0,0 +1,104 @@
+<div class="max-w-md">
+
+  <!-- Initial Email Form -->
+  <form id="emailForm" class="mb-8">
+    <input
+      class="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
+      type="email"
+      name="email"
+      id="email"
+      placeholder="Your Kobo Account Email"
+      required
+    >
+    <button
+      class="mt-4 bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline"
+      type="submit"
+    >
+      Start Activation
+    </button>
+  </form>
+
+  <!-- Activation Instructions (Hidden initially) -->
+  <div id="activationInstructions" class="hidden">
+    <div class="bg-blue-100 border-l-4 border-blue-500 text-blue-700 p-4 mb-4" role="alert">
+      <h3 class="font-bold">Follow these steps:</h3>
+      <ol class="list-decimal ml-4 mt-2">
+        <li class="mb-2">Open <a href="" id="activationLink" target="_blank" class="text-blue-600 hover:underline">the Kobo activation page</a></li>
+        <li class="mb-2">Enter this code: <span id="activationCode" class="font-mono bg-gray-200 px-2 py-1 rounded"></span></li>
+        <li>Sign in to your Kobo account if prompted</li>
+      </ol>
+    </div>
+    <div class="text-center">
+      <div class="inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900"></div>
+      <p class="mt-2">Waiting for activation...</p>
+    </div>
+  </div>
+</div>
+
+<script>
+document.getElementById('emailForm').addEventListener('submit', async (e) => {
+  e.preventDefault();
+  const email = document.getElementById('email').value;
+  
+  try {
+    const response = await fetch('/user', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+      },
+      body: new URLSearchParams({
+        email: email
+      })
+    });
+    
+    const data = await response.json();
+    
+    // Show activation instructions
+    document.getElementById('emailForm').classList.add('hidden');
+    document.getElementById('activationInstructions').classList.remove('hidden');
+    
+    // Update activation details
+    document.getElementById('activationLink').href = data.activation_url;
+    document.getElementById('activationCode').textContent = data.activation_code;
+    
+    // Start polling for activation
+    pollActivation(data.check_url, data.email);
+    
+  } catch (error) {
+    console.error('Error:', error);
+    alert('An error occurred. Please try again.');
+  }
+});
+
+async function pollActivation(checkUrl, email) {
+  while (true) {
+    try {
+      const response = await fetch('/user/check-activation', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          check_url: checkUrl,
+          email: email
+        })
+      });
+      
+      const data = await response.json();
+      
+      if (data.success) {
+        window.location.reload();
+        return;
+      }
+      
+      // Wait 5 seconds before next poll
+      await new Promise(resolve => setTimeout(resolve, 5000));
+      
+    } catch (error) {
+      console.error('Error checking activation:', error);
+      alert('Error checking activation status. Please try again.');
+      return;
+    }
+  }
+}
+</script>

kobodl/templates/instructions.html

@@ -6,8 +6,8 @@
   <thead>
     <tr class="text-left">
       <th class="p-2 pl-4"> Email </th>
-      <th class="p-2 pl-4""> DeviceId </th>
-      <th class="p-2 pl-4""> Books </th>
+      <th class="p-2 pl-4"> DeviceId </th>
+      <th class="p-2 pl-4"> Books </th>
     </tr>
   </thead>
   <tbody>
@@ -30,40 +30,7 @@
 {% endif %}
 
 <h1 class="text-2xl mt-6">Add User</h1>
-<form style="max-width: 500px;" action="/user" method="post">
-  {% include "error.j2" %}
-  <input
-    class="my-2 shadow appearance-none border
-      rounded w-full py-2 px-3 text-gray-700
-      leading-tight focus:outline-none focus:shadow-outline"
-    type="text"
-    name="email"
-    placeholder="Kobo Account Email"
-  >
-  <input
-    class="my-2 shadow appearance-none border
-      rounded w-full py-2 px-3 text-gray-700 mb-3
-      leading-tight focus:outline-none focus:shadow-outline"
-    name="password"
-    type="password"
-    placeholder="password"
-  >
-  <input
-    class="my-2 shadow appearance-none border
-      rounded w-full py-2 px-3 text-gray-700 mb-3
-      leading-tight focus:outline-none focus:shadow-outline"
-    name="captcha"
-    type="text"
-    placeholder="captcha code (see instructions)"
-  >
-  <button
-    class="my-2 bg-blue-500 hover:bg-blue-700 text-white font-bold
-      py-2 px-4 rounded focus:outline-none focus:shadow-outline"
-    type="submit"
-  >
-    Add user
-  </button>
-</form>
+{% include "error.j2" %}
+{% include "activation_form.html" %}
 
-{% include "instructions.html" %}
 {% include "footer.html" %}

kobodl/templates/users.j2

@@ -12,7 +12,7 @@ multi_line_output = 3
 
 [tool.poetry]
 name = "kobodl"
-version = "0.10.0"
+version = "0.10.1"
 description = "Kobo Book Downloader"
 authors = ["Brandon Davis <[email protected]>"]
 license = "Unlicense"