Feat: Support for Microsoft Oauth in Email Channel #6227

tejaswinichile · 2023-01-10T19:02:09Z

https://www.loom.com/share/e930184057d549da813f97bc66fff390

1. Added gmail_xoauth 2. fetch_imap email jobs with new oauth token 3. Added ms_oauth_token and expires on datetime

…d imap search update

netlify · 2023-01-10T19:02:27Z

✅ Deploy Preview for chatwoot-storybook ready!

Name	Link
🔨 Latest commit	`759fecf`
🔍 Latest deploy log	https://app.netlify.com/sites/chatwoot-storybook/deploys/63c5b9d244e1a900099fa50d
😎 Deploy Preview	https://deploy-preview-6227--chatwoot-storybook.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

pranavrajs · 2023-01-11T04:23:33Z

app/controllers/microsoft/callbacks_controller.rb

+
+    @response = client.auth_code.get_token(
+      oauth_code,
+      redirect_uri: "#{base_utl}/microsoft/callback"


Suggested change

redirect_uri: "#{base_utl}/microsoft/callback"

redirect_uri: "#{base_url}/microsoft/callback"

pranavrajs · 2023-01-11T04:24:45Z

app/controllers/microsoft/callbacks_controller.rb

+      inbox = create_inbox
+      ::Redis::Alfred.delete(permitted_params['current_account_id'])
+      # ::microsoft::WebhookSubscribeService.new(inbox_id: inbox.id).perform
+      redirect_to app_twitter_inbox_agents_url(account_id: account.id, inbox_id: inbox.id)


Let us rename this path.

pranavrajs · 2023-01-11T04:27:34Z

Gemfile.lock

@@ -249,6 +249,8 @@ GEM
    gli (2.21.0)
    globalid (1.0.0)
      activesupport (>= 5.0)
+    gmail_xoauth (0.4.2)


@tejaswinichile net::imap latest versions support xoauth automatically. We can upgrade the package. No need to do it in this PR. We can take it as a separate task.

pranavrajs

Moving to "request changes" status so that we don't accidently merge this PR.

pranavrajs · 2023-01-12T02:22:40Z

.env.example

+#MS OAUTH creds
+AZURE_APP_ID=
+AZURE_APP_SECRET=
+AZURE_SCOPES = 'Mail.Send offline_access https://graph.microsoft.com/IMAP.AccessAsUser.All https://graph.microsoft.com/SMTP.Send'


@tejaswinichile Why do we need to take this as an env variable?

sojan-official · 2023-01-13T09:53:00Z

app/jobs/channels/refresh_ms_oauth_token_job.rb

+  def perform
+    Channel::Email.where(provider: 'microsoft').each do |channel|
+      # refresh the token here, with microsoft offline_access scope
+      provider_config = channel.provider_config || {}
+
+      refresh_tokens(channel, provider_config.with_indifferent_access) if provider_config[:refresh_token].present?
+    end
+  end


let's move this to services instead. since we won't be using the perform block nor need to inherit the application job. We only need the access_token method, right?

Right! makes sense 👍🏼

sojan-official

refactored the refresh token service a bit and added some addition specs.
noted that specs for callbacks controller is missing

sojan-official · 2023-01-13T13:53:43Z

app/javascript/dashboard/i18n/locale/en/inboxMgmt.json

@@ -53,6 +53,10 @@
          "ENABLE": "Create conversations from mentioned Tweets"
        }
      },
