From 4ec2f07ce6fc2b1343d30c20639a3b20cf27c704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mili=C4=87?= <marko@tesobe.com>
Date: Thu, 17 Jun 2021 00:35:57 +0200
Subject: [PATCH] feature/User Invitation Flow - POW 2

---
 .../main/scala/code/model/dataAccess/AuthUser.scala  | 11 +++++++++++
 .../src/main/scala/code/snippet/UserInvitation.scala | 12 +++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
index 1f2fc02e1..7b790f5d6 100644
--- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
+++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
@@ -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. 
diff --git a/obp-api/src/main/scala/code/snippet/UserInvitation.scala b/obp-api/src/main/scala/code/snippet/UserInvitation.scala
index 93aa3eac6..e58fcce71 100644
--- a/obp-api/src/main/scala/code/snippet/UserInvitation.scala
+++ b/obp-api/src/main/scala/code/snippet/UserInvitation.scala
@@ -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)
       }