Skip to content

Commit 7d4a5c6

Browse files
committed
set meta.pre-auth to skip redirect_url if token validated
1 parent 3b05cb0 commit 7d4a5c6

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/mod_invites_register.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ c2s_unauthenticated_packet(#{invite := Invite} = State,
7474
IQ1 = xmpp:set_els(IQ, [Register]),
7575
User = Invite#invite_token.account_name,
7676
IQ2 = xmpp:set_from_to(IQ1, jid:make(User, Server), jid:make(Server)),
77-
ResIQ = mod_register:process_iq(IQ2),
77+
ResIQ = mod_register:process_iq(xmpp:set_meta(IQ2, #{pre_auth => true})),
7878
ResIQ1 = xmpp:set_from_to(ResIQ, jid:make(Server), undefined),
7979
{stop, ejabberd_c2s:send(State, ResIQ1)}
8080
end);

src/mod_register.erl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,9 @@ process_iq(#iq{type = get, from = From, to = To, id = ID, lang = Lang} = IQ,
215215
Instr = translate:translate(
216216
Lang, ?T("Choose a username and password to register "
217217
"with this server")),
218+
IsPreAuth = maps:get(pre_auth, xmpp:get_meta(IQ), false) == true,
218219
URL = mod_register_opt:redirect_url(Server),
219-
if (URL /= undefined) and not IsRegistered ->
220+
if (URL /= undefined) and not IsRegistered and not IsPreAuth ->
220221
Desc = str:translate_and_format(Lang, ?T("To register, visit ~s"), [URL]),
221222
xmpp:make_iq_result(
222223
IQ, #register{instructions = Desc,

0 commit comments

Comments
 (0)