nautobot 2.2.0__py3-none-any.whl → 2.2.0b1__py3-none-any.whl

nautobot/project-static/docs/user-guide/platform-functionality/status.html

@@ -688,27 +688,6 @@
   
   
   
-    <li class="md-nav__item">
-      <a href="../administration/installation/health-checks.html" class="md-nav__link">
-        
-  
-  <span class="md-ellipsis">
-    Health Checks
-  </span>
-  
-
-      </a>
-    </li>
-  
-
-              
-            
-              
-                
-  
-  
-  
-  
     <li class="md-nav__item">
       <a href="../administration/installation/selinux-troubleshooting.html" class="md-nav__link">
         
@@ -1914,7 +1893,7 @@
   
   
     <li class="md-nav__item">
-      <a href="../feature-guides/contacts-and-teams.html" class="md-nav__link">
+      <a href="../feature-guides/contact-and-team.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
@@ -3179,11 +3158,11 @@
   
   
     <li class="md-nav__item">
-      <a href="../core-data-model/dcim/controllermanageddevicegroup.html" class="md-nav__link">
+      <a href="../core-data-model/dcim/controllerdevicegroup.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
-    Controller Managed Device Group
+    Controller Device Group
   </span>
   
 

nautobot/project-static/docs/user-guide/platform-functionality/tag.html

@@ -688,27 +688,6 @@
   
   
   
-    <li class="md-nav__item">
-      <a href="../administration/installation/health-checks.html" class="md-nav__link">
-        
-  
-  <span class="md-ellipsis">
-    Health Checks
-  </span>
-  
-
-      </a>
-    </li>
-  
-
-              
-            
-              
-                
-  
-  
-  
-  
     <li class="md-nav__item">
       <a href="../administration/installation/selinux-troubleshooting.html" class="md-nav__link">
         
@@ -1914,7 +1893,7 @@
   
   
     <li class="md-nav__item">
-      <a href="../feature-guides/contacts-and-teams.html" class="md-nav__link">
+      <a href="../feature-guides/contact-and-team.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
@@ -3179,11 +3158,11 @@
   
   
     <li class="md-nav__item">
-      <a href="../core-data-model/dcim/controllermanageddevicegroup.html" class="md-nav__link">
+      <a href="../core-data-model/dcim/controllerdevicegroup.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
-    Controller Managed Device Group
+    Controller Device Group
   </span>
   
 

nautobot/project-static/docs/user-guide/platform-functionality/template-filters.html

@@ -688,27 +688,6 @@
   
   
   
-    <li class="md-nav__item">
-      <a href="../administration/installation/health-checks.html" class="md-nav__link">
-        
-  
-  <span class="md-ellipsis">
-    Health Checks
-  </span>
-  
-
-      </a>
-    </li>
-  
-
-              
-            
-              
-                
-  
-  
-  
-  
     <li class="md-nav__item">
       <a href="../administration/installation/selinux-troubleshooting.html" class="md-nav__link">
         
@@ -1914,7 +1893,7 @@
   
   
     <li class="md-nav__item">
-      <a href="../feature-guides/contacts-and-teams.html" class="md-nav__link">
+      <a href="../feature-guides/contact-and-team.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
@@ -3179,11 +3158,11 @@
   
   
     <li class="md-nav__item">
-      <a href="../core-data-model/dcim/controllermanageddevicegroup.html" class="md-nav__link">
+      <a href="../core-data-model/dcim/controllerdevicegroup.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
-    Controller Managed Device Group
+    Controller Device Group
   </span>
   
 

nautobot/project-static/docs/user-guide/platform-functionality/users/objectpermission.html

@@ -688,27 +688,6 @@
   
   
   
-    <li class="md-nav__item">
-      <a href="../../administration/installation/health-checks.html" class="md-nav__link">
-        
-  
-  <span class="md-ellipsis">
-    Health Checks
-  </span>
-  
-
-      </a>
-    </li>
-  
-
-              
-            
-              
-                
-  
-  
-  
-  
     <li class="md-nav__item">
       <a href="../../administration/installation/selinux-troubleshooting.html" class="md-nav__link">
         
@@ -1914,7 +1893,7 @@
   
   
     <li class="md-nav__item">
-      <a href="../../feature-guides/contacts-and-teams.html" class="md-nav__link">
+      <a href="../../feature-guides/contact-and-team.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
@@ -3179,11 +3158,11 @@
   
   
     <li class="md-nav__item">
