Skip to content

fixing microsoft #1996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: staging
Choose a base branch
from
Draft

fixing microsoft #1996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7202c9
fixing microsoft
ahmetskilinc Aug 20, 2025
23d14f4
fixes all the errors in microsoft.ts
ahmetskilinc Aug 21, 2025
b9923ea
test
ahmetskilinc Aug 21, 2025
a20c018
remove
ahmetskilinc Aug 21, 2025
fbeab53
fixes
ahmetskilinc Aug 21, 2025
b110aa7
some fixes to align with google driver
ahmetskilinc Aug 21, 2025
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
12 changes: 6 additions & 6 deletions apps/mail/lib/constants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { GmailColor, } from '../components/icons/icons';
import { GmailColor, OutlookColor } from '../components/icons/icons';

export const I18N_LOCALE_COOKIE_NAME = 'i18n:locale';
export const SIDEBAR_COOKIE_NAME = 'sidebar:state';
Expand All @@ -18,11 +18,11 @@ export const emailProviders = [
icon: GmailColor,
providerId: 'google',
},
// {
// name: 'Outlook',
// icon: OutlookColor,
// providerId: 'microsoft',
// },
{
name: 'Outlook',
icon: OutlookColor,
providerId: 'microsoft',
},
] as const;

interface GmailColor {
Expand Down
52 changes: 26 additions & 26 deletions apps/server/src/lib/auth-providers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,32 +49,32 @@ export const authProviders = (env: Record<string, string>): ProviderConfig[] =>
},
required: true,
},
// {
// id: 'microsoft',
// name: 'Microsoft',
// requiredEnvVars: ['MICROSOFT_CLIENT_ID', 'MICROSOFT_CLIENT_SECRET'],
// envVarInfo: [
// { name: 'MICROSOFT_CLIENT_ID', source: 'Microsoft Azure App ID' },
// { name: 'MICROSOFT_CLIENT_SECRET', source: 'Microsoft Azure App Password' },
// ],
// config: {
// clientId: env.MICROSOFT_CLIENT_ID,
// clientSecret: env.MICROSOFT_CLIENT_SECRET,
// redirectUri: env.MICROSOFT_REDIRECT_URI,
// scope: [
// 'https://graph.microsoft.com/User.Read',
// 'https://graph.microsoft.com/Mail.ReadWrite',
// 'https://graph.microsoft.com/Mail.Send',
// 'offline_access',
// ],
// authority: 'https://login.microsoftonline.com/common',
// responseType: 'code',
// prompt: 'consent',
// loginHint: 'email',
// disableProfilePhoto: true,
// },
// required: false,
// },
{
id: 'microsoft',
name: 'Microsoft',
requiredEnvVars: ['MICROSOFT_CLIENT_ID', 'MICROSOFT_CLIENT_SECRET'],
envVarInfo: [
{ name: 'MICROSOFT_CLIENT_ID', source: 'Microsoft Azure App ID' },
{ name: 'MICROSOFT_CLIENT_SECRET', source: 'Microsoft Azure App Password' },
],
config: {
clientId: env.MICROSOFT_CLIENT_ID,
clientSecret: env.MICROSOFT_CLIENT_SECRET,
redirectUri: env.MICROSOFT_REDIRECT_URI,
scope: [
'https://graph.microsoft.com/User.Read',
'https://graph.microsoft.com/Mail.ReadWrite',
'https://graph.microsoft.com/Mail.Send',
'offline_access',
],
authority: 'https://login.microsoftonline.com/common',
responseType: 'code',
prompt: 'consent',
loginHint: 'email',
disableProfilePhoto: true,
},
required: false,
},
];

export function isProviderEnabled(provider: ProviderConfig, env: Record<string, string>): boolean {
Expand Down
6 changes: 6 additions & 0 deletions apps/server/src/lib/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,15 @@ const connectionHandlerHook = async (account: Account) => {

const userInfo = await driver.getUserInfo().catch(async () => {
if (account.accessToken) {
console.log('[connectionHandlerHook] revoking token', account.accessToken);
await driver.revokeToken(account.accessToken);
await resetConnection(account.id);
}
throw new Response(null, { status: 301, headers: { Location: '/' } });
});

if (!userInfo?.address) {
console.log('[connectionHandlerHook] no user info address', userInfo);
try {
await Promise.allSettled(
[account.accessToken, account.refreshToken]
Expand All @@ -136,6 +138,10 @@ const connectionHandlerHook = async (account: Account) => {
expiresAt: new Date(Date.now() + (account.accessTokenExpiresAt?.getTime() || 3600000)),
};

console.log('[connectionHandlerHook] creating connection', userInfo);

console.log('[connectionHandlerHook] updatingInfo', updatingInfo);

const db = await getZeroDB(account.userId);
const [result] = await db.createConnection(
account.providerId as EProviders,
Expand Down
4 changes: 2 additions & 2 deletions apps/server/src/lib/brain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ReSummarizeThread, SummarizeMessage, SummarizeThread } from './brain.fallback.prompts';
import { getSubscriptionFactory } from './factories/subscription-factory.registry';
import { AiChatPrompt, StyledEmailAssistantSystemPrompt } from './prompts';
import { resetConnection } from './server-utils';
// import { resetConnection } from './server-utils';
import { EPrompts, EProviders } from '../types';
import { getPromptName } from '../pipelines';
import { env } from '../env';
Expand All @@ -12,7 +12,7 @@ export const enableBrainFunction = async (connection: { id: string; providerId:
await subscriptionFactory.subscribe({ body: { connectionId: connection.id } });
} catch (error) {
console.error(`Failed to enable brain function: ${error}`);
await resetConnection(connection.id);
// await resetConnection(connection.id);
}
};

Expand Down
Loading
Loading