Skip to content

Commit

Permalink
fix: support password entry for /join-manually
Browse files Browse the repository at this point in the history
Closes ssbc#234.
  • Loading branch information
decentral1se committed Apr 7, 2022
1 parent 49aaff9 commit 36d95e6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
3 changes: 2 additions & 1 deletion web/i18n/defaults/active.de.toml
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,11 @@ InviteFacadeInstructQR = "Falls dich deine SSB-App auf einem anderen Gerät befi

InviteFacadeFallbackInsertID = "SSB-ID einfügen"

InviteInsertWelcome = "Du kannst mit deine SSB-ID eine Einladung anfordern. Danach kannst du mit deiner SSB-App eine Verbindung zum Raum herstellen."
InviteInsertWelcome = "Du kannst mit deine SSB-ID eine Einladung anfordern. Danach kannst du ein Fallback-Kontopasswort erstellen und mit deiner SSB-App eine Verbindung zum Raum herstellen."

InviteConsumedTitle = "Einladung angenommen!"
InviteConsumedWelcome = "Du bist jetzt Mitglied dieses Raums. Wenn du eine Multiserver-Adresse benötigst, kannst du die folgende kopieren und einfügen: "
InviteConsumedSetPassword = "Du kannst jetzt ein Fallback-Passwort für Ihr Konto erstellen:"

# alias resolution
##################
Expand Down
5 changes: 3 additions & 2 deletions web/i18n/defaults/active.en.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ AuthFallbackInstruct = "This method is an acceptable fallback, if you have a use
AuthFallbackNewPassword="New Password"
AuthFallbackRepeatPassword="Repeat Password"
AuthFallbackPasswordChangeFormTitle = "Change Password"
AuthFallbackPasswordChangeWelcome = "Here you can change your fallback password. Please make sure it's longer then 10 characters. Via the repetition we make sure that you don't accidentally mistype it. Additionally we use the lookup from <a href='https://haveibeenpwned.com'>haveibeenpwned.com</a> to make sure you don't accidentally use a weak password."
AuthFallbackPasswordChangeWelcome = "Here you can set your fallback password. Please make sure it's longer then 10 characters. Via the repetition we make sure that you don't accidentally mistype it. Additionally we use the lookup from <a href='https://haveibeenpwned.com'>haveibeenpwned.com</a> to make sure you don't accidentally use a weak password."
AuthFallbackPasswordUpdated = "The password was updated. You can now use it to sign in."
AdminMemberPasswordResetLinkCreatedTitle = "Password reset token created"
AdminMemberPasswordResetLinkCreatedInstruct = "The reset token was created. Please send it to the member via some means (like E-Mail or another suitable side-channel). When they open it, they will be able to choose a new password for themselves."
Expand Down Expand Up @@ -186,10 +186,11 @@ InviteFacadeInstructQR = "If your SSB app is on another device, you can scan the

InviteFacadeFallbackInsertID = "Insert SSB ID"

InviteInsertWelcome = "You can claim your invite by inserting your SSB ID below. After that, you'll be able to connect to the room in your SSB app."
InviteInsertWelcome = "You can claim your invite by inserting your SSB ID below. After that, you'll be able to create a fallback account password and connect to the room in your SSB app."

InviteConsumedTitle = "Invite accepted!"
InviteConsumedWelcome = "You are now a member of this room. If you need a multiserver address to connect to the room, you can copy-paste the one below:"
InviteConsumedSetPassword = "You can now create an account fallback password:"

# alias resolution
##################
Expand Down
13 changes: 12 additions & 1 deletion web/templates/invite/consumed.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,16 @@ SPDX-License-Identifier: CC-BY-4.0
<span
class="bg-gray-200 py-1 px-2 mb-8 w-64 font-mono break-all"
>{{.MultiserverAddress}}</span>

<span
class="text-center"
>{{i18n "InviteConsumedSetPassword" }}<br /></span>

<span
class="w-64 my-6 text-center"
><a
class="self-start shadow rounded h-8 flex flex-row justify-center items-center text-gray-100 bg-pink-600 hover:bg-pink-700 focus:outline-none focus:ring-2 focus:ring-pink-600 focus:ring-opacity-50"
href="{{urlTo "members:change-password"}}"
>Create password</a></span>
</div>
{{end}}
{{end}}

0 comments on commit 36d95e6

Please sign in to comment.