refac user token for testing

Author: lane711

src/cms/admin/auth.test.ts

@@ -3,7 +3,7 @@ import app from '../../server';
 import { sql } from 'drizzle-orm';
 import { getD1DataByTable, insertD1Data } from '../data/d1-data';
 import { postData } from '../util/fetch';
-import { createCategoriesTestTable1, createUserTestTables } from '../util/testing';
+import { createCategoriesTestTable1, createUserAndGetToken, createUserTestTables } from '../util/testing';
 import { createUser } from '../auth/lucia';
 const { __D1_BETA__D1DATA, KVDATA } = getMiniflareBindings();
 
@@ -41,52 +41,23 @@ describe('admin should be restricted', () => {
     expect(body.data[0].id).toBe('1');
   });
 
-    it('user record', async () => {
-      await createUserTestTables(ctx);
-
-      //TODO: create user properly using the lucia api so that the user keys data in populated
-      let user = {data: {
-        email: "[email protected]",
-        password: "password123",
-        role:'admin',
-        table:'users'
-      }};
-      const result = await createUser({ content: user, ctx });
-
-
-      // const userRecord = await insertD1Data(ctx.env.D1DATA, ctx.env.KVDATA, 'users', {
-      //   firstName: 'John',
-      //   id: 'aaa',
-      //   email: '[email protected]',
-      //   password: 'password123',
-      //   role: 'admin'
-      // });
-
-      const users = await getD1DataByTable(ctx.env.D1DATA, 'users', undefined);
-      expect(users.length).toBe(1);
+    it('create and login user', async () => {
+      const token = await createUserAndGetToken(app, ctx);
+    });
 
-      //now log that users in
-      let payload = {data: {
-        email: "[email protected]",
-        password: "password123"
-      }};
+    it('admin can list users', async () => {
+      const token = await createUserAndGetToken(app, ctx);
 
-      let req = new Request("http://localhost/v1/auth/login", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(payload)
+      // 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);
-
-      //use the token to get thee user info
-
-      // let req = new Request('http://localhost/v1/users/aaa', {
-      //   method: 'GET',
-      //   headers: { 'Content-Type': 'application/json' }
-      // });
-      // let res = await app.fetch(req, ctx.env);
-      // expect(res.status).toBe(200);
     });
 
 });

src/cms/util/testing.ts

@@ -1,5 +1,44 @@
 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){
+  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'
+  }};
+  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);
+  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" },
+    body: JSON.stringify(login)
+  });
+  let res = await app.fetch(req, ctx.env);
+  expect(res.status).toBe(200);
+  let body = await res.json();
+  expect(body.bearer.length).toBeGreaterThan(10);
+  return body.bearer;
+}
 
 export async function createUserTestTables(ctx) {
   await createUserTestTable1(ctx);