Dev (#1702)

* Initial Typescript models.

* Re-add realtime data

* get distinct sessions for session metrics

* Add queries for new schema.

* Fix Typo.

* Add some api/team endpoints.

* Fix destructure error.

* Fix getWebsites call.

* Ignore typescript build errors.

* Fix enum issue.

* add clickhouse route to deleteWebsite

* Fix Website auth.

* Updated lint-staged config.

* Add permission checks.

* Add user role api.

* Fix error when updating website.

* Fix isAdmin check.  Fix Schema.

* Initial conversion to react-basics.

* Remove user/team transfer from website update.

* delete website in relational query

* Fix login secure token creation.

* Add event type to event.

* Allow user to be added to team with role.

* Updated login form.

* Add Role to TeamUser.

* Add database migration.

* Refactored permissions check. Updated redis lib.

* Feat/um 114 roles and permissions (#1683)

* Auth checkpoint.

* Merge branch 'dev' into feat/um-114-roles-and-permissions

* Add 02 migration.

* Added lib/types.

* Updated schema.

* Updated roles and permissions logic.

* Implement react-basics styles. Fix queries.

* Update website details layout.

* Add 01 migration.

* Fix admin create.

* Update react-basics.

Co-authored-by: Francis Cao <franciscao@gmail.com>
Co-authored-by: Mike Cao <mike@mikecao.com>
Co-authored-by: Mike Cao <moocao@gmail.com>

pages/api/auth/login.ts

@@ -7,11 +7,26 @@ import {
   methodNotAllowed,
   getRandomChars,
 } from 'next-basics';
-import { getUser } from 'queries';
+import { getUser, User } from 'queries';
 import { secret } from 'lib/crypto';
 import redis from 'lib/redis';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
 
-export default async (req, res) => {
+export interface LoginRequestBody {
+  username: string;
+  password: string;
+}
+
+export interface LoginResponse {
+  token: string;
+  user: User;
+}
+
+export default async (
+  req: NextApiRequestQueryBody<any, LoginRequestBody>,
+  res: NextApiResponse<LoginResponse>,
+) => {
   if (req.method === 'POST') {
     const { username, password } = req.body;
 
@@ -19,7 +34,7 @@ export default async (req, res) => {
       return badRequest(res);
     }
 
-    const user = await getUser({ username });
+    const user = await getUser({ username }, { includePassword: true });
 
     if (user && checkPassword(password, user.password)) {
       if (redis.enabled) {
@@ -27,7 +42,7 @@ export default async (req, res) => {
 
         await redis.set(key, user);
 
-        const token = createSecureToken(key, secret());
+        const token = createSecureToken({ key }, secret());
 
         return ok(res, { token, user });
       }

pages/api/auth/logout.ts

@@ -2,8 +2,9 @@ import { methodNotAllowed, ok } from 'next-basics';
 import { useAuth } from 'lib/middleware';
 import redis from 'lib/redis';
 import { getAuthToken } from 'lib/auth';
+import { NextApiRequest, NextApiResponse } from 'next';
 
-export default async (req, res) => {
+export default async (req: NextApiRequest, res: NextApiResponse) => {
   await useAuth(req, res);
 
   if (req.method === 'POST') {

pages/api/auth/verify.js

@@ -1,8 +0,0 @@
-import { useAuth } from 'lib/middleware';
-import { ok } from 'next-basics';
-
-export default async (req, res) => {
-  await useAuth(req, res);
-
-  return ok(res, req.auth);
-};

pages/api/auth/verify.ts

@@ -0,0 +1,10 @@
+import { NextApiRequestAuth } from 'lib/types';
+import { useAuth } from 'lib/middleware';
+import { NextApiResponse } from 'next';
+import { ok } from 'next-basics';
+
+export default async (req: NextApiRequestAuth, res: NextApiResponse) => {
+  await useAuth(req, res);
+
+  return ok(res, req.auth);
+};