Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 56 additions & 19 deletions apps/event-system/services/users/users.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ import {
randomCode,
getFirstAndLastNameFromName,
} from '@libs-private/utils/user';
import { LinkSettings } from '@event-inc/types';
import { generateSettingsRecord } from '@libs-private/service-logic/generators/settings/linkSettings';
import { useGenericCRUDService } from '@libs-private/service-logic/services/genericCRUD';
import { Services } from '@libs-private/data-models/types/services';

class AuthGenericError extends MoleculerError {
constructor() {
Expand Down Expand Up @@ -949,7 +953,7 @@ module.exports = {

_user = await this.createOrUpdateUser({
ctx,
provider: 'programmatic',
provider: 'pica-api',
emails,
email,
username,
Expand All @@ -959,29 +963,62 @@ module.exports = {
profileLink,
organizationId: ctx?.meta?.buildable?._id,
});
const { pointers, _id, buildableId } = _user;

const { _id, email: _email, userKey, firstName: _firstName, lastName: _lastName, state, pointers } = _user;
// Find the settings record from the settings service by the buildableId
const settings = await ctx.broker.call('v1.settings.find', {
query: {
"ownership.buildableId": ctx?.meta?.buildable?._id,
},
});

const buildableId = get(_user, 'client.buildableId');
const containerId = get(_user, 'client.containers[0]._id');
if (!settings || settings.length === 0) {
throw new Error('No settings found for this buildable ID');
}

const token = this.createToken({
_id,
email: _email,
username,
userKey,
buildableId,
containerId,
firstName: _firstName,
lastName: _lastName,
pointers,
});
if (!buildableId) {
throw new Error('buildableId is required to create settings record');
}

if (!_id) {
throw new Error('user id is required to create settings record');
}

const firstSettings: LinkSettings = settings[0];


const newSettings = generateSettingsRecord({
ownership: {
buildableId,
organizationId: ctx?.meta?.buildable?._id,
userId: _id,
},
platforms: firstSettings.connectedPlatforms,
features: firstSettings.features,
buildKitIntegrations: firstSettings.buildKitIntegrations,
})

const { create } = useGenericCRUDService(ctx, Services.Settings, newSettings.ownership);

// Create new settings record with st prefix
const newSettingsRecord = await create('st', newSettings);

// If the newSettingsRecord is not created, throw an error
if (!newSettingsRecord.ok) {
throw new Error('Failed to create new settings record');
}

// Return the pointers
return {
token,
state,
_id,
email,
secrets: {
live: `sk_live${pointers?.[1]}`,
sandbox: `sk_test${pointers?.[0]}`,
}
};


}
catch (error) {
console.error(error);
Expand Down Expand Up @@ -1194,7 +1231,7 @@ module.exports = {
: `${
username || email.substring(0, email.indexOf('@'))
}${randomCode(6)}`,
[`providers.${provider}`]: user,
[`providers.${provider}`]: provider === 'pica-api' ? true : user,
connectedAccounts,
profile: {
//profile may be an array of onboarding questions answered
Expand Down Expand Up @@ -1275,7 +1312,7 @@ module.exports = {
username || email.substring(0, email.indexOf('@'))
}${randomCode(6)}`,
providers: {
[provider]: user,
[provider]: provider === 'pica-api' ? true : user,
},
connectedAccounts: [
// for frontend connected accounts page
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ export const useSettingsService = (ctx: Context, ownership: Ownership) => {
}
);

const { updateMany } = useGenericCRUDService(
ctx,
SERVICE_NAME,
ownership,
{ DISABLE_ADDING_OWNERSHIP_CHECK: true }
);

return {
find,
async get(props: FindRequest = {}): Promise<BResult<Settings, 'service'>> {
Expand Down Expand Up @@ -135,13 +142,40 @@ export const useSettingsService = (ctx: Context, ownership: Ownership) => {
}
}

await updateById(settingsRecord._id, {
const updatedValues = {
connectedPlatforms: settingsRecord.connectedPlatforms,
updatedAt: new Date().getTime(),
updatedDate: new Date().toISOString(),
features: features?.length ? features : settingsRecord.features,
buildKitIntegrations: settingsRecord.buildKitIntegrations || [],
});
updatedAt: new Date().getTime(),
updatedDate: new Date().toISOString(),
};

const result = await updateById(settingsRecord._id, updatedValues);

if (!result.ok) {
console.error(`Failed to update settings record ${settingsRecord._id}`);
}

if (result.ok) {
// Update all settings records with the same organizationId but different buildableId in one operation
const updateResult = await updateMany({
query: {
"ownership.organizationId": ownership.organizationId,
"ownership.buildableId": { "$ne": ownership.buildableId }
},
update: {
$set: {
connectedPlatforms: updatedValues.connectedPlatforms,
features: updatedValues.features,
buildKitIntegrations: updatedValues.buildKitIntegrations,
}
}
});

if (!updateResult.ok) {
console.error('Failed to update multiple settings records');
}
}

return resultOk(true);
}
Expand Down
Loading