Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: 🎸 逻辑测试 #778

Merged
merged 1 commit into from
Apr 19, 2022
Merged

feat: 🎸 逻辑测试 #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions arkid/core/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from django.contrib import admin
from .models import(
User, UserGroup,
User, UserGroup, Tenant,
App, AppGroup, Permission,
Approve, ExpiringToken, TenantConfig,
)

# admin.site.register(Tenant)
admin.site.register(Tenant)
admin.site.register(User)
admin.site.register(UserGroup)
admin.site.register(App)
Expand Down
26 changes: 13 additions & 13 deletions extension_root/com_longgui_oauth2_server/appscheme.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class CLIENT_TYPE(str, Enum):
class GRANT_TYPE(str, Enum):
authorization_code = _('Authorization code', '私密')
implicit = _('Implicit','公开')
password = _('Resource owner password based','密码')
password = _('Resource owner password-based','密码')
client_credentials = _('Client credentials','客户端凭据')
openid_hybrid = _('OpenID connect hybrid','OpenID链接')

Expand All @@ -30,12 +30,12 @@ class ConfigBaseSchema(Schema):
class Oauth2ConfigSchema(ConfigBaseSchema):

# 输出的比输入的额外多了一些字段
client_id: str = Field(title=_('client id','客户端id'), readonly=True)
client_secret: str = Field(title=_('client secret','客户端密钥'), readonly=True)
authorize: str = Field(title=_('authorize','授权url'), readonly=True)
token: str = Field(title=_('token','获取token地址'), readonly=True)
userinfo: str = Field(title=_('userinfo','用户信息地址'), readonly=True)
logout: str = Field(title=_('logout', '退出登录地址'), readonly=True)
client_id: str = Field(title=_('client id','客户端id'), readonly=True, default='')
client_secret: str = Field(title=_('client secret','客户端密钥'), readonly=True, default='')
authorize: str = Field(title=_('authorize','授权url'), readonly=True, default='')
token: str = Field(title=_('token','获取token地址'), readonly=True, default='')
userinfo: str = Field(title=_('userinfo','用户信息地址'), readonly=True, default='')
logout: str = Field(title=_('logout', '退出登录地址'), readonly=True, default='')


# class OAuth2AppSchema(AppBaseSchema):
Expand All @@ -52,12 +52,12 @@ class ALGORITHM_TYPE(str, Enum):
class OIDCConfigSchema(ConfigBaseSchema):

algorithm: ALGORITHM_TYPE = Field(title=_('algorithm','加密类型'))
client_id: str = Field(title=_('client id','客户端id'), readonly=True)
client_secret: str = Field(title=_('client secret','客户端密钥'), readonly=True)
authorize: str = Field(title=_('authorize','授权url'), readonly=True)
token: str = Field(title=_('token','获取token地址'), readonly=True)
userinfo: str = Field(title=_('userinfo','用户信息地址'), readonly=True)
logout: str = Field(title=_('logout', '退出登录地址'), readonly=True)
client_id: str = Field(title=_('client id','客户端id'), readonly=True, default='')
client_secret: str = Field(title=_('client secret','客户端密钥'), readonly=True, default='')
authorize: str = Field(title=_('authorize','授权url'), readonly=True, default='')
token: str = Field(title=_('token','获取token地址'), readonly=True, default='')
userinfo: str = Field(title=_('userinfo','用户信息地址'), readonly=True, default='')
logout: str = Field(title=_('logout', '退出登录地址'), readonly=True, default='')


# class OIDCAppSchema(AppBaseSchema):
Expand Down