Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: salesforce/tough-cookie
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 671ad413b38d7464352886772f57a7ec417d4760
Choose a base ref
...
head repository: salesforce/tough-cookie
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4ff4d29f6cefd279a412b8d62a21142ebd410b36
Choose a head ref

Commits on Jun 25, 2018

  1. Copy the full SHA
    e083fc8 View commit details

Commits on Jul 30, 2018

  1. Merge pull request #116 from salesforce/fix-clone

    Fix jar clone and cloneSync methods, fixing #101
    stash authored Jul 30, 2018
    Copy the full SHA
    6300174 View commit details
  2. Copy the full SHA
    901d898 View commit details
  3. Copy the full SHA
    55a41c1 View commit details
  4. Merge pull request #118 from salesforce/deps-2018jul30

    Update packages & npm audit fix. Merging based on discussion today.
    awaterma authored Jul 30, 2018
    Copy the full SHA
    4cbd182 View commit details
  5. 2.4.4-1

    stash committed Jul 30, 2018
    Copy the full SHA
    3d8570c View commit details
  6. Purposefully don't lock dependencies

    Since this is a module and not an end package, we want CI/etc. to always
    upgrade packages based on semver.
    stash committed Jul 30, 2018
    Copy the full SHA
    550f951 View commit details
  7. Upgrade to punycode 2.1

    stash committed Jul 30, 2018
    Copy the full SHA
    31ad267 View commit details

Commits on Aug 6, 2018

  1. Merge pull request #119 from salesforce/inline-version

    Inline version
    wtfismyip authored Aug 6, 2018
    Copy the full SHA
    b897b49 View commit details

Commits on Aug 14, 2018

  1. Merge pull request #120 from salesforce/no-package-lock

    Purposefully don't lock dependencies
    awaterma authored Aug 14, 2018
    Copy the full SHA
    d6ea115 View commit details
  2. Merge pull request #121 from salesforce/punycode-2.1

    Upgrade to punycode 2.1
    awaterma authored Aug 14, 2018
    Copy the full SHA
    8302ebc View commit details

Commits on Oct 16, 2018

  1. Remove left-over mention of MPL from README

    Closes #129
    stash authored Oct 16, 2018
    Copy the full SHA
    8783d46 View commit details

