Merge remote-tracking branch 'origin/405-dev-lost-password-design' into dev-merge

gargantext.cabal

@@ -491,6 +491,7 @@ library
     , transformers-base
     , tuple
     , unordered-containers
+    , uri-encode
     , utf8-string
     , uuid
     , validity

package.yaml

@@ -275,6 +275,7 @@ library:
   - unordered-containers
   - utf8-string
   - uuid
+  - uri-encode
   - validity
   - vector
   - wai

src/Gargantext/API/Admin/Auth.hs

@@ -48,8 +48,6 @@ import GHC.Generics (Generic)
 import Servant
 import Servant.Auth.Server
 import Servant.Job.Async (JobFunction(..), serveJobsAPI)
-import qualified Text.Blaze.Html.Renderer.Text as H
-import qualified Text.Blaze.Html5 as H
 --import qualified Text.Blaze.Html5.Attributes as HA
 
 import qualified Gargantext.Prelude.Crypto.Auth as Auth
@@ -59,7 +57,6 @@ import Gargantext.API.Admin.Orchestrator.Types (JobLog(..), AsyncJobs)
 import Gargantext.API.Admin.Types
 import Gargantext.API.Job (jobLogSuccess)
 import Gargantext.API.Prelude (HasJoseError(..), joseError, HasServerError, GargServerC, GargServer, _ServerError)
-import Gargantext.API.Types
 import Gargantext.Core.Mail (MailModel(..), mail)
 import Gargantext.Core.Mail.Types (HasMail, mailSettings)
 import Gargantext.Core.Types.Individu (User(..), Username, GargPassword(..))
@@ -173,7 +170,7 @@ type ForgotPasswordAPI = Summary "Forgot password POST API"
                            :> Post '[JSON] ForgotPasswordResponse
                          :<|> Summary "Forgot password GET API"
                            :> QueryParam "uuid" Text
-                           :> Get '[HTML] Text
+                           :> Get '[JSON] ForgotPasswordGet
 
   
 forgotPassword :: GargServer ForgotPasswordAPI
@@ -193,8 +190,8 @@ forgotPasswordPost (ForgotPasswordRequest email) = do
   pure $ ForgotPasswordResponse "ok"
 
 forgotPasswordGet :: (HasSettings env, HasConnectionPool env, HasJoseError err, HasConfig env, HasMail env, HasServerError err)
-     => Maybe Text -> Cmd' env err Text
-forgotPasswordGet Nothing = pure ""
+     => Maybe Text -> Cmd' env err ForgotPasswordGet
+forgotPasswordGet Nothing = pure $ ForgotPasswordGet ""
 forgotPasswordGet (Just uuid) = do
   let mUuid = fromText uuid
   case mUuid of
@@ -209,7 +206,7 @@ forgotPasswordGet (Just uuid) = do
 ---------------------
 
 forgotPasswordGetUser :: (HasSettings env, HasConnectionPool env, HasJoseError err, HasConfig env, HasMail env, HasServerError err)
-     => UserLight -> Cmd' env err Text
+     => UserLight -> Cmd' env err ForgotPasswordGet
 forgotPasswordGetUser (UserLight { .. }) = do
   -- pick some random password
   password <- liftBase gargPass
@@ -225,16 +222,7 @@ forgotPasswordGetUser (UserLight { .. }) = do
   -- clear the uuid so that the page can't be refreshed
   _ <- updateUserForgotPasswordUUID $ UserLight { userLight_forgot_password_uuid = Nothing, .. }
     
-  pure $ toStrict $ H.renderHtml $
-    H.docTypeHtml $ do
-      H.html $ do
-        H.head $ do
-          H.title "Gargantext - forgot password"
-        H.body $ do
-          H.h1 "Forgot password"
-          H.p $ do
-            H.span "Here is your password (will be shown only once): "
-            H.b $ H.toHtml password
+  pure $ ForgotPasswordGet password
 
 forgotUserPassword :: (HasConnectionPool env, HasConfig env, HasMail env)
      => UserLight -> Cmd' env err ()

src/Gargantext/API/Admin/Auth/Types.hs

@@ -112,6 +112,7 @@ data PathId = PathNode NodeId | PathNodeNode ListId DocId
 ---------------------------
 
 type Email = Text
+type Password = Text
 
 data ForgotPasswordRequest = ForgotPasswordRequest { _fpReq_email :: Email }
   deriving (Generic )
@@ -124,3 +125,9 @@ data ForgotPasswordResponse = ForgotPasswordResponse { _fpRes_status :: Text }
 $(deriveJSON (unPrefix "_fpRes_") ''ForgotPasswordResponse)
 instance ToSchema ForgotPasswordResponse where
   declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_fpRes_")
+
+data ForgotPasswordGet = ForgotPasswordGet {_fpGet_password :: Password}
+  deriving (Generic )
+$(deriveJSON (unPrefix "_fpGet_") ''ForgotPasswordGet)
+instance ToSchema ForgotPasswordGet where
+  declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "_fpGet_") 
\ No newline at end of file

src/Gargantext/API/Client.hs

@@ -66,7 +66,7 @@ getBackendVersion :: ClientM Text
 -- * auth API
 postAuth :: AuthRequest -> ClientM AuthResponse
 forgotPasswordPost :: ForgotPasswordRequest -> ClientM ForgotPasswordResponse
-forgotPasswordGet :: Maybe Text -> ClientM Text
+forgotPasswordGet :: Maybe Text -> ClientM ForgotPasswordGet
 postForgotPasswordAsync :: ClientM (JobStatus 'Safe JobLog)
 postForgotPasswordAsyncJob :: JobInput Maybe ForgotPasswordAsyncParams -> ClientM (JobStatus 'Safe JobLog)
 killForgotPasswordAsyncJob :: JobID 'Unsafe -> Maybe Limit -> Maybe Offset -> ClientM (JobStatus 'Safe JobLog)

src/Gargantext/Core/Mail.hs

@@ -12,6 +12,7 @@ Portability : POSIX
 module Gargantext.Core.Mail where
 
 import Control.Lens (view)
+import Network.URI.Encode (encodeText)
 import Data.Text (Text, unlines, splitOn)
 import Gargantext.Core.Types.Individu
 import Gargantext.Database.Schema.User (UserLight(..))
@@ -90,7 +91,7 @@ bodyWith server (ForgotPassword { user = UserLight { userLight_forgot_password_u
   , forgot_password_link server uuid ]
 
 forgot_password_link :: ServerAddress -> Text -> Text
-forgot_password_link server uuid = server <> "/api/v1.0/forgot-password?uuid=" <> uuid
+forgot_password_link server uuid = server <> "/#/forgotPassword?uuid=" <> uuid <> "&server=" <> encodeText server
 
 ------------------------------------------------------------------------
 email_subject :: MailModel -> Text