-      <a href="../../core-data-model/dcim/controllermanageddevicegroup.html" class="md-nav__link">
+      <a href="../../core-data-model/dcim/controllerdevicegroup.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
-    Controller Managed Device Group
+    Controller Device Group
   </span>
   
 

nautobot/project-static/docs/user-guide/platform-functionality/users/token.html

@@ -688,27 +688,6 @@
   
   
   
-    <li class="md-nav__item">
-      <a href="../../administration/installation/health-checks.html" class="md-nav__link">
-        
-  
-  <span class="md-ellipsis">
-    Health Checks
-  </span>
-  
-
-      </a>
-    </li>
-  
-
-              
-            
-              
-                
-  
-  
-  
-  
     <li class="md-nav__item">
       <a href="../../administration/installation/selinux-troubleshooting.html" class="md-nav__link">
         
@@ -1914,7 +1893,7 @@
   
   
     <li class="md-nav__item">
-      <a href="../../feature-guides/contacts-and-teams.html" class="md-nav__link">
+      <a href="../../feature-guides/contact-and-team.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
@@ -3179,11 +3158,11 @@
   
   
     <li class="md-nav__item">
-      <a href="../../core-data-model/dcim/controllermanageddevicegroup.html" class="md-nav__link">
+      <a href="../../core-data-model/dcim/controllerdevicegroup.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
-    Controller Managed Device Group
+    Controller Device Group
   </span>
   
 

nautobot/project-static/docs/user-guide/platform-functionality/webhook.html

@@ -688,27 +688,6 @@
   
   
   
-    <li class="md-nav__item">
-      <a href="../administration/installation/health-checks.html" class="md-nav__link">
-        
-  
-  <span class="md-ellipsis">
-    Health Checks
-  </span>
-  
-
-      </a>
-    </li>
-  
-
-              
-            
-              
-                
-  
-  
-  
-  
     <li class="md-nav__item">
       <a href="../administration/installation/selinux-troubleshooting.html" class="md-nav__link">
         
@@ -1914,7 +1893,7 @@
   
   
     <li class="md-nav__item">
-      <a href="../feature-guides/contacts-and-teams.html" class="md-nav__link">
+      <a href="../feature-guides/contact-and-team.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
@@ -3179,11 +3158,11 @@
   
   
     <li class="md-nav__item">
-      <a href="../core-data-model/dcim/controllermanageddevicegroup.html" class="md-nav__link">
+      <a href="../core-data-model/dcim/controllerdevicegroup.html" class="md-nav__link">
         
   
   <span class="md-ellipsis">
-    Controller Managed Device Group
+    Controller Device Group
   </span>
   
 

nautobot/tenancy/api/urls.py

@@ -2,7 +2,8 @@ from nautobot.core.api.routers import OrderedDefaultRouter
 
 from . import views
 
-router = OrderedDefaultRouter(view_name="Tenancy")
+router = OrderedDefaultRouter()
+router.APIRootView = views.TenancyRootView
 
 # Tenants
 router.register("tenant-groups", views.TenantGroupViewSet)

nautobot/tenancy/api/views.py

@@ -1,3 +1,5 @@
+from rest_framework.routers import APIRootView
+
 from nautobot.circuits.models import Circuit
 from nautobot.core.models.querysets import count_related
 from nautobot.dcim.models import Device, Rack
@@ -9,6 +11,16 @@ from nautobot.virtualization.models import VirtualMachine
 
 from . import serializers
 
+
+class TenancyRootView(APIRootView):
+    """
+    Tenancy API root view
+    """
+
+    def get_view_name(self):
+        return "Tenancy"
+
+
 #
 # Tenant Groups
 #

nautobot/tenancy/tables.py

@@ -12,7 +12,7 @@ from .models import Tenant, TenantGroup
 
 TREE_LINK = """
 {% load helpers %}
-{% tree_hierarchy_ui_representation record.tree_depth|as_range table.hide_hierarchy_ui %}
+{% tree_hierarchy_ui_representation record.tree_depth|as_range table.order_by %}
 <a href="{{ record.get_absolute_url }}">{{ record.name }}</a>
 """
 

nautobot/tenancy/tests/test_views.py

@@ -5,7 +5,6 @@ from nautobot.tenancy.models import Tenant, TenantGroup
 
 class TenantGroupTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
     model = TenantGroup
-    sort_on_field = "name"
 
     @classmethod
     def setUpTestData(cls):

nautobot/users/api/urls.py

@@ -2,7 +2,8 @@ from nautobot.core.api.routers import OrderedDefaultRouter
 
 from . import views
 
