MOBILE-242 | Password Reset is failing from mobile

projectNEWM · Aug 20, 2024 · 73321b9 · 73321b9
1 parent 7c89f71
commit 73321b9
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 41 deletions.
diff --git a/newm-server/src/main/kotlin/io/newm/server/Application.kt b/newm-server/src/main/kotlin/io/newm/server/Application.kt
@@ -36,37 +36,42 @@ fun main(args: Array<String>) =
 
 @Suppress("unused")
 fun Application.module() {
-    initializeSentry()
-    installDependencyInjection()
-    initializeDatabase()
-    installCurator()
+    try {
+        initializeSentry()
+        installDependencyInjection()
+        initializeDatabase()
+        installCurator()
 
-    installCallLogging()
-    installContentNegotiation()
-    installAuthentication()
-    installStatusPages()
-    installCORS()
-    installForwarder()
-    installHealthCheck()
+        installCallLogging()
+        installContentNegotiation()
+        installAuthentication()
+        installStatusPages()
+        installCORS()
+        installForwarder()
+        installHealthCheck()
 
-    routing {
-        createStaticContentRoutes()
-        createAuthenticationRoutes()
-        createUserRoutes()
-        createCardanoRoutes()
-        createSongRoutes()
-        createCollaborationRoutes()
-        createPlaylistRoutes()
-        createCloudinaryRoutes()
-        createIdenfyRoutes()
-        createDistributionRoutes()
-        createEarningsRoutes()
-        createWalletConnectionRoutes()
-        createMarketplaceRoutes()
-        createClientConfigRoutes()
+        routing {
+            createStaticContentRoutes()
+            createAuthenticationRoutes()
+            createUserRoutes()
+            createCardanoRoutes()
+            createSongRoutes()
+            createCollaborationRoutes()
+            createPlaylistRoutes()
+            createCloudinaryRoutes()
+            createIdenfyRoutes()
+            createDistributionRoutes()
+            createEarningsRoutes()
+            createWalletConnectionRoutes()
+            createMarketplaceRoutes()
+            createClientConfigRoutes()
 
-        createOpenApiDocumentationRoutes()
-    }
+            createOpenApiDocumentationRoutes()
+        }
 
-    initializeDaemons()
+        initializeDaemons()
+    } catch (t: Throwable) {
+        t.printStackTrace()
+        throw t
+    }
 }
diff --git a/newm-server/src/main/kotlin/io/newm/server/features/user/repo/UserRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/user/repo/UserRepositoryImpl.kt
@@ -220,7 +220,7 @@ internal class UserRepositoryImpl(
         val email = user.email?.asValidEmail()?.asVerifiedEmail(user.authCode)
         val passwordHash = user.newPassword?.asValidPassword(user.confirmPassword)?.toHash()
 
-        newSuspendedTransaction {
+        val userEntity = newSuspendedTransaction {
             val entity = UserEntity[userId]
             user.firstName?.let {
                 entity.checkNameModifiable(it, entity.firstName)
@@ -285,6 +285,10 @@ internal class UserRepositoryImpl(
             user.distributionLabelId?.let { entity.distributionLabelId = it }
             user.distributionIsni?.let { entity.distributionIsni = it.orNull() }
             user.distributionIpn?.let { entity.distributionIpn = it.orNull() }
+            entity
+        }
+        passwordHash?.let {
+            userEntity.notifyPasswordChanged()
         }
     }
 
@@ -340,12 +344,7 @@ internal class UserRepositoryImpl(
                 this.passwordHash = passwordHash
             }
         }
-        emailRepository.send(
-            to = email,
-            subject = environment.getConfigString("passwordChanged.subject"),
-            messageUrl = environment.getConfigString("passwordChanged.messageUrl"),
-            messageArgs = mapOf("owner" to userEntity.stageOrFullName)
-        )
+        userEntity.notifyPasswordChanged()
     }
 
     override suspend fun delete(userId: UserId) {
@@ -426,4 +425,13 @@ internal class UserRepositoryImpl(
         biography?.checkLength("biography", 250)
         companyName?.checkLength("companyName")
     }
+
+    private suspend fun UserEntity.notifyPasswordChanged() {
+        emailRepository.send(
+            to = email,
+            subject = environment.getConfigString("passwordChangeNotification.subject"),
+            messageUrl = environment.getConfigString("passwordChangeNotification.messageUrl"),
+            messageArgs = mapOf("owner" to stageOrFullName)
+        )
+    }
 }
diff --git a/newm-server/src/main/resources/application.conf b/newm-server/src/main/resources/application.conf
@@ -270,11 +270,12 @@ mintingNotifications {
          messageUrl = "/email/mint-released.html"
          messageUrl = ${?EMAIL_MINT_RELEASED_MESSAGE_URL}
     }
-    passwordChanged {
-         subject = "Your password has been reset /Password reset confirmation"
-         messageUrl = "/email/password-changed.html"
-         messageUrl = ${?EMAIL_PASSWORD_CHANGED_MESSAGE_URL}
-    }
+}
+
+passwordChangeNotification {
+     subject = "Your password has been reset /Password reset confirmation"
+     messageUrl = "/email/password-changed.html"
+     messageUrl = ${?EMAIL_PASSWORD_CHANGED_MESSAGE_URL}
 }
 
 nftCdn {