nfx-ui 0.23.0 → 0.24.1

package/src/providers/DataProvider/index.tsx

@@ -1,10 +1,13 @@
 import type { IdentityRepositories } from "@/apis";
 import type { ReactNode } from "react";
 
-import { useEffect } from "react";
-import { ApiAssetRepository, ApiAuthRepository, IdentityRepositoriesContext, setIdentityRepositories } from "@/apis";
+import { useEffect, useMemo } from "react";
+import { ApiAssetRepository, ApiAuthRepository, IdentityRepositoriesContext, setIdentityRepositories, useAuthRepository } from "@/apis";
 import { scheduleAccessTokenRefresh } from "@/apis/authRefresh";
-import { AuthStore, subscribeAuthStorageSync } from "@/stores/auth";
+import { useAuthQueryScope, useCurrentProfile } from "@/hooks/auth";
+import { configurePreferenceSync, useApplyPreferenceOnLoad } from "@/hooks/preference";
+import { AuthStore, hasSelectedProfile, subscribeAuthStorageSync } from "@/stores/auth";
+import { parseServerPreference, toServerPreference } from "@/stores/preference";
 
 const defaultIdentityRepositories: IdentityRepositories = {
   auth: new ApiAuthRepository(),
@@ -30,12 +33,40 @@ function AuthSessionBootstrap() {
   return null;
 }
 
+function AuthPreferenceSync() {
+  const auth = useAuthRepository();
+  const { kind, isAuthValid, pID } = useAuthQueryScope();
+  const { profile } = useCurrentProfile();
+
+  useEffect(() => {
+    if (!isAuthValid || !hasSelectedProfile(pID)) {
+      configurePreferenceSync(undefined);
+      return;
+    }
+    configurePreferenceSync((state) => {
+      void auth.UpdatePreference(kind, JSON.stringify(toServerPreference(state)));
+    });
+    return () => configurePreferenceSync(undefined);
+  }, [auth, kind, isAuthValid, pID]);
+
+  const serverPreference = useMemo(() => (profile?.preference ? parseServerPreference(profile.preference) : null), [profile?.preference]);
+
+  useApplyPreferenceOnLoad({
+    isAuthValid: isAuthValid && hasSelectedProfile(pID),
+    applyKey: pID,
+    serverPreference,
+  });
+
+  return null;
+}
+
 export function DataProvider({ children, repositories }: DataProviderProps) {
   const value = repositories ?? defaultIdentityRepositories;
   setIdentityRepositories(value);
   return (
     <IdentityRepositoriesContext.Provider value={value}>
       <AuthSessionBootstrap />
+      <AuthPreferenceSync />
       {children}
     </IdentityRepositoriesContext.Provider>
   );

package/src/types/domain/auth/login.ts

@@ -48,18 +48,6 @@ export namespace Login {
       deviceId: string;
     }
 
-    export interface LoginWithGitHub {
-      code: string;
-      state: string;
-      deviceId: string;
-      signupPlatform: string;
-    }
-
-    export interface LinkGitHub {
-      code: string;
-      state: string;
-    }
-
     export interface SelectProfile {
       profileId: string;
       kind: ProfileKindEnum;
@@ -124,12 +112,6 @@ export namespace Login {
     }
 
     export type LoginWithPhone = LoginWithEmail;
-    export type LoginWithGitHub = LoginWithEmail;
-
-    export interface GitHubAuthorizeUrl {
-      authorizeUrl: string;
-      state: string;
-    }
 
     export interface SelectProfile {
       accountId: string;

package/src/types/domain/auth/profile.ts

@@ -73,6 +73,8 @@ export namespace Profile {
     export interface Preference {
       theme: Maybe<ThemePreference>;
       language: Maybe<LanguageEnum>;
+      layoutMode?: string;
+      dashboardBackground?: string;
     }
 
     export interface Account {

package/src/types/domain/auth/signup.ts

@@ -1,5 +1,7 @@
 import type { AuthSignupPlatformEnum, LanguageEnum } from "@/enums";
 
+import type { Login } from "./login";
+
 export namespace Signup {
   export namespace Request {
     export interface SendVerificationCode {
@@ -18,11 +20,6 @@ export namespace Signup {
   }
 
   export namespace Response {
-    export interface SignupWithEmail {
-      accountId: string;
-      profileId: Maybe<string>;
-      accessToken: string;
-      refreshToken: string;
-    }
+    export type SignupWithEmail = Login.Response.LoginWithEmail;
   }
 }

package/src/utils/domain/buildProfilePatch.ts

@@ -2,15 +2,10 @@ import type { UserProfileEditFormData } from "@/schemas";
 import type { Profile } from "@/types";
 
 import { Language } from "@/enums";
+import { assignIfChanged, assignNullableString, normalizeOptionalString } from "@/utils/primitive/patch";
 import { safeNullable, safeStringable } from "@/utils/safe";
 import { toDateInputValue } from "@/utils/time";
 
-import { assignIfChanged, assignNullableString, normalizeOptionalString } from "../primitive/patch";
-
-function toBirthdayISO(value: string): string {
-  return `${value}T00:00:00.000Z`;
-}
-
 export function buildProfilePatch(original: Maybe<Profile.Response.ProfileBase>, form: Partial<UserProfileEditFormData>): Profile.Request.PatchProfile {
   const patch: Profile.Request.PatchProfile = {};
 
@@ -30,7 +25,7 @@ export function buildProfilePatch(original: Maybe<Profile.Response.ProfileBase>,
     const nextBirthday = normalizeOptionalString(safeStringable(form.birthday));
     const previousBirthday = original?.birthday ? toDateInputValue(original.birthday) : null;
     if (nextBirthday !== previousBirthday) {
-      patch.birthday = nextBirthday ? toBirthdayISO(nextBirthday) : null;
+      patch.birthday = nextBirthday || null;
     }
   }