Skip to content
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.

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

Xero authentication flow #40277

Merged

Conversation

SzymczakJ
Copy link
Contributor

@SzymczakJ SzymczakJ commented Apr 16, 2024

Details

This PR is part of the Xero integration project where we supports integration with Xero, an accounting software, on New Expensify.

This PR adds a button that the user can click to start the authentication flow with the Xero, similarily to QBO authentication flow. On both web and native platforms, this button opens up a new web page where the user can authenticate with the Xero. After the authentication is complete, the user's authentication token is stored in the backend and the web page closes.

On a web browser, the web page is opened on a separate browser window. On iOS and Android, a temporary browser window is opened as a modal within the app to display the web page.

This PR also adds support to 'Other integrations' section on PolicyAccountingPage. When one of accounting integration is successfully connected, then the rest of integrations is put into 'Other integrations' section.

Fixed Issues

$ #39725
$ #39955
PROPOSAL:

Tests

To test this you need to add .env file in root of the project with following content
ENVIRONMENT=staging

  1. Create a Collect type workspace that has areConnectionsEnabled = true prop(you can set it on OldDot by writing commands in console like on screen-shot)
    Screenshot 2024-04-19 at 12 55 12
  2. On workspace page go to the "More features" and enable "Accounting"
  3. Go to the new "Accounting" menu entry and try setting up connection with Xero.
  4. Try to set up Xero connection.
  5. Try to open up 'Other integrations' and set up QBO(modal with disconnecting from QBO should pop up)
Screenshot 2024-04-24 at 15 30 04
  1. Try connecting to Xero from 'Other integrations' the same way you connected to QBO.
  2. Try disconnecting from Xero by clicking three dots and then 'Disconnect'
Screenshot 2024-04-24 at 15 29 03

Offline tests

QA Steps

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@SzymczakJ SzymczakJ changed the title xero auth flow Xero authentication flow Apr 19, 2024
@SzymczakJ SzymczakJ marked this pull request as ready for review April 19, 2024 16:15
@SzymczakJ SzymczakJ requested a review from a team as a code owner April 19, 2024 16:15
@melvin-bot melvin-bot bot requested review from mollfpr and removed request for a team April 19, 2024 16:15
Copy link

melvin-bot bot commented Apr 19, 2024

@mollfpr Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

Copy link
Contributor

@filip-solecki filip-solecki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add also ES translations

