feat(backend): migrate freelancer and portal runtimes
This commit is contained in:
@@ -1,90 +1,100 @@
|
||||
'use server'
|
||||
"use server";
|
||||
|
||||
import { revalidatePath } from 'next/cache'
|
||||
import { eq } from "drizzle-orm";
|
||||
import { headers } from "next/headers";
|
||||
import { revalidatePath } from "next/cache";
|
||||
import { auth } from "@/server/auth/auth";
|
||||
import { getSqliteConnection } from "@/server/db/client";
|
||||
import { appProfiles } from "@/server/db/schema";
|
||||
import { domainActorFromSession } from "@/server/auth/domain-actor";
|
||||
import { getFileService } from "@/server/files/runtime";
|
||||
import { getPublicAiSettings, updateAiSettings } from "@/server/settings/ai";
|
||||
import { requireFreelancerBackend } from "@/server/web/freelancer";
|
||||
import { cleanText } from "@/server/web/form-data";
|
||||
|
||||
import { createServiceRoleClient } from '@/lib/supabase/admin'
|
||||
import { createClient } from '@/lib/supabase/server'
|
||||
export async function loadSettings() {
|
||||
const { context, actor } = await requireFreelancerBackend();
|
||||
const [firstName = "", ...lastNameParts] = context.profile.displayName.trim().split(/\s+/);
|
||||
const ai = getPublicAiSettings(actor);
|
||||
|
||||
type ProfileUpdateData = {
|
||||
first_name: string
|
||||
last_name: string
|
||||
avatar_url?: string
|
||||
return {
|
||||
firstName,
|
||||
lastName: lastNameParts.join(" "),
|
||||
avatarUrl: context.user.image ?? "",
|
||||
aiProvider: ai.provider,
|
||||
hasApiKey: ai.hasApiKey,
|
||||
};
|
||||
}
|
||||
|
||||
export async function updateProfile(formData: FormData) {
|
||||
const supabase = await createClient()
|
||||
|
||||
const {
|
||||
data: { user },
|
||||
} = await supabase.auth.getUser()
|
||||
|
||||
if (!user) {
|
||||
return { error: 'Kullanıcı bulunamadı.' }
|
||||
}
|
||||
|
||||
const firstName = formData.get('firstName') as string
|
||||
const lastName = formData.get('lastName') as string
|
||||
const avatarFile = formData.get('avatar') as File | null
|
||||
|
||||
let avatarUrl: string | undefined
|
||||
|
||||
if (avatarFile && avatarFile.size > 0) {
|
||||
const fileExt = avatarFile.name.split('.').pop()
|
||||
const fileName = `${user.id}/${Math.random()}.${fileExt}`
|
||||
const admin = createServiceRoleClient()
|
||||
|
||||
const { error: uploadError } = await admin.storage
|
||||
.from('avatars')
|
||||
.upload(fileName, avatarFile, { upsert: true })
|
||||
|
||||
if (uploadError) {
|
||||
return {
|
||||
error: `Profil fotoğrafı yüklenirken hata oluştu: ${uploadError.message}`,
|
||||
}
|
||||
try {
|
||||
const { context } = await requireFreelancerBackend();
|
||||
const firstName = cleanText(formData.get("firstName"));
|
||||
const lastName = cleanText(formData.get("lastName"));
|
||||
if (!firstName || !lastName || firstName.length > 80 || lastName.length > 120) {
|
||||
return { error: "Ad ve soyad zorunludur." };
|
||||
}
|
||||
|
||||
const {
|
||||
data: { publicUrl },
|
||||
} = admin.storage.from('avatars').getPublicUrl(fileName)
|
||||
const displayName = `${firstName} ${lastName}`;
|
||||
await auth.api.updateUser({
|
||||
headers: await headers(),
|
||||
body: { name: displayName },
|
||||
});
|
||||
getSqliteConnection().db
|
||||
.update(appProfiles)
|
||||
.set({ displayName, updatedAt: new Date() })
|
||||
.where(eq(appProfiles.authUserId, context.user.id))
|
||||
.run();
|
||||
|
||||
avatarUrl = publicUrl
|
||||
const avatar = formData.get("avatar");
|
||||
if (avatar instanceof File && avatar.size > 0) {
|
||||
getFileService().upload(domainActorFromSession(context), {
|
||||
kind: "avatar",
|
||||
originalName: avatar.name,
|
||||
claimedMimeType: avatar.type,
|
||||
bytes: new Uint8Array(await avatar.arrayBuffer()),
|
||||
});
|
||||
}
|
||||
|
||||
revalidatePath("/settings");
|
||||
revalidatePath("/", "layout");
|
||||
return { success: true };
|
||||
} catch (error) {
|
||||
return { error: error instanceof Error ? error.message : "Profil güncellenemedi." };
|
||||
}
|
||||
|
||||
const updateData: ProfileUpdateData = {
|
||||
first_name: firstName,
|
||||
last_name: lastName,
|
||||
}
|
||||
|
||||
if (avatarUrl) {
|
||||
updateData.avatar_url = avatarUrl
|
||||
}
|
||||
|
||||
const { error } = await supabase.from('profiles').upsert({
|
||||
id: user.id,
|
||||
...updateData,
|
||||
})
|
||||
|
||||
if (error) {
|
||||
return { error: `Profil güncellenirken hata oluştu: ${error.message}` }
|
||||
}
|
||||
|
||||
revalidatePath('/settings')
|
||||
return { success: true }
|
||||
}
|
||||
|
||||
export async function updatePassword(formData: FormData) {
|
||||
const supabase = await createClient()
|
||||
const password = formData.get('password') as string
|
||||
const currentPassword = cleanText(formData.get("currentPassword"));
|
||||
const newPassword = cleanText(formData.get("password"));
|
||||
|
||||
if (!password || password.length < 6) {
|
||||
return { error: 'Şifre en az 6 karakter olmalıdır.' }
|
||||
if (!currentPassword || !newPassword || newPassword.length < 8) {
|
||||
return { error: "Mevcut şifre zorunludur; yeni şifre en az 8 karakter olmalıdır." };
|
||||
}
|
||||
|
||||
const { error } = await supabase.auth.updateUser({ password })
|
||||
try {
|
||||
await requireFreelancerBackend();
|
||||
await auth.api.changePassword({
|
||||
headers: await headers(),
|
||||
body: {
|
||||
currentPassword,
|
||||
newPassword,
|
||||
revokeOtherSessions: true,
|
||||
},
|
||||
});
|
||||
return { success: true };
|
||||
} catch {
|
||||
return { error: "Mevcut şifre doğrulanamadı veya şifre güncellenemedi." };
|
||||
}
|
||||
}
|
||||
|
||||
if (error) {
|
||||
return { error: `Şifre güncellenirken hata oluştu: ${error.message}` }
|
||||
export async function saveAiSettings(provider: string, apiKey: string) {
|
||||
try {
|
||||
const { actor } = await requireFreelancerBackend();
|
||||
const settings = updateAiSettings(actor, { provider, apiKey });
|
||||
revalidatePath("/settings");
|
||||
return { success: true, hasApiKey: settings.hasApiKey };
|
||||
} catch (error) {
|
||||
return { error: error instanceof Error ? error.message : "Ayarlar kaydedilemedi." };
|
||||
}
|
||||
|
||||
return { success: true }
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { AlertTriangle, Blocks, Brain, Key, Save, Shield, User } from "lucide-react";
|
||||
import { updatePassword, updateProfile } from "./actions";
|
||||
import { createClient } from "@/lib/supabase/client";
|
||||
import Image from "next/image";
|
||||
import { Blocks, Brain, Key, Save, Shield, User } from "lucide-react";
|
||||
import { loadSettings, saveAiSettings, updatePassword, updateProfile } from "./actions";
|
||||
import { Button, Card, CardContent, Input, Label } from "poyraz-ui/atoms";
|
||||
import { toast } from "poyraz-ui/molecules";
|
||||
|
||||
@@ -23,9 +23,7 @@ export default function SettingsPage() {
|
||||
// AI States
|
||||
const [aiProvider, setAiProvider] = useState<AiProvider>("gemini");
|
||||
const [apiKey, setApiKey] = useState("");
|
||||
|
||||
// Supabase
|
||||
const [supabase] = useState(() => createClient());
|
||||
const [hasApiKey, setHasApiKey] = useState(false);
|
||||
|
||||
const tabs = [
|
||||
{ name: "Profile & Account", icon: User },
|
||||
@@ -37,42 +35,18 @@ export default function SettingsPage() {
|
||||
let isActive = true;
|
||||
|
||||
const fetchData = async () => {
|
||||
const { data: { user } } = await supabase.auth.getUser();
|
||||
if (!user || !isActive) return;
|
||||
|
||||
// 1. Fetch Profile
|
||||
const { data: profile } = await supabase
|
||||
.from("profiles")
|
||||
.select("*")
|
||||
.eq("id", user.id)
|
||||
.single();
|
||||
|
||||
if (profile && isActive) {
|
||||
setFirstName(profile.first_name || "");
|
||||
setLastName(profile.last_name || "");
|
||||
setAvatarUrl(profile.avatar_url || "");
|
||||
}
|
||||
|
||||
// 2. Fetch User Settings from Supabase
|
||||
const { data: settings } = await supabase
|
||||
.from("app_settings")
|
||||
.select("*")
|
||||
.eq("user_id", user.id)
|
||||
.single();
|
||||
|
||||
if (settings && isActive) {
|
||||
setAiProvider((settings.ai_provider as AiProvider) || "gemini");
|
||||
setApiKey(settings.api_key || "");
|
||||
|
||||
// Also sync to local storage for existing API route calls if they use it
|
||||
localStorage.setItem("mindspace_ai_provider", settings.ai_provider || "gemini");
|
||||
localStorage.setItem("mindspace_api_key", settings.api_key || "");
|
||||
}
|
||||
const settings = await loadSettings();
|
||||
if (!isActive) return;
|
||||
setFirstName(settings.firstName);
|
||||
setLastName(settings.lastName);
|
||||
setAvatarUrl(settings.avatarUrl);
|
||||
setAiProvider(settings.aiProvider);
|
||||
setHasApiKey(settings.hasApiKey);
|
||||
};
|
||||
|
||||
void fetchData();
|
||||
return () => { isActive = false; };
|
||||
}, [supabase]);
|
||||
}, []);
|
||||
|
||||
const handleProfileAction = async (formData: FormData) => {
|
||||
const response = await updateProfile(formData);
|
||||
@@ -96,32 +70,14 @@ export default function SettingsPage() {
|
||||
};
|
||||
|
||||
const handleSaveAI = async () => {
|
||||
try {
|
||||
const { data: { user } } = await supabase.auth.getUser();
|
||||
if (!user) throw new Error("Giriş yapılmamış");
|
||||
|
||||
// Save to Supabase app_settings table
|
||||
const { error } = await supabase
|
||||
.from("app_settings")
|
||||
.upsert({
|
||||
user_id: user.id,
|
||||
ai_provider: aiProvider,
|
||||
ai_model: null, // Reset to allow default model fallback
|
||||
api_key: apiKey,
|
||||
updated_at: new Date().toISOString()
|
||||
}, { onConflict: 'user_id' });
|
||||
|
||||
if (error) throw error;
|
||||
|
||||
// Sync to localStorage as a redundant fallback
|
||||
localStorage.setItem("mindspace_ai_provider", aiProvider);
|
||||
localStorage.setItem("mindspace_api_key", apiKey);
|
||||
|
||||
toast.success("Yapay Zeka ayarları kaydedildi!");
|
||||
} catch (e: any) {
|
||||
console.error(e);
|
||||
toast.error("Hata oluştu, veritabanına kaydedilemedi.");
|
||||
const response = await saveAiSettings(aiProvider, apiKey);
|
||||
if (response.error) {
|
||||
toast.error(response.error);
|
||||
return;
|
||||
}
|
||||
setHasApiKey(Boolean(response.hasApiKey));
|
||||
setApiKey("");
|
||||
toast.success("Yapay Zeka ayarları kaydedildi!");
|
||||
};
|
||||
|
||||
return (
|
||||
@@ -173,7 +129,14 @@ export default function SettingsPage() {
|
||||
<form action={handleProfileAction} className="space-y-6 max-w-xl">
|
||||
<div className="flex items-center gap-4 mb-6">
|
||||
{avatarUrl ? (
|
||||
<img src={avatarUrl} alt="Avatar" className="h-16 w-16 rounded-full border border-border object-cover" />
|
||||
<Image
|
||||
src={avatarUrl}
|
||||
alt="Avatar"
|
||||
width={64}
|
||||
height={64}
|
||||
unoptimized
|
||||
className="h-16 w-16 rounded-full border border-border object-cover"
|
||||
/>
|
||||
) : (
|
||||
<div className="flex h-16 w-16 items-center justify-center rounded-full border border-border bg-muted/50">
|
||||
<User className="h-8 w-8 text-muted-foreground" />
|
||||
@@ -211,9 +174,13 @@ export default function SettingsPage() {
|
||||
<CardContent className="p-6 sm:p-8">
|
||||
<h2 className="text-xl font-bold mb-6 text-foreground">Şifre İşlemleri</h2>
|
||||
<form ref={formRef} action={handlePasswordAction} className="space-y-6 max-w-xl">
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="currentPassword">Mevcut Şifre</Label>
|
||||
<Input id="currentPassword" name="currentPassword" type="password" required />
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="password">Yeni Şifre</Label>
|
||||
<Input id="password" name="password" type="password" minLength={6} placeholder="En az 6 karakter" required />
|
||||
<Input id="password" name="password" type="password" minLength={8} placeholder="En az 8 karakter" required />
|
||||
</div>
|
||||
<div className="flex items-center gap-4 pt-4">
|
||||
<Button type="submit" className="gap-2">
|
||||
@@ -269,7 +236,7 @@ export default function SettingsPage() {
|
||||
type="password"
|
||||
value={apiKey}
|
||||
onChange={(e) => setApiKey(e.target.value)}
|
||||
placeholder="sk-..."
|
||||
placeholder={hasApiKey ? "Kayıtlı anahtarı korumak için boş bırakın" : "sk-..."}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user