fix nb

Author: erikgaas

fasthtml/oauth.py

@@ -127,10 +127,10 @@ def get_host(request):
     return forwarded_host if forwarded_host else request.url.netloc
 
 # %% ../nbs/api/08_oauth.ipynb
-def redir_url(request, redir_path, scheme=None):
+def redir_url(req, redir_path, scheme=None):
     "Get the redir url for the host in `request`"
-    host = get_host(request)
-    scheme = 'http' if url_match(req,self.http_patterns) or not self.https else 'https'
+    host = get_host(req)
+    scheme = 'http' if host.split(':')[0] in ("localhost", "127.0.0.1") else 'https'
     return f"{scheme}://{host}{redir_path}"
 
 # %% ../nbs/api/08_oauth.ipynb

nbs/api/08_oauth.ipynb

@@ -352,40 +352,13 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "def redir_url(request, redir_path, scheme=None):\n",
+    "def redir_url(req, redir_path, scheme=None):\n",
     "    \"Get the redir url for the host in `request`\"\n",
-    "    host = get_host(request)\n",
-    "    scheme = 'http' if url_match(req,self.http_patterns) or not self.https else 'https'\n",
+    "    host = get_host(req)\n",
+    "    scheme = 'http' if host.split(':')[0] in (\"localhost\", \"127.0.0.1\") else 'https'\n",
     "    return f\"{scheme}://{host}{redir_path}\""
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "fee2db6c",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Localhost: http://localhost:8000/redirect\n",
-      "With X-Forwarded-Host: https://example.com/redirect\n",
-      "Production: https://myapp.com/redirect\n"
-     ]
-    }
-   ],
-   "source": [
-    "from types import SimpleNamespace\n",
-    "from urllib.parse import urlparse\n",
-    "\n",
-    "mock_request_prod = SimpleNamespace(headers={}, url=SimpleNamespace(netloc='myapp.com', hostname='myapp.com'))\n",
-    "\n",
-    "print(\"Localhost:\", redir_url(mock_request_localhost, '/redirect'))\n",
-    "print(\"With X-Forwarded-Host:\", redir_url(mock_request_with_forward, '/redirect'))\n",
-    "print(\"Production:\", redir_url(mock_request_prod, '/redirect'))"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -522,6 +495,33 @@
     "    return any(re.match(pattern, get_host(request).split(':')[0]) for pattern in patterns)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "fee2db6c",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Localhost: http://localhost:8000/redirect\n",
+      "With X-Forwarded-Host: https://example.com/redirect\n",
+      "Production: https://myapp.com/redirect\n"
+     ]
+    }
+   ],
+   "source": [
+    "from types import SimpleNamespace\n",
+    "from urllib.parse import urlparse\n",
+    "\n",
+    "mock_request_prod = SimpleNamespace(headers={}, url=SimpleNamespace(netloc='myapp.com', hostname='myapp.com'))\n",
+    "\n",
+    "print(\"Localhost:\", redir_url(mock_request_localhost, '/redirect'))\n",
+    "print(\"With X-Forwarded-Host:\", redir_url(mock_request_with_forward, '/redirect'))\n",
+    "print(\"Production:\", redir_url(mock_request_prod, '/redirect'))"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -622,6 +622,8 @@
       "text/markdown": [
        "---\n",
        "\n",
+       "[source](https://github.com/AnswerDotAI/fasthtml/blob/main/fasthtml/oauth.py#L223){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "\n",
        "### GoogleAppClient.consent_url\n",
        "\n",
        ">      GoogleAppClient.consent_url (proj=None)\n",
@@ -631,6 +633,8 @@
       "text/plain": [
        "---\n",
        "\n",
+       "[source](https://github.com/AnswerDotAI/fasthtml/blob/main/fasthtml/oauth.py#L223){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "\n",
        "### GoogleAppClient.consent_url\n",
        "\n",
        ">      GoogleAppClient.consent_url (proj=None)\n",
@@ -673,6 +677,8 @@
       "text/markdown": [
        "---\n",
        "\n",
+       "[source](https://github.com/AnswerDotAI/fasthtml/blob/main/fasthtml/oauth.py#L231){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "\n",
        "### Credentials.update\n",
        "\n",
        ">      Credentials.update ()\n",
@@ -682,6 +688,8 @@
       "text/plain": [
        "---\n",
        "\n",
+       "[source](https://github.com/AnswerDotAI/fasthtml/blob/main/fasthtml/oauth.py#L231){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "\n",
        "### Credentials.update\n",
        "\n",
        ">      Credentials.update ()\n",
@@ -723,6 +731,8 @@
       "text/markdown": [
        "---\n",
        "\n",
+       "[source](https://github.com/AnswerDotAI/fasthtml/blob/main/fasthtml/oauth.py#L238){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "\n",
        "### Credentials.save\n",
        "\n",
        ">      Credentials.save (fname)\n",
@@ -732,6 +742,8 @@
       "text/plain": [
        "---\n",
        "\n",
+       "[source](https://github.com/AnswerDotAI/fasthtml/blob/main/fasthtml/oauth.py#L238){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "\n",
        "### Credentials.save\n",
        "\n",
        ">      Credentials.save (fname)\n",
@@ -788,6 +800,8 @@
       "text/markdown": [
        "---\n",
        "\n",
+       "[source](https://github.com/AnswerDotAI/fasthtml/blob/main/fasthtml/oauth.py#L249){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "\n",
        "### GoogleAppClient.creds\n",
        "\n",
        ">      GoogleAppClient.creds ()\n",
@@ -797,6 +811,8 @@
       "text/plain": [
        "---\n",
        "\n",
+       "[source](https://github.com/AnswerDotAI/fasthtml/blob/main/fasthtml/oauth.py#L249){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "\n",
        "### GoogleAppClient.creds\n",
        "\n",
        ">      GoogleAppClient.creds ()\n",