Skip to content

Commit 0d1a9d9

Browse files
authored
Merge pull request #34 from ridi/feature/chagne_dir
Feature/chagne dir
2 parents b8c6c6c + 10ded3c commit 0d1a9d9

8 files changed

Lines changed: 9 additions & 43 deletions

File tree

CHANGES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
Changelog
22
=========
3+
1.0.1 (Oct 10st 2019)
4+
------------------
5+
- Change lib dir to ridi_django_oauth2_lib for preventing dir conflict
6+
- Update README.md
7+
38
1.0.0 (Oct 10st 2019)
49
------------------
510
- Change main logic to get public key from OAuth2 server

README.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,7 @@ AUTH_USER_MODEL = 'ridi_django_oauth2.RidiUser'
2828

2929

3030
# RIDI Setting
31-
RIDI_OAUTH2_JWT_SECRETS = [
32-
{
33-
'kid': '0',
34-
'secret': 'this-is-hs256-key',
35-
'alg': 'HS256',
36-
},
37-
{
38-
'kid': '1',
39-
'secret': 'this-is-rs256-public-key',
40-
'alg': 'RS256',
41-
},
42-
]
31+
RIDI_OAUTH2_KEY_URL = 'https://{auth_server_host}/oauth2/keys/public'
4332
RIDI_OAUTH2_CLIENT_ID = 'this-is-client-id'
4433
RIDI_OAUTH2_CLIENT_SECRET = 'this-is-client-secret'
4534

lib/decorators/memorize.py

Lines changed: 0 additions & 28 deletions
This file was deleted.
File renamed without changes.

ridi_oauth2/introspector/dtos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from Crypto.PublicKey import RSA
66

7-
from lib.utils.bytes import bytes_to_int
7+
from ridi_django_oauth2_lib.utils.bytes import bytes_to_int
88
from ridi_oauth2.introspector.constants import JWK_EXPIRES_MIN
99

1010

ridi_oauth2/introspector/key_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import requests
44
from requests import RequestException, Response
55

6-
from lib.decorators.retry import RetryFailException, retry
6+
from ridi_django_oauth2_lib.decorators.retry import RetryFailException, retry
77
from ridi_django_oauth2.config import RidiOAuth2Config
88
from ridi_oauth2.introspector.constants import JWKKeyType, JWKUse
99
from ridi_oauth2.introspector.dtos import JWKDto

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from setuptools import find_packages, setup
22

3-
version = '1.0.0'
3+
version = '1.0.1'
44

55
# When the project is installed by pip, this is the specification that is used to install its dependencies.
66
install_requires = [

0 commit comments

Comments
 (0)