refactor(user): call increment_generation_id from set_password

Signed-off-by: stadust <[email protected]>

Author: stadust

pointercrate-user/src/auth/oauth/patch.rs

@@ -0,0 +1,20 @@
+use sqlx::PgConnection;
+
+use crate::auth::legacy::LegacyAuthenticatedUser;
+use crate::Result;
+
+use super::{ValidatedGoogleCredentials};
+
+impl LegacyAuthenticatedUser {
+    pub async fn set_linked_google_account(&mut self, creds: &ValidatedGoogleCredentials, connection: &mut PgConnection) -> Result<()> {
+        sqlx::query!(
+            "UPDATE members SET google_account_id = $1 WHERE member_id = $2",
+            creds.google_account_id(),
+            self.user().id
+        )
+        .execute(connection)
+        .await?;
+
+        Ok(())
+    }
+}

pointercrate-user/src/auth/patch.rs

@@ -50,9 +50,6 @@ impl AuthenticatedUser<PasswordOrBrowser> {
             }
 
             self.set_password(password, connection).await?;
-
-            // needed to invalidate existing access tokens
-            self.increment_generation_id(connection).await?;
         }
 
         self.into_user()
@@ -69,9 +66,12 @@ impl AuthenticatedUser<PasswordOrBrowser> {
 
     async fn set_password(&mut self, password: String, connection: &mut PgConnection) -> Result<()> {
         match &mut self.auth_type {
-            AuthenticationType::Legacy(legacy) => legacy.set_password(password, connection).await,
-            _ => Err(UserError::NonLegacyAccount),
+            AuthenticationType::Legacy(legacy) => legacy.set_password(password, connection).await?,
+            _ => return Err(UserError::NonLegacyAccount),
         }
+
+        // needed to invalidate existing access tokens
+        self.increment_generation_id(connection).await
     }
 
     pub(super) async fn increment_generation_id(&mut self, connection: &mut PgConnection) -> Result<()> {