feat: encode redirectUri (#1297 )

fix: illegal user when new a permission (#1298 )
fix: limit only under PC can login by following Wechat Official Account (#1293 )
2025-07-21 14:33:50 +08:00 · 2022-11-15 19:05:59 +08:00 · 2022-11-15 14:19:20 +08:00 · 2022-11-14 09:03:55 +08:00
3 changed files with 3 additions and 3 deletions
--- a/web/src/PermissionListPage.js
+++ b/web/src/PermissionListPage.js
@ -29,7 +29,7 @@ class PermissionListPage extends BaseListPage {
      name: `permission_${randomName}`,
      createdTime: moment().format(),
      displayName: `New Permission - ${randomName}`,
-      users: [this.props.account.name],
+      users: [`${this.props.account.owner}/${this.props.account.name}`],
      roles: [],
      domains: [],
      resourceType: "Application",
--- a/web/src/auth/AuthBackend.js
+++ b/web/src/auth/AuthBackend.js
@ -54,7 +54,7 @@ export function oAuthParamsToQuery(oAuthParams) {
  }

  // code
-  return `?clientId=${oAuthParams.clientId}&responseType=${oAuthParams.responseType}&redirectUri=${oAuthParams.redirectUri}&scope=${oAuthParams.scope}&state=${oAuthParams.state}&nonce=${oAuthParams.nonce}&code_challenge_method=${oAuthParams.challengeMethod}&code_challenge=${oAuthParams.codeChallenge}`;
+  return `?clientId=${oAuthParams.clientId}&responseType=${oAuthParams.responseType}&redirectUri=${encodeURIComponent(oAuthParams.redirectUri)}&scope=${oAuthParams.scope}&state=${oAuthParams.state}&nonce=${oAuthParams.nonce}&code_challenge_method=${oAuthParams.challengeMethod}&code_challenge=${oAuthParams.codeChallenge}`;
 }

 export function getApplicationLogin(oAuthParams) {
--- a/web/src/auth/ProviderButton.js
+++ b/web/src/auth/ProviderButton.js
@ -118,7 +118,7 @@ function getSamlUrl(provider, location) {
 export function renderProviderLogo(provider, application, width, margin, size, location) {
  if (size === "small") {
    if (provider.category === "OAuth") {
-      if (provider.type === "WeChat" && provider.clientId2 !== "" && provider.clientSecret2 !== "" && provider.content !== "" && provider.disableSsl === true) {
+      if (provider.type === "WeChat" && provider.clientId2 !== "" && provider.clientSecret2 !== "" && provider.content !== "" && provider.disableSsl === true && !navigator.userAgent.includes("MicroMessenger")) {
        const info = async() => {
          const t1 = setInterval(await getEvent, 1000, application, provider);
          {Modal.info({
Author	SHA1	Message	Date
会思考的下丘脑	37d1a73c0c	feat: encode redirectUri (#1297 )	2022-11-15 19:05:59 +08:00
Yaodong Yu	727877cf54	fix: illegal user when new a permission (#1298 )	2022-11-15 14:19:20 +08:00
Mr Forest	939b416717	fix: limit only under PC can login by following Wechat Official Account (#1293 )	2022-11-14 09:03:55 +08:00