+      "MICROSOFT": {


should this be a part of the frontend PR ?

…ot/chatwoot into feat/microsoft-oauth-apis

github-actions · 2023-02-15T22:04:50Z

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

tejaswinichile added 11 commits January 10, 2023 23:03

fix:

f3c4fcf

1. Added gmail_xoauth 2. fetch_imap email jobs with new oauth token 3. Added ms_oauth_token and expires on datetime

fix:

cab4aa3

1. Added gmail_xoauth 2. fetch_imap email jobs with new oauth token 3. Added ms_oauth_token and expires on datetime

refresh tokens and fetch the mails from ms graph

579bebc

fix: refresh tokens with IMAP; commented conde for the HTTParty

bb5a248

refresh tokens and fetch the mails from ms graph

3247067

code cleaning, hash indifferent access fix, updated schedule class an…

d91d1dc

…d imap search update

send email via SMTP

44a55ac

code sanity changes, addded comments and references

c71c602

rubocop and spec fixes

7a58a70

Feat: microsoft email channel oauth provider and fetching emails

330a36e

minor fixes

96368e8

pr-triage bot added the PR: unreviewed label Jan 10, 2023

pranavrajs reviewed Jan 11, 2023

View reviewed changes

pranavrajs approved these changes Jan 11, 2023

View reviewed changes

pr-triage bot added PR: reviewed-approved and removed PR: unreviewed labels Jan 11, 2023

pranavrajs requested changes Jan 11, 2023

View reviewed changes

pr-triage bot added PR: reviewed-changes-requested and removed PR: reviewed-approved labels Jan 11, 2023

feat: code clean up and refactoring

5f99ffa

pr-triage bot added PR: unreviewed and removed PR: reviewed-changes-requested labels Jan 11, 2023

tejaswinichile and others added 2 commits January 11, 2023 13:37

feat: code clean up and refactoring

48bf5b5

Remove all the frontend code

b10ccb6

pranavrajs reviewed Jan 12, 2023

View reviewed changes

vishnu-narayanan mentioned this pull request Jan 12, 2023

feat: support Oauth for Email Channel #5724

Closed

pranavrajs mentioned this pull request Jan 12, 2023

chore: Create a resuable component for selecting a channel #6241

Merged

Merge branch 'develop' into feat/microsoft-oauth-apis

90471d7

sojan-official reviewed Jan 13, 2023

View reviewed changes

fix: moved refersh_ms_oauth_token job to service

f0bcdda

sojan-official changed the title ~~Feat: Microsoft Oauth Api/s~~ Feat: Support for Microsoft Oauth in Email Channel Jan 13, 2023

sojan-official added 2 commits January 13, 2023 19:11

chore: refactor the token service

4b28672

chore: rubocop fixes

d53b077

sojan-official reviewed Jan 13, 2023

View reviewed changes

tejaswinichile and others added 17 commits January 13, 2023 22:55

spces for callbacks controlelr

2708fc2

spces for callbacks controlelr

5d712dd

Merge branch 'feat/microsoft-oauth-apis' of https://github.com/chatwo…

526b83a

…ot/chatwoot into feat/microsoft-oauth-apis

Merge branch 'develop' into feat/microsoft-oauth-apis

9d941de

fix: failing specs

799f46b

Merge branch 'develop' into feat/microsoft-oauth-apis

5eab1de

chore: remove unneccesary mocks

f18d7a5

Merge branch 'develop' into feat/microsoft-oauth-apis

8e55349

chore: callback controller specs

908c409

chore: remove unwanted code

6a9f78c

chore: spec for model

6adebd1

chore: rubocop

80d977b

chore: more specs

7da09f6

chore: refactor

cae923b

chore: refactor

ba09939

chore: fix specs

10cf72c

Merge branch 'develop' into feat/microsoft-oauth-apis

759fecf

sojan-official merged commit 00cbdaa into develop Jan 16, 2023

sojan-official deleted the feat/microsoft-oauth-apis branch January 16, 2023 21:09

pr-triage bot added PR: merged and removed PR: unreviewed labels Jan 16, 2023

github-actions bot locked as resolved and limited conversation to collaborators Feb 15, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat: Support for Microsoft Oauth in Email Channel #6227

Feat: Support for Microsoft Oauth in Email Channel #6227

tejaswinichile commented Jan 10, 2023

netlify bot commented Jan 10, 2023 •

edited

Loading

pranavrajs Jan 11, 2023

pranavrajs Jan 11, 2023

pranavrajs Jan 11, 2023

pranavrajs left a comment

pranavrajs Jan 12, 2023

sojan-official Jan 13, 2023

tejaswinichile Jan 13, 2023

sojan-official left a comment

sojan-official Jan 13, 2023

github-actions bot commented Feb 15, 2023

	redirect_uri: "#{base_utl}/microsoft/callback"
	redirect_uri: "#{base_url}/microsoft/callback"

Feat: Support for Microsoft Oauth in Email Channel #6227

Feat: Support for Microsoft Oauth in Email Channel #6227

Conversation

tejaswinichile commented Jan 10, 2023

netlify bot commented Jan 10, 2023 • edited Loading

✅ Deploy Preview for chatwoot-storybook ready!

pranavrajs Jan 11, 2023

Choose a reason for hiding this comment

pranavrajs Jan 11, 2023

Choose a reason for hiding this comment

pranavrajs Jan 11, 2023

Choose a reason for hiding this comment

pranavrajs left a comment

Choose a reason for hiding this comment

pranavrajs Jan 12, 2023

Choose a reason for hiding this comment

sojan-official Jan 13, 2023

Choose a reason for hiding this comment

tejaswinichile Jan 13, 2023

Choose a reason for hiding this comment

sojan-official left a comment

Choose a reason for hiding this comment

sojan-official Jan 13, 2023

Choose a reason for hiding this comment

github-actions bot commented Feb 15, 2023

netlify bot commented Jan 10, 2023 •

edited

Loading