ISSUE #5412 createTEamspace now assign admin role to user

3drepo · Mar 2, 2025 · 1da40bc · 1da40bc
1 parent 26e4253
commit 1da40bc
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 18 deletions.
diff --git a/backend/src/v5/middleware/sso/frontegg.js b/backend/src/v5/middleware/sso/frontegg.js
@@ -139,7 +139,7 @@ const redirectForAuth = (redirectURL) => async (req, res) => {
 			codeChallenge: req.session.pkceCodes.challenge,
 		};
 
-		const link = generateAuthenticationCodeUrl(req.authParams, accountId);
+		const link = await generateAuthenticationCodeUrl(req.authParams, accountId);
 		respond(req, res, templates.ok, { link });
 	} catch (err) {
 		respond(req, res, err);

diff --git a/backend/src/v5/processors/teamspaces/index.js b/backend/src/v5/processors/teamspaces/index.js
@@ -65,7 +65,7 @@ Teamspaces.initTeamspace = async (teamspaceName, owner) => {
 		]);
 		await Promise.all([
 			createTeamspaceSettings(teamspaceName, teamspaceId),
-			assignUserToJob(teamspaceName, DEFAULT_OWNER_JOB, teamspaceName),
+			assignUserToJob(teamspaceName, DEFAULT_OWNER_JOB, owner),
 			addDefaultTemplates(teamspaceName),
 		]);
 		await Promise.all([

diff --git a/backend/src/v5/services/sso/frontegg/components/accounts.js b/backend/src/v5/services/sso/frontegg/components/accounts.js
@@ -25,7 +25,7 @@ const Accounts = {};
 
 Accounts.getTeamspaceByAccount = async (accountId) => {
 	try {
-		const config = getConfig();
+		const config = await getConfig();
 		const { data: { metadata } } = await get(`${config.vendorDomain}/tenants/resources/tenants/v2/${accountId}`, await getBearerHeader());
 		const metaJson = JSON.parse(metadata);
 		return metaJson[META_LABEL_TEAMSPACE];
@@ -36,7 +36,7 @@ Accounts.getTeamspaceByAccount = async (accountId) => {
 
 Accounts.createAccount = async (name) => {
 	try {
-		const config = getConfig();
+		const config = await getConfig();
 		const payload = {
 			tenantId: generateUUIDString(),
 			name,
@@ -70,7 +70,7 @@ Accounts.createAccount = async (name) => {
 
 Accounts.getAllUsersInAccount = async (accountId) => {
 	try {
-		const config = getConfig();
+		const config = await getConfig();
 		const header = {
 			...await getBearerHeader(),
 			'frontegg-tenant-id': accountId,
@@ -107,7 +107,7 @@ Accounts.getAllUsersInAccount = async (accountId) => {
 
 Accounts.addUserToAccount = async (accountId, userId, sendInvite = true) => {
 	try {
-		const config = getConfig();
+		const config = await getConfig();
 		const payload = {
 			tenantId: accountId,
 			validateTenantExist: true,
@@ -122,7 +122,7 @@ Accounts.addUserToAccount = async (accountId, userId, sendInvite = true) => {
 
 Accounts.removeUserFromAccount = async (accountId, userId) => {
 	try {
-		const config = getConfig();
+		const config = await getConfig();
 		const headers = {
 			...await getBearerHeader(),
 			[HEADER_TENANT_ID]: accountId,
@@ -137,7 +137,7 @@ Accounts.removeUserFromAccount = async (accountId, userId) => {
 
 Accounts.removeAccount = async (accountId) => {
 	try {
-		const config = getConfig();
+		const config = await getConfig();
 		await httpDelete(`${config.vendorDomain}/tenants/resources/tenants/v1/${accountId}`, await getBearerHeader());
 	} catch (err) {
 		logger.logError(`Failed to remove account: ${JSON.stringify(err?.response?.data)} `);

diff --git a/backend/src/v5/services/sso/frontegg/components/auth.js b/backend/src/v5/services/sso/frontegg/components/auth.js
@@ -44,8 +44,8 @@ Auth.validateToken = async ({ token }, userId) => {
 	}
 };
 
-Auth.generateAuthenticationCodeUrl = ({ state, redirectURL, codeChallenge }, tenantId) => {
-	const config = getConfig();
+Auth.generateAuthenticationCodeUrl = async ({ state, redirectURL, codeChallenge }, tenantId) => {
+	const config = await getConfig();
 	const qsObj = deleteIfUndefined({
 		response_type: 'code',
 		scope: 'openId',
@@ -60,7 +60,7 @@ Auth.generateAuthenticationCodeUrl = ({ state, redirectURL, codeChallenge }, ten
 };
 
 Auth.generateToken = async (urlUsed, code, challenge) => {
-	const config = getConfig();
+	const config = await getConfig();
 	const payload = {
 		grant_type: 'authorization_code',
 		code,

diff --git a/backend/src/v5/services/sso/frontegg/components/connections.js b/backend/src/v5/services/sso/frontegg/components/connections.js
@@ -70,11 +70,8 @@ const init = async () => {
 	}
 };
 
-Connection.getConfig = () => {
-	if (!config) {
-		throw new Error('Cannot get config before initialising');
-	}
-
+Connection.getConfig = async () => {
+	await init();
 	return config;
 };
 

diff --git a/backend/src/v5/services/sso/frontegg/components/users.js b/backend/src/v5/services/sso/frontegg/components/users.js
@@ -23,7 +23,7 @@ const Users = {};
 
 Users.getUserById = async (userId) => {
 	try {
-		const config = getConfig();
+		const config = await getConfig();
 		const { data } = await get(`${config.vendorDomain}/identity/resources/vendor-only/users/v1/${userId}`, await getBearerHeader());
 		return data;
 	} catch (err) {
@@ -33,7 +33,7 @@ Users.getUserById = async (userId) => {
 
 Users.createUser = async (accountId, email, name, userData, privateUserData, bypassVerification = false) => {
 	try {
-		const config = getConfig();
+		const config = await getConfig();
 		const payload = deleteIfUndefined({
 			email,
 			name,