# Introduction In this PR we've migrated `twenty-shared` from a `vite` app [libary-mode](https://vite.dev/guide/build#library-mode) to a [preconstruct](https://preconstruct.tools/) "atomic" application ( in the future would like to introduce preconstruct to handle of all our atomic dependencies such as `twenty-emails` `twenty-ui` etc it will be integrated at the monorepo's root directly, would be to invasive in the first, starting incremental via `twenty-shared`) For more information regarding the motivations please refer to nor: - https://github.com/twentyhq/core-team-issues/issues/587 - https://github.com/twentyhq/core-team-issues/issues/281#issuecomment-2630949682 close https://github.com/twentyhq/core-team-issues/issues/589 close https://github.com/twentyhq/core-team-issues/issues/590 ## How to test In order to ease the review this PR will ship all the codegen at the very end, the actual meaning full diff is `+2,411 −114` In order to migrate existing dependent packages to `twenty-shared` multi barrel new arch you need to run in local: ```sh yarn tsx packages/twenty-shared/scripts/migrateFromSingleToMultiBarrelImport.ts && \ npx nx run-many -t lint --fix -p twenty-front twenty-ui twenty-server twenty-emails twenty-shared twenty-zapier ``` Note that `migrateFromSingleToMultiBarrelImport` is idempotent, it's atm included in the PR but should not be merged. ( such as codegen will be added before merging this script will be removed ) ## Misc - related opened issue preconstruct https://github.com/preconstruct/preconstruct/issues/617 ## Closed related PR - https://github.com/twentyhq/twenty/pull/11028 - https://github.com/twentyhq/twenty/pull/10993 - https://github.com/twentyhq/twenty/pull/10960 ## Upcoming enhancement: ( in others dedicated PRs ) - 1/ refactor generate barrel to export atomic module instead of `*` - 2/ generate barrel own package with several files and tests - 3/ Migration twenty-ui the same way - 4/ Use `preconstruct` at monorepo global level ## Conclusion As always any suggestions are welcomed !
98 lines
3.6 KiB
TypeScript
98 lines
3.6 KiB
TypeScript
import { Injectable } from '@nestjs/common';
|
|
|
|
import { assertUnreachable } from 'twenty-shared/utils';
|
|
import { ConnectedAccountProvider } from 'twenty-shared/types';
|
|
|
|
import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
|
|
import {
|
|
GoogleAPIRefreshAccessTokenService,
|
|
GoogleTokens,
|
|
} from 'src/modules/connected-account/refresh-tokens-manager/drivers/google/services/google-api-refresh-access-token.service';
|
|
import {
|
|
MicrosoftAPIRefreshAccessTokenService,
|
|
MicrosoftTokens,
|
|
} from 'src/modules/connected-account/refresh-tokens-manager/drivers/microsoft/services/microsoft-api-refresh-tokens.service';
|
|
import {
|
|
ConnectedAccountRefreshAccessTokenException,
|
|
ConnectedAccountRefreshAccessTokenExceptionCode,
|
|
} from 'src/modules/connected-account/refresh-tokens-manager/exceptions/connected-account-refresh-tokens.exception';
|
|
import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
|
|
|
|
export type ConnectedAccountTokens = GoogleTokens | MicrosoftTokens;
|
|
|
|
@Injectable()
|
|
export class ConnectedAccountRefreshTokensService {
|
|
constructor(
|
|
private readonly googleAPIRefreshAccessTokenService: GoogleAPIRefreshAccessTokenService,
|
|
private readonly microsoftAPIRefreshAccessTokenService: MicrosoftAPIRefreshAccessTokenService,
|
|
private readonly twentyORMManager: TwentyORMManager,
|
|
) {}
|
|
|
|
async refreshAndSaveTokens(
|
|
connectedAccount: ConnectedAccountWorkspaceEntity,
|
|
workspaceId: string,
|
|
): Promise<string> {
|
|
const refreshToken = connectedAccount.refreshToken;
|
|
|
|
if (!refreshToken) {
|
|
throw new ConnectedAccountRefreshAccessTokenException(
|
|
`No refresh token found for connected account ${connectedAccount.id} in workspace ${workspaceId}`,
|
|
ConnectedAccountRefreshAccessTokenExceptionCode.REFRESH_TOKEN_NOT_FOUND,
|
|
);
|
|
}
|
|
|
|
const connectedAccountTokens = await this.refreshTokens(
|
|
connectedAccount,
|
|
refreshToken,
|
|
workspaceId,
|
|
);
|
|
|
|
try {
|
|
const connectedAccountRepository =
|
|
await this.twentyORMManager.getRepository<ConnectedAccountWorkspaceEntity>(
|
|
'connectedAccount',
|
|
);
|
|
|
|
await connectedAccountRepository.update(
|
|
{ id: connectedAccount.id },
|
|
connectedAccountTokens,
|
|
);
|
|
} catch (error) {
|
|
throw new Error(
|
|
`Error saving the new tokens for connected account ${connectedAccount.id} in workspace ${workspaceId}: ${error.message} `,
|
|
);
|
|
}
|
|
|
|
return connectedAccountTokens.accessToken;
|
|
}
|
|
|
|
async refreshTokens(
|
|
connectedAccount: ConnectedAccountWorkspaceEntity,
|
|
refreshToken: string,
|
|
workspaceId: string,
|
|
): Promise<ConnectedAccountTokens> {
|
|
try {
|
|
switch (connectedAccount.provider) {
|
|
case ConnectedAccountProvider.GOOGLE:
|
|
return this.googleAPIRefreshAccessTokenService.refreshAccessToken(
|
|
refreshToken,
|
|
);
|
|
case ConnectedAccountProvider.MICROSOFT:
|
|
return this.microsoftAPIRefreshAccessTokenService.refreshTokens(
|
|
refreshToken,
|
|
);
|
|
default:
|
|
return assertUnreachable(
|
|
connectedAccount.provider,
|
|
`Provider ${connectedAccount.provider} not supported`,
|
|
);
|
|
}
|
|
} catch (error) {
|
|
throw new ConnectedAccountRefreshAccessTokenException(
|
|
`Error refreshing tokens for connected account ${connectedAccount.id} in workspace ${workspaceId}: ${error.message} ${error?.response?.data?.error_description}`,
|
|
ConnectedAccountRefreshAccessTokenExceptionCode.REFRESH_ACCESS_TOKEN_FAILED,
|
|
);
|
|
}
|
|
}
|
|
}
|