Fix role issue for users in RCOS Discord

Author: vcfxb

CHANGELOG.md

@@ -8,6 +8,8 @@ please submit a pull request fixing it.
 - Fixed bug in rendering of registration form. ([#222])
 - User profile OGP tags ([#228])
 - Added Spring 2022 RCOS proposal ([#240])
+- Updated minimum rust version to 1.58.1.
+- Fixed bug that missed verified role on users already in the RCOS Discord. ([#236], #PR)
 
 ## 0.8.5 - December 31st, 2021
 - Changes to the config file:
@@ -179,3 +181,4 @@ please submit a pull request fixing it.
 [#222]: https://github.com/rcos/Telescope/pull/222
 [#228]: https://github.com/rcos/Telescope/pull/228
 [#240]: https://github.com/rcos/Telescope/pull/240
+[#236]: https://github.com/rcos/Telescope/issues/236

Cargo.toml

@@ -4,7 +4,7 @@ version = "0.8.6-dev"
 authors = ["Antonia \"Nia\" Calia-Bogan <[email protected]>"]
 description = "The RCOS webapp"
 edition = "2021"
-rust-version = "1.57"
+rust-version = "1.58.1"
 
 [dependencies]
 # command line argument parser

Dockerfile

@@ -1,5 +1,5 @@
 # Use latest rust (by explicit version to avoid getting a stale release)
-FROM rust:1.57
+FROM rust:1.58.1
 
 # Set timezone
 ENV TZ=America/New_York

src/web/services/auth/oauth2_providers/discord.rs

@@ -190,7 +190,7 @@ impl DiscordIdentity {
             });
     }
 
-    /// Add this user to the RCOS Discord. Set their nickname and give them the "Verified" role.
+    /// Add this user to the RCOS Discord. Set their nickname and give them the specified roles.
     pub async fn add_to_rcos_guild(
         &self,
         nickname: Option<String>,

src/web/services/user/join_discord.rs

@@ -1,12 +1,14 @@
 //! Page and service to let users into RCOS Discord and give them the verified role.
 
-use crate::api::discord::rcos_discord_verified_role_id;
+use crate::api::discord::{global_discord_client, rcos_discord_verified_role_id};
 use crate::api::rcos::users::discord_whois::DiscordWhoIs;
 use crate::error::TelescopeError;
 
 use crate::web::services::auth::identity::AuthenticationCookie;
 use actix_web::HttpResponse;
 use reqwest::header::LOCATION;
+use serenity::model::prelude::RoleId;
+use crate::env::global_config;
 
 /// Let users into the RCOS discord.
 #[get("/join_discord")]
@@ -86,13 +88,26 @@ pub async fn handle(auth: AuthenticationCookie) -> Result<HttpResponse, Telescop
     );
 
     // Get RCOS Discord Verified role ID if possible. If not, user empty role list.
-    let roles = rcos_discord_verified_role_id()
+    let verified_role: RoleId = rcos_discord_verified_role_id()
         .await?
-        .map(|role| vec![role])
         .ok_or(TelescopeError::ise("Could not get Verified role ID."))?;
 
-    // Add user to Discord.
-    discord.add_to_rcos_guild(Some(nickname), roles).await?;
+    // Add user to Discord with verified role and nickname.
+    discord.add_to_rcos_guild(Some(nickname), vec![verified_role]).await?;
+
+    // If user was already in the discord, they may not have the verified role, and the
+    // previous call will do nothing. Make an additional call here to add the verified role
+    // to the user if they don't already have it.
+    // See https://github.com/rcos/Telescope/issues/236.
+
+    // Get the rcos discord guild ID.
+    let rcos_discord_guild = global_config().discord_config.rcos_guild_id();
+
+    // Make the call to add the verified role
+    global_discord_client()
+        .add_member_role(rcos_discord_guild, discord_user_id, verified_role.0)
+        .await
+        .map_err(TelescopeError::serenity_error)?;
 
     // On success, redirect user back to their profile.
     Ok(HttpResponse::Found()