Merge branch 'main' into feat/progress-hosting

Author: peterpeterparker

src/frontend/src/lib/components/auth/AuthConfig.svelte

@@ -5,8 +5,9 @@
 	import type { AuthenticationConfig, Rule } from '$declarations/satellite/satellite.did';
 	import SkeletonText from '$lib/components/ui/SkeletonText.svelte';
 	import Value from '$lib/components/ui/Value.svelte';
+	import { getAuthConfig } from '$lib/services/auth.config.services';
 	import { getRuleUser } from '$lib/services/collection.services';
-	import { getAuthConfig, listCustomDomains } from '$lib/services/hosting.services';
+	import { listCustomDomains } from '$lib/services/custom-domain.services';
 	import { authStore } from '$lib/stores/auth.store';
 	import { busy } from '$lib/stores/busy.store';
 	import { i18n } from '$lib/stores/i18n.store';

src/frontend/src/lib/components/hosting/CustomDomainActions.svelte

@@ -12,7 +12,7 @@
 	import Checkbox from '$lib/components/ui/Checkbox.svelte';
 	import Html from '$lib/components/ui/Html.svelte';
 	import Popover from '$lib/components/ui/Popover.svelte';
-	import { deleteCustomDomain as deleteCustomDomainService } from '$lib/services/hosting.services';
+	import { deleteCustomDomain as deleteCustomDomainService } from '$lib/services/custom-domain.services';
 	import { authStore } from '$lib/stores/auth.store';
 	import { busy, isBusy } from '$lib/stores/busy.store';
 	import { i18n } from '$lib/stores/i18n.store';

src/frontend/src/lib/components/hosting/Hosting.svelte

@@ -11,7 +11,8 @@
 	import CustomDomainInfo from '$lib/components/hosting/CustomDomainInfo.svelte';
 	import HostingCount from '$lib/components/hosting/HostingCount.svelte';
 	import { sortedSatelliteCustomDomains } from '$lib/derived/satellite-custom-domains.derived';
-	import { listCustomDomains, getAuthConfig } from '$lib/services/hosting.services';
+	import { getAuthConfig } from '$lib/services/auth.config.services';
+	import { listCustomDomains } from '$lib/services/custom-domain.services';
 	import { authStore } from '$lib/stores/auth.store';
 	import { i18n } from '$lib/stores/i18n.store';
 	import type { CustomDomainRegistrationState } from '$lib/types/custom-domain';

src/frontend/src/lib/components/modals/CustomDomainModal.svelte

@@ -9,7 +9,7 @@
 	import IconVerified from '$lib/components/icons/IconVerified.svelte';
 	import Modal from '$lib/components/ui/Modal.svelte';
 	import SpinnerModal from '$lib/components/ui/SpinnerModal.svelte';
-	import { setCustomDomain } from '$lib/services/hosting.services';
+	import { setCustomDomain } from '$lib/services/custom-domain.services';
 	import { authStore } from '$lib/stores/auth.store';
 	import { wizardBusy } from '$lib/stores/busy.store';
 	import { i18n } from '$lib/stores/i18n.store';

src/frontend/src/lib/components/satellites/SatelliteActions.svelte

@@ -9,7 +9,7 @@
 	import SegmentDetach from '$lib/components/canister/SegmentDetach.svelte';
 	import TopUp from '$lib/components/canister/TopUp.svelte';
 	import SegmentActions from '$lib/components/segments/SegmentActions.svelte';
-	import { listCustomDomains } from '$lib/services/hosting.services';
+	import { listCustomDomains } from '$lib/services/custom-domain.services';
 	import { busy } from '$lib/stores/busy.store';
 	import { i18n } from '$lib/stores/i18n.store';
 	import { toasts } from '$lib/stores/toasts.store';

src/frontend/src/lib/components/satellites/SatelliteOverviewCustomDomain.svelte

@@ -8,7 +8,7 @@
 		satelliteCustomDomain,
 		satelliteCustomDomainsLoaded
 	} from '$lib/derived/satellite-custom-domains.derived';
-	import { listCustomDomains } from '$lib/services/hosting.services';
+	import { listCustomDomains } from '$lib/services/custom-domain.services';
 	import { i18n } from '$lib/stores/i18n.store';
 	import { satelliteUrl } from '$lib/utils/satellite.utils';
 

src/frontend/src/lib/services/auth.config.services.ts

@@ -1,7 +1,13 @@
 import type { Satellite } from '$declarations/mission_control/mission_control.did';
 import type { AuthenticationConfig, Rule } from '$declarations/satellite/satellite.did';
-import { setAuthConfig, setRule } from '$lib/api/satellites.api';
+import {
+	getAuthConfig as getAuthConfigApi,
+	satelliteVersion,
+	setAuthConfig,
+	setRule
+} from '$lib/api/satellites.api';
 import { DEFAULT_RATE_CONFIG_TIME_PER_TOKEN_NS } from '$lib/constants/data.constants';
