admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix the bug "require approval" (#9859)

Browse Source 
## The bug : 
"Approval required" even though admin consent has been granted for the
whole tenant"

Fix https://github.com/twentyhq/core-team-issues/issues/277 

### More details
described here in
[stackoverflow](https://stackoverflow.com/questions/79385342/approval-required-even-though-admin-consent-has-been-granted-for-the-whole-ten?noredirect=1#comment140006092_79385342)
This commit is contained in:
Guillim
2025-01-27 14:36:01 +01:00
committed by GitHub
parent c1e84a746c
commit 77c586db24
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-apis-auth.controller.ts
View File

@ -77,7 +77,6 @@ export class MicrosoftAPIsAuthController {
AuthExceptionCode.FORBIDDEN_EXCEPTION, AuthExceptionCode.FORBIDDEN_EXCEPTION,
); );
} }
if (!workspaceId) { if (!workspaceId) {
throw new AuthException( throw new AuthException(
'Workspace not found', 'Workspace not found',
@ -85,6 +84,12 @@ export class MicrosoftAPIsAuthController {
); );
} }
if (emails.length === 0) {
throw new AuthException(
'No email - Ask your Azure Entra Admin to add you one on top of your User Principal Name',
AuthExceptionCode.USER_NOT_FOUND,
);
}
const handle = emails[0].value; const handle = emails[0].value;
await this.microsoftAPIsService.refreshMicrosoftRefreshToken({ await this.microsoftAPIsService.refreshMicrosoftRefreshToken({

2
packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-request-code.auth.strategy.ts
View File

@ -21,7 +21,7 @@ export class GoogleAPIsOauthRequestCodeStrategy extends GoogleAPIsOauthCommonStr
options = { options = {
...options, ...options,
accessType: 'offline', accessType: 'offline',
prompt: 'consent', prompt: 'select_account',
loginHint: req.params.loginHint, loginHint: req.params.loginHint,
state: JSON.stringify({ state: JSON.stringify({
transientToken: req.params.transientToken, transientToken: req.params.transientToken,

2
packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft-apis-oauth-request-code.auth.strategy.ts
View File

@ -13,7 +13,7 @@ export class MicrosoftAPIsOauthRequestCodeStrategy extends MicrosoftAPIsOauthCom
options = { options = {
...options, ...options,
accessType: 'offline', accessType: 'offline',
prompt: 'consent', prompt: 'select_account',
loginHint: req.params.loginHint, loginHint: req.params.loginHint,
state: JSON.stringify({ state: JSON.stringify({
transientToken: req.params.transientToken, transientToken: req.params.transientToken,