ae56eaa · warden · git.iko.soy

git.iko.soy/warden

on master help sign in

Cleaned up backend

ae56eaaiko4 years ago

backend/BW/Logic.purs−6

compare with master

unifiedsplit

@@ -4,23 +4,17 @@ import BW

4import BW.Types

5import Control.El

6import Prelude

7−import Control.Monad.Error.Class (throwError)

8import Control.Promise (Promise)

7import Control.Promise (Promise)

9import Control.Promise as Promise

8import Control.Promise as Promise

10import Data.EncString as EncString

9import Data.EncString as EncString

11import Data.Function.Uncurried (runFn2, runFn3, runFn4)

10import Data.Function.Uncurried (runFn2, runFn3, runFn4)

12import Data.JNullable (jnull, nullify)

11import Data.JNullable (jnull, nullify)

13−import Data.Maybe (Maybe(..))

14import Data.String as String

12import Data.String as String

15import Data.SymmetricCryptoKey (SymmetricCryptoKey)

13import Data.SymmetricCryptoKey (SymmetricCryptoKey)

16import Data.SymmetricCryptoKey as SymmetricCryptoKey

14import Data.SymmetricCryptoKey as SymmetricCryptoKey

17import Effect.Aff.Class (class MonadAff, liftAff)

15import Effect.Aff.Class (class MonadAff, liftAff)

18import Effect.Class (liftEffect)

16import Effect.Class (liftEffect)

19−import Effect.Class.Console (log)

20−import Effect.Exception (error)

21import Effect.Exception as Exc

17import Effect.Exception as Exc

22−import Localstorage (class StorageKey)

23−import Web.Storage.Storage (Storage)

25-- | Creates the master key

19-- | Creates the master key

26makePreloginKey ::

20makePreloginKey ::

backend/BW/Types.purs+1−2

@@ -3,11 +3,10 @@ module BW.Types where

3import Prelude

5import Data.Argonaut (class DecodeJson, class EncodeJson)

6−import Data.Date (Date)

7import Data.JNullable (JNullable)

6import Data.JNullable (JNullable)

8import Data.JOpt (JOpt)

7import Data.JOpt (JOpt)

9import Data.ShowableJson (ShowableJson)

8import Data.ShowableJson (ShowableJson)

10−import Data.Timestamp (Timestamp(..))

9+import Data.Timestamp (Timestamp)

12newtype EncryptedString

11newtype EncryptedString

13 = EncryptedString String

12 = EncryptedString String

backend/Main.purs+5−19

@@ -2,35 +2,25 @@ module Main

2 ( main

3 ) where

5−import Bridge

6import Prelude

5import Prelude

8−import BW (ApiService, CryptoService, Hash(..), Services)

7+import BW (ApiService, CryptoService, Hash, Services)

9import BW as WB

8import BW as WB

10import BW.Logic (decrypt, hashPassword, liftPromise)

9import BW.Logic (decrypt, hashPassword, liftPromise)

11import BW.Logic as Logic

10import BW.Logic as Logic

12−import BW.Types (CipherResponse, Email(..), EncryptedString(..), IdentityTokenResponse, Password(..), PreloginResponse, SyncResponse, Urls, PreloginRequest)

11+import BW.Types (CipherResponse, Email(..), IdentityTokenResponse, Password(..), PreloginResponse, SyncResponse, Urls)

13import Bridge as Bridge

12import Bridge as Bridge

14import Control.El (class HasL, Al, L(..), l)

13import Control.El (class HasL, Al, L(..), l)

15import Control.Monad.Reader (runReaderT)

14import Control.Monad.Reader (runReaderT)

16−import Control.Promise (Promise)

17−import Control.Promise as Promise

18−import Data.Argonaut (class DecodeJson, class EncodeJson, encodeJson)

15+import Data.Argonaut (class DecodeJson)

19−import Data.Argonaut as Json

20−import Data.Array as A

21import Data.Either (Either(..))

16import Data.Either (Either(..))

22−import Data.JNullable (JNullable(..), jnull, nullify)

17+import Data.JNullable (jnull, nullify)

23import Data.Maybe (Maybe(..))

18import Data.Maybe (Maybe(..))

24−import Data.Nullable (Nullable, null, toNullable)

25−import Data.Nullable as Nullable

26import Data.SymmetricCryptoKey (SymmetricCryptoKey)

19import Data.SymmetricCryptoKey (SymmetricCryptoKey)

27import Data.Timestamp as Timestamp

20import Data.Timestamp as Timestamp

28import Data.Traversable (traverse)

21import Data.Traversable (traverse)

29import Effect (Effect)

22import Effect (Effect)

30import Effect.Aff (Aff, runAff_, try)

23import Effect.Aff (Aff, runAff_, try)

31−import Effect.Aff as Aff

32−import Effect.Aff.Class (class MonadAff, liftAff)

33−import Effect.Aff.Class as Aff

34import Effect.Class (liftEffect)

24import Effect.Class (liftEffect)

35import Effect.Class.Console (log)

25import Effect.Class.Console (log)

36import Effect.Exception as Exc

26import Effect.Exception as Exc

@@ -38,12 +28,8 @@ import Effect.Ref as Ref

38import Elm as Elm

28import Elm as Elm

39import FFI (Elm)

29import FFI (Elm)

40import FFI as FFI

30import FFI as FFI

41−import Localstorage (class StorageKey, storageKey)

31+import Localstorage (class StorageKey)

42import Localstorage as Storage

32import Localstorage as Storage

43−import Localstorage as Storage

44−import Prelude as Array

45−import Unsafe.Coerce (unsafeCoerce)

46−import Web.HTML (Window)

47import Web.HTML as Html

33import Web.HTML as Html

48import Web.HTML.Window as Window

34import Web.HTML.Window as Window

49import Web.Storage.Storage (Storage)

35import Web.Storage.Storage (Storage)