Migrate the API and Auth service from legacy to services

block-core · Oct 8, 2023 · 2649605 · 2649605
1 parent 69519c8
commit 2649605
Show file tree

Hide file tree

Showing 7 changed files with 258 additions and 7 deletions.
diff --git a/app/src/app/people/people.ts b/app/src/app/people/people.ts
@@ -31,7 +31,7 @@ import { DataService } from '../services/data';
 import { CircleService } from '../services/circle';
 import { OptionsService } from '../services/options';
 import { MetricService } from '../services/metric-service';
-import { ApiService } from '../legacy/services/api.service';
+import { ApiService } from '../services/api.service';
 
 @Component({
   selector: 'app-people',

diff --git a/app/src/app/projects/project/project.component.ts b/app/src/app/projects/project/project.component.ts
@@ -14,7 +14,7 @@ import { copyToClipboard } from '../../shared/utilities';
 import { Subscription, tap } from 'rxjs';
 import { DataService } from '../../services/data';
 import { NavigationService } from '../../services/navigation';
-import { ApiService } from '../../legacy/services/api.service';
+import { ApiService } from '../../services/api.service';
 
 @Component({
   selector: 'app-project',

diff --git a/app/src/app/projects/projects.component.ts b/app/src/app/projects/projects.component.ts
@@ -14,7 +14,7 @@ import { copyToClipboard } from '../shared/utilities';
 import { Subscription, tap } from 'rxjs';
 import { DataService } from '../services/data';
 import { NavigationService } from '../services/navigation';
-import { ApiService } from '../legacy/services/api.service';
+import { ApiService } from '../services/api.service';
 
 @Component({
   selector: 'app-projects',
@@ -75,7 +75,9 @@ export class ProjectsComponent {
 
   getFollowingInCircle(id?: number) {
     if (id == null) {
-      return this.profileService.following.filter((f) => f.circle == null || f.circle == 0);
+      return this.profileService.following.filter(
+        (f) => f.circle == null || f.circle == 0
+      );
     } else {
       return this.profileService.following.filter((f) => f.circle == id);
     }
@@ -146,7 +148,6 @@ export class ProjectsComponent {
 
     this.projects = await this.apiService.projects();
 
-
     // this.subscriptions.push(this.profileService.items$.subscribe((profiles) => (this.following = profiles)) as Subscription);
   }
 }
diff --git a/app/src/app/services/api.service.ts b/app/src/app/services/api.service.ts
@@ -0,0 +1,183 @@
+import { Injectable } from "@angular/core";
+import { environment } from "../../environments/environment";
+
+@Injectable({ providedIn: 'root' })
+export class ApiService {
+  constructor() {}
+
+  baseUrl() {
+    return environment.apiUrl;
+  }
+
+  async categories() {
+    const response = await fetch(`${environment.apiUrl}/category/root`);
+
+    if (response.status >= 400) {
+      throw new Error(response.statusText);
+    }
+
+    const result = await response.json();
+    return result;
+  }
+
+  async collections() {
+    const response = await fetch(`${environment.apiUrl}/collection`);
+
+    if (response.status >= 400) {
+      throw new Error(response.statusText);
+    }
+
+    const result = await response.json();
+    return result;
+  }
+
+  async projects() {
+    const response = await fetch(`${environment.apiUrl}/project`);
+
+    if (response.status >= 400) {
+      throw new Error(response.statusText);
+    }
+
+    const result = await response.json();
+    return result;
+  }
+
+  async project(id: string) {
+    const response = await fetch(`${environment.apiUrl}/project/${id}`);
+
+    if (response.status >= 400) {
+      throw new Error(response.statusText);
+    }
+
+    const result = await response.json();
+    return result;
+  }
+
+  async users() {
+    const response = await fetch(`${environment.apiUrl}/user`);
+
+    if (response.status >= 400) {
+      throw new Error(response.statusText);
+    }
+
+    const result = await response.json();
+    return result;
+  }
+
+  // async deleteCategory() {
+  //   const response = await fetch(`${environment.apiUrl}/collection`);
+
+  //   if (response.status >= 400) {
+  //     throw new Error(response.statusText);
+  //   }
+
+  //   const result = await response.json();
+  //   return result;
+  // }
+
+  async insertCategory(item: any) {
+    const response = await fetch(`${environment.apiUrl}/category`, {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(item),
+    });
+
+    if (response.status >= 400) {
+      throw new Error(response.statusText);
+    }
+
+    const result = await response.json();
+    return result.item;
+  }
+
+  async updateCategory(id: string, item: any) {
+    const response = await fetch(`${environment.apiUrl}/category/${id}`, {
+      method: 'PUT',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(item),
+    });
+
+    if (response.status >= 400) {
+      throw new Error(response.statusText);
+    }
+
+    const result = await response.json();
+    return result.item;
+  }
+
+  async deleteCategory(id: string) {
+    const response = await fetch(`${environment.apiUrl}/category/${id}`, {
+      method: 'DELETE',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+    });
+
+    if (response.status >= 400) {
+      throw new Error(response.statusText);
+    }
+
+    const result = await response.json();
+    return result;
+  }
+
+  async insertUser(item: any) {
+    const response = await fetch(`${environment.apiUrl}/user`, {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(item),
+    });
+
+    if (response.status >= 400) {
+      throw new Error(response.statusText);
+    }
+
+    const result = await response.json();
+    return result.item;
+  }
+
+  async updateUser(id: string, item: any) {
+    const response = await fetch(`${environment.apiUrl}/user/${id}`, {
+      method: 'PUT',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(item),
+    });
+
+    if (response.status >= 400) {
+      throw new Error(response.statusText);
+    }
+
+    const result = await response.json();
+    return result.item;
+  }
+
+  async deleteUser(id: string) {
+    const response = await fetch(`${environment.apiUrl}/user/${id}`, {
+      method: 'DELETE',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+    });
+
+    if (response.status >= 400) {
+      throw new Error(response.statusText);
+    }
+
+    const result = await response.json();
+    return result;
+  }
+}
diff --git a/app/src/app/services/auth.service.ts b/app/src/app/services/auth.service.ts
@@ -0,0 +1,67 @@
+@@ -1,66 +0,0 @@
+import { Injectable } from '@angular/core';
+import { environment } from '../../environments/environment';
+
+@Injectable({ providedIn: 'root' })
+export class AuthService {
+  constructor() {}
+
+  baseUrl() {
+    return environment.apiUrl;
+  }
+
+  async challenge() {
+    const response = await fetch(`${environment.apiUrl}/authenticate`);
+
+    if (response.status >= 400) {
+      throw new Error('Unable to receive authentication challenge.');
+    }
+
+    const result = await response.json();
+    return result;
+  }
+
+  async verify(challenge: string) {
+    const response = await fetch(`${environment.apiUrl}/authenticate`, {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(challenge),
+    });
+
+    if (response.status >= 400) {
+      throw new Error('Unable to verify authentication challenge.');
+    }
+
+    const result = await response.json();
+    return result;
+  }
+
+  async authenticated() {
+    const response = await fetch(
+      `${environment.apiUrl}/authenticate/protected`
+    );
+
+    if (response.status == 200) {
+      const result = await response.json();
+
+      return result;
+    } else {
+      return null;
+    }
+  }
+
+  async logout() {
+    const response = await fetch(`${environment.apiUrl}/authenticate/logout`);
+
+    // if (response.status >= 400) {
+    //   throw new Error('Unable to receive authentication challenge.');
+    // }
+
+    const result = await response.json();
+    console.log('LOGOUT RESULT:', result);
+    return result;
+  }
+}
diff --git a/app/src/app/services/data.ts b/app/src/app/services/data.ts
@@ -51,7 +51,7 @@ import { QueueService } from './queue.service';
 import { UIService } from './ui';
 import { CircleService } from './circle';
 import { NostrService } from './nostr';
-import { ApiService } from '../legacy/services/api.service';
+import { ApiService } from '../services/api.service';
 
 @Injectable({
   providedIn: 'root',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blockcore-hub",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "scripts": {
     "version": "node -p \"require('./package.json').version\""
   },