feat: org setup

client/src/routes/setup/+page.svelte

@@ -65,6 +65,8 @@
 	let step = 1;
 	let error: string | null = null;
 	let orgName: string;
+	let username: string;
+	let orgDomain: string;
 	let orgEmail: string;
 	let confirmEmail: string;
 	let password: string;
@@ -91,7 +93,9 @@
 			const { data } = await apiClient.post("/admin/setup", {
 				orgName,
 				orgEmail,
-				password
+				password,
+				username,
+				orgDomain
 			});
 			didInfo = data;
 			isDisabled = false;
@@ -119,6 +123,8 @@
 						bind:orgName
 						bind:orgEmail
 						bind:confirmEmail
+						bind:username
+						bind:orgDomain
 						stepHandler={stepOneHandler}
 					/>
 				{:else if step === 2}

client/src/routes/setup/steps/step1.svelte

@@ -18,6 +18,8 @@
 	export let orgName: string;
 	export let orgEmail: string;
 	export let confirmEmail: string;
+	export let username: string;
+	export let orgDomain: string;
 
 	export let stepHandler: (...args: any[]) => any;
 </script>
@@ -30,6 +32,20 @@
 			bind:value={orgName}
 		/>
 	</div>
+	<div class="text-block">
+		<Input
+			label="Admin Username"
+			placeholder="Enter Admin User Name"
+			bind:value={username}
+		/>
+	</div>
+	<div class="text-block">
+		<Input
+			label="Website Domain"
+			placeholder="https://organization.org"
+			bind:value={orgDomain}
+		/>
+	</div>
 	<div class="text-block">
 		<Input
 			label="Organization Email"

docker-compose.yml

@@ -34,6 +34,7 @@ services:
             - ./server:/app
             - ./logs:/app/logs
             - ./identity:/identity
+        restart: always
         depends_on:
             - postgres
         networks:

server/package.json

@@ -12,7 +12,7 @@
 	},
 	"dependencies": {
 		"@iota/identity-stronghold-nodejs": "^0.6.0",
-		"@tanglelabs/identity-manager": "^0.2.3",
+		"@tanglelabs/identity-manager": "0.2.4",
 		"bcryptjs": "^2.4.3",
 		"cookie-parser": "1.4.6",
 		"cors": "^2.8.5",

server/src/controllers/admin.controller.ts

@@ -71,13 +71,12 @@ export const setupOrganization = asyncHandler(async (req: Request, res: Response
 		})
 		.catch(async (e) => {
 			if (e.code !== "ENOENT") throw new Error("400::Config already exists");
-			const { orgName, password, orgEmail } = req.body;
+			const { orgName, username, orgDomain, password, orgEmail } = req.body;
 
 			const did = await IdentityService.newDid({
 				alias: "admin-did",
 				store: {
 					type: Types.Mongo,
-
 					options: {
 						mongouri: IDENTITY_DB_URI
 					}
@@ -88,12 +87,17 @@ export const setupOrganization = asyncHandler(async (req: Request, res: Response
 			await did.attachEncryptionMethod();
 
 			const user = await UsersService.create({
-				name: orgName,
+				name: username,
 				email: orgEmail,
 				password,
 				isSuperUser: true
 			});
-			await createSettingsJson({ owner: user.id, did: did.getDid().toString() });
+			await createSettingsJson({
+				owner: user.id,
+				did: did.getDid().toString(),
+				orgName,
+				orgWebsite: orgDomain
+			});
 
 			res.json({ user, did: did.getDocument() });
 		});

server/src/middleware/auth/auth.middleware.ts

@@ -1,35 +1,43 @@
 import { RolesService, SessionsService, UsersService } from "@/services";
 import { createJsonWebToken, validateJsonWebToken } from "@/utils";
 import { NextFunction, Request, Response } from "express";
+import asyncHandler from "express-async-handler";
 
-export const userDeserializer = async (req: Request, res: Response, next: NextFunction) => {
-	const { accessToken, refreshToken } = req.cookies;
+export const userDeserializer = asyncHandler(
+	async (req: Request, res: Response, next: NextFunction) => {
+		const { accessToken, refreshToken } = req.cookies;
 
-	if (!accessToken && !refreshToken) return next();
+		if (!accessToken && !refreshToken) return next();
 
-	const { payload, expired } = validateJsonWebToken(accessToken);
+		const { payload, expired } = validateJsonWebToken(accessToken);
 
-	if (payload) {
-		req.session = payload;
-		req.user = await UsersService.findById(payload.userId, [RolesService.model]);
-		return next();
-	}
+		if (payload) {
+			req.session = payload;
+			req.user = await UsersService.findById(payload.userId, [RolesService.model]);
+			return next();
+		}
+
+		const { payload: refresh } =
+			!expired && refreshToken ? validateJsonWebToken(refreshToken) : { payload: null };
+		if (!refresh) return next();
 
-	const { payload: refresh } =
-		!expired && refreshToken ? validateJsonWebToken(refreshToken) : { payload: null };
-	if (!refresh) return next();
-	const { id, userId } = await SessionsService.findOne({ id: refresh.sessionId });
+		try {
+			const { id, userId } = await SessionsService.findOne({ id: refresh.sessionId });
 
-	if (!userId) return next();
-	const token = createJsonWebToken({ userId, id });
+			if (!userId || !id) return next();
+			const token = createJsonWebToken({ userId, id });
 
-	res.cookie("accessToken", token, {
-		maxAge: 60 * 60 * 1000,
-		httpOnly: true
-	});
+			res.cookie("accessToken", token, {
+				maxAge: 60 * 60 * 1000,
+				httpOnly: true
+			});
 
-	req.session = validateJsonWebToken(token).payload;
-	req.user = await UsersService.findById(userId);
+			req.session = validateJsonWebToken(token).payload;
+			req.user = await UsersService.findById(userId);
 
-	return next();
-};
+			return next();
+		} catch {
+			return next();
+		}
+	}
+);

server/src/routers/credential.routers.ts

@@ -53,7 +53,7 @@ const router = Router();
  *   get:
  *     tags:
  *       - Credentials
- *     summary: Edit a specific role
+ *     summary: get a specific credential
  *     parameters:
  *       - in: path
  *         name: id