feature/User Invitation Flow - POW 2

This commit is contained in:
Marko Milić 2021-06-17 00:35:57 +02:00
parent c54518d5af
commit 4ec2f07ce6
2 changed files with 14 additions and 9 deletions

View File

@ -1169,6 +1169,17 @@ def restoreSomeSessions(): Unit = {
case _ => ""
}
}
override def passwordResetXhtml = {
(<form method="post" action={S.uri}>
<table><tr><td colspan="2">{if(S.queryString.isDefined) Helper.i18n("set.your.password") else S.?("reset.your.password")}</td></tr>
<tr><td>{S.?("enter.your.new.password")}</td><td><input type="password" /></td></tr>
<tr><td>{S.?("repeat.your.new.password")}</td><td><input type="password" /></td></tr>
<tr><td>&nbsp;</td><td><input type="submit" /></td></tr>
</table>
</form>)
}
/**
* Find the authUsers by author email(authUser and resourceUser are the same).
* Only search for the local database.

View File

@ -36,7 +36,6 @@ import net.liftweb.common.Box
import net.liftweb.http.{RequestVar, S, SHtml}
import net.liftweb.util.CssSel
import net.liftweb.util.Helpers._
import org.apache.commons.lang3.StringUtils
import scala.collection.immutable.List
@ -49,11 +48,7 @@ class UserInvitation extends MdcLoggable {
private object devEmailVar extends RequestVar("")
private object usernameVar extends RequestVar("")
// Can be used to show link to an online form to collect more information about the App / Startup
val registrationMoreInfoUrl = getWebUiPropsValue("webui_post_user_invitation_more_info_url", "")
val registrationConsumerButtonValue: String = getWebUiPropsValue("webui_post_user_invitation_submit_button_value", "Register as a Developer")
def registerForm: CssSel = {
@ -66,20 +61,19 @@ class UserInvitation extends MdcLoggable {
val email = userInvitation.map(_.email).getOrElse("None")
devEmailVar.set(email)
companyVar.set(userInvitation.map(_.company).getOrElse("None"))
countryVar.set(userInvitation.map(_.country).getOrElse("Bahrain"))
countryVar.set(userInvitation.map(_.country).getOrElse("None"))
val username = firstName.toLowerCase + "." + lastName.toLowerCase()
usernameVar.set(username)
def submitButtonDefense(): Unit = {
val username = firstNameVar.is + "." + lastNameVar.is
createResourceUser(
provider = "OBP-User-Invitation",
providerId = Some(username),
providerId = Some(usernameVar.is),
name = Some(firstName + " " + lastName),
email = Some(email)
).map{ u =>
createAuthUser(user = u, firstName = firstName, lastName = lastName, password = "")
val resetLink = AuthUser.passwordResetUrl(u.idGivenByProvider, u.emailAddress, u.userId)
val resetLink = AuthUser.passwordResetUrl(u.idGivenByProvider, u.emailAddress, u.userId) + "?action=set"
S.redirectTo(resetLink)
}