chore: remove basic auth (#1255)

juspay · Sep 2, 2024 · d8b105c · d8b105c
1 parent b767afc
commit d8b105c
Show file tree

Hide file tree

Showing 36 changed files with 39 additions and 879 deletions.
diff --git a/.github/workflows/release-stable-version.yml b/.github/workflows/release-stable-version.yml
@@ -163,4 +163,4 @@ jobs:
         with:
           name: release-notes.md
           path: release-notes.md
-          if-no-files-found: error
+          if-no-files-found: error
diff --git a/config/config.toml b/config/config.toml
@@ -38,7 +38,6 @@ global_search=false
 dispute_analytics=false
 configure_pmts=false
 branding=false
-totp=false
 live_users_counter=false
 granularity=false
 custom_webhook_headers=false

diff --git a/src/context/AuthInfoProvider.res b/src/context/AuthInfoProvider.res
@@ -31,21 +31,6 @@ let make = (~children) => {
     switch newAuthStatus {
     | LoggedIn(info) =>
       switch info {
-      | BasicAuth(basicInfo) =>
-        switch basicInfo.token {
-        | Some(token) =>
-          if !(token->LogicUtils.isEmptyString) {
-            setAuth(_ => newAuthStatus)
-            BasicAuthUtils.setBasicAuthResToStorage(basicInfo)
-          } else {
-            setAuth(_ => LoggedOut)
-            CommonAuthUtils.clearLocalStorage()
-          }
-        | None => {
-            setAuth(_ => LoggedOut)
-            CommonAuthUtils.clearLocalStorage()
-          }
-        }
       | Auth(totpInfo) =>
         if totpInfo.token->Option.isSome {
           setAuth(_ => newAuthStatus)

diff --git a/src/context/TokenContextProvider.res b/src/context/TokenContextProvider.res
@@ -6,15 +6,15 @@ type tokenContextObjectType = {
   setToken: (option<string> => option<string>) => unit,
   tokenDetailsDict: Dict.t<JSON.t>,
   setTokenDetailsDict: (Dict.t<JSON.t> => Dict.t<JSON.t>) => unit,
-  parentAuthInfo: option<BasicAuthTypes.basicAuthInfo>,
+  parentAuthInfo: option<AuthProviderTypes.authInfo>,
 }
 
 let defaultTokenObj = {
   token: None,
   setToken: defaultTokenSetter,
   tokenDetailsDict: Dict.make(),
   setTokenDetailsDict: defaultDictSetter,
-  parentAuthInfo: Some(BasicAuthUtils.getBasicAuthInfo(JSON.Encode.object(Dict.make()))),
+  parentAuthInfo: Some(AuthUtils.getAuthInfo(JSON.Encode.object(Dict.make()))),
 }
 
 let tokenContext = React.createContext(defaultTokenObj)
@@ -31,9 +31,7 @@ let make = (~children) => {
 
   let tokenContextObjext = React.useMemo(() => {
     let parentAuthInfo = Some(
-      BasicAuthUtils.getBasicAuthInfo(
-        tokenDetailsDict->LogicUtils.getJsonObjectFromDict("tokenDict"),
-      ),
+      AuthUtils.getAuthInfo(tokenDetailsDict->LogicUtils.getJsonObjectFromDict("tokenDict")),
     )
 
     {

diff --git a/src/context/UserPrefContext.res b/src/context/UserPrefContext.res
@@ -39,8 +39,7 @@ let make = (~children) => {
   let username = switch authStatus {
   | LoggedIn(authType) =>
     switch authType {
-    | BasicAuth(basicAuthInfo) => basicAuthInfo.name->Option.getOr("")
-    | _ => ""
+    | Auth(_) => ""
     }
   | _ => ""
   }

diff --git a/src/entryPoints/AcceptInvite.res b/src/entryPoints/AcceptInvite.res
diff --git a/src/entryPoints/AuthModule/AuthModuleHooks.res b/src/entryPoints/AuthModule/AuthModuleHooks.res
@@ -95,7 +95,7 @@ let useAuthMethods = (): authMethodProps => {
     | None => false
     }
     let emailFeatureFlagEnable = featureFlagValues.email
-    let isTotpFeatureDisable = featureFlagValues.totp
+    // let isTotpFeatureDisable = featureFlagValues.totp
 
     let isLiveMode = featureFlagValues.isLiveMode
 
@@ -108,10 +108,10 @@ let useAuthMethods = (): authMethodProps => {
     } else if isSingUpAllowedinPassword {
       // Singup is allowed if email feature flag and allow_signup in the passowrd method is true
       (true, PASSWORD)
-    } else if !isTotpFeatureDisable && emailFeatureFlagEnable {
+    } else if emailFeatureFlagEnable {
       // Singup is allowed if totp feature  is disable and email feature is enabled
       (true, MAGIC_LINK)
-    } else if !isTotpFeatureDisable {
+    } else if !isLiveMode {
       // Singup is allowed if totp feature  is disable
       (true, PASSWORD)
     } else {

diff --git a/src/entryPoints/AuthModule/AuthProviderTypes.res b/src/entryPoints/AuthModule/AuthProviderTypes.res
@@ -6,7 +6,7 @@ type preLoginType = {
 
 type authInfo = {token: option<string>}
 
-type authType = BasicAuth(BasicAuthTypes.basicAuthInfo) | Auth(authInfo)
+type authType = Auth(authInfo)
 
 type authStatus =
   | LoggedOut