backend/fix : token based auth in value first api

lib/mobility-core/src/Kernel/External/SMS/Interface/MyValueFirst.hs

@@ -42,9 +42,8 @@ sendOTP smsCfg SendSMSReq {..} = do
       otpSmsTemp = smsBody
       phone = phoneNumber
       senderName = sender
-  username <- decrypt smsCfg.username
-  password <- decrypt smsCfg.password
-  res <- MVF.sendOTPApi urlAddress username password otpSmsTemp phone senderName
+  token <- decrypt smsCfg.token
+  res <- MVF.sendOTPApi urlAddress token otpSmsTemp phone senderName
 
   return $ returnSmsResultMVF res
 

lib/mobility-core/src/Kernel/External/SMS/MyValueFirst/API.hs

@@ -26,8 +26,7 @@ import Servant
 type ServiceAPI =
   "smpp"
     :> "sendsms"
-    :> MandatoryQueryParam "username" Text
-    :> MandatoryQueryParam "password" Text
+    :> Header "Authorization" Text
     :> MandatoryQueryParam "from" Text
     :> MandatoryQueryParam "to" Text
     :> MandatoryQueryParam "text" Text
@@ -37,4 +36,4 @@ serviceAPI :: Proxy ServiceAPI
 serviceAPI = Proxy
 
 submitSms :: SubmitSms -> ET.EulerClient SubmitSmsRes
-submitSms SubmitSms {..} = ET.client serviceAPI username password from to text
+submitSms SubmitSms {..} = ET.client serviceAPI (Just $ "Bearer " <> token) from to text

lib/mobility-core/src/Kernel/External/SMS/MyValueFirst/Config.hs

@@ -20,6 +20,7 @@ import Kernel.Prelude
 data MyValueFirstCfg = MyValueFirstCfg
   { username :: EncryptedField 'AsEncrypted Text,
     password :: EncryptedField 'AsEncrypted Text,
-    url :: BaseUrl
+    url :: BaseUrl,
+    token :: EncryptedField 'AsEncrypted Text
   }
   deriving (Show, Eq, Generic, ToJSON, FromJSON)

lib/mobility-core/src/Kernel/External/SMS/MyValueFirst/Flow.hs

@@ -49,17 +49,15 @@ sendOTPApi ::
   Text ->
   Text ->
   Text ->
-  Text ->
   m SubmitSmsRes
-sendOTPApi url username password otpSmsTemplate phoneNumber sender = do
+sendOTPApi url token otpSmsTemplate phoneNumber sender = do
   submitSms
     url
     SubmitSms
-      { username = username,
-        password = password,
-        from = sender,
+      { from = sender,
         to = phoneNumber,
-        text = otpSmsTemplate
+        text = otpSmsTemplate,
+        token = token
       }
 
 sendSms ::
@@ -73,15 +71,17 @@ sendSms ::
 sendSms smsCfg smsTemplate phoneNumber = do
   let smsCred = smsCfg.credConfig
       url = smsCfg.url
-  submitSms
-    url
-    SubmitSms
-      { username = smsCred.username,
-        password = smsCred.password,
-        from = smsCfg.sender,
-        to = phoneNumber,
-        text = smsTemplate
-      }
+  case smsCred.token of
+    Just token -> do
+      submitSms
+        url
+        SubmitSms
+          { from = smsCfg.sender,
+            to = phoneNumber,
+            text = smsTemplate,
+            token = token
+          }
+    Nothing -> throwError $ InternalError "token is null"
 
 checkSmsResult :: (Log m, MonadThrow m) => SubmitSmsRes -> m ()
 checkSmsResult =

lib/mobility-core/src/Kernel/External/SMS/MyValueFirst/Types.hs

@@ -23,15 +23,14 @@ import Servant
 
 data SubmitSms = SubmitSms
   { -- | Login of myfirstvalue.com account.
-    username :: Text,
-    -- | Password of that account.
-    password :: Text,
     -- | Author name assigned to SMS.
     from :: Text,
     -- | Phone number.
     to :: Text,
     -- | SMS contents.
-    text :: Text
+    text :: Text,
+    -----
+    token :: Text
   }
   deriving (Show)
 

lib/mobility-core/src/Kernel/Sms/Config.hs

@@ -28,7 +28,8 @@ data SmsSessionConfig = SmsSessionConfig
 data SmsCredConfig = SmsCredConfig
   { username :: Text, -- FIXME? Do we need to reuse Servant's one?
     password :: Text, -- idem
-    otpHash :: Text
+    otpHash :: Text,
+    token :: Maybe Text
   }
   deriving (Generic, FromDhall)