refactor(client): migrate captcha flow to betterCaptcha adapter model by lizheming · Pull Request #3442 · walinejs/waline

lizheming · 2026-02-26T12:17:23Z

fix #1829

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9820d8d660

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Mister-Hope · 2026-02-26T14:08:18Z

I am confused why this is called betterCaptcha, not just captcha?

The better prefix seeks meaningless for option design

doudou0720 · 2026-02-26T14:21:56Z

I am confused why this is called betterCaptcha, not just captcha?

See #3441,Cause the library was called Better Captcha

Mister-Hope · 2026-02-26T16:26:58Z

Users do NOT care what libraries are behind the sense, in short, as long as the options are not "favored", shorter name with no confusion shall be always preferred. And we are now in the case.

Mister-Hope · 2026-02-26T16:28:22Z

Also I would suggest leaving this as drafts till the package becomes stable or at least api solid

lizheming · 2026-02-26T16:32:52Z

@Mister-Hope I had AI initialize the relevant changes for this PR. Currently, the PR is still in draft. I will add you to the CR after I have made the necessary revisions and completed the testing.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 92a2c815fb

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Copilot

Pull request overview

This PR refactors Waline’s captcha integration to use the @better-captcha/* adapter model, introducing a unified captcha config (and request field) while deprecating the legacy recaptchaV3Key / turnstileKey flow. It addresses #1829 by making the client/admin captcha layer more extensible.

Changes:

Add captcha configuration to client typings/config and wire comment submission to send comment.captcha.
Replace admin login/register captcha UI with @better-captcha/react providers and send captcha in auth requests.
Add server-side compatibility by accepting captcha in BaseLogic.useCaptchaCheck().

Reviewed changes

Copilot reviewed 26 out of 27 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
pnpm-lock.yaml	Adds `@better-captcha/react` / `@better-captcha/vue` and removes `recaptcha-v3`.
packages/server/src/middleware/dashboard.js	Exposes captcha configuration to admin UI via `window.*`.
packages/server/src/logic/base.js	Accepts `captcha` token as an alternative to `turnstile` / `recaptchaV3`.
packages/client/template/init.html	Updates example config to reflect new captcha configuration direction.
packages/client/src/utils/config.ts	Adds `captcha` to normalized config and maps legacy keys into `captcha`.
packages/client/src/typings/waline.ts	Adds `captcha` prop and deprecates legacy captcha keys in typings.
packages/client/src/typings/index.ts	Re-exports new captcha typings.
packages/client/src/typings/captcha.ts	Introduces captcha provider option typings (based on `@better-captcha/vue`).
packages/client/src/composables/index.ts	Removes old recaptcha/turnstile composables exports.
packages/client/src/components/CommentBox.vue	Integrates `@better-captcha/vue` and sends captcha response with comment submit.
packages/client/src/components/Captcha.ts	Adds provider-to-component mapping for client captcha rendering.
packages/client/rollup.config.ts	Updates externals list (but currently does not account for `@better-captcha/vue`).
packages/client/package.json	Adds `@better-captcha/vue` (currently in devDependencies).
packages/admin/src/utils/getCaptchaConfig.js	Centralizes admin captcha config derivation.
packages/admin/src/store/user.js	Adds `captcha` to login action payload.
packages/admin/src/services/auth.js	Sends `captcha` field to server token endpoint.
packages/admin/src/pages/register/index.jsx	Renders captcha provider component and submits `captcha` token.
packages/admin/src/pages/login/index.jsx	Renders captcha provider component and submits `captcha` token.
packages/admin/src/components/Captcha.js	Adds provider-to-component mapping for admin captcha rendering.
packages/admin/package.json	Adds `@better-captcha/react`.

Files not reviewed (1)

pnpm-lock.yaml: Language not supported

Comments suppressed due to low confidence (2)

packages/client/src/components/CommentBox.vue:224

comment is typed as WalineCommentData, but later you assign comment.captcha (line 293). WalineCommentData from @waline/api currently only defines recaptchaV3 / turnstile and has no captcha field, which will break .d.ts generation/type-checking. Update the API typings to include captcha?: string (or extend the local type) so this assignment is type-safe.

  const { serverURL, lang, login, wordLimit, requiredMeta, captcha } = config.value;

  const comment: WalineCommentData = {
    comment: content.value,
    nick: userMeta.value.nick,
    mail: userMeta.value.mail,
    link: userMeta.value.link,
    url: config.value.path,
    ua: await userAgent(),
  };

packages/client/package.json:88

@better-captcha/vue is imported at runtime (e.g. in CommentBox.vue / Captcha.ts) and its types are referenced from the exported typings. Keeping it in devDependencies means downstream TypeScript consumers may fail to resolve the generated .d.ts imports. Move it to dependencies (or peerDependencies + dependenciesMeta), consistent with other runtime deps.

  "dependencies": {
    "@vueuse/core": "^14.2.1",
    "@waline/api": "workspace:*",
    "autosize": "^6.0.1",
    "marked": "^17.0.2",
    "marked-highlight": "^2.2.3",
    "vue": "^3.5.28"
  },
  "devDependencies": {
    "@babel/core": "7.29.0",
    "@babel/preset-env": "7.29.0",
    "@better-captcha/vue": "^0.5.6",
    "@giphy/js-types": "5.1.0",
    "@types/autosize": "4.0.3",
    "@vitejs/plugin-vue": "6.0.4",
    "vite": "7.3.1"
  },

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-01T13:49:18Z

    ],
    treeshake: 'smallest',
-    external: [
-      '@vueuse/core',
-      '@waline/api',
-      'autosize',
-      'marked',
-      'marked-highlight',
-      'recaptcha-v3',
-      'vue',
-    ],
+    external: ['@vueuse/core', '@waline/api', 'autosize', 'marked', 'marked-highlight', 'vue'],
  },


@better-captcha/vue is now a runtime import in the slim/components builds, but it isn’t listed in external. This will bundle the captcha adapter into slim.js/component.js, which is inconsistent with how other runtime deps are treated here and may increase bundle size / duplicate dependencies. Consider adding @better-captcha/vue to external (and ensure it’s a proper dependency/peerDependency).

@copilot open a new pull request to apply changes based on this feedback

Copilot · 2026-03-01T14:06:05Z

@lizheming I've opened a new pull request, #3455, to work on those changes. Once the pull request is ready, I'll request review from you.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…dency (#3455) * Initial plan * fix: add @better-captcha/vue to external and move to dependencies Co-authored-by: lizheming <424491+lizheming@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: lizheming <424491+lizheming@users.noreply.github.com> Co-authored-by: Austin Lee <i@imnerd.org>

… github.com:walinejs/waline into codex/refactor-@waline/client-to-use-better-captcha

lizheming · 2026-03-01T14:22:13Z

@Mister-Hope the pr has been ready. You can code review it in your free time now.

Mister-Hope · 2026-03-01T14:28:56Z

The notice seems dangerous to me; I am not sure we should merge a package with such a notice.

I would expect the package to be more stable. Though the api interface might not be changed, the core packages are still being heavily refactored in the past month, so at least that gives me the signal that the project is still in the development stage.

I would suggest delaying merging this PR.

lizheming · 2026-03-01T15:02:08Z

Yes, I agree it. It will be merged after I check more captcha service later. It won't be soon

…captcha

refactor(client): unify captcha handling with betterCaptcha config

9820d8d

lizheming added the codex label Feb 26, 2026 — with ChatGPT Codex Connector

chatgpt-codex-connector bot reviewed Feb 26, 2026

View reviewed changes

Comment thread packages/client/src/utils/config.ts Outdated

refactor(admin): align captcha flow with betterCaptcha config

51a6e67

lizheming marked this pull request as draft February 26, 2026 15:26

chore: refactor with better-captcha module

83ae92f

doudou0720 mentioned this pull request Feb 26, 2026

[Feature]: 是否考虑添加其他验证码 || [Feature]: Whether to consider adding other verification codes #3441

Open

chore: use @better-captcha/react refact admin captcha

192669b

chore: update config

93bde2a

chore: update better-captcha config key

8ccf581

github-advanced-security AI found potential problems Feb 27, 2026

View reviewed changes

Comment thread packages/server/src/logic/base.js Fixed

lizheming added 5 commits February 27, 2026 23:56

chore: update admin react component

ad807af

chore: remove log

02bd8f5

chore: remove unused var

fe488d0

chore: udpate captcah

92a2c81

chore: update type

1532132

lizheming marked this pull request as ready for review March 1, 2026 13:33

chatgpt-codex-connector bot reviewed Mar 1, 2026

View reviewed changes

Comment thread packages/admin/src/utils/getCaptchaConfig.js

lizheming requested a review from Copilot March 1, 2026 13:44

Copilot started reviewing on behalf of lizheming March 1, 2026 13:45 View session

chore: close some lint rule

774d235

Copilot AI reviewed Mar 1, 2026

View reviewed changes

Copilot AI mentioned this pull request Mar 1, 2026

fix: add @better-captcha/vue to external and promote to runtime dependency #3455

Merged

Update packages/server/src/middleware/dashboard.js

a58e09e

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

lizheming and others added 5 commits March 1, 2026 22:08

Update packages/client/src/components/CommentBox.vue

9889300

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Merge branch 'codex/refactor-@waline/client-to-use-better-captcha' of…

8a946d2

… github.com:walinejs/waline into codex/refactor-@waline/client-to-use-better-captcha

fix: fix lint

6b92f6c

chore: update lock file

be9449e

Merge branch 'main' into codex/refactor-@waline/client-to-use-better-…

f984a53

…captcha

Conversation

lizheming commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Mister-Hope commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

doudou0720 commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Mister-Hope commented Feb 26, 2026

Uh oh!

Mister-Hope commented Feb 26, 2026

Uh oh!

lizheming commented Feb 26, 2026

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Mar 1, 2026

Choose a reason for hiding this comment

Uh oh!

lizheming Mar 1, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI commented Mar 1, 2026

Uh oh!

lizheming commented Mar 1, 2026

Uh oh!

Mister-Hope commented Mar 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lizheming commented Mar 1, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

lizheming commented Feb 26, 2026 •

edited

Loading

Mister-Hope commented Feb 26, 2026 •

edited

Loading

doudou0720 commented Feb 26, 2026 •

edited

Loading

Mister-Hope commented Mar 1, 2026 •

edited

Loading