+import { SATELLITE_v0_0_17 } from '$lib/constants/version.constants';
 import { i18n } from '$lib/stores/i18n.store';
 import { toasts } from '$lib/stores/toasts.store';
 import type { OptionIdentity } from '$lib/types/itentity';
@@ -10,7 +16,15 @@ import {
 	buildDeleteAuthenticationConfig,
 	buildSetAuthenticationConfig
 } from '$lib/utils/auth.config.utils';
-import { fromNullishNullable, isNullish, nonNullish, toNullable } from '@dfinity/utils';
+import type { Principal } from '@dfinity/principal';
+import {
+	fromNullable,
+	fromNullishNullable,
+	isNullish,
+	nonNullish,
+	toNullable
+} from '@dfinity/utils';
+import { compare } from 'semver';
 import { get } from 'svelte/store';
 
 interface UpdateAuthConfigParams {
@@ -161,3 +175,43 @@ const updateRule = async ({
 
 	return { result: 'success' };
 };
+
+export const getAuthConfig = async ({
+	satelliteId,
+	identity
+}: {
+	satelliteId: Principal;
+	identity: OptionIdentity;
+}): Promise<{
+	result: 'success' | 'error' | 'skip';
+	config?: AuthenticationConfig | undefined;
+}> => {
+	try {
+		// TODO: load versions globally and use store value instead of fetching version again
+		const version = await satelliteVersion({ satelliteId, identity });
+
+		// TODO: keep a list of those version checks and remove them incrementally
+		// Also would be cleaner than to have 0.0.17 hardcoded there and there...
+		const authConfigSupported = compare(version, SATELLITE_v0_0_17) >= 0;
+
+		if (!authConfigSupported) {
+			return { result: 'skip' };
+		}
+
+		const config = await getAuthConfigApi({
+			satelliteId,
+			identity
+		});
+
+		return { result: 'success', config: fromNullable(config) };
+	} catch (err: unknown) {
+		const labels = get(i18n);
+
+		toasts.error({
+			text: labels.errors.authentication_config_loading,
+			detail: err
+		});
+
+		return { result: 'error' };
+	}
+};

…end/src/lib/services/hosting.services.ts …c/lib/services/custom-domain.services.tssrc/frontend/src/lib/services/hosting.services.ts renamed to src/frontend/src/lib/services/custom-domain.services.ts src/frontend/src/lib/services/hosting.services.ts renamed to src/frontend/src/lib/services/custom-domain.services.ts

@@ -1,21 +1,16 @@
-import type { AuthenticationConfig, CustomDomain } from '$declarations/satellite/satellite.did';
+import type { CustomDomain } from '$declarations/satellite/satellite.did';
 import {
 	deleteCustomDomain as deleteCustomDomainApi,
-	getAuthConfig as getAuthConfigApi,
 	listCustomDomains as listCustomDomainsApi,
-	satelliteVersion,
 	setCustomDomain as setCustomDomainApi
 } from '$lib/api/satellites.api';
-import { SATELLITE_v0_0_17 } from '$lib/constants/version.constants';
 import { deleteDomain, registerDomain } from '$lib/rest/bn.rest';
 import { authStore } from '$lib/stores/auth.store';
 import { customDomainsStore } from '$lib/stores/custom-domains.store';
 import { i18n } from '$lib/stores/i18n.store';
 import { toasts } from '$lib/stores/toasts.store';
-import type { OptionIdentity } from '$lib/types/itentity';
 import type { Principal } from '@dfinity/principal';
 import { fromNullable, nonNullish } from '@dfinity/utils';
-import { compare } from 'semver';
 import { get } from 'svelte/store';
 
 /**
@@ -110,43 +105,3 @@ export const listCustomDomains = async ({
 		return { success: false };
 	}
 };
-
-export const getAuthConfig = async ({
-	satelliteId,
-	identity
-}: {
-	satelliteId: Principal;
-	identity: OptionIdentity;
-}): Promise<{
-	result: 'success' | 'error' | 'skip';
-	config?: AuthenticationConfig | undefined;
-}> => {
-	try {
-		// TODO: load versions globally and use store value instead of fetching version again
-		const version = await satelliteVersion({ satelliteId, identity });
-
-		// TODO: keep a list of those version checks and remove them incrementally
-		// Also would be cleaner than to have 0.0.17 hardcoded there and there...
-		const authConfigSupported = compare(version, SATELLITE_v0_0_17) >= 0;
-
-		if (!authConfigSupported) {
-			return { result: 'skip' };
-		}
-
-		const config = await getAuthConfigApi({
-			satelliteId,
-			identity
-		});
-
-		return { result: 'success', config: fromNullable(config) };
-	} catch (err: unknown) {
-		const labels = get(i18n);
-
-		toasts.error({
-			text: labels.errors.authentication_config_loading,
-			detail: err
-		});
-
-		return { result: 'error' };
-	}
-};