Skip to content

Commit 0561385

Browse files
committed
1 parent a017d0c commit 0561385

8 files changed

Lines changed: 64 additions & 46 deletions

File tree

LICENSE

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
License of Authlib (AGPLv3+)
1+
Copyright (c) 2019, Hsiaoming Yang
22

3-
Copyright (C) 2017 Hsiaoming Yang
3+
All rights reserved.
44

5-
This program is free software: you can redistribute it and/or modify
6-
it under the terms of the GNU Affero General Public License as published by
7-
the Free Software Foundation, either version 3 of the License, or
8-
(at your option) any later version.
5+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
96

10-
This program is distributed in the hope that it will be useful,
11-
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU Affero General Public License for more details.
7+
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
148

15-
You should have received a copy of the GNU Affero General Public License
16-
along with this program. If not, see <https://www.gnu.org/licenses/>.
9+
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
10+
11+
* Neither the name of the creator nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
12+
13+
14+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ You can also find it at <https://keybase.io/lepture>.
227227

228228
## License
229229

230-
Authlib is licensed under AGPLv3+. Please see LICENSE for licensing details.
230+
Authlib is licensed under BSD. Please see LICENSE for licensing details.
231231

232232
If this license does not fit your company, consider to purchase a commercial
233233
license. Find more information on [Authlib Plans](https://authlib.org/plans).

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Implementations
4747
License
4848
-------
4949

50-
Authlib is licensed under AGPLv3+. Please see LICENSE for licensing details.
50+
Authlib is licensed under BSD. Please see LICENSE for licensing details.
5151

5252
If this license does not fit your company, consider to purchase a commercial
5353
license. Find more information on `Authlib Plans`_.

authlib/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
implementation to high level framework integrations.
88
99
:copyright: (c) 2017 by Hsiaoming Yang.
10-
:license: AGPLv3+, see LICENSE for more details.
10+
:license: BSD, see LICENSE for more details.
1111
"""
1212
from .consts import version, homepage, author
1313

1414
__version__ = version
1515
__homepage__ = homepage
1616
__author__ = author
17-
__license__ = 'AGPLv3+'
17+
__license__ = 'BSD'

docs/changelog.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,26 @@ Changelog
66

77
Here you can see the full list of changes between each Authlib release.
88

9+
Version 0.11
10+
------------
11+
12+
**Release Date not decided yet.**
13+
14+
**BIG NEWS**: Authlib has changed its open source license from AGPL to BSD.
15+
16+
RFC implementations and updates in this release:
17+
18+
- RFC7518: Added A128GCMKW, A192GCMKW, A256GCMKW algorithms for JWE.
19+
- RFC5849: Removed draft-eaton-oauth-bodyhash-00 spec for OAuth 1.0.
20+
21+
Small changes and bug fixes in this release:
22+
23+
- Fixed missing scope on password and client_credentials grant types
24+
of ``OAuth2Session`` via :gh:`issue#96`.
25+
- Fixed Flask OAuth client cache detection via :gh:`issue#98`.
26+
- Enabled ssl certificates for ``OAuth2Session`` via :gh:`PR#100`, thanks
27+
to pingz.
28+
929
Version 0.10: Kluke
1030
-------------------
1131

docs/community/licenses.rst

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
Authlib Licenses
22
================
33

4-
Authlib offers two licenses, one is APGLv3+ for open source projects, one is
4+
Authlib offers two licenses, one is BSD for open source projects, one is
55
a commercial license for closed source projects.
66

77
Open Source License
88
-------------------
99

10-
Copyright (C) 2017 Hsiaoming Yang
10+
Copyright (c) 2019, Hsiaoming Yang
1111

12-
This program is free software: you can redistribute it and/or modify
13-
it under the terms of the GNU Affero General Public License as published by
14-
the Free Software Foundation, either version 3 of the License, or
15-
(at your option) any later version.
12+
All rights reserved.
1613

17-
This program is distributed in the hope that it will be useful,
18-
but WITHOUT ANY WARRANTY; without even the implied warranty of
19-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20-
GNU Affero General Public License for more details.
14+
Redistribution and use in source and binary forms, with or without
15+
modification, are permitted provided that the following conditions are met:
2116

22-
You should have received a copy of the GNU Affero General Public License
23-
along with this program. If not, see <https://www.gnu.org/licenses/>.
17+
* Redistributions of source code must retain the above copyright notice, this
18+
list of conditions and the following disclaimer.
2419

25-
Commercial License
26-
------------------
20+
* Redistributions in binary form must reproduce the above copyright notice,
21+
this list of conditions and the following disclaimer in the documentation
22+
and/or other materials provided with the distribution.
2723

28-
The content of the commercial license can be found in the repository in a file
29-
named **COMMERCIAL-LICENSE**. You can buy a license at:
24+
* Neither the name of the creator nor the names of its contributors may be
25+
used to endorse or promote products derived from this software without
26+
specific prior written permission.
3027

31-
https://authlib.org/plans
28+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
29+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
30+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
31+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
32+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
33+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
34+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
35+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
36+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
37+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3238

33-
Discuss on License
39+
Commercial License
3440
------------------
3541

36-
There is a discuss on the license issue. I personally don't think AGPL is a
37-
good license for Authlib either. If you have a better understanding of licenses
38-
issues, you can offer your suggestions at:
39-
40-
https://github.com/lepture/authlib/issues/59
42+
The content of the commercial license can be found in the repository in a file
43+
named **COMMERCIAL-LICENSE**. You can get a commercial license at:
4144

42-
.. note::
43-
Authlib will be separated into 3 modules in the future. The client part
44-
will be licensed under BSD, the server part will remain AGPL (or BSD with
45-
Common Clause).
45+
https://authlib.org/plans

docs/community/sustainable.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ supporter, a backer or a company sponsor.
2828
Commercial License
2929
------------------
3030

31-
Authlib is licensed under AGPLv3+, if this license doesn't fit your company,
31+
Authlib is licensed under BSD, if this license doesn't fit your company,
3232
consider to purchase a commercial license.
3333

3434
Find more information on

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
include_package_data=True,
3030
platforms='any',
3131
long_description=readme,
32-
license='GNU AGPLv3+',
32+
license='BSD',
3333
install_requires=client_requires + crypto_requires,
3434
project_urls={
3535
'Documentation': 'https://docs.authib.org/',
@@ -45,7 +45,7 @@
4545
'Framework :: Flask',
4646
'Framework :: Django',
4747
'Intended Audience :: Developers',
48-
'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
48+
'License :: OSI Approved :: BSD License',
4949
'Operating System :: OS Independent',
5050
'Programming Language :: Python',
5151
'Programming Language :: Python :: 2',

0 commit comments

Comments
 (0)