Skip to content

Commit

Permalink
Revert "Updated login error message (#1731)"
Browse files Browse the repository at this point in the history 
This reverts commit cf4b7f4.
  • Loading branch information
@taoeffect
taoeffect committed Oct 20, 2023
1 parent 04bb180 commit 29add18
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 171 deletions.
18 changes: 8 additions & 10 deletions frontend/controller/actions/identity.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,21 +347,19 @@ export default (sbp('sbp/selectors/register', {
}

if (!identityContractID) {
throw new GIErrorUIRuntimeError(L('Incorrect username or password'))
throw new GIErrorUIRuntimeError(L('Invalid username or password'))
}

const password = passwordFn?.()
const transientSecretKeys = []
if (password) {
try {

const transientSecretKeys = password
? await (async () => {
const salt = await sbp('gi.actions/identity/retrieveSalt', username, passwordFn)
const IEK = await deriveKeyFromPassword(CURVE25519XSALSA20POLY1305, password, salt)
transientSecretKeys.push({ key: IEK, transient: true })
} catch (e) {
console.error('caught error calling retrieveSalt:', e)
throw new GIErrorUIRuntimeError(L('Incorrect username or password'))
}
}

return [{ key: IEK, transient: true }]
})()
: []

try {
sbp('appLogs/startCapture', identityContractID)
Expand Down
23 changes: 7 additions & 16 deletions strings/english.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"\"No\" votes required to block a proposal": "\"No\" votes required to block a proposal",
"\"{errorMsg}\". You can {a_}report the error{_a}.": "\"{errorMsg}\". You can {a_}report the error{_a}.",
"(edited)": "(edited)",
"(group name unavailable)": "(group name unavailable)",
"* This month contains delayed payments for prior months.": "* This month contains delayed payments for prior months.",
"*This value was automatically adjusted because there should always be at least 2 \"yes\" votes.": "*This value was automatically adjusted because there should always be at least 2 \"yes\" votes.",
"*This value was automatically adjusted because your group is too small for the disagreement number.": "*This value was automatically adjusted because your group is too small for the disagreement number.",
Expand Down Expand Up @@ -108,7 +107,6 @@
"Are you sure you want to vote yes?": "Are you sure you want to vote yes?",
"Ask a question!": "Ask a question!",
"At the moment, no one is in need of contributions.": "At the moment, no one is in need of contributions.",
"Attach file": "Attach file",
"Automated": "Automated",
"Automated ban because they're sending malformed messages resulting in: {error}": "Automated ban because they're sending malformed messages resulting in: {error}",
"Automatically switched to pledging {zero}": "Automatically switched to pledging {zero}",
Expand All @@ -118,7 +116,6 @@
"Based on other members pledges, the group is not able to provide a full mincome yet.": "Based on other members pledges, the group is not able to provide a full mincome yet.",
"Bio": "Bio",
"Blog": "Blog",
"Broken invite link!": "Broken invite link!",
"Browser notifications": "Browser notifications",
"Can't change distribution date because distribution period has already started.": "Can't change distribution date because distribution period has already started.",
"Cancel": "Cancel",
Expand Down Expand Up @@ -157,7 +154,6 @@
"Channel members ({nbMembers})": "Channel members ({nbMembers})",
"Channels": "Channels",
"Chat": "Chat",
"Chat attachment too large modal": "Chat attachment too large modal",
"Choose your group's distribution date": "Choose your group's distribution date",
"Choose...": "Choose...",
"Clear search": "Clear search",
Expand Down Expand Up @@ -245,8 +241,6 @@
"Expired on {date}": "Expired on {date}",
"Expires after (days)": "Expires after (days)",
"Expires on: {expiry}": "Expires on: {expiry}",
"Failed to accept invite.": "Failed to accept invite.",
"Failed to add chat channel": "Failed to add chat channel",
"Failed to add message.": "Failed to add message.",
"Failed to cancel proposal.": "Failed to cancel proposal.",
"Failed to change chat channel description.": "Failed to change chat channel description.",
Expand All @@ -255,7 +249,7 @@
"Failed to create a new direct message channel.": "Failed to create a new direct message channel.",
"Failed to create chat channel.": "Failed to create chat channel.",
"Failed to create chat channel. {reportError}": "Failed to create chat channel. {reportError}",
"Failed to create invite.": "Failed to create invite.",
"Failed to create mailbox: {reportError}": "Failed to create mailbox: {reportError}",
"Failed to create payment.": "Failed to create payment.",
"Failed to create proposal.": "Failed to create proposal.",
"Failed to create the group: {reportError}": "Failed to create the group: {reportError}",
Expand All @@ -281,6 +275,7 @@
"Failed to send a payment thank you note.": "Failed to send a payment thank you note.",
"Failed to set direct message visibility.": "Failed to set direct message visibility.",
"Failed to set login state.": "Failed to set login state.",
"Failed to set mailbox attributes.": "Failed to set mailbox attributes.",
"Failed to set profile attributes.": "Failed to set profile attributes.",
"Failed to signup: {reportError}": "Failed to signup: {reportError}",
"Failed to update \"lastLoggedIn\" in a group profile.": "Failed to update \"lastLoggedIn\" in a group profile.",
Expand All @@ -297,7 +292,6 @@
"Failed to vote on a poll.": "Failed to vote on a poll.",
"Failed to vote on proposal.": "Failed to vote on proposal.",
"Fatal error: {reportError}": "Fatal error: {reportError}",
"File too large": "File too large",
"Filter links": "Filter links",
"For now, the only way to join a group is to get an invitation. Don’t know anyone using Group Income?": "For now, the only way to join a group is to get an invitation. Don’t know anyone using Group Income?",
"Forgot your password?": "Forgot your password?",
Expand Down Expand Up @@ -347,12 +341,12 @@
"In Group Income, you can use an invitation link to add members to the group and invite up to 60 people. Once someone uses that link to join the group, they’ll need to be approved by a member of the group with member approval permissions.": "In Group Income, you can use an invitation link to add members to the group and invite up to 60 people. Once someone uses that link to join the group, they’ll need to be approved by a member of the group with member approval permissions.",
"Inactivity": "Inactivity",
"Income Details": "Income Details",
"Incorrect username or password": "Incorrect username or password",
"Info": "Info",
"Information about your pledges streaks and other streak members appears here.": "Information about your pledges streaks and other streak members appears here.",
"Introduce the potential new member(s) to your group": "Introduce the potential new member(s) to your group",
"Invalid associated proposal.": "Invalid associated proposal.",
"Invalid password": "Invalid password",
"Invalid username or password": "Invalid username or password",
"Invite links": "Invite links",
"Invite members to your group": "Invite members to your group",
"Invitee name": "Invitee name",
Expand Down Expand Up @@ -469,6 +463,9 @@
"Only group creator can update distribution date.": "Only group creator can update distribution date.",
"Only the channel creator can delete channel.": "Only the channel creator can delete channel.",
"Only the group creator can remove members.": "Only the group creator can remove members.",
"Only the mailbox creator can create direct message channel.": "Only the mailbox creator can create direct message channel.",
"Only the mailbox creator can hide direct message channel.": "Only the mailbox creator can hide direct message channel.",
"Only the mailbox creator can set attributes.": "Only the mailbox creator can set attributes.",
"Oops, you entered a negative number": "Oops, you entered a negative number",
"Open Modal": "Open Modal",
"Open Modal \"John\"": "Open Modal \"John\"",
Expand Down Expand Up @@ -504,7 +501,6 @@
"Payments received": "Payments received",
"Payments sent": "Payments sent",
"Payments type": "Payments type",
"Pending": "Pending",
"Pending Approval": "Pending Approval",
"People from outside the group can see the channel's content": "People from outside the group can see the channel's content",
"Percentage based": "Percentage based",
Expand Down Expand Up @@ -568,7 +564,6 @@
"Relative to": "Relative to",
"Remove": "Remove",
"Remove Member": "Remove Member",
"Remove attachment": "Remove attachment",
"Remove invitee": "Remove invitee",
"Remove member": "Remove member",
"Remove method": "Remove method",
Expand Down Expand Up @@ -602,7 +597,6 @@
"See more": "See more",
"See original proposal": "See original proposal",
"See proposal": "See proposal",
"See {a_}logs for details{_a}.": "See {a_}logs for details{_a}.",
"Select payment item": "Select payment item",
"Select which day of the month the distribution should be calculated. Every group member will need to update their mincome details before this date to ensure that the algorithm can fairly distribute available funds between group members.": "Select which day of the month the distribution should be calculated. Every group member will need to update their mincome details before this date to ensure that the algorithm can fairly distribute available funds between group members.",
"Send Thank You Modal": "Send Thank You Modal",
Expand Down Expand Up @@ -655,11 +649,9 @@
"Text size": "Text size",
"Thank you note!": "Thank you note!",
"Thank you!": "Thank you!",
"That file is too large and cannot be uploaded. The limit is {sizeLimit}": "That file is too large and cannot be uploaded. The limit is {sizeLimit}",
"The amount must be a number (e.g. 100.75)": "The amount must be a number (e.g. 100.75)",
"The amount must be a number. (E.g. 100.75)": "The amount must be a number. (E.g. 100.75)",
"The distribution period begins on: {startDate}": "The distribution period begins on: {startDate}",
"The file you just attached is not supported and cannot be uploaded to the chat.": "The file you just attached is not supported and cannot be uploaded to the chat.",
"The first distribution period is not started yet, so {strong_}this change will be immediate{_strong} (no voting required).": "The first distribution period is not started yet, so {strong_}this change will be immediate{_strong} (no voting required).",
"The form is invalid.": "The form is invalid.",
"The group has a new member. Say hi to {name}!": "The group has a new member. Say hi to {name}!",
Expand Down Expand Up @@ -726,14 +718,13 @@
"Troubleshooting": "Troubleshooting",
"Trying to reconnect...": "Trying to reconnect...",
"Type \"{code}\" below": "Type \"{code}\" below",
"Unable to find the original proposal.": "Unable to find the original proposal.",
"Undo": "Undo",
"Unsupported file type": "Unsupported file type",
"Update Password": "Update Password",
"Update description": "Update description",
"Updated the channel description to: {description}": "Updated the channel description to: {description}",
"Updated the channel name to: {title}": "Updated the channel name to: {title}",
"Upload an image": "Upload an image",
"Upload attachment": "Upload attachment",
"Use system settings": "Use system settings",
"Used": "Used",
"User settings": "User settings",
Expand Down
Loading

0 comments on commit 29add18

Please sign in to comment.