twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-10-04 21:07:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

[calendar] change api scope (#4888)

Browse Source 
## Context
Calendar scope was too broad, this PR updates it to events only.
Also changing "Cannot connect Google account to demo workspace" error to
a 404 to avoid having a 500 for something expected
This commit is contained in:
Weiko 2024-04-09 11:18:48 +02:00 committed by GitHub
parent 35717fce8b
commit 19df43156e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,11 @@
import { Controller, Get, Req, Res, UseGuards } from '@nestjs/common';
import {
Controller,
Get,
Req,
Res,
UnauthorizedException,
UseGuards,
} from '@nestjs/common';
import { Response } from 'express';
@ -40,7 +47,9 @@ export class GoogleAPIsAuthController {
const demoWorkspaceIds = this.environmentService.get('DEMO_WORKSPACE_IDS');
if (demoWorkspaceIds.includes(workspaceId)) {
throw new Error('Cannot connect Google account to demo workspace');
throw new UnauthorizedException(
'Cannot connect Google account to demo workspace',
);
}
if (!workspaceId) {

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

@ -35,7 +35,7 @@ export class GoogleAPIsStrategy extends PassportStrategy(
}
if (environmentService.get('CALENDAR_PROVIDER_GOOGLE_ENABLED')) {
scope.push('https://www.googleapis.com/auth/calendar');
scope.push('https://www.googleapis.com/auth/calendar.events');
}
super({