Merge pull request #83 from ml-tooling/fix/support-base-url

Add missing base_url prefix to links for correct routing
jupyterhub · Feb 20, 2020 · 3ce00d3 · 3ce00d3
2 parents a0c0810 + bc08543
commit 3ce00d3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/nativeauthenticator/handlers.py b/nativeauthenticator/handlers.py
@@ -109,7 +109,7 @@ class ChangeAuthorizationHandler(LocalBase):
     @admin_only
     async def get(self, slug):
         UserInfo.change_authorization(self.db, slug)
-        self.redirect('/authorize')
+        self.redirect(self.hub.base_url + 'authorize')
 
 
 class ChangePasswordHandler(LocalBase):

diff --git a/nativeauthenticator/templates/autorization-area.html b/nativeauthenticator/templates/autorization-area.html
@@ -24,7 +24,7 @@ <h1>Authorization Area</h1>
                 <td>{{ user.has_2fa }}</td>
                 <td>Yes</td>
                 <td>
-                    <a class="btn btn-default" href="/hub/authorize/{{ user.username }}" role="button">Unauthorize</a>
+                    <a class="btn btn-default" href="{{ base_url }}authorize/{{ user.username }}" role="button">Unauthorize</a>
                 </td>
                 {% else %}
             <tr>
@@ -35,7 +35,7 @@ <h1>Authorization Area</h1>
                 <td>{{ user.has_2fa }}</td>
                 <td>No</td>
                 <td>
-                    <a class="btn btn-jupyter" href="/hub/authorize/{{ user.username }}" role="button">Authorize</a>
+                    <a class="btn btn-jupyter" href="{{ base_url }}authorize/{{ user.username }}" role="button">Authorize</a>
                 </td>
                 {% endif %}
             </tr>

diff --git a/nativeauthenticator/templates/native-login.html b/nativeauthenticator/templates/native-login.html
@@ -53,7 +53,7 @@
             {% endif %}
             <input type="submit" id="login_submit" class='btn btn-jupyter' value='Sign In' tabindex="3" />
             <div style="padding-top: 25px;">
-                <p>Don't have an user? <a href="/signup">Signup!</a></p>
+                <p>Don't have an user? <a href="{{ base_url }}signup">Signup!</a></p>
             </div>
         </div>
     </form>

diff --git a/nativeauthenticator/templates/signup.html b/nativeauthenticator/templates/signup.html
@@ -44,7 +44,7 @@
             {% endif %}
             <input type="submit" id="signup_submit" class='btn btn-jupyter' value='Create User' tabindex="3" />
             <div style="padding-top: 25px;">
-                Already have an user? <a href="/login">Login!</a>
+                Already have an user? <a href="{{ base_url }}login">Login!</a>
             </div>
             {% if alert %}
             <div class="alert {{alert}}" style="margin-top: 15px;" role="alert">