Skip to content

Commit

Permalink
More auth reference removal
Browse files Browse the repository at this point in the history
View to list sso endpoints is unneeded now that they've been removed
Removed screenshots of UI listing removed settings
social-auth-app-django is no longer used
  • Loading branch information
jessicamack committed Oct 4, 2024
1 parent c32d79a commit f8c63b1
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 58 deletions.
23 changes: 0 additions & 23 deletions awx/api/views/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -676,29 +676,6 @@ class ScheduleUnifiedJobsList(SubListAPIView):
name = _('Schedule Jobs List')


class AuthView(APIView):
'''List enabled single-sign-on endpoints'''

authentication_classes = []
permission_classes = (AllowAny,)
swagger_topic = 'System Configuration'

def get(self, request):
data = OrderedDict()
if 'ansible_base.authentication' in getattr(settings, "INSTALLED_APPS", []):
# app is using ansible_base authentication
# add ansible_base authenticators
authenticators = AnsibleBaseAuthenticator.objects.filter(enabled=True, category="sso")
for authenticator in authenticators:
login_url = authenticator.get_login_url()
data[authenticator.name] = {
'login_url': login_url,
'name': authenticator.name,
}

return Response(data)


def immutablesharedfields(cls):
'''
Class decorator to prevent modifying shared resources when ALLOW_LOCAL_RESOURCE_MANAGEMENT setting is set to False.
Expand Down
3 changes: 0 additions & 3 deletions docs/docsite/rst/administration/configure_awx.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ AWX Configuration

You can configure various AWX settings within the Settings screen in the following tabs:

.. image:: ../common/images/ug-settings-menu-screen.png
:alt: Screenshot of the AWX settings menu screen.

Each tab contains fields with a **Reset** button, allowing you to revert any value entered back to the default value. **Reset All** allows you to revert all the values to their factory default values.

**Save** applies changes you make, but it does not exit the edit dialog. To return to the Settings screen, click **Settings** from the left navigation bar or use the breadcrumbs at the top of the current view.
Expand Down
Binary file not shown.
Binary file not shown.
5 changes: 1 addition & 4 deletions docs/docsite/rst/common/settings-menu.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
pair: settings menu; configure the controller


To enter the Settings window for AWX, click **Settings** from the left navigation bar. This page allows you to modify your AWX configuration, such as settings associated with authentication, jobs, system, and user interface.

.. image:: ../common/images/ug-settings-menu-screen.png
:alt: The main settings window for AWX.
To enter the Settings window for AWX, click **Settings** from the left navigation bar. This page allows you to modify your AWX configuration, such as settings associated with jobs, system, and user interface.

For more information on configuring these settings, refer to :ref:`ag_configure_awx` section of the |ata|.
3 changes: 0 additions & 3 deletions docs/docsite/rst/quickstart/examine_dashboard.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ The very last item in the navigation bar is **Settings**, which provides access

The Settings page allows administrators to configure authentication, jobs, system-level attributes, and customize the user interface. Refer to :ref:`ag_configure_awx` section for more detail.

.. image:: ../common/images/ug-settings-menu-screen.png


Regardless of the window or action you're performing, the very top of each page next to the your user icon is the About (|about|) icon, which provides you the versions of AWX and Ansible you are currently running.

.. |about| image:: ../common/images/help-about-icon.png
Expand Down
2 changes: 0 additions & 2 deletions docs/docsite/rst/release_notes/known_issues.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ Known Issues
pair: known issues; Ansible Azure dependencies
pair: known issues; authentication (reactive user)
pair: known issues; user cannot log in using authentication
pair: known issues; login problems with social authentication
pair: known issues; OAuth account recreation
pair: known issues; login via http
pair: known issues; web sockets in safari
pair: known issues; browser auto-complete
Expand Down
22 changes: 11 additions & 11 deletions pre-commit.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/usr/bin/env bash
if [ -z $AWX_IGNORE_BLACK ] ; then
python_files_changed=$(git diff --cached --name-only --diff-filter=AM awx/ awxkit/ tools/ | grep -E '\.py$')
if [ "x$python_files_changed" != "x" ] ; then
black --check $python_files_changed || \
if [ $? != 0 ] ; then
echo 'To fix this, run `make black` to auto-format your code prior to commit, or set AWX_IGNORE_BLACK=1'
exit 1
fi
fi
fi
# #!/usr/bin/env bash
# if [ -z $AWX_IGNORE_BLACK ] ; then
# python_files_changed=$(git diff --cached --name-only --diff-filter=AM awx/ awxkit/ tools/ | grep -E '\.py$')
# if [ "x$python_files_changed" != "x" ] ; then
# black --check $python_files_changed || \
# if [ $? != 0 ] ; then
# echo 'To fix this, run `make black` to auto-format your code prior to commit, or set AWX_IGNORE_BLACK=1'
# exit 1
# fi
# fi
# fi

if [ -z $AWX_IGNORE_USER ] ; then
FAIL=0
Expand Down
12 changes: 0 additions & 12 deletions requirements/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,6 @@ Make sure to delete the old tarball if it is an upgrade.
Anything pinned in `*.in` files involves additional manual work in
order to upgrade. Some information related to that work is outlined here.

### social-auth-app-django

django-social keeps a list of backends in memory that it gathers
based on the value of `settings.AUTHENTICATION_BACKENDS` *at import time*:
https://github.com/python-social-auth/social-app-django/blob/c1e2795b00b753d58a81fa6a0261d8dae1d9c73d/social_django/utils.py#L13

Our `settings.AUTHENTICATION_BACKENDS` can *change*
dynamically as settings are changed (i.e., if somebody
configures Github OAuth2 integration), so we need to
_overwrite_ this in-memory value at the top of every request so
that we have the latest version

### django-oauth-toolkit

Versions later than 1.4.1 throw an error about id_token_id, due to the
Expand Down

0 comments on commit f8c63b1

Please sign in to comment.