Update flare-ui/src/app/services/api.service.ts

flare-ui/src/app/services/api.service.ts

@@ -1,205 +1,259 @@
-import { Injectable, inject } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { Observable } from 'rxjs';
-
-// Models
-export interface Environment {
-  work_mode: string;
-  cloud_token: string;
-  spark_endpoint: string;
-}
-
-export interface Project {
-  id: number;
-  name: string;
-  caption: string;
-  enabled: boolean;
-  last_version_number: number;
-  version_id_counter: number;
-  versions: Version[];
-  deleted: boolean;
-  created_date: string;
-  created_by: string;
-  last_update_date: string;
-  last_update_user: string;
-}
-
-export interface Version {
-  id: number;
-  caption: string;
-  published: boolean;
-  general_prompt: string;
-  llm: LLMConfig;
-  intents: Intent[];
-  created_date: string;
-  created_by: string;
-  last_update_date: string;
-  last_update_user: string;
-  publish_date?: string;
-  published_by?: string;
-  deleted?: boolean;
-}
-
-export interface LLMConfig {
-  repo_id: string;
-  generation_config: {
-    max_new_tokens: number;
-    temperature: number;
-    top_p: number;
-    repetition_penalty: number;
-  };
-  use_fine_tune: boolean;
-  fine_tune_zip: string;
-}
-
-export interface Intent {
-  name: string;
-  caption: string;
-  locale: string;
-  detection_prompt: string;
-  examples: string[];
-  parameters: Parameter[];
-  action: string;
-  fallback_timeout_prompt?: string;
-  fallback_error_prompt?: string;
-}
-
-export interface Parameter {
-  name: string;
-  caption: string;
-  type: string;
-  required: boolean;
-  variable_name: string;
-  extraction_prompt: string;
-  validation_regex?: string;
-  invalid_prompt?: string;
-  type_error_prompt?: string;
-}
-
-export interface API {
-  name: string;
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body_template: any;
-  timeout_seconds: number;
-  retry: {
-    retry_count: number;
-    backoff_seconds: number;
-    strategy: string;
-  };
-  proxy?: string;
-  auth?: APIAuth;
-  response_prompt?: string;
-  deleted: boolean;
-  created_date: string;
-  created_by: string;
-  last_update_date: string;
-  last_update_user: string;
-}
-
-export interface APIAuth {
-  enabled: boolean;
-  token_endpoint?: string;
-  response_token_path?: string;
-  token_request_body?: any;
-  token_refresh_endpoint?: string;
-  token_refresh_body?: any;
-}
-
-@Injectable({
-  providedIn: 'root'
-})
-export class ApiService {
-  private http = inject(HttpClient);
-  private baseUrl = '/api';
-
-  // Environment
-  getEnvironment(): Observable<Environment> {
-    return this.http.get<Environment>(`${this.baseUrl}/environment`);
-  }
-
-  updateEnvironment(env: Environment): Observable<any> {
-    return this.http.put(`${this.baseUrl}/environment`, env);
-  }
-
-  // Projects
-  getProjects(includeDeleted = false): Observable<Project[]> {
-    return this.http.get<Project[]>(`${this.baseUrl}/projects?include_deleted=${includeDeleted}`);
-  }
-
-  createProject(project: { name: string; caption: string }): Observable<Project> {
-    return this.http.post<Project>(`${this.baseUrl}/projects`, project);
-  }
-
-  updateProject(id: number, update: { caption: string; last_update_date: string }): Observable<Project> {
-    return this.http.put<Project>(`${this.baseUrl}/projects/${id}`, update);
-  }
-
-  deleteProject(id: number): Observable<any> {
-    return this.http.delete(`${this.baseUrl}/projects/${id}`);
-  }
-
-  toggleProject(id: number): Observable<{ enabled: boolean }> {
-    return this.http.patch<{ enabled: boolean }>(`${this.baseUrl}/projects/${id}/toggle`, {});
-  }
-
-  exportProject(id: number): Observable<any> {
-    return this.http.get(`${this.baseUrl}/projects/${id}/export`);
-  }
-
-  importProject(data: any): Observable<any> {
-    return this.http.post(`${this.baseUrl}/projects/import`, data);
-  }
-
-  // Versions
-  createVersion(projectId: number, sourceVersionId: number, caption: string): Observable<Version> {
-    return this.http.post<Version>(`${this.baseUrl}/projects/${projectId}/versions`, {
-      source_version_id: sourceVersionId,
-      caption
-    });
-  }
-
-  updateVersion(projectId: number, versionId: number, update: any): Observable<Version> {
-    return this.http.put<Version>(`${this.baseUrl}/projects/${projectId}/versions/${versionId}`, update);
-  }
-
-  publishVersion(projectId: number, versionId: number): Observable<any> {
-    return this.http.post(`${this.baseUrl}/projects/${projectId}/versions/${versionId}/publish`, {});
-  }
-
-  deleteVersion(projectId: number, versionId: number): Observable<any> {
-    return this.http.delete(`${this.baseUrl}/projects/${projectId}/versions/${versionId}`);
-  }
-
-  // APIs
-  getAPIs(includeDeleted = false): Observable<API[]> {
-    return this.http.get<API[]>(`${this.baseUrl}/apis?include_deleted=${includeDeleted}`);
-  }
-
-  createAPI(api: Partial<API>): Observable<API> {
-    return this.http.post<API>(`${this.baseUrl}/apis`, api);
-  }
-
-  updateAPI(name: string, update: any): Observable<API> {
-    return this.http.put<API>(`${this.baseUrl}/apis/${name}`, update);
-  }
-
-  deleteAPI(name: string): Observable<any> {
-    return this.http.delete(`${this.baseUrl}/apis/${name}`);
-  }
-
-  testAPI(api: Partial<API>): Observable<any> {
-    return this.http.post(`${this.baseUrl}/apis/test`, api);
-  }
-
-  // Testing
-  runTests(testType: string): Observable<any> {
-    return this.http.post(`${this.baseUrl}/test/run-all`, { test_type: testType });
-  }
-
-  // Validation
-  validateRegex(pattern: string, testValue: string): Observable<{ valid: boolean; matches?: boolean; error?: string }> {
-    return this.http.post<any>(`${this.baseUrl}/validate/regex`, { pattern, test_value: testValue });
-  }
+import { Injectable } from '@angular/core';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Observable, throwError } from 'rxjs';
+import { catchError, tap } from 'rxjs/operators';
+import { Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ApiService {
+  private apiUrl = '/api';
+  private tokenKey = 'flare_admin_token';
+  private usernameKey = 'flare_admin_username';
+
+  constructor(
+    private http: HttpClient,
+    private router: Router
+  ) {}
+
+  // ===================== Auth =====================
+  login(username: string, password: string): Observable<any> {
+    return this.http.post(`${this.apiUrl}/login`, { username, password }).pipe(
+      tap((response: any) => {
+        localStorage.setItem(this.tokenKey, response.token);
+        localStorage.setItem(this.usernameKey, response.username);
+      })
+    );
+  }
+
+  logout(): void {
+    localStorage.removeItem(this.tokenKey);
+    localStorage.removeItem(this.usernameKey);
+    this.router.navigate(['/login']);
+  }
+
+  getToken(): string | null {
+    return localStorage.getItem(this.tokenKey);
+  }
+
+  getUsername(): string | null {
+    return localStorage.getItem(this.usernameKey);
+  }
+
+  isAuthenticated(): boolean {
+    return !!this.getToken();
+  }
+
+  private getAuthHeaders(): HttpHeaders {
+    const token = this.getToken();
+    return new HttpHeaders({
+      'Authorization': `Bearer ${token}`,
+      'Content-Type': 'application/json'
+    });
+  }
+
+  // ===================== User =====================
+  changePassword(currentPassword: string, newPassword: string): Observable<any> {
+    return this.http.post(
+      `${this.apiUrl}/change-password`,
+      { current_password: currentPassword, new_password: newPassword },
+      { headers: this.getAuthHeaders() }
+    ).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  // ===================== Environment =====================
+  getEnvironment(): Observable<any> {
+    return this.http.get(`${this.apiUrl}/environment`, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  updateEnvironment(data: any): Observable<any> {
+    return this.http.put(`${this.apiUrl}/environment`, data, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  // ===================== Projects =====================
+  getProjects(includeDeleted = false): Observable<any[]> {
+    return this.http.get<any[]>(`${this.apiUrl}/projects`, {
+      headers: this.getAuthHeaders(),
+      params: { include_deleted: includeDeleted.toString() }
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  createProject(data: any): Observable<any> {
+    return this.http.post(`${this.apiUrl}/projects`, data, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  updateProject(id: number, data: any): Observable<any> {
+    return this.http.put(`${this.apiUrl}/projects/${id}`, data, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  deleteProject(id: number): Observable<any> {
+    return this.http.delete(`${this.apiUrl}/projects/${id}`, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  toggleProject(id: number): Observable<any> {
+    return this.http.patch(`${this.apiUrl}/projects/${id}/toggle`, {}, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  exportProject(id: number): Observable<any> {
+    return this.http.get(`${this.apiUrl}/projects/${id}/export`, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  importProject(data: any): Observable<any> {
+    return this.http.post(`${this.apiUrl}/projects/import`, data, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  // ===================== Versions =====================
+  createVersion(projectId: number, data: any): Observable<any> {
+    return this.http.post(`${this.apiUrl}/projects/${projectId}/versions`, data, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  updateVersion(projectId: number, versionId: number, data: any): Observable<any> {
+    return this.http.put(`${this.apiUrl}/projects/${projectId}/versions/${versionId}`, data, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  deleteVersion(projectId: number, versionId: number): Observable<any> {
+    return this.http.delete(`${this.apiUrl}/projects/${projectId}/versions/${versionId}`, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  publishVersion(projectId: number, versionId: number): Observable<any> {
+    return this.http.post(`${this.apiUrl}/projects/${projectId}/versions/${versionId}/publish`, {}, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  // ===================== APIs =====================
+  getAPIs(includeDeleted = false): Observable<any[]> {
+    return this.http.get<any[]>(`${this.apiUrl}/apis`, {
+      headers: this.getAuthHeaders(),
+      params: { include_deleted: includeDeleted.toString() }
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  createAPI(data: any): Observable<any> {
+    return this.http.post(`${this.apiUrl}/apis`, data, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  updateAPI(name: string, data: any): Observable<any> {
+    return this.http.put(`${this.apiUrl}/apis/${name}`, data, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  deleteAPI(name: string): Observable<any> {
+    return this.http.delete(`${this.apiUrl}/apis/${name}`, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  testAPI(data: any): Observable<any> {
+    return this.http.post(`${this.apiUrl}/apis/test`, data, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  // ===================== Tests =====================
+  runTests(testType: string): Observable<any> {
+    return this.http.post(`${this.apiUrl}/test/run-all`, { test_type: testType }, {
+      headers: this.getAuthHeaders()
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  // ===================== Activity Log =====================
+  getActivityLog(limit = 50): Observable<any[]> {
+    return this.http.get<any[]>(`${this.apiUrl}/activity-log`, {
+      headers: this.getAuthHeaders(),
+      params: { limit: limit.toString() }
+    }).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  // ===================== Validation =====================
+  validateRegex(pattern: string, testValue: string): Observable<any> {
+    return this.http.post(`${this.apiUrl}/validate/regex`,
+      { pattern, test_value: testValue },
+      { headers: this.getAuthHeaders() }
+    ).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  // ===================== Error Handler =====================
+  private handleError(error: any) {
+    console.error('API Error:', error);
+
+    if (error.status === 401) {
+      // Token expired or invalid
+      localStorage.removeItem(this.tokenKey);
+      localStorage.removeItem(this.usernameKey);
+      this.router.navigate(['/login']);
+    }
+
+    return throwError(() => error.error || error);
+  }
 }