Add OpenIdEmailVerification enum to OpenIdConfig

Author: sea-snake

src/internet_identity/internet_identity.did

@@ -364,6 +364,11 @@ type Aud = text;
 type JWT = text;
 type Salt = blob;
 
+type OpenIdEmailVerification = variant {
+    Google;
+    Microsoft;
+};
+
 type OpenIdConfig = record {
     name : text;
     logo : text;
@@ -373,6 +378,7 @@ type OpenIdConfig = record {
     auth_uri : text;
     auth_scope : vec text;
     fedcm_uri : opt text;
+    email_verification : opt OpenIdEmailVerification;
 };
 
 type OpenIdCredentialKey = record { Iss; Sub };

src/internet_identity/src/openid.rs

@@ -12,8 +12,8 @@ use internet_identity_interface::internet_identity::types::openid::{
     OpenIdCredentialAddError, OpenIdDelegationError,
 };
 use internet_identity_interface::internet_identity::types::{
-    AnchorNumber, Delegation, EmailVerification, IdRegFinishError, MetadataEntryV2, OpenIdConfig,
-    PublicKey, SessionKey, SignedDelegation, Timestamp, UserKey,
+    AnchorNumber, Delegation, IdRegFinishError, MetadataEntryV2, OpenIdConfig,
+    OpenIdEmailVerification, PublicKey, SessionKey, SignedDelegation, Timestamp, UserKey,
 };
 use serde_bytes::ByteBuf;
 use sha2::{Digest, Sha256};
@@ -184,7 +184,7 @@ impl OpenIdCredential {
 pub trait OpenIdProvider {
     fn issuer(&self) -> String;
 
-    fn email_verification(&self) -> Option<EmailVerification>;
+    fn email_verification(&self) -> Option<OpenIdEmailVerification>;
 
     /// Verify JWT and bound nonce with salt, return `OpenIdCredential` if successful
     ///
@@ -289,12 +289,12 @@ pub fn get_all_claims(claims_bytes: &[u8], keys: Vec<String>) -> Vec<(String, St
 
 /// Get the verified email from metadata if it passes the provider's verification requirements.
 pub fn get_verified_email(
-    verification: &EmailVerification,
+    verification: &OpenIdEmailVerification,
     metadata: &HashMap<String, MetadataEntryV2>,
 ) -> Option<String> {
     match verification {
-        EmailVerification::Google => get_google_verified_email(metadata),
-        EmailVerification::Microsoft => get_microsoft_verified_email(metadata),
+        OpenIdEmailVerification::Google => get_google_verified_email(metadata),
+        OpenIdEmailVerification::Microsoft => get_microsoft_verified_email(metadata),
     }
 }
 
@@ -401,7 +401,7 @@ impl OpenIdProvider for ExampleProvider {
         "https://example.com".into()
     }
 
-    fn email_verification(&self) -> Option<EmailVerification> {
+    fn email_verification(&self) -> Option<OpenIdEmailVerification> {
         None
     }
 
@@ -603,7 +603,7 @@ impl OpenIdProvider for ExamplePlaceholderProvider {
         "https://login.microsoftonline.com/{tid}/v2.0".into()
     }
 
-    fn email_verification(&self) -> Option<EmailVerification> {
+    fn email_verification(&self) -> Option<OpenIdEmailVerification> {
         None
     }
 

src/internet_identity/src/openid/generic.rs

@@ -19,7 +19,7 @@ use identity_jose::jws::{
     VerificationInput,
 };
 use internet_identity_interface::internet_identity::types::{
-    EmailVerification, MetadataEntryV2, OpenIdConfig,
+    MetadataEntryV2, OpenIdConfig, OpenIdEmailVerification,
 };
 use rsa::{Pkcs1v15Sign, RsaPublicKey};
 use serde::Serialize;
@@ -103,15 +103,15 @@ pub struct Provider {
     client_id: String,
     issuer: String,
     certs: Rc<RefCell<Vec<Jwk>>>,
-    email_verification: Option<EmailVerification>,
+    email_verification: Option<OpenIdEmailVerification>,
 }
 
 impl OpenIdProvider for Provider {
     fn issuer(&self) -> String {
         self.issuer.clone()
     }
 
-    fn email_verification(&self) -> Option<EmailVerification> {
+    fn email_verification(&self) -> Option<OpenIdEmailVerification> {
         self.email_verification.clone()
     }
 

src/internet_identity_interface/src/internet_identity/types.rs

@@ -356,10 +356,8 @@ pub enum DeployArchiveResult {
 }
 
 #[derive(Clone, Debug, CandidType, Deserialize, Eq, PartialEq)]
-pub enum EmailVerification {
-    #[serde(rename = "google")]
+pub enum OpenIdEmailVerification {
     Google,
-    #[serde(rename = "microsoft")]
     Microsoft,
 }
 
@@ -373,7 +371,7 @@ pub struct OpenIdConfig {
     pub auth_uri: String,
     pub auth_scope: Vec<String>,
     pub fedcm_uri: Option<String>,
-    pub email_verification: Option<EmailVerification>,
+    pub email_verification: Option<OpenIdEmailVerification>,
 }
 
 pub enum AuthorizationKey {