Skip to content

Commit b5c1215

Browse files
committed
Removed deprecated message factory
1 parent 2e751ed commit b5c1215

File tree

4 files changed

+2
-114
lines changed

4 files changed

+2
-114
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ The format is based on the [KeepAChangeLog] project.
99

1010
### Removed
1111
- [#671] Removed deprecated request/response_cls kwargs from Provider/Client methods
12+
- [#676] Removed deprecated message factory and related stuff
1213

1314
[#671]: https://github.com/OpenIDC/pyoidc/pull/XXX
15+
[#676]: https://github.com/OpenIDC/pyoidc/pull/676
1416

1517
## 1.0.1 [2019-06-30]
1618

src/oic/extension/message.py

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import inspect
2-
import sys
32
from urllib.parse import urlparse
43

54
import requests
@@ -190,34 +189,6 @@ class ClientUpdateRequest(RegistrationRequest):
190189
)
191190

192191

193-
MSG = {
194-
"RegistrationRequest": RegistrationRequest,
195-
"ClientInfoResponse": ClientInfoResponse,
196-
"ClientRegistrationError": ClientRegistrationError,
197-
"ClientUpdateRequest": ClientUpdateRequest,
198-
"TokenRevocationRequest": TokenRevocationRequest,
199-
"TokenIntrospectionRequest": TokenIntrospectionRequest,
200-
"TokenIntrospectionResponse": TokenIntrospectionResponse,
201-
"SoftwareStatement": SoftwareStatement,
202-
"StateJWT": StateJWT,
203-
}
204-
205-
206-
def factory(msgtype):
207-
for _, obj in inspect.getmembers(sys.modules[__name__]):
208-
if inspect.isclass(obj) and issubclass(obj, Message):
209-
try:
210-
if obj.__name__ == msgtype:
211-
return obj
212-
except AttributeError:
213-
pass
214-
215-
# check among standard OAuth2 messages
216-
from oic.oauth2 import message
217-
218-
return message.factory(msgtype)
219-
220-
221192
def make_software_statement(keyjar, iss, **kwargs):
222193
params = list(inspect.signature(JWT.__init__).parameters.keys())
223194

src/oic/oauth2/message.py

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import copy
22
import json
33
import logging
4-
import warnings
54
from collections import MutableMapping
65
from collections import namedtuple
76
from typing import Any # noqa - This is used for MyPy
@@ -1146,35 +1145,6 @@ class ASConfigurationResponse(Message):
11461145
c_default = {"version": "3.0"}
11471146

11481147

1149-
MSG = {
1150-
"Message": Message,
1151-
"ErrorResponse": ErrorResponse,
1152-
"AuthorizationErrorResponse": AuthorizationErrorResponse,
1153-
"TokenErrorResponse": TokenErrorResponse,
1154-
"AccessTokenRequest": AccessTokenRequest,
1155-
"AuthorizationRequest": AuthorizationRequest,
1156-
"AuthorizationResponse": AuthorizationResponse,
1157-
"AccessTokenResponse": AccessTokenResponse,
1158-
"NoneResponse": NoneResponse,
1159-
"ROPCAccessTokenRequest": ROPCAccessTokenRequest,
1160-
"CCAccessTokenRequest": CCAccessTokenRequest,
1161-
"RefreshAccessTokenRequest": RefreshAccessTokenRequest,
1162-
"ResourceRequest": ResourceRequest,
1163-
"ASConfigurationResponse": ASConfigurationResponse,
1164-
}
1165-
1166-
1167-
def factory(msgtype):
1168-
warnings.warn(
1169-
"`factory` is deprecated. Use `OauthMessageFactory` instead.",
1170-
DeprecationWarning,
1171-
)
1172-
try:
1173-
return MSG[msgtype]
1174-
except KeyError:
1175-
raise FormatError("Unknown message type: %s" % msgtype)
1176-
1177-
11781148
MessageTuple = namedtuple("MessageTuple", ["request_cls", "response_cls"])
11791149

11801150

src/oic/oic/message.py

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
import inspect
21
import json
32
import logging
4-
import sys
53
import time
6-
import warnings
74
from typing import Dict # noqa
85
from typing import List # noqa
96
from urllib.parse import urlencode
@@ -1120,58 +1117,6 @@ class FrontChannelLogoutRequest(Message):
11201117
c_param = {"iss": SINGLE_OPTIONAL_STRING, "sid": SINGLE_OPTIONAL_STRING}
11211118

11221119

1123-
MSG = {
1124-
"RefreshAccessTokenRequest": RefreshAccessTokenRequest,
1125-
"TokenErrorResponse": TokenErrorResponse,
1126-
"AccessTokenResponse": AccessTokenResponse,
1127-
"UserInfoRequest": UserInfoRequest,
1128-
"AuthorizationResponse": AuthorizationResponse,
1129-
"AuthorizationErrorResponse": AuthorizationErrorResponse,
1130-
"AuthorizationRequest": AuthorizationRequest,
1131-
"AccessTokenRequest": AccessTokenRequest,
1132-
"AddressClaim": AddressClaim,
1133-
"OpenIDSchema": OpenIDSchema,
1134-
"RegistrationRequest": RegistrationRequest,
1135-
"RegistrationResponse": RegistrationResponse,
1136-
"ClientRegistrationErrorResponse": ClientRegistrationErrorResponse,
1137-
"IdToken": IdToken,
1138-
"RefreshSessionRequest": RefreshSessionRequest,
1139-
"RefreshSessionResponse": RefreshSessionResponse,
1140-
"CheckSessionRequest": CheckSessionRequest,
1141-
"CheckIDRequest": CheckIDRequest,
1142-
"EndSessionRequest": EndSessionRequest,
1143-
"EndSessionResponse": EndSessionResponse,
1144-
"Claims": Claims,
1145-
"OpenIDRequest": OpenIDRequest,
1146-
"ProviderConfigurationResponse": ProviderConfigurationResponse,
1147-
"AuthnToken": AuthnToken,
1148-
"UserInfoErrorResponse": UserInfoErrorResponse,
1149-
"DiscoveryRequest": DiscoveryRequest,
1150-
"DiscoveryResponse": DiscoveryResponse,
1151-
"ResourceRequest": ResourceRequest,
1152-
# LOGOUT messages
1153-
"LogoutToken": LogoutToken,
1154-
"BackChannelLogoutRequest": BackChannelLogoutRequest,
1155-
"FrontChannelLogoutRequest": FrontChannelLogoutRequest,
1156-
}
1157-
1158-
1159-
def factory(msgtype):
1160-
warnings.warn(
1161-
"`factory` is deprecated. Use `OIDCMessageFactory` instead.", DeprecationWarning
1162-
)
1163-
for _, obj in inspect.getmembers(sys.modules[__name__]):
1164-
if inspect.isclass(obj) and issubclass(obj, Message):
1165-
try:
1166-
if obj.__name__ == msgtype:
1167-
return obj
1168-
except AttributeError:
1169-
pass
1170-
1171-
# Fall back to basic OAuth2 messages
1172-
return message.factory(msgtype)
1173-
1174-
11751120
class OIDCMessageFactory(MessageFactory):
11761121
"""Factory that knows OIDC message types."""
11771122

0 commit comments

Comments
 (0)