formatting

Author: lane711

src/cms/admin/auth.test.ts

@@ -3,20 +3,29 @@ import app from '../../server';
 import { sql } from 'drizzle-orm';
 import { getD1DataByTable, insertD1Data } from '../data/d1-data';
 import { postData } from '../util/fetch';
-import { createCategoriesTestTable1, createUserAndGetToken, createUserTestTables } from '../util/testing';
+import {
+  createCategoriesTestTable1,
+  createUserAndGetToken,
+  createUserTestTables
+} from '../util/testing';
 import { createUser } from '../auth/lucia';
 const { __D1_BETA__D1DATA, KVDATA } = getMiniflareBindings();
 
-const toJson = function(json){ 
-  return json
+const toJson = function (json) {
+  return json;
 };
 
-const ctx = { env: { KVDATA: KVDATA, D1DATA: __D1_BETA__D1DATA },
-json: toJson };
+const ctx = {
+  env: { KVDATA: KVDATA, D1DATA: __D1_BETA__D1DATA },
+  json: toJson
+};
 
 describe('admin should be restricted', () => {
   it('ping should return 200', async () => {
-    const res = await app.fetch(new Request('http://localhost/v1/ping'), ctx.env);
+    const res = await app.fetch(
+      new Request('http://localhost/v1/ping'),
+      ctx.env
+    );
     expect(res.status).toBe(200);
     let body = await res.json();
     expect(body).toBe('/v1/ping is all good');
@@ -41,23 +50,23 @@ describe('admin should be restricted', () => {
     expect(body.data[0].id).toBe('1');
   });
 
-    it('create and login user', async () => {
-      const token = await createUserAndGetToken(app, ctx);
-    });
+  it('create and login user', async () => {
+    const token = await createUserAndGetToken(app, ctx);
+  });
 
-    it('admin can list users', async () => {
-      const token = await createUserAndGetToken(app, ctx);
+  it('admin can list users', async () => {
+    const token = await createUserAndGetToken(app, ctx);
 
-      // use the token to get thee user info
-// TODO should be able to get users
-      let req = new Request('http://localhost/v1/categories', {
-        method: 'GET',
-        headers: { 'Content-Type': 'application/json',
-        'Authorization': `Bearer ${token}`
+    // use the token to get thee user info
+    // TODO should be able to get users
+    let req = new Request('http://localhost/v1/categories', {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${token}`
       }
-      });
-      let res = await app.fetch(req, ctx.env);
-      expect(res.status).toBe(200);
     });
-
+    let res = await app.fetch(req, ctx.env);
+    expect(res.status).toBe(200);
+  });
 });

src/cms/api/api.test.ts

@@ -11,7 +11,10 @@ const ctx = { env: { KVDATA: KVDATA, D1DATA: __D1_BETA__D1DATA } };
 
 describe('Test the APIs', () => {
   it('ping should return 200', async () => {
-    const res = await app.fetch(new Request('http://localhost/v1/ping'), ctx.env);
+    const res = await app.fetch(
+      new Request('http://localhost/v1/ping'),
+      ctx.env
+    );
     expect(res.status).toBe(200);
     let body = await res.json();
     expect(body).toBe('/v1/ping is all good');
@@ -90,20 +93,20 @@ describe('Test the APIs', () => {
   //     expect(body2.source).toBe('cache');
   //   });
   //
-    it('post (insert) should return 204', async () => {
-      createCategoriesTestTable1(ctx);
-      let payload = JSON.stringify({ data: { title: 'My Category' } });
-      let req = new Request('http://localhost/v1/categories', {
-        method: 'POST',
-        body: payload,
-        headers: { 'Content-Type': 'application/json' }
-      });
-      let res = await app.fetch(req, ctx.env);
-      expect(res.status).toBe(201);
-      let body = await res.json();
-      expect(body.title).toBe('My Category');
-      expect(body.id.length).toBeGreaterThan(1);
+  it('post (insert) should return 204', async () => {
+    createCategoriesTestTable1(ctx);
+    let payload = JSON.stringify({ data: { title: 'My Category' } });
+    let req = new Request('http://localhost/v1/categories', {
+      method: 'POST',
+      body: payload,
+      headers: { 'Content-Type': 'application/json' }
     });
+    let res = await app.fetch(req, ctx.env);
+    expect(res.status).toBe(201);
+    let body = await res.json();
+    expect(body.title).toBe('My Category');
+    expect(body.id.length).toBeGreaterThan(1);
+  });
   //
   //   it('put should return 200 and return id', async () => {
   //     //create test record to update

src/cms/util/fetch.ts

@@ -1,36 +1,41 @@
-import { sql } from "drizzle-orm";
-import { drizzle } from "drizzle-orm/d1";
-import { createUser } from "../auth/lucia";
-import { getD1DataByTable } from "../data/d1-data";
+import { sql } from 'drizzle-orm';
+import { drizzle } from 'drizzle-orm/d1';
+import { createUser } from '../auth/lucia';
+import { getD1DataByTable } from '../data/d1-data';
 
-
-export async function createUserAndGetToken(app, ctx){
+export async function createUserAndGetToken(app, ctx) {
   await createUserTestTables(ctx);
 
   //TODO: create user properly using the lucia api so that the user keys data in populated
-  let login = {        
-    email: "[email protected]",
-    password: "password123"
-  }
-
-  let user = {data: {
-    email: login.email,
-    password: login.password,
-    role:'admin',
-    table:'users'
-  }};
+  let login = {
+    email: '[email protected]',
+    password: 'password123'
+  };
+
+  let user = {
+    data: {
+      email: login.email,
+      password: login.password,
+      role: 'admin',
+      table: 'users'
+    }
+  };
   const result = await createUser({ content: user, ctx });
 
   const users = await getD1DataByTable(ctx.env.D1DATA, 'users', undefined);
   expect(users.length).toBe(1);
 
-  const usersKeys = await getD1DataByTable(ctx.env.D1DATA, 'user_keys', undefined);
+  const usersKeys = await getD1DataByTable(
+    ctx.env.D1DATA,
+    'user_keys',
+    undefined
+  );
   expect(usersKeys.length).toBe(1);
 
   //now log the users in
-  let req = new Request("http://localhost/v1/auth/login", {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
+  let req = new Request('http://localhost/v1/auth/login', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify(login)
   });
   let res = await app.fetch(req, ctx.env);