-router = OrderedDefaultRouter(view_name="Users")
+router = OrderedDefaultRouter()
+router.APIRootView = views.UsersRootView
 
 # Users and groups
 router.register("users", views.UserViewSet)

nautobot/users/api/views.py

@@ -1,10 +1,14 @@
-from django.contrib.auth import get_user_model
+from django.contrib.auth import get_user_model, login, logout
 from django.contrib.auth.models import Group
 from django.db.models import Count
+from django.utils.decorators import method_decorator
+from django.views.decorators.csrf import ensure_csrf_cookie
 from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiTypes
 from rest_framework.authentication import BasicAuthentication
-from rest_framework.permissions import IsAuthenticated
+from rest_framework.decorators import action
+from rest_framework.permissions import AllowAny, IsAuthenticated
 from rest_framework.response import Response
+from rest_framework.routers import APIRootView
 from rest_framework.viewsets import ViewSet
 
 from nautobot.core.api.serializers import BulkOperationIntegerIDSerializer
@@ -16,6 +20,16 @@ from nautobot.users.models import ObjectPermission, Token
 
 from . import serializers
 
+
+class UsersRootView(APIRootView):
+    """
+    Users API root view
+    """
+
+    def get_view_name(self):
+        return "Users"
+
+
 #
 # Users and groups
 #
@@ -26,6 +40,40 @@ class UserViewSet(ModelViewSet):
     serializer_class = serializers.UserSerializer
     filterset_class = filters.UserFilterSet
 
