Merge branch 'master' into Develop

2020-02-22 16:24:06 +01:00
parent 27a18d60a7 b7f3e00fbf
commit 372c284ad4
7 changed files with 69 additions and 55 deletions
@@ -121,7 +121,7 @@ kobo_auth = Blueprint("kobo_auth", __name__, url_prefix="/kobo_auth")
@login_required
 def generate_auth_token(user_id):
    host = ':'.join(request.host.rsplit(':')[0:-1])
-    if host == '127.0.0.1' or host.lower() == 'localhost' or host =='[::ffff:7f00:1]':
+    if host.startswith('127.') or host.lower() == 'localhost' or host.startswith('[::ffff:7f'):
        warning = _('PLease access calibre-web from non localhost to get valid api_endpoint for kobo device')
        return render_title_template(
            "generate_kobo_auth_url.html",