rainycode 1.5.9__tar.gz → 1.6.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. {rainycode-1.5.9 → rainycode-1.6.0}/PKG-INFO +1 -1
  2. {rainycode-1.5.9 → rainycode-1.6.0}/common_servers/api/wechat_api.py +4 -1
  3. {rainycode-1.5.9 → rainycode-1.6.0}/common_servers/service/auth_svc.py +5 -2
  4. {rainycode-1.5.9 → rainycode-1.6.0}/pyproject.toml +1 -1
  5. {rainycode-1.5.9 → rainycode-1.6.0}/rainycode.egg-info/PKG-INFO +1 -1
  6. {rainycode-1.5.9 → rainycode-1.6.0}/common_base/aiorequests.py +0 -0
  7. {rainycode-1.5.9 → rainycode-1.6.0}/common_base/consts.py +0 -0
  8. {rainycode-1.5.9 → rainycode-1.6.0}/common_base/exception.py +0 -0
  9. {rainycode-1.5.9 → rainycode-1.6.0}/common_base/logging.py +0 -0
  10. {rainycode-1.5.9 → rainycode-1.6.0}/common_base/response.py +0 -0
  11. {rainycode-1.5.9 → rainycode-1.6.0}/common_depends/auth_depend.py +0 -0
  12. {rainycode-1.5.9 → rainycode-1.6.0}/common_models/__init__.py +0 -0
  13. {rainycode-1.5.9 → rainycode-1.6.0}/common_models/base_model.py +0 -0
  14. {rainycode-1.5.9 → rainycode-1.6.0}/common_models/file_model.py +0 -0
  15. {rainycode-1.5.9 → rainycode-1.6.0}/common_models/user_model.py +0 -0
  16. {rainycode-1.5.9 → rainycode-1.6.0}/common_models/wechat_model.py +0 -0
  17. {rainycode-1.5.9 → rainycode-1.6.0}/common_servers/api/auth_api.py +0 -0
  18. {rainycode-1.5.9 → rainycode-1.6.0}/common_servers/router.py +0 -0
  19. {rainycode-1.5.9 → rainycode-1.6.0}/common_servers/schemas/auth_schema.py +0 -0
  20. {rainycode-1.5.9 → rainycode-1.6.0}/common_servers/service/file_svc.py +0 -0
  21. {rainycode-1.5.9 → rainycode-1.6.0}/common_servers/service/wechat_svc.py +0 -0
  22. {rainycode-1.5.9 → rainycode-1.6.0}/common_utils/bcrypt_util.py +0 -0
  23. {rainycode-1.5.9 → rainycode-1.6.0}/common_utils/captcha_util.py +0 -0
  24. {rainycode-1.5.9 → rainycode-1.6.0}/common_utils/datetime_util.py +0 -0
  25. {rainycode-1.5.9 → rainycode-1.6.0}/common_utils/ip_util.py +0 -0
  26. {rainycode-1.5.9 → rainycode-1.6.0}/common_utils/jwt_util.py +0 -0
  27. {rainycode-1.5.9 → rainycode-1.6.0}/common_utils/snowflake_util.py +0 -0
  28. {rainycode-1.5.9 → rainycode-1.6.0}/common_utils/wechat_util.py +0 -0
  29. {rainycode-1.5.9 → rainycode-1.6.0}/core/base_config.py +0 -0
  30. {rainycode-1.5.9 → rainycode-1.6.0}/core/databases/aiodb.py +0 -0
  31. {rainycode-1.5.9 → rainycode-1.6.0}/core/databases/aioredis.py +0 -0
  32. {rainycode-1.5.9 → rainycode-1.6.0}/core/middleware/http_middleware.py +0 -0
  33. {rainycode-1.5.9 → rainycode-1.6.0}/core/start.py +0 -0
  34. {rainycode-1.5.9 → rainycode-1.6.0}/rainycode.egg-info/SOURCES.txt +0 -0
  35. {rainycode-1.5.9 → rainycode-1.6.0}/rainycode.egg-info/dependency_links.txt +0 -0
  36. {rainycode-1.5.9 → rainycode-1.6.0}/rainycode.egg-info/requires.txt +0 -0
  37. {rainycode-1.5.9 → rainycode-1.6.0}/rainycode.egg-info/top_level.txt +0 -0
  38. {rainycode-1.5.9 → rainycode-1.6.0}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rainycode
3
- Version: 1.5.9
3
+ Version: 1.6.0
4
4
  Summary: FastAPI base modules
5
5
  Requires-Python: >=3.10
6
6
  Requires-Dist: aerich==0.9.2
@@ -89,7 +89,10 @@ async def wechat_oauth_callback(
89
89
  "error": error,
90
90
  "error_description": error_description or "用户拒绝授权",
91
91
  }
92
- error_url = f"{redirect_uri}?{urlencode(params)}"
92
+ # redirect_uri 现在可能已带目标路由(...#/pages/xxx),拼接符按需选,
93
+ # 使错误信息落在该页自己的 query 上(路由之后)
94
+ sep = "&" if "?" in redirect_uri else "?"
95
+ error_url = f"{redirect_uri}{sep}{urlencode(params)}"
93
96
  return RedirectResponse(url=error_url, status_code=302)
94
97
 
95
98
  raise CustomException(msg="授权失败")
@@ -531,7 +531,10 @@ class AuthService:
531
531
  if state:
532
532
  params["state"] = state
533
533
 
534
- # 使用 # fragment 传递 token,避免出现在服务器日志中
534
+ # 凭证一律挂在 query 上(token 不落 fragment):redirect_uri 由前端带上目标页
535
+ # 路由(https://host/#/pages/xxx),拼出来即 ...#/pages/xxx?access_token=..
536
+ # 它自身已带参数时(...#/pages/xxx?id=3)用 & 续接。
535
537
  fragment = urlencode(params)
536
- redirect_url = f"{redirect_uri}#{fragment}"
538
+ sep = "&" if "?" in redirect_uri else "?"
539
+ redirect_url = f"{redirect_uri}{sep}{fragment}"
537
540
  return RedirectResponse(url=redirect_url, status_code=302)
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "rainycode"
7
- version = "1.5.9"
7
+ version = "1.6.0"
8
8
  description = "FastAPI base modules"
9
9
  requires-python = ">=3.10"
10
10
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rainycode
3
- Version: 1.5.9
3
+ Version: 1.6.0
4
4
  Summary: FastAPI base modules
5
5
  Requires-Python: >=3.10
6
6
  Requires-Dist: aerich==0.9.2
File without changes
File without changes
File without changes