From 721c278fd4a42c1ba21added9407feab09fb8851 Mon Sep 17 00:00:00 2001
From: neil <neil@neils-MacBook-Pro.local>
Date: Fri, 6 Jan 2023 12:45:13 +0800
Subject: [PATCH] cleanup and lint

---
 modules/gui/src-tauri/src/handlers/auth.rs    |  5 ----
 modules/gui/src-tauri/src/handlers/mod.rs     |  3 +--
 .../components/NavBar/ProfileNavButton.svelte |  4 ++--
 .../ProfileBanner/ProfileBanner.svelte        |  4 ++--
 modules/gui/src/libs/api/tauri.ts             |  4 ++--
 modules/gui/src/libs/stores/auth.ts           | 24 ++++---------------
 modules/ui/src/types.ts                       |  2 +-
 7 files changed, 13 insertions(+), 33 deletions(-)
 delete mode 100644 modules/gui/src-tauri/src/handlers/auth.rs

diff --git a/modules/gui/src-tauri/src/handlers/auth.rs b/modules/gui/src-tauri/src/handlers/auth.rs
deleted file mode 100644
index 31913f5..0000000
--- a/modules/gui/src-tauri/src/handlers/auth.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#[tauri::command]
-pub fn auth(package: String) {
-  println!("installing: {}", package);
-  
-}
\ No newline at end of file
diff --git a/modules/gui/src-tauri/src/handlers/mod.rs b/modules/gui/src-tauri/src/handlers/mod.rs
index 5ce0e78..cc9a312 100644
--- a/modules/gui/src-tauri/src/handlers/mod.rs
+++ b/modules/gui/src-tauri/src/handlers/mod.rs
@@ -1,2 +1 @@
-pub mod packages;
-pub mod auth;
\ No newline at end of file
+pub mod packages;
\ No newline at end of file
diff --git a/modules/gui/src/components/NavBar/ProfileNavButton.svelte b/modules/gui/src/components/NavBar/ProfileNavButton.svelte
index d7b53ed..521d9fc 100644
--- a/modules/gui/src/components/NavBar/ProfileNavButton.svelte
+++ b/modules/gui/src/components/NavBar/ProfileNavButton.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 	import { open } from '@tauri-apps/api/shell';
 	import { authStore } from '$libs/stores';
-	import type { User } from '@tea/ui/types';
+	import type { Developer } from '@tea/ui/types';
 
-	let user: User | null = null;
+	let user: Developer | null = null;
 	const deviceId = authStore.deviceIdStore;
 
 	const openGithub = () => {
diff --git a/modules/gui/src/components/ProfileBanner/ProfileBanner.svelte b/modules/gui/src/components/ProfileBanner/ProfileBanner.svelte
index d487a16..3cf7154 100644
--- a/modules/gui/src/components/ProfileBanner/ProfileBanner.svelte
+++ b/modules/gui/src/components/ProfileBanner/ProfileBanner.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 	import '$appcss';
 	import { authStore } from '$libs/stores';
-	import type { User } from '@tea/ui/types';
+	import type { Developer } from '@tea/ui/types';
 
-	let user: User | null = null;
+	let user: Developer | null = null;
 	const authPage = `http://localhost:3000/v1/auth/user?device_id=${authStore.deviceId}`; // https://api.tea.xyz/v1/auth/user?device_id=device_id
 
 	authStore.subscribe((u) => (user = u));
diff --git a/modules/gui/src/libs/api/tauri.ts b/modules/gui/src/libs/api/tauri.ts
index e9d99d5..e3a967d 100644
--- a/modules/gui/src/libs/api/tauri.ts
+++ b/modules/gui/src/libs/api/tauri.ts
@@ -15,7 +15,7 @@ import { getClient } from '@tauri-apps/api/http';
 import { Command } from '@tauri-apps/api/shell';
 import { readDir, BaseDirectory } from '@tauri-apps/api/fs';
 
-import type { Package, Review, AirtablePost, User, Bottle } from '@tea/ui/types';
+import type { Package, Review, AirtablePost, Developer, Bottle } from '@tea/ui/types';
 import type { GUIPackage, Course, Category, AuthStatus } from '../types';
 
 import * as mock from './mock';
@@ -171,7 +171,7 @@ export async function getCategorizedPackages(): Promise<Category[]> {
 
 type DeviceAuth = {
 	status: AuthStatus;
-	user: User;
+	user: Developer;
 	key: string;
 };
 
diff --git a/modules/gui/src/libs/stores/auth.ts b/modules/gui/src/libs/stores/auth.ts
index bcbfe21..739a1c9 100644
--- a/modules/gui/src/libs/stores/auth.ts
+++ b/modules/gui/src/libs/stores/auth.ts
@@ -2,13 +2,13 @@ import { writable } from 'svelte/store';
 import { BaseDirectory, createDir, readTextFile, writeTextFile } from '@tauri-apps/api/fs';
 import { join } from '@tauri-apps/api/path';
 import { getDeviceAuth, registerDevice } from '@api';
-import type { User } from '@tea/ui/types';
+import type { Developer } from '@tea/ui/types';
 
 const basePath = '.tea/tea.xyz/gui';
 interface Session {
 	device_id?: string;
 	key?: string;
-	user?: any;
+	user?: Developer;
 }
 
 export default function initAuthStore() {
@@ -69,8 +69,8 @@ export default function initAuthStore() {
 	return {
 		deviceId,
 		deviceIdStore,
-		subscribe: (cb: (u: User) => void) => {
-			return session.subscribe((v) => v && cb(v.user));
+		subscribe: (cb: (u: Developer) => void) => {
+			return session.subscribe((v) => v?.user && cb(v.user));
 		},
 		pollSession
 	};
@@ -96,7 +96,7 @@ const getLocalSessionData = async (): Promise<Session | void> => {
 		data = JSON.parse(encryptedData || '{}');
 	} catch (error) {
 		console.error(error);
-		const deviceId = await getDeviceId();
+		const deviceId = await registerDevice();
 		data = {
 			device_id: deviceId
 		};
@@ -113,17 +113,3 @@ const saveLocallySessionData = async (data: Session) => {
 		dir: BaseDirectory.Home
 	});
 };
-
-const getDeviceId = async (): Promise<string> => {
-	const hasLocal = false;
-	// get from local data
-	// else get from server
-	// 	GET /v1/auth/registerDevice
-	let deviceId = '';
-	if (hasLocal) {
-	} else {
-		deviceId = await registerDevice();
-	}
-	console.log('deviceId:', deviceId);
-	return deviceId;
-};
diff --git a/modules/ui/src/types.ts b/modules/ui/src/types.ts
index 9c5a2f9..afc7524 100644
--- a/modules/ui/src/types.ts
+++ b/modules/ui/src/types.ts
@@ -35,7 +35,7 @@ export type AirtablePost = {
 	tags: string[];
 };
 
-export type User = {
+export type Developer = {
 	developer_id: string;
 	avatar_url?: string;
 	name: string;