Sourcery Starbot ⭐ refactored danyi1212/django-windowsauth by SourceryAI · Pull Request #16 · danyi1212/django-windowsauth

SourceryAI · 2022-03-16T12:15:25Z

Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨

Here's your pull request refactoring your most popular Python repo.

If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.

Review changes via command line

To manually merge these changes, make sure you're on the main branch, then run:

git fetch https://github.com/sourcery-ai-bot/django-windowsauth main
git merge --ff-only FETCH_HEAD
git reset HEAD^

SourceryAI · 2022-03-16T12:15:27Z

-            else:
-                # for all domains
-                return True
+            return user.ldap.domain == domain if domain else True


Function domain_required.check_domain refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

This removes the following comments ( why? ):

# for all domains # for specific domain

SourceryAI · 2022-03-16T12:15:27Z

-        if user.is_authenticated and LDAPUser.objects.filter(user=user).exists():
-            try:
-                if WAUTH_USE_CACHE:
-                    user.ldap.sync()
-                else:
-                    # check via database query
-                    if not timedelta or not user.ldap.last_sync or user.ldap.last_sync < timezone.now() - timedelta:
-                        user.ldap.sync()
-
-                return True
-            except Exception as e:
-                if raise_exception:
-                    raise e
-                else:
-                    return False
-        else:
+        if (
+            not user.is_authenticated
+            or not LDAPUser.objects.filter(user=user).exists()
+        ):
            return allow_non_ldap
+        try:
+            if WAUTH_USE_CACHE:
+                user.ldap.sync()
+            elif not timedelta or not user.ldap.last_sync or user.ldap.last_sync < timezone.now() - timedelta:
+                user.ldap.sync()
+
+            return True
+        except Exception as e:
+            if raise_exception:
+                raise e
+            else:
+                return False


Function ldap_sync_required.check_sync refactored with the following changes:

Add guard clause (last-if-guard)

Merge else clause's nested if statement into elif (merge-else-if-into-elif)

This removes the following comments ( why? ):

# check via database query

SourceryAI · 2022-03-16T12:15:27Z

    def __init__(self, domain: str, settings: Optional[LDAPSettings] = None):
        self.domain = domain
-        self.settings = settings if settings else LDAPSettings.for_domain(domain)
+        self.settings = settings or LDAPSettings.for_domain(domain)


Function LDAPManager.__init__ refactored with the following changes:

Simplify if expression by using or (or-if-exp-identity)

SourceryAI · 2022-03-16T12:15:27Z

-                else:
-                    # check via database query
-                    if not ldap_user.last_sync or ldap_user.last_sync < timezone.now() - timezone.timedelta(seconds=timeout):
-                        ldap_user.sync()
+                elif not ldap_user.last_sync or ldap_user.last_sync < timezone.now() - timezone.timedelta(seconds=timeout):
+                    ldap_user.sync()
            except LDAPUser.DoesNotExist:
                # user is getting created the first time
                pass
            except Exception as e:
                logger.exception(f"Failed to synchronize user {request.user} against LDAP")
-                # return error response
-                if WAUTH_REQUIRE_RESYNC:
-                    if isinstance(WAUTH_ERROR_RESPONSE, int):
-                        return HttpResponse(f"Authorization Failed.", status=WAUTH_ERROR_RESPONSE)
-                    elif callable(WAUTH_ERROR_RESPONSE):
+                if isinstance(WAUTH_ERROR_RESPONSE, int):
+                    if WAUTH_REQUIRE_RESYNC:
+                        return HttpResponse("Authorization Failed.", status=WAUTH_ERROR_RESPONSE)
+                elif callable(WAUTH_ERROR_RESPONSE):
+                    if WAUTH_REQUIRE_RESYNC:
                        return WAUTH_ERROR_RESPONSE(request, e)
-                    else:
-                        raise e
-        response = self.get_response(request)
-        return response
+                elif WAUTH_REQUIRE_RESYNC:
+                    raise e
+        return self.get_response(request)


Function UserSyncMiddleware.__call__ refactored with the following changes:

Merge else clause's nested if statement into elif (merge-else-if-into-elif)

Swap positions of nested conditionals (swap-nested-ifs)

