Merge pull request #176 from obsidiansystems/ym/move-password-reset-t…

…oken account: move PasswordResetToken to rhyolite-account-types
obsidiansystems · Jan 12, 2022 · a6f5b4b · a6f5b4b
2 parents ec7fb78 + 7f7f4a8
commit a6f5b4b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/account/backend/src/Rhyolite/Backend/Account.hs b/account/backend/src/Rhyolite/Backend/Account.hs
@@ -13,7 +13,6 @@ module Rhyolite.Backend.Account
   , setAccountPassword
   , setAccountPasswordHash
   , makePasswordHash
-  , PasswordResetToken (..)
   , passwordResetToken
   , newNonce
   , resetPassword
@@ -174,14 +173,6 @@ resetPasswordHash accountTable aid nonce pwhash = do
         return $ Just aid
       else fail "nonce mismatch"
 
-newtype PasswordResetToken = PasswordResetToken
-  { unPasswordResetToken :: (PrimaryKey Account Identity, UTCTime)
-  }
-  deriving (Generic)
-
-instance ToJSON PasswordResetToken
-instance FromJSON PasswordResetToken
-
 passwordResetToken
   :: MonadIO m
   => CS.Key

diff --git a/account/types/src/Rhyolite/Account.hs b/account/types/src/Rhyolite/Account.hs
@@ -43,3 +43,12 @@ deriving instance Show (PrimaryKey Account Identity)
 
 instance ToJSON (PrimaryKey Account Identity)
 instance FromJSON (PrimaryKey Account Identity)
+
+
+newtype PasswordResetToken = PasswordResetToken
+  { unPasswordResetToken :: (PrimaryKey Account Identity, UTCTime)
+  }
+  deriving (Generic)
+
+instance ToJSON PasswordResetToken
+instance FromJSON PasswordResetToken