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

Inline templates #59

Merged
merged 4 commits into from
Jan 18, 2020
Merged

Inline templates #59

merged 4 commits into from
Jan 18, 2020

Conversation

chris-armstrong
Copy link

By submitting a PR to this repository, you agree to the terms within the Auth0 Code of Conduct. Please see the contributing guidelines for how to create and submit a high-quality PR for this repo.

Description

The purpose of this PR is to make it easier to use xml-encryption with a bundler, like webpack.

This PR inlines the template files used by utils.js as JavaScript files instead of using fs.readFileSync() to load them.

This allows webpack to statically include the templates, instead of depending on hacks like that described in #55.

References

See #55

Testing

This code adds no new functionality. Tests pass locally.

Checklist

  • I have added documentation for new/changed functionality in this PR or in auth0.com/docs
  • All active GitHub checks for tests, formatting, and security are passing
  • The correct base branch is being used, if not master

@chris-armstrong chris-armstrong requested a review from a team as a code owner January 13, 2020 05:45
@chris-armstrong
Copy link
Author

Please note the node 4 and 6 builds are failing because of the include mocha upgrade - both these versions of node have long since been deprecated, and the mocha upgrade was necessary to get rid of known security issues in mocha 3.3.0 dependencies.

@gkwang
Copy link
Contributor

gkwang commented Jan 15, 2020

@chris-armstrong thanks for the PR. Can you remove node 4 and 6 from the travis config file so that the CI build will go through?
We will be cutting a new major soon along with this change.
Thanks!

@gkwang gkwang added this to the v1.0.0 milestone Jan 15, 2020
@gkwang
Copy link
Contributor

gkwang commented Jan 16, 2020

Thanks @chris-armstrong looks good. One last ask, can you have the commits signed? We require signed commits to be able to merge into master.
You can follow the process here: https://help.github.com/en/github/authenticating-to-github/managing-commit-signature-verification.

@chris-armstrong
Copy link
Author

chris-armstrong commented Jan 16, 2020 via email

@chris-armstrong
Copy link
Author

Commits are verified now.

@gkwang gkwang merged commit c3507d8 into auth0:master Jan 18, 2020
This was referenced Jan 18, 2020
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.

2 participants