+    @action(methods=["GET"], detail=False, url_path="my-profile")
+    def my_profile(self, request):
+        serializer = self.serializer_class(instance=request.user, context={"request": request})
+        return Response(serializer.data)
+
+    @method_decorator(ensure_csrf_cookie)
+    @action(methods=["GET"], detail=False, permission_classes=[AllowAny])
+    def session(self, request):
+        from django.conf import settings as django_settings
+        from django.urls import reverse
+        from social_django.context_processors import backends
+
+        from nautobot.core.settings_funcs import sso_auth_enabled
+
+        serializer = self.serializer_class(instance=request.user, context={"request": request})
+
+        _backends = []
+        sso_enabled = sso_auth_enabled(django_settings.AUTHENTICATION_BACKENDS)
+
+        social_auth_backends = backends(request)["backends"]
+        if sso_enabled:
+            for backend in social_auth_backends["backends"]:
+                _backends.append(reverse("social:begin", kwargs={"backend": backend}))
+
+        resp = {
+            "user": serializer.data,
+            "logged_in": request.user.is_authenticated,
+            "sso_enabled": sso_enabled,
+            "sso_user": (len(social_auth_backends["associated"]) > 0),
+            "backends": _backends,
+        }
+
+        return Response(resp)
+
 
 @extend_schema_view(
     bulk_destroy=extend_schema(request=BulkOperationIntegerIDSerializer(many=True)),
@@ -53,6 +101,21 @@ class TokenViewSet(ModelViewSet):
         classes = super().authentication_classes
         return [*classes, BasicAuthentication]
 
+    # TODO(timizuo): Move authenticate and logout to its own view;
+    #  as it is not proper to be on this.
+    @action(methods=["POST"], detail=False, permission_classes=[AllowAny])
+    def authenticate(self, request):
+        serializer = serializers.UserLoginSerializer(data=request.data, context=self.get_serializer_context())
+        serializer.is_valid(raise_exception=True)
+        user = serializer.validated_data["user"]
+        login(request, user=user)
+        return Response(status=200)
+
+    @action(methods=["GET"], detail=False)
+    def logout(self, request):
+        logout(request)
+        return Response(status=200)
+
     def get_queryset(self):
         """
         Limit users to their own Tokens.

nautobot/users/views.py

@@ -7,6 +7,7 @@ from django.contrib.auth import (
     logout as auth_logout,
     update_session_auth_hash,
 )
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import HttpResponseForbidden, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
@@ -17,7 +18,6 @@ from django.views.decorators.debug import sensitive_post_parameters
 from django.views.generic import View
 
 from nautobot.core.forms import ConfirmationForm
-from nautobot.core.views.generic import GenericView
 
 from .forms import AdvancedProfileSettingsForm, LoginForm, PasswordChangeForm, TokenForm
 from .models import Token
@@ -118,7 +118,7 @@ def is_django_auth_user(request):
     return request.session.get(BACKEND_SESSION_KEY, None) == "nautobot.core.authentication.ObjectPermissionBackend"
 
 
-class ProfileView(GenericView):
+class ProfileView(LoginRequiredMixin, View):
     template_name = "users/profile.html"
 
     def get(self, request):
@@ -132,7 +132,7 @@ class ProfileView(GenericView):
         )
 
 
-class UserConfigView(GenericView):
+class UserConfigView(LoginRequiredMixin, View):
     template_name = "users/preferences.html"
 
     def get(self, request):
@@ -160,7 +160,7 @@ class UserConfigView(GenericView):
         return redirect("user:preferences")
 
 
-class ChangePasswordView(GenericView):
+class ChangePasswordView(LoginRequiredMixin, View):
     template_name = "users/change_password.html"
 
     RESTRICTED_NOTICE = "Remotely authenticated user credentials cannot be changed within Nautobot."
@@ -218,7 +218,7 @@ class ChangePasswordView(GenericView):
 #
 
 
-class TokenListView(GenericView):
+class TokenListView(LoginRequiredMixin, View):
     def get(self, request):
         tokens = Token.objects.filter(user=request.user)
 
@@ -233,7 +233,7 @@ class TokenListView(GenericView):
         )
 
 
-class TokenEditView(GenericView):
+class TokenEditView(LoginRequiredMixin, View):
     def get(self, request, pk=None):
         if pk is not None:
             if not request.user.has_perm("users.change_token"):
@@ -292,7 +292,7 @@ class TokenEditView(GenericView):
         )
 
 
-class TokenDeleteView(GenericView):
+class TokenDeleteView(LoginRequiredMixin, View):
     def get(self, request, pk):
         token = get_object_or_404(Token.objects.filter(user=request.user), pk=pk)
         initial_data = {
@@ -336,7 +336,7 @@ class TokenDeleteView(GenericView):
 #
 
 
-class AdvancedProfileSettingsEditView(GenericView):
+class AdvancedProfileSettingsEditView(LoginRequiredMixin, View):
     template_name = "users/advanced_settings_edit.html"
 
     def get(self, request):

nautobot/virtualization/api/urls.py

@@ -2,7 +2,8 @@ from nautobot.core.api.routers import OrderedDefaultRouter
 
 from . import views
 
-router = OrderedDefaultRouter(view_name="Virtualization")
+router = OrderedDefaultRouter()
+router.APIRootView = views.VirtualizationRootView
 
 # Clusters
 router.register("cluster-types", views.ClusterTypeViewSet)

nautobot/virtualization/api/views.py

@@ -1,3 +1,5 @@
+from rest_framework.routers import APIRootView
+
 from nautobot.core.models.querysets import count_related
 from nautobot.dcim.models import Device
 from nautobot.extras.api.views import (
@@ -17,6 +19,16 @@ from nautobot.virtualization.models import (
 
 from . import serializers
 
+
+class VirtualizationRootView(APIRootView):
+    """
+    Virtualization API root view
+    """
+
+    def get_view_name(self):
+        return "Virtualization"
+
+
 #
 # Clusters
 #

{nautobot-2.2.0.dist-info → nautobot-2.2.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nautobot
-Version: 2.2.0
+Version: 2.2.0b1
 Summary: Source of truth and network automation platform.
 Home-page: https://nautobot.com
 License: Apache-2.0
@@ -22,7 +22,7 @@ Provides-Extra: mysql
 Provides-Extra: napalm
 Provides-Extra: remote-storage
 Provides-Extra: sso
-Requires-Dist: Django (>=3.2.25,<3.3.0)
+Requires-Dist: Django (>=3.2.24,<3.3.0)
 Requires-Dist: GitPython (>=3.1.41,<3.2.0)
 Requires-Dist: Jinja2 (>=3.1.3,<3.2.0)
 Requires-Dist: Markdown (>=3.3.7,<3.6.0)
@@ -68,7 +68,7 @@ Requires-Dist: psycopg2-binary (>=2.9.9,<2.10.0)
 Requires-Dist: python-slugify (>=8.0.3,<8.1.0)
 Requires-Dist: pyuwsgi (>=2.0.23,<2.1.0)
 Requires-Dist: social-auth-app-django (>=5.2.0,<5.3.0)
-Requires-Dist: social-auth-core[openidconnect,saml] (>=4.5.3,<4.6.0) ; extra == "all" or extra == "sso"
+Requires-Dist: social-auth-core[openidconnect,saml] (>=4.4.2,<4.5.0) ; extra == "all" or extra == "sso"
 Requires-Dist: svgwrite (>=1.4.2,<1.5.0)
 Project-URL: Documentation, https://docs.nautobot.com
 Project-URL: Repository, https://github.com/nautobot/nautobot