Commits on Nov 26, 2018

  1. remove all cookies from cookie jar at once (#115)

    * remove all cookies from jar
    * fix typo in readme
    * delete cookies one-by-one for old store implementations
    YevhenLukomskyi authored and stash committed Nov 26, 2018
    Copy the full SHA
    62802ef View commit details
  2. Copy the full SHA
    28f0808 View commit details
  3. Copy the full SHA
    5cc9bd2 View commit details
  4. Additional documentation for removeAllCookies

    Covers the cases where removeAllCookies (and even getAllCookies!) isn't
    implemented, in particular what happens when multiple errors are
    returned.
    stash committed Nov 26, 2018
    Copy the full SHA
    1855bf3 View commit details
  5. Copy the full SHA
    9ff4ba5 View commit details
  6. 2.5.0

    stash committed Nov 26, 2018
    Copy the full SHA
    7c1fdf1 View commit details

Commits on Dec 31, 2018

  1. 1
    Copy the full SHA
    eff9118 View commit details

Commits on Jan 7, 2019

  1. setCookie arg must be Cookie or string

    Addresses #132, partially. The error message is clearer, indicating that
    this method only accepts the afformentioned types. The part of 132 that
    it doesn't address is the whole "Cookie instance from another version of
    the `tough-cookie` package" thing, which isn't really solvable unless we
    somehow expose the Cookie class that "belongs to" this CookieJar class,
    which is maybe another patch.
    stash committed Jan 7, 2019
    Copy the full SHA
    84422cd View commit details
  2. Leave a breadcrumb for setCookie error

    In the event that two tough-cookie modules are loaded, it can be confusing when one sees this error, so help folks figure out how to resolve this.
    stash authored Jan 7, 2019
    Copy the full SHA
    e213c27 View commit details
  3. Merge pull request #137 from salesforce/issue-132

    setCookie arg must be Cookie or string
    stash authored Jan 7, 2019
    Copy the full SHA
    9e2626d View commit details
  4. Merge pull request #136 from gzzhanghao/master

    Use ip-regex instead of net.isIP. Fix #125
    stash authored Jan 7, 2019
    Copy the full SHA
    8aaa5c4 View commit details
  5. Copy the full SHA
    16ba441 View commit details
  6. Merge pull request #138 from salesforce/issue-125

    Fixes #125 
    Upgrades minimum supported node.js version to v6 because (a) ip-regexp doesn't work before v4 and (b) request now requires v6+
    stash authored Jan 7, 2019
    Copy the full SHA
    0ebed2e View commit details
  7. 3.0.0

    stash committed Jan 7, 2019
    Copy the full SHA
    05b4713 View commit details

Commits on Jan 10, 2019

  1. Copy the full SHA
    e8ce830 View commit details

Commits on Feb 4, 2019

  1. Merge pull request #141 from simonihmig/fix-ip-regex

    Downgrade ip-regex dependency to support node 6
    stash authored Feb 4, 2019
    Copy the full SHA
    73920e5 View commit details

Commits on Feb 5, 2019

  1. 3.0.1

    stash committed Feb 5, 2019
    Copy the full SHA
    4350705 View commit details
  2. Copy the full SHA
    a4bf3e2 View commit details
  3. SameSite: set-cookie logic

    stash committed Feb 5, 2019
    Copy the full SHA
    cf3ede8 View commit details
  4. Copy the full SHA
    9582a4f View commit details
  5. Copy the full SHA
    a7a2b5b View commit details
  6. Copy the full SHA
    2b4c8e9 View commit details
  7. SameSite: documentation

    stash committed Feb 5, 2019
    Copy the full SHA
    c84fffe View commit details
  8. Copy the full SHA
    797f0a5 View commit details
  9. Copy the full SHA
    a565060 View commit details
  10. Copy the full SHA
    3abb594 View commit details
  11. Copy the full SHA
    9cdd54e View commit details
  12. .cloneSync should not require object param

    Documentation says: `.cloneSync([store])` 
    So cloneSync does not require `store` param, but it does due to property(`synchronous`) checking
    AlexOwl authored Feb 5, 2019
    Copy the full SHA
    275724b View commit details

Commits on Feb 6, 2019

  1. Copy the full SHA
    23dba9e View commit details

Commits on Feb 7, 2019

  1. Change style 😁👌

    AlexOwl authored Feb 7, 2019
    Copy the full SHA
    ff932cd View commit details

Commits on May 30, 2019

  1. fix(cookie-jar): use typeof for checking type of option

    Works around jestjs/jest#2549 when used in Jest
    SimenB authored May 30, 2019
    Copy the full SHA
    d94532d View commit details

Commits on Aug 21, 2019

  1. use eslint and prettier to apply consistent, modern formatting (#155)

    * use eslint and prettier to apply consistent formatting
    * convert var to let,const
    * prefer template literal over string concatenation
    * prefer arrow function callbacks
    * remove string.prototype.repeat
    * bump async and nyc to latest
    * use Date.prototype.toUTCString to format date
    * reformat async task arrangement to be more compact
    * condense json serialization test with arrow functions
    * require punycode unconditionally
    * update remove cookies test to no assume synchronous store
    * npm test should not run eslint
    jstewmon authored and awaterma committed Aug 21, 2019
    Copy the full SHA
    88618e2 View commit details

Commits on Aug 22, 2019

  1. Copy the full SHA
    c1a791e View commit details
  2. use eslint and prettier to apply consistent, modern formatting (#168)

    * use eslint and prettier to apply consistent formatting
    * convert var to let,const
    * prefer template literal over string concatenation
    * prefer arrow function callbacks
    * remove string.prototype.repeat
    * bump async and nyc to latest
    * use Date.prototype.toUTCString to format date
    * reformat async task arrangement to be more compact
    * condense json serialization test with arrow functions
    * require punycode unconditionally
    * update remove cookies test to no assume synchronous store
    * npm test should not run eslint
    * test: update ietf test dates to impossibly far in the future
    * test: prune unused module var
    jstewmon authored and awaterma committed Aug 22, 2019
    Copy the full SHA
    296a98f View commit details

Commits on Aug 26, 2019

  1. updated PSL

    medelibero-sfdc committed Aug 26, 2019
    Copy the full SHA
    720703f View commit details
  2. Merge pull request #169 from salesforce/deps-20190826

    updated PSL
    wtfismyip authored Aug 26, 2019
    Copy the full SHA
    7b8570c View commit details

Commits on Oct 5, 2019

  1. modify permuteDomain to allow special-use domain 'local'

        this was added because .local domains are commonly used for testing
        purposes inside internal/local networks.
    miggs125 committed Oct 5, 2019
    Copy the full SHA
    873842e View commit details
  2. add allowSpecialUseDomain to MemoryCookieStore.findCookies

        added allowSpecialUseDomain to parameters so that it can be passed to
        permuteDomain, line 103
    miggs125 committed Oct 5, 2019
    Copy the full SHA
    f08f254 View commit details
21 changes: 21 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"extends": ["plugin:prettier/recommended"],
"parserOptions": {
"ecmaVersion": 6
},
"rules": {
"no-debugger": "error",
"no-var": "error",
"prefer-arrow-callback": "error",
"prefer-const": "error",
"prefer-template": "error",
"no-restricted-modules": ["error",
// we can't rely on node standard modules in "native" or "browser" environments
// - exceptions:
// "punycode": since it's a package.json dependency
"assert", "buffer", "child_process", "cluster", "crypto", "dgram", "dns", "domain", "events", "freelist", "fs",
"http", "https", "module", "net", "os", "path", "querystring", "readline", "repl", "smalloc", "stream",
"string_decoder", "sys", "timers", "tls", "tracing", "tty", "url", "util", "vm", "zlib"
]
}
}
26 changes: 26 additions & 0 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Actions-CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [14.x, 16.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies and test
run: npm install
- run: npm test
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -5,3 +5,7 @@ npm-debug.log
docker-compose.override.yml
.nyc_output
coverage
package-lock.json
.npm
.config
.bash_history
70 changes: 0 additions & 70 deletions .jshintrc

This file was deleted.

1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -2,3 +2,4 @@ docker-compose.yml
Dockerfile
.nyc_output
coverage
package-lock.json
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lib/version.js
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -4,8 +4,5 @@ node_js:
- "v10.*"
- "v8.*"
- "v6.*"
- "v4.*"
- "v0.12.*"
- "v0.10.*"
matrix:
fast_finish: true
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Changelog

All notable changes to this project can be found at on the [Releases](https://github.com/salesforce/tough-cookie/releases)
page.

2 changes: 2 additions & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Comment line immediately above ownership line is reserved for related information. Please be careful while editing.
#ECCN:Open Source
105 changes: 105 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
# Salesforce Open Source Community Code of Conduct

## About the Code of Conduct

Equality is a core value at Salesforce. We believe a diverse and inclusive
community fosters innovation and creativity, and are committed to building a
culture where everyone feels included.

Salesforce open-source projects are committed to providing a friendly, safe, and
welcoming environment for all, regardless of gender identity and expression,
sexual orientation, disability, physical appearance, body size, ethnicity, nationality,
race, age, religion, level of experience, education, socioeconomic status, or
other similar personal characteristics.

The goal of this code of conduct is to specify a baseline standard of behavior so
that people with different social values and communication styles can work
together effectively, productively, and respectfully in our open source community.
It also establishes a mechanism for reporting issues and resolving conflicts.

All questions and reports of abusive, harassing, or otherwise unacceptable behavior
in a Salesforce open-source project may be reported by contacting the Salesforce
Open Source Conduct Committee at ossconduct@salesforce.com.

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of gender
identity and expression, sexual orientation, disability, physical appearance,
body size, ethnicity, nationality, race, age, religion, level of experience, education,
socioeconomic status, or other similar personal characteristics.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy toward other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Personal attacks, insulting/derogatory comments, or trolling
* Public or private harassment
* Publishing, or threatening to publish, others' private information—such as
a physical or electronic address—without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
* Advocating for or encouraging any of the above behaviors

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned with this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project email
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the Salesforce Open Source Conduct Committee
at ossconduct@salesforce.com. All complaints will be reviewed and investigated
and will result in a response that is deemed necessary and appropriate to the
circumstances. The committee is obligated to maintain confidentiality with
regard to the reporter of an incident. Further details of specific enforcement
policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership and the Salesforce Open Source Conduct
Committee.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][contributor-covenant-home],
version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html.
It includes adaptions and additions from [Go Community Code of Conduct][golang-coc],
[CNCF Code of Conduct][cncf-coc], and [Microsoft Open Source Code of Conduct][microsoft-coc].

This Code of Conduct is licensed under the [Creative Commons Attribution 3.0 License][cc-by-3-us].

[contributor-covenant-home]: https://www.contributor-covenant.org (https://www.contributor-covenant.org/)
[golang-coc]: https://golang.org/conduct
[cncf-coc]: https://github.com/cncf/foundation/blob/master/code-of-conduct.md
[microsoft-coc]: https://opensource.microsoft.com/codeofconduct/
[cc-by-3-us]: https://creativecommons.org/licenses/by/3.0/us/
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node
FROM node:16
MAINTAINER awaterman@salesforce.com
LABEL Description="Vendor=\"Salesforce.com\" Version=\"1.0\""
RUN apt-get update && \
Loading