Skip to content

πŸ“¨ The ultimate agentic social media scheduling tool πŸ€–

feat: more info

Nevo David852ac517a7fa
diff --git a/apps/backend/src/public-api/routes/v1/public.integrations.controller.ts b/apps/backend/src/public-api/routes/v1/public.integrations.controller.ts
index 6a64c0752..99ac59181 100644
--- a/apps/backend/src/public-api/routes/v1/public.integrations.controller.ts
+++ b/apps/backend/src/public-api/routes/v1/public.integrations.controller.ts
@@ -17,6 +17,7 @@ import { streamUploadOptions } from '@gitroom/nestjs-libraries/upload/multer.str
import { ApiTags } from '@nestjs/swagger';
import { GetOrgFromRequest } from '@gitroom/nestjs-libraries/user/org.from.request';
import { GetIncludeDeletedFromRequest } from '@gitroom/nestjs-libraries/user/include.deleted.from.request';
+import { GetOAuthUserIdFromRequest } from '@gitroom/nestjs-libraries/user/oauth.user.id.from.request';
import { Organization } from '@prisma/client';
import { IntegrationService } from '@gitroom/nestjs-libraries/database/prisma/integrations/integration.service';
import { CheckPolicies } from '@gitroom/backend/services/auth/permissions/permissions.ability';
@@ -229,6 +230,24 @@ export class PublicIntegrationsController {
return { connected: true };
}
+ // `user` is only known for OAuth app tokens; an API key belongs to the
+ // whole organization
+ @Get('/me')
+ async getMe(
+ @GetOrgFromRequest() org: Organization,
+ @GetOAuthUserIdFromRequest() userId?: string
+ ) {
+ Sentry.metrics.count('public_api-request', 1);
+ const user = userId ? await this._usersService.getPersonal(userId) : null;
+
+ return {
+ organization: { id: org.id, name: org.name },
+ user: user
+ ? { id: user.id, name: user.name, picture: user.picture?.path || null }
+ : null,
+ };
+ }
+
@Get('/groups')
async listGroups(@GetOrgFromRequest() org: Organization) {
Sentry.metrics.count('public_api-request', 1);
diff --git a/apps/backend/src/services/auth/public.auth.middleware.ts b/apps/backend/src/services/auth/public.auth.middleware.ts
index 7cbcee386..526757b68 100644
--- a/apps/backend/src/services/auth/public.auth.middleware.ts
+++ b/apps/backend/src/services/auth/public.auth.middleware.ts
@@ -44,6 +44,9 @@ export class PublicAuthMiddleware implements NestMiddleware {
}
org = authorization.organization;
+ // The user who approved the OAuth app, so /me can show who is connected
+ // @ts-ignore
+ req.oauthUserId = authorization.userId;
} else {
org = await this._organizationService.getOrgByApiKey(auth);
if (!org) {
diff --git a/libraries/nestjs-libraries/src/user/oauth.user.id.from.request.ts b/libraries/nestjs-libraries/src/user/oauth.user.id.from.request.ts
new file mode 100644
index 000000000..5f578c4a9
--- /dev/null
+++ b/libraries/nestjs-libraries/src/user/oauth.user.id.from.request.ts
@@ -0,0 +1,8 @@
+import { createParamDecorator, ExecutionContext } from '@nestjs/common';
+
+export const GetOAuthUserIdFromRequest = createParamDecorator(
+ (data: unknown, ctx: ExecutionContext) => {
+ const request = ctx.switchToHttp().getRequest();
+ return request.oauthUserId as string | undefined;
+ }
+);