Mirror/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2025-01-31 10:31:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix new WS middleware for old auth method, improve auth token admin panel

Browse Source
This commit is contained in:
Reckless_Satoshi 2023-05-07 14:28:44 -07:00
parent 2293a8922d
commit af0289c264
No known key found for this signature in database
GPG Key ID: 9C4585B561315571
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/admin.py
View File

@ -4,12 +4,15 @@ from django.contrib import admin, messages
from django.contrib.auth.admin import UserAdmin from django.contrib.auth.admin import UserAdmin
from django.contrib.auth.models import Group, User from django.contrib.auth.models import Group, User
from django_admin_relation_links import AdminChangeLinksMixin from django_admin_relation_links import AdminChangeLinksMixin
from rest_framework.authtoken.admin import TokenAdmin
from rest_framework.authtoken.models import TokenProxy
from api.logics import Logics from api.logics import Logics
from api.models import Currency, LNPayment, MarketTick, OnchainPayment, Order, Robot from api.models import Currency, LNPayment, MarketTick, OnchainPayment, Order, Robot
admin.site.unregister(Group) admin.site.unregister(Group)
admin.site.unregister(User) admin.site.unregister(User)
admin.site.unregister(TokenProxy)
class RobotInline(admin.StackedInline): class RobotInline(admin.StackedInline):
@ -41,6 +44,22 @@ class EUserAdmin(AdminChangeLinksMixin, UserAdmin):
return obj.robot.avatar_tag() return obj.robot.avatar_tag()
# extended tokens with raw id fields and avatars
@admin.register(TokenProxy)
class ETokenAdmin(AdminChangeLinksMixin, TokenAdmin):
raw_id_fields = ["user"]
list_display = (
"avatar_tag",
"key",
"user_link",
)
list_display_links = ("key",)
change_links = ("user",)
def avatar_tag(self, obj):
return obj.user.robot.avatar_tag()
@admin.register(Order) @admin.register(Order)
class OrderAdmin(AdminChangeLinksMixin, admin.ModelAdmin): class OrderAdmin(AdminChangeLinksMixin, admin.ModelAdmin):
list_display = ( list_display = (

3
robosats/middleware.py
View File

@ -162,7 +162,8 @@ class TokenAuthMiddleware(BaseMiddleware):
token_key = hex_to_base91(token_key) token_key = hex_to_base91(token_key)
except ValueError: except ValueError:
token_key = None token_key = None
scope["user"] = ( scope["user"] = (
AnonymousUser() if token_key is None else await get_user(token_key) scope["user"] if token_key is None else await get_user(token_key)
) )
return await super().__call__(scope, receive, send) return await super().__call__(scope, receive, send)

2
robosats/urls.py
View File

@ -28,6 +28,6 @@ urlpatterns = [
path("", include("frontend.urls")), path("", include("frontend.urls")),
] ]
admin.site.site_header = f"RoboSats Coordinator: {config('COORDINATOR_ALIAS', cast=str, default='NoAlias')} {config('NETWORK', cast=str, default='')} (v{VERSION['major']}.{VERSION['minor']}.{VERSION['patch']})" admin.site.site_header = f"RoboSats Coordinator: {config('COORDINATOR_ALIAS', cast=str, default='NoAlias')} {config('NETWORK', cast=str, default='')} (v{VERSION['major']}.{VERSION['minor']}.{VERSION['patch']})".title()
admin.site.index_title = "Coordinator administration" admin.site.index_title = "Coordinator administration"
admin.site.site_title = "RoboSats Coordinator Admin" admin.site.site_title = "RoboSats Coordinator Admin"