src/components/ConnectToXeroButton/index.native.tsx Outdated Show resolved Hide resolved
src/pages/workspace/accounting/PolicyAccountingPage.tsx Outdated Show resolved Hide resolved
const {title, icon, setupConnectionButton} = accountingIntegrationData(integration, policyID, translate, styles);
return {
icon,
iconType: 'avatar',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use CONST.ICON_TYPE_AVATAR

src/pages/workspace/accounting/PolicyAccountingPage.tsx Outdated Show resolved Hide resolved
src/pages/workspace/accounting/PolicyAccountingPage.tsx Outdated Show resolved Hide resolved
@SzymczakJ
Copy link
Contributor Author

bump @mollfpr 😃

@mountiny mountiny requested review from mountiny and mananjadhav and removed request for mollfpr April 22, 2024 15:58

const getXeroSetupLink = (policyID: string) => {
const params = new URLSearchParams({policyID});
const commandURL = getCommandURL({command: 'ConnectPolicyToXero', shouldSkipWebProxy: true});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it the final version and we are sure we want to skip web proxy? 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right now proxy causes 407 Proxy Authentication Required error. When we adjust backend to work with proxy then we can remove this, but let's not allow this to block us

@mananjadhav
Copy link
Collaborator

I'll be back on the review here in an hour.

@rushatgabhane
Copy link
Member

Did you create a new account?

Yes

Did you setup any data in that? All I did is create a new Xero account and a basic company with no details/data

Yes same.

@lakchote
Copy link
Contributor

A PR to fix the sync progress not being displayed is under review, and will be merged as soon as possible.

@lakchote
Copy link
Contributor

lakchote commented Apr 29, 2024

@cdOut you'll need to update the translations with this copy:

English:

Disconnect Xero
Are you sure you want to disconnect Xero?

Spanish:

Desconectar Xero
¿Estás seguro de que quieres desconectar Xero?

English:

Disconnect Xero
Are you sure you want to disconnect Xero to set up QuickBooks Online?

Spanish:

Desconectar Xero
¿Estás seguro de que quieres desconectar Xero para configurar QuickBooks Online?

@cdOut
Copy link
Contributor

cdOut commented Apr 29, 2024

@mananjadhav I've pushed fixes to the recently added suggestions and also updated the translations. PR should be ready to be re-tested, let me know if I've missed any issues.

@mananjadhav
Copy link
Collaborator

mananjadhav commented Apr 29, 2024

Overall the auth change works, but disconnect doesn't.

  1. Clicking on Disconnect doesn't work for Xero.
  2. Clicking on Cancel doesn't land me back to the App.
  3. On Desktop after successful connection it didn't redirect back to the Desktop app.
  4. There's a slight delay after successful connection, and you end up seeing the setup clickable button. In extension to this, should we be having a loader state when the connection is being authentication?
  5. When I click on Sync now for Xero, it shows Importing your Quickbooks Online data.
Screen.Recording.2024-04-29.at.11.57.57.PM.mov

@mananjadhav
Copy link
Collaborator

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
android-xero-authentication_J1ZqJV0D.mp4
Android: mWeb Chrome
mweb-chrome-xero-authentication.mov
iOS: Native
iOS: mWeb Safari
mweb-safari-xero-authentication.mov
MacOS: Chrome / Safari
web-xero-authentication.mov
MacOS: Desktop
desktop-xero-authentication.mov

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mananjadhav Thanks! I think we can go ahead with this now and we can fix the Xero disconnect issue as a quick follow up. Getting this to staging will help us get more testing on this flow

@lakchote
Copy link
Contributor

lakchote commented Apr 29, 2024

Overall the auth change works, but disconnect doesn't.

  1. Clicking on Disconnect doesn't work for Xero.
  2. Clicking on Cancel doesn't land me back to the App.
  3. On Desktop after successful connection it didn't redirect back to the Desktop app.
  4. There's a slight delay after successful connection, and you end up seeing the setup clickable button. In extension to this, should we be having a loader state when the connection is being authentication?
  5. When I click on Sync now for Xero, it shows Importing your Quickbooks Online data.

Thank you for this recap on what needs to be fixed.

Regarding 4. the slight delay with the Set upclickable button, there's an issue for this that has been created for QBO. You can take a look here. We should take a moment to think on how to handle this (a new fullSync param/logic was added to QBO job).

Concerning the loading states, we should have them, it'll be fixed when the PR to fix push notifications will be merged.

For the reasons mentioned above by @mountiny, I'm going to proceed with the merge so we can identify and fix as soon as possible eventual new issues that'll arise on staging.

@lakchote lakchote merged commit 49db149 into Expensify:main Apr 29, 2024
17 checks passed
@OSBotify
Copy link
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/francoisl in version: 1.4.67-7 🚀

platform result
🤖 android 🤖 failure ❌
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/lakchote in version: 1.4.68-0 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 web 🕸 success ✅

@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/francoisl in version: 1.4.67-7 🚀

platform result
🤖 android 🤖 failure ❌
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

@OSBotify
Copy link
Contributor

OSBotify commented May 1, 2024

🚀 Deployed to production by https://github.com/francoisl in version: 1.4.68-3 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

setIsDisconnectModalOpen(true);
return;
}
setWebViewOpen(true);
}}
text={translate('workspace.accounting.setup')}
style={styles.justifyContentCenter}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We deleted this style caused a regression here

onClose={() => setWebViewOpen(false)}
fullscreen
isVisible={isWebViewOpen}
type={CONST.MODAL.MODAL_TYPE.CENTERED}
Copy link
Member

@rushatgabhane rushatgabhane Jun 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This modal type has a bug for android. More details here: #40978 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants