refactor(auth): move delegation to sub-module credentials

Author: peterpeterparker

src/console/src/accounts/impls.rs

@@ -1,7 +1,7 @@
 use crate::constants::E8S_PER_ICP;
 use crate::types::state::{Account, OpenIdData, Provider};
 use ic_cdk::api::time;
-use junobuild_auth::openid::delegation::types::interface::OpenIdCredential;
+use junobuild_auth::openid::credentials::delegation::types::interface::OpenIdCredential;
 use junobuild_auth::profile::types::OpenIdProfile;
 use junobuild_shared::types::state::{MissionControlId, UserId};
 

src/console/src/auth/delegation.rs

@@ -1,13 +1,14 @@
 use crate::auth::strategy_impls::AuthHeap;
 use crate::certification::strategy_impls::AuthCertificate;
+use junobuild_auth::delegation;
 use junobuild_auth::delegation::types::{
     GetDelegationError, GetDelegationResult, OpenIdGetDelegationArgs, OpenIdPrepareDelegationArgs,
     PrepareDelegationError, PreparedDelegation,
 };
-use junobuild_auth::openid::delegation::types::interface::OpenIdCredential;
-use junobuild_auth::openid::delegation::types::provider::OpenIdDelegationProvider;
+use junobuild_auth::openid::credentials;
+use junobuild_auth::openid::credentials::delegation::types::interface::OpenIdCredential;
+use junobuild_auth::openid::credentials::delegation::types::provider::OpenIdDelegationProvider;
 use junobuild_auth::state::types::config::OpenIdAuthProviders;
-use junobuild_auth::{delegation, openid};
 
 pub type OpenIdPrepareDelegationResult = Result<
     (
@@ -23,7 +24,7 @@ pub async fn openid_prepare_delegation(
     providers: &OpenIdAuthProviders,
 ) -> OpenIdPrepareDelegationResult {
     let (credential, provider) =
-        match openid::delegation::verify_openid_credentials_with_jwks_renewal(
+        match credentials::delegation::verify_openid_credentials_with_jwks_renewal(
             &args.jwt, &args.salt, providers, &AuthHeap,
         )
         .await
@@ -48,7 +49,7 @@ pub fn openid_get_delegation(
     providers: &OpenIdAuthProviders,
 ) -> GetDelegationResult {
     let (credential, provider) =
-        match openid::delegation::verify_openid_credentials_with_cached_jwks(
+        match credentials::delegation::verify_openid_credentials_with_cached_jwks(
             &args.jwt, &args.salt, providers, &AuthHeap,
         ) {
             Ok(value) => value,

src/console/src/auth/register.rs

@@ -3,8 +3,8 @@ use crate::types::state::OpenId;
 use crate::types::state::{Account, OpenIdData, Provider};
 use candid::Principal;
 use junobuild_auth::delegation::types::UserKey;
-use junobuild_auth::openid::delegation::types::interface::OpenIdCredential;
-use junobuild_auth::openid::delegation::types::provider::OpenIdDelegationProvider;
+use junobuild_auth::openid::credentials::delegation::types::interface::OpenIdCredential;
+use junobuild_auth::openid::credentials::delegation::types::provider::OpenIdDelegationProvider;
 
 pub async fn register_account(
     public_key: &UserKey,

src/console/src/types.rs

@@ -4,7 +4,7 @@ pub mod state {
     use candid::CandidType;
     use ic_ledger_types::{BlockIndex, Tokens};
     use ic_stable_structures::StableBTreeMap;
-    use junobuild_auth::openid::delegation::types::provider::OpenIdDelegationProvider;
+    use junobuild_auth::openid::credentials::delegation::types::provider::OpenIdDelegationProvider;
     use junobuild_auth::state::types::state::AuthenticationHeapState;
     use junobuild_cdn::proposals::{ProposalsStable, SegmentDeploymentVersion};
     use junobuild_cdn::storage::{ProposalAssetsStable, ProposalContentChunksStable};

src/libs/auth/src/delegation/get.rs

@@ -4,8 +4,10 @@ use crate::delegation::types::{
 use crate::delegation::utils::seed::calculate_seed;
 use crate::delegation::utils::signature::{build_signature_inputs, build_signature_msg};
 use crate::delegation::utils::targets::build_targets;
-use crate::openid::delegation::types::interface::{OpenIdCredential, OpenIdCredentialKey};
-use crate::openid::delegation::types::provider::OpenIdDelegationProvider;
+use crate::openid::credentials::delegation::types::interface::{
+    OpenIdCredential, OpenIdCredentialKey,
+};
+use crate::openid::credentials::delegation::types::provider::OpenIdDelegationProvider;
 use crate::state::get_salt;
 use crate::state::services::read_state;
 use crate::strategies::{AuthCertificateStrategy, AuthHeapStrategy};

src/libs/auth/src/delegation/impls.rs

@@ -1,5 +1,5 @@
 use crate::delegation::types::{GetDelegationError, PrepareDelegationError};
-use crate::openid::delegation::types::errors::VerifyOpenidCredentialsError;
+use crate::openid::credentials::delegation::types::errors::VerifyOpenidCredentialsError;
 
 impl From<VerifyOpenidCredentialsError> for GetDelegationError {
     fn from(e: VerifyOpenidCredentialsError) -> Self {

src/libs/auth/src/delegation/prepare.rs

@@ -6,8 +6,10 @@ use crate::delegation::utils::duration::build_expiration;
 use crate::delegation::utils::seed::calculate_seed;
 use crate::delegation::utils::signature::{build_signature_inputs, build_signature_msg};
 use crate::delegation::utils::targets::build_targets;
-use crate::openid::delegation::types::interface::{OpenIdCredential, OpenIdCredentialKey};
-use crate::openid::delegation::types::provider::OpenIdDelegationProvider;
+use crate::openid::credentials::delegation::types::interface::{
+    OpenIdCredential, OpenIdCredentialKey,
+};
+use crate::openid::credentials::delegation::types::provider::OpenIdDelegationProvider;
 use crate::state::get_salt;
 use crate::state::services::mutate_state;
 use crate::strategies::{AuthCertificateStrategy, AuthHeapStrategy};

src/libs/auth/src/delegation/utils/duration.rs

@@ -1,5 +1,5 @@
 use crate::delegation::constants::{DEFAULT_EXPIRATION_PERIOD_NS, MAX_EXPIRATION_PERIOD_NS};
-use crate::openid::delegation::types::provider::OpenIdDelegationProvider;
+use crate::openid::credentials::delegation::types::provider::OpenIdDelegationProvider;
 use crate::state::get_config;
 use crate::strategies::AuthHeapStrategy;
 use ic_cdk::api::time;

src/libs/auth/src/delegation/utils/seed.rs

@@ -1,4 +1,4 @@
-use crate::openid::delegation::types::interface::OpenIdCredentialKey;
+use crate::openid::credentials::delegation::types::interface::OpenIdCredentialKey;
 use crate::state::types::state::Salt;
 use ic_certification::Hash;
 use sha2::{Digest, Sha256};
@@ -30,7 +30,7 @@ fn hash_bytes(value: impl AsRef<[u8]>) -> Hash {
 #[cfg(test)]
 mod tests {
     use super::calculate_seed;
-    use crate::openid::delegation::types::interface::OpenIdCredentialKey;
+    use crate::openid::credentials::delegation::types::interface::OpenIdCredentialKey;
     use crate::state::types::state::Salt;
     use ic_certification::Hash;
     use sha2::{Digest, Sha256};

src/libs/auth/src/delegation/utils/targets.rs

@@ -1,5 +1,5 @@
 use crate::delegation::types::DelegationTargets;
-use crate::openid::delegation::types::provider::OpenIdDelegationProvider;
+use crate::openid::credentials::delegation::types::provider::OpenIdDelegationProvider;
 use crate::state::get_config;
 use crate::strategies::AuthHeapStrategy;
 use junobuild_shared::ic::api::id;