change join-room to claim-http-invite
This commit is contained in:
parent
5e9dc63153
commit
3beb656b9c
|
@ -7,7 +7,7 @@ window.addEventListener('focus', () => {
|
|||
});
|
||||
|
||||
const waitingElem = document.getElementById('waiting');
|
||||
const anchorElem = document.getElementById('join-room-uri');
|
||||
const anchorElem = document.getElementById('claim-invite-uri');
|
||||
anchorElem.onclick = function handleURI(ev) {
|
||||
ev.preventDefault();
|
||||
const ssbUri = anchorElem.href;
|
||||
|
|
|
@ -41,7 +41,7 @@ func (h inviteHandler) buildJoinRoomURI(token string) template.URL {
|
|||
joinRoomURI.Opaque = "experimental"
|
||||
|
||||
queryVals := make(url.Values)
|
||||
queryVals.Set("action", "join-room")
|
||||
queryVals.Set("action", "claim-http-invite")
|
||||
queryVals.Set("invite", token)
|
||||
|
||||
submissionURL := h.urlTo(router.CompleteInviteConsume)
|
||||
|
|
|
@ -72,18 +72,18 @@ func TestInviteShowAcceptForm(t *testing.T) {
|
|||
a.Equal(testToken, tokenFromArg)
|
||||
|
||||
webassert.Localized(t, doc, []webassert.LocalizedElement{
|
||||
{"#join-room-uri", "InviteFacadeJoin"},
|
||||
{"#claim-invite-uri", "InviteFacadeJoin"},
|
||||
{"title", "InviteFacadeTitle"},
|
||||
})
|
||||
|
||||
// Fallback URL in data-href-fallback
|
||||
fallbackURL := ts.URLTo(router.CompleteInviteFacadeFallback, "token", testToken)
|
||||
joinDataHrefFallback, ok := doc.Find("#join-room-uri").Attr("data-href-fallback")
|
||||
joinDataHrefFallback, ok := doc.Find("#claim-invite-uri").Attr("data-href-fallback")
|
||||
a.Equal(fallbackURL.String(), joinDataHrefFallback)
|
||||
a.True(ok)
|
||||
|
||||
// ssb-uri in href
|
||||
joinDataHref, ok := doc.Find("#join-room-uri").Attr("href")
|
||||
joinDataHref, ok := doc.Find("#claim-invite-uri").Attr("href")
|
||||
a.True(ok)
|
||||
joinURI, err := url.Parse(joinDataHref)
|
||||
r.NoError(err)
|
||||
|
@ -92,7 +92,7 @@ func TestInviteShowAcceptForm(t *testing.T) {
|
|||
a.Equal("experimental", joinURI.Opaque)
|
||||
|
||||
params := joinURI.Query()
|
||||
a.Equal("join-room", params.Get("action"))
|
||||
a.Equal("claim-http-invite", params.Get("action"))
|
||||
|
||||
inviteParam := params.Get("invite")
|
||||
a.Equal(testToken, inviteParam)
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<p class="text-center mt-3">{{i18n "InviteFacadeInstruct"}}</p>
|
||||
|
||||
<a
|
||||
id="join-room-uri"
|
||||
id="claim-invite-uri"
|
||||
href="{{.JoinRoomURI}}"
|
||||
data-href-fallback="{{.FallbackURL}}"
|
||||
class="shadow rounded flex flex-row justify-center items-center mt-8 px-4 h-8 text-gray-100 bg-purple-500 hover:bg-purple-600 focus:outline-none focus:ring-2 focus:ring-purple-600 focus:ring-opacity-50"
|
||||
|
|
Loading…
Reference in New Issue