store selected proceed space for confluence site

PROCEED-Labs · LucasMGo · May 14, 2024 · May 15, 2024 · May 15, 2024 · May 15, 2024
commit 3884bd1b56f2d8abf2939d686469a69c48f3c6c3
diff --git a/src/management-system-v2/app/api/auth/[...nextauth]/auth-options.ts b/src/management-system-v2/app/api/auth/[...nextauth]/auth-options.ts
@@ -11,6 +11,8 @@ import { sendEmail } from '@/lib/email/mailer';
 import { randomUUID } from 'crypto';
 import renderSigninLinkEmail from './signin-link-email';
 import { verifyJwt } from '@/app/confluence/helpers';
+import { getConfluenceClientInfos } from '@/lib/data/legacy/fileHandling';
+import { addMember, isMember } from '@/lib/data/legacy/iam/memberships';
 
 const nextAuthOptions: AuthOptions = {
   secret: process.env.NEXTAUTH_SECRET,
@@ -37,16 +39,24 @@ const nextAuthOptions: AuthOptions = {
         if (credentials) {
           try {
             const decodedToken = await verifyJwt(credentials.token);
+            const confluenceClientInfos = await getConfluenceClientInfos(decodedToken.iss);
+            console.log('deocedToken', decodedToken);
 
             const existingUser = getUserById(decodedToken.sub as string);
 
             if (!existingUser) {
-              return addUser({
+              const user = addUser({
                 id: decodedToken.sub as string,
                 username: `Confluence_User_${decodedToken.sub}`,
                 confluence: true,
                 guest: false,
               });
+
+              if (confluenceClientInfos.proceedSpace) {
+                addMember(confluenceClientInfos.proceedSpace, user.id);
+              }
+            } else if (!isMember(confluenceClientInfos.proceedSpace, existingUser.id)) {
+              addMember(confluenceClientInfos.proceedSpace, existingUser.id);
             }
             return existingUser;
           } catch (err) {

diff --git a/src/management-system-v2/app/api/confluence/installed/route.ts b/src/management-system-v2/app/api/confluence/installed/route.ts
@@ -1,15 +1,11 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { saveSharedSecret } from '@/lib/data/legacy/fileHandling';
+import { addConfluenceClient } from '@/lib/data/legacy/fileHandling';
 
 export async function POST(request: NextRequest) {
   const bodyData = await request.json();
   const { clientKey, sharedSecret, baseUrl } = bodyData;
 
-  await saveSharedSecret(
-    clientKey || 'DIDNOTWORK-KEY',
-    sharedSecret || 'DIDNOTWORK-SECRET',
-    baseUrl || 'DIDNOTWORK-BASEURL',
-  );
+  await addConfluenceClient(clientKey, sharedSecret, baseUrl);
 
-  return NextResponse.json({ clientKey, sharedSecret, baseUrl });
+  return new NextResponse(null, { status: 201, statusText: 'Created' });
 }
diff --git a/src/management-system-v2/app/api/confluence/sharedSecret/route.ts b/src/management-system-v2/app/api/confluence/sharedSecret/route.ts
diff --git a/src/management-system-v2/app/confluence/config/config.tsx b/src/management-system-v2/app/confluence/config/config.tsx
@@ -4,6 +4,7 @@ import Tabs, { Tab, TabList, TabPanel } from '@atlaskit/tabs';
 import { Label } from '@atlaskit/form';
 import Select from '@atlaskit/select';
 import { createFolder } from '@/lib/data/folders';
+import { updateConfluenceClientSelectedSpace } from '@/lib/data/confluence';
 
 const SpaceSelectionTab = ({
   userEnvironments,
@@ -44,7 +45,13 @@ const SpaceSelectionTab = ({
   );
 };
 
-const Config = ({ userEnvironments }: { userEnvironments: Environment[] }) => {
+const Config = ({
+  userEnvironments,
+  clientKey,
+}: {
+  userEnvironments: Environment[];
+  clientKey: string;
+}) => {
   console.log('environments', userEnvironments);
   const selectSpace = async (selectedSpace: { label: string; value: string } | null) => {
     console.log('selectedSpace', selectedSpace);
@@ -58,6 +65,7 @@ const Config = ({ userEnvironments }: { userEnvironments: Environment[] }) => {
         environmentId: selectedSpace.value,
       });
       console.log('res', res);
+      await updateConfluenceClientSelectedSpace(clientKey, selectedSpace.value);
     }
     const users = JSON.parse((await getConfluenceUsers()) as string).results;
     const atlassianUsers = users.filter(

diff --git a/src/management-system-v2/app/confluence/config/page.tsx b/src/management-system-v2/app/confluence/config/page.tsx
@@ -6,9 +6,21 @@ import { Environment } from '@/lib/data/environment-schema';
 import { getEnvironmentById } from '@/lib/data/legacy/iam/environments';
 import { getUserOrganizationEnvironments } from '@/lib/data/legacy/iam/memberships';
 import Config from './config';
+import jwt, { JwtPayload } from 'jsonwebtoken';
 
 const ConfigPage = async ({ params, searchParams }: { params: any; searchParams: any }) => {
+  console.log('searchparams', searchParams.jwt);
+  const jwtToken = searchParams.jwt;
+  const decoded = jwt.decode(jwtToken, { complete: true });
+  const { iss: clientKey } = decoded!.payload as JwtPayload;
+  console.log('clientKey', clientKey);
+
+  if (!clientKey) {
+    throw new Error('Could not extract ClientKey from given JWT Token');
+  }
+
   const { userId } = await getCurrentUser();
+  console.log('userId', userId);
 
   if (userId) {
     const userEnvironments: Environment[] = [getEnvironmentById(userId)];
@@ -27,7 +39,7 @@ const ConfigPage = async ({ params, searchParams }: { params: any; searchParams:
         activeSpace={{ spaceId: userId || '', isOrganization: false }}
       >
         <div style={{ padding: '1rem', width: '100%' }}>
-          <Config userEnvironments={userEnvironments}></Config>
+          <Config userEnvironments={userEnvironments} clientKey={clientKey}></Config>
         </div>
       </Layout>
     );

diff --git a/src/management-system-v2/app/confluence/helpers.ts b/src/management-system-v2/app/confluence/helpers.ts
@@ -1,6 +1,7 @@
 'use server';
 import jwt, { JwtPayload } from 'jsonwebtoken';
 import * as AtlassianJwt from 'atlassian-jwt';
+import { getConfluenceClientInfos } from '@/lib/data/legacy/fileHandling';
 
 export const createAttachment = async (pageId: string, attachmentFormData: FormData) => {
   const processId = attachmentFormData.get('id');
@@ -125,82 +126,63 @@ export const getSpaces = async (jwtToken: any) => {
 
   const decoded = jwt.decode(jwtToken, { complete: true });
   const { iss: clientKey } = decoded!.payload as JwtPayload;
-  const req: AtlassianJwt.Request = AtlassianJwt.fromMethodAndUrl(
-    'GET',
-    'https://proceed-test.atlassian.net/wiki/api/v2/pages',
-  );
-  const tokenData = {
-    iss: clientKey,
-    iat: Math.floor(+new Date() / 1000), // The time the token is generated
-    exp: Math.floor((+new Date() + 1000 * 60 * 60 * 5) / 1000), // Token expiry time (recommend 3 minutes after issuing)
-    sub: '712020:3a3f17e3-744f-4cd0-accc-1311bd5daad6',
-    qsh: AtlassianJwt.createQueryStringHash({
-      method: 'GET',
-      pathname: 'https://proceed-test.atlassian.net/wiki/api/v2/pages',
-    }), // [Query String Hash](https://developer.atlassian.com/cloud/jira/platform/understanding-jwt/#a-name-qsh-a-creating-a-query-string-hash)
-  };
 
-  const { sharedSecrets } = await fetch(
-    'https://pr-281---ms-server-staging-c4f6qdpj7q-ew.a.run.app/api/confluence/sharedSecret',
-    {
+  if (clientKey) {
+    const req: AtlassianJwt.Request = AtlassianJwt.fromMethodAndUrl(
+      'GET',
+      'https://proceed-test.atlassian.net/wiki/api/v2/pages',
+    );
+    const tokenData = {
+      iss: clientKey,
+      iat: Math.floor(+new Date() / 1000), // The time the token is generated
+      exp: Math.floor((+new Date() + 1000 * 60 * 60 * 5) / 1000), // Token expiry time (recommend 3 minutes after issuing)
+      sub: '712020:3a3f17e3-744f-4cd0-accc-1311bd5daad6',
+      qsh: AtlassianJwt.createQueryStringHash({
+        method: 'GET',
+        pathname: 'https://proceed-test.atlassian.net/wiki/api/v2/pages',
+      }), // [Query String Hash](https://developer.atlassian.com/cloud/jira/platform/understanding-jwt/#a-name-qsh-a-creating-a-query-string-hash)
+    };
+
+    const confluenceClientData = await getConfluenceClientInfos(clientKey);
+    const sharedSecret = confluenceClientData.sharedSecret;
+
+    const newToken = AtlassianJwt.encodeSymmetric(tokenData, sharedSecret);
+    console.log('newToken encodes with atlassianjwt', newToken);
+
+    const decodedNewToken = AtlassianJwt.decodeSymmetric(
+      newToken,
+      sharedSecret,
+      AtlassianJwt.SymmetricAlgorithm.HS256,
+    );
+    console.log('decoded newtoken', decodedNewToken);
+
+    const res = await fetch('https://proceed-test.atlassian.net/wiki/api/v2/pages', {
       method: 'GET',
-    },
-  ).then((res) => {
-    return res.json();
-  });
-
-  const sharedSecret = Object.entries(sharedSecrets).map(([key, val]) => {
-    const values = val as { sharedSecret: string; baseUrl: string };
-    console.log('clientKey', key);
-    console.log('sharedSecret', values.sharedSecret);
-    console.log('baseUrl', values.baseUrl);
-    return values.sharedSecret;
-  })[0];
-
-  const newToken = AtlassianJwt.encodeSymmetric(tokenData, sharedSecret);
-  console.log('newToken encodes with atlassianjwt', newToken);
-
-  const decodedNewToken = AtlassianJwt.decodeSymmetric(
-    newToken,
-    sharedSecret,
-    AtlassianJwt.SymmetricAlgorithm.HS256,
-  );
-  console.log('decoded newtoken', decodedNewToken);
-
-  const res = await fetch('https://proceed-test.atlassian.net/wiki/api/v2/pages', {
-    method: 'GET',
-    headers: {
-      Authorization: `JWT ${newToken}`,
-    },
-  });
-  console.log('res', res);
-  console.log('res json', await res.json());
-  return res;
+      headers: {
+        Authorization: `JWT ${newToken}`,
+      },
+    });
+    console.log('res', res);
+    console.log('res json', await res.json());
+    return res;
+  }
 };
 
 export const verifyJwt = async (jwtToken: any) => {
   const decoded = jwt.decode(jwtToken, { complete: true });
   const { iss: clientKey } = decoded!.payload as JwtPayload;
 
-  const { sharedSecrets } = await fetch(
-    'https://pr-281---ms-server-staging-c4f6qdpj7q-ew.a.run.app/api/confluence/sharedSecret',
-    {
-      method: 'GET',
-    },
-  ).then((res) => {
-    return res.json();
-  });
+  if (clientKey) {
+    const confluenceClientData = await getConfluenceClientInfos(clientKey);
+    const sharedSecret = confluenceClientData.sharedSecret;
 
-  const sharedSecret = Object.entries(sharedSecrets).map(([key, val]) => {
-    const values = val as { sharedSecret: string; baseUrl: string };
-    return values.sharedSecret;
-  })[0];
+    const verified = AtlassianJwt.decodeSymmetric(
+      jwtToken,
+      sharedSecret,
+      AtlassianJwt.SymmetricAlgorithm.HS256,
+    );
 
-  const verified = AtlassianJwt.decodeSymmetric(
-    jwtToken,
-    sharedSecret,
-    AtlassianJwt.SymmetricAlgorithm.HS256,
-  );
-
-  return verified;
+    return verified;
+  }
+  return false;
 };
diff --git a/src/management-system-v2/lib/data/confluence.ts b/src/management-system-v2/lib/data/confluence.ts
@@ -0,0 +1,10 @@
+'use server';
+
+import { updateConfluenceClientInfos } from './legacy/fileHandling';
+
+export const updateConfluenceClientSelectedSpace = async (
+  clientKey: string,
+  selectedSpace: string,
+) => {
+  await updateConfluenceClientInfos(clientKey, { proceedSpace: selectedSpace });
+};
diff --git a/src/management-system-v2/lib/data/legacy/fileHandling.js b/src/management-system-v2/lib/data/legacy/fileHandling.js
@@ -50,8 +50,8 @@ export function getAppDataPath() {
  * Find the path to the folder where the info about all Processes is stored
  * @returns {String}
  */
-function getSharedSecretFolder() {
-  return path.join(getAppDataPath(), 'SharedSecret');
+function getConfluenceClientFolder() {
+  return path.join(getAppDataPath(), 'Confluence');
 }
 /**
  * Find the path to the folder where the info about all Processes is stored
@@ -115,34 +115,57 @@ function getUserTaskDir(id) {
 }
 
 /**
- * Saves sharedSecret
+ * Adds new confluence client
  *
  * @param {String} clientKey
  * @param {String} sharedSecret
  * @param {String} baseUrl
  */
-export async function saveSharedSecret(clientKey, sharedSecret, baseUrl) {
-  const sharedSecretDir = getSharedSecretFolder();
+export async function addConfluenceClient(clientKey, sharedSecret, baseUrl) {
+  const confluenceClientDir = getConfluenceClientFolder();
 
-  fse.ensureDirSync(sharedSecretDir);
+  fse.ensureDirSync(confluenceClientDir);
 
-  const sharedSecretData = JSON.stringify({ [clientKey]: { sharedSecret, baseUrl } });
-  fse.writeFileSync(path.join(sharedSecretDir, `sharedSecret.json`), sharedSecretData);
+  const sharedSecretData = JSON.stringify({ clientKey, sharedSecret, baseUrl });
+  fse.writeFileSync(path.join(confluenceClientDir, `${clientKey}.json`), sharedSecretData);
 }
 
 /**
- * Get sharedSecret
+ * Update confluence client infos
  *
  * @param {String} clientKey
+ * @param {object} clientInfos
  */
-export async function getSharedSecret() {
-  const sharedSecretDir = getSharedSecretFolder();
-  const sharedSecretFilePath = path.join(sharedSecretDir, 'sharedSecret.json');
+export async function updateConfluenceClientInfos(clientKey, newClientInfos) {
+  const initialConfluenceClientInfos = await getConfluenceClientInfos(clientKey);
 
-  if (fse.existsSync(sharedSecretFilePath)) {
-    const sharedSecretData = JSON.parse(fse.readFileSync(sharedSecretFilePath, 'utf-8'));
+  if (initialConfluenceClientInfos) {
+    const confluenceClientDir = getConfluenceClientFolder();
 
-    return sharedSecretData;
+    fse.ensureDirSync(confluenceClientDir);
+
+    const sharedSecretData = JSON.stringify({
+      ...initialConfluenceClientInfos,
+      ...newClientInfos,
+      clientKey,
+    });
+    fse.writeFileSync(path.join(confluenceClientDir, `${clientKey}.json`), sharedSecretData);
+  }
+}
+
+/**
+ * Get infos of confluence client
+ *
+ * @param {String} clientKey
+ */
+export async function getConfluenceClientInfos(clientKey) {
+  const confluenceClientDir = getConfluenceClientFolder();
+  const confluenceClientFilePath = path.join(confluenceClientDir, `${clientKey}.json`);
+
+  if (fse.existsSync(confluenceClientFilePath)) {
+    const confluenceClientData = JSON.parse(fse.readFileSync(confluenceClientFilePath, 'utf-8'));
+
+    return confluenceClientData;
   }
   return { error: 'Does not exist' };
 }