Replace f-string with no interpolated values with string (remove-redundant-fstring)

Inline variable that is immediately returned (inline-immediately-returned-variable)

This removes the following comments ( why? ):

# return error response # check via database query

SourceryAI · 2022-03-16T12:15:27Z

+        elif "\\" in username:
            domain, sam_account_name = username.split("\\", 2)

+        else:
+            raise ValueError("Username must be in DOMAIN\\username format.")


Function LDAPUserManager.create_user refactored with the following changes:

Merge else clause's nested if statement into elif (merge-else-if-into-elif)

Lift code into else after jump in control flow (reintroduce-else)

Swap if/else branches (swap-if-else-branches)

SourceryAI · 2022-03-16T12:15:28Z

-        return format_bytes(obj.bytes_received) + " / " + format_bytes(obj.bytes_transmitted)
+        return f'{format_bytes(obj.bytes_received)} / ' + format_bytes(
+            obj.bytes_transmitted
+        )


Function LDAPUsageAdmin.bytes refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

SourceryAI · 2022-03-16T12:15:28Z

-        return str(obj.messages_received) + " / " + str(obj.messages_transmitted)
+        return f'{str(obj.messages_received)} / {str(obj.messages_transmitted)}'


Function LDAPUsageAdmin.messages refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

SourceryAI · 2022-03-16T12:15:29Z

-        return str(obj.open_sockets) + " / " + str(obj.closed_sockets) + " / " + str(obj.wrapped_sockets)
+        return f'{str(obj.open_sockets)} / {str(obj.closed_sockets)} / ' + str(
+            obj.wrapped_sockets
+        )


Function LDAPUsageAdmin.sockets refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

SourceryAI · 2022-03-16T12:15:29Z

 def collect_metrics(unbind: bool = True):
    if unbind:
-        logger.info(f"Unbinding all LDAP Connections for collecting metrics")
+        logger.info("Unbinding all LDAP Connections for collecting metrics")


Function collect_metrics refactored with the following changes:

Replace f-string with no interpolated values with string (remove-redundant-fstring)

SourceryAI · 2022-03-16T12:15:29Z

-                # predefined tasks
-                if command in PREDEFINED_TASKS:
-                    create_task = PREDEFINED_TASKS[command]
-                    create_task(command=command, name=name, desc=desc, identity=identity, folder=folder,
-                                interval=interval, random=random, timeout=timeout, priority=priority)
-                else:
+                if command not in PREDEFINED_TASKS:
                    raise CommandError(f"Predefined task for \"{command}\" does not exist.")
+                create_task = PREDEFINED_TASKS[command]
+                create_task(command=command, name=name, desc=desc, identity=identity, folder=folder,
+                            interval=interval, random=random, timeout=timeout, priority=priority)


Function Command.handle refactored with the following changes:

Swap if/else branches (swap-if-else-branches)

Remove unnecessary else after guard condition (remove-unnecessary-else)

This removes the following comments ( why? ):

# predefined tasks

'Refactored by Sourcery'

6701dcf

SourceryAI commented Mar 16, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery Starbot ⭐ refactored danyi1212/django-windowsauth#16

Sourcery Starbot ⭐ refactored danyi1212/django-windowsauth#16
SourceryAI wants to merge 1 commit into
danyi1212:mainfrom
SourceryAI:main

SourceryAI commented Mar 16, 2022

Uh oh!

SourceryAI Mar 16, 2022

Uh oh!

SourceryAI Mar 16, 2022

Uh oh!

SourceryAI Mar 16, 2022

Uh oh!

SourceryAI Mar 16, 2022

Uh oh!

SourceryAI Mar 16, 2022

Uh oh!

SourceryAI Mar 16, 2022

Uh oh!

SourceryAI Mar 16, 2022

Uh oh!

SourceryAI Mar 16, 2022

Uh oh!

SourceryAI Mar 16, 2022

Uh oh!

SourceryAI Mar 16, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

		return str(obj.messages_received) + " / " + str(obj.messages_transmitted)
		return f'{str(obj.messages_received)} / {str(obj.messages_transmitted)}'

Conversation

SourceryAI commented Mar 16, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant