#129 bcrypt authorization attach on headers.authorization

modules/gui/package.json

@@ -42,8 +42,8 @@
 	"type": "module",
 	"dependencies": {
 		"@tauri-apps/api": "^1.2.0",
-		"@types/bcrypt": "^5.0.0",
-		"bcrypt": "^5.1.0",
+		"@types/bcryptjs": "^2.4.2",
+		"bcryptjs": "^2.4.3",
 		"buffer": "^6.0.3",
 		"fuse.js": "^6.6.2",
 		"lodash": "^4.17.21",

modules/gui/src/libs/api/tauri.ts

@@ -20,20 +20,41 @@ import type { GUIPackage, Course, Category, AuthStatus } from '../types';
 
 import * as mock from './mock';
 import { PackageStates } from '../types';
+import { getSession } from '$libs/stores/auth';
+import type { Session } from '$libs/stores/auth';
+import bcrypt from 'bcryptjs';
 
 export const apiBaseUrl = 'https://api.tea.xyz/v1';
-// const apiBaseUrl = 'http://localhost:3000/v1';
+// export const apiBaseUrl = 'http://localhost:3000/v1';
+
+async function getHeaders(path: string, session: Session) {
+	const unixMs = new Date().getTime();
+	const unixHexSecs = Math.round(unixMs / 1000).toString(16); // hex
+	const deviceId = session.device_id?.split('-')[0];
+	const preHash = [unixHexSecs, session.key, deviceId, path].join('');
+
+	const Authorization = bcrypt.hashSync(preHash, 10);
+
+	return {
+		Authorization,
+		['tea-ts']: unixMs.toString(),
+		['tea-uid']: session.user?.developer_id,
+		['tea-gui_id']: session.device_id
+	};
+}
 
 async function get<T>(path: string, query?: { [key: string]: string }) {
-	console.log('path', path);
-	const client = await getClient();
+	const [session, client] = await Promise.all([getSession(), getClient()]);
+
 	const uri = join(apiBaseUrl, path);
-	console.log('uri:', uri);
+
+	const headers =
+		session?.device_id && session?.user
+			? await getHeaders(`GET/${path}`, session)
+			: { Authorization: 'public ' };
+
 	const { data } = await client.get<T>(uri.toString(), {
-		headers: {
-			Authorization: 'public' // TODO: figure out why req w/o Authorization does not work
-			// 'cache-control': 'no-cache'
-		},
+		headers,
 		query: query || {}
 	});
 	return data;
@@ -79,6 +100,7 @@ export async function getPackageReviews(full_name: string): Promise<Review[]> {
 	const reviews: Review[] = await get<Review[]>(
 		`packages/${full_name.replaceAll('/', ':')}/reviews`
 	);
+
 	return reviews;
 }
 

modules/gui/src/libs/stores.ts

@@ -46,7 +46,7 @@ function initPackagesStore() {
 export const packagesStore = initPackagesStore();
 
 export const initializeFeaturedPackages = async () => {
-	console.log('initialzie featured packages');
+	console.log('intialize featured packages');
 	const packages = await getFeaturedPackages();
 	featuredPackages.set(packages);
 };

modules/gui/src/libs/stores/auth.ts

@@ -5,14 +5,25 @@ import { getDeviceAuth, registerDevice } from '@api';
 import type { Developer } from '@tea/ui/types';
 
 const basePath = '.tea/tea.xyz/gui';
-interface Session {
+export interface Session {
 	device_id?: string;
 	key?: string;
 	user?: Developer;
 }
 
+export let session: Session | null = null;
+export const getSession = async (): Promise<Session | null> => {
+	if (session && session?.user) return session;
+	const sessionFilePath = await join(basePath, 'tmp.dat');
+	const encryptedData = await readTextFile(sessionFilePath, {
+		dir: BaseDirectory.Home
+	});
+	session = JSON.parse(encryptedData || '{}') as Session;
+	return session;
+};
+
 export default function initAuthStore() {
-	const session = writable<Session>({});
+	const sessionStore = writable<Session>({});
 	let pollLoop = 0;
 
 	const deviceIdStore = writable<string>('');
@@ -20,7 +31,8 @@ export default function initAuthStore() {
 
 	initSession().then((sess) => {
 		if (sess) {
-			session.set(sess);
+			session = sess;
+			sessionStore.set(sess);
 			deviceIdStore.set(sess.device_id!);
 			deviceId = sess.device_id!;
 		}
@@ -35,7 +47,7 @@ export default function initAuthStore() {
 			user: data.user
 		};
 		saveLocallySessionData(localSession);
-		session.set(localSession);
+		sessionStore.set(localSession);
 	}
 
 	async function pollSession() {
@@ -70,7 +82,7 @@ export default function initAuthStore() {
 		deviceId,
 		deviceIdStore,
 		subscribe: (cb: (u: Developer) => void) => {
-			return session.subscribe((v) => v?.user && cb(v.user));
+			return sessionStore.subscribe((v) => v?.user && cb(v.user));
 		},
 		pollSession
 	};
@@ -86,14 +98,12 @@ const initSession = async (): Promise<Session | void> => {
 };
 
 const getLocalSessionData = async (): Promise<Session | void> => {
-	const sessionFilePath = await join(basePath, 'tmp.dat');
 	let data: Session;
 	try {
-		const encryptedData = await readTextFile(sessionFilePath, {
-			dir: BaseDirectory.Home
-		});
-		// TODO: decrypt then return
-		data = JSON.parse(encryptedData || '{}');
+		const session = await getSession();
+		if (session) {
+			data = session;
+		}
 	} catch (error) {
 		console.error(error);
 		const deviceId = await registerDevice();

modules/gui/src/routes/+page.svelte

@@ -9,7 +9,6 @@
 	import News from '$components/News/News.svelte';
 	import CategorizedPackages from '$components/CategorizedPackages/CategorizedPackages.svelte';
 	backLink.set('');
-	console.log('test', window.location);
 </script>
 
 <div>