Skip to content

Commit e48d9bb

Browse files
committed
Remove deprecated internal data properties
Signed-off-by: Ivan Kanakarakis <[email protected]>
1 parent 0f19874 commit e48d9bb

File tree

1 file changed

+3
-42
lines changed

1 file changed

+3
-42
lines changed

src/satosa/internal.py

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,6 @@ class InternalData(_Datafy):
109109
A base class for the data carriers between frontends/backends
110110
"""
111111

112-
_DEPRECATED_TO_NEW_MEMBERS = {
113-
"name_id": "subject_id",
114-
"user_id": "subject_id",
115-
"user_id_hash_type": "subject_type",
116-
"approved_attributes": "attributes",
117-
}
118-
119112
def __init__(
120113
self,
121114
auth_info=None,
@@ -124,10 +117,6 @@ def __init__(
124117
subject_id=None,
125118
subject_type=None,
126119
attributes=None,
127-
user_id=None,
128-
user_id_hash_type=None,
129-
name_id=None,
130-
approved_attributes=None,
131120
*args,
132121
**kwargs,
133122
):
@@ -138,21 +127,13 @@ def __init__(
138127
:param subject_id:
139128
:param subject_type:
140129
:param attributes:
141-
:param user_id:
142-
:param user_id_hash_type:
143-
:param name_id:
144-
:param approved_attributes:
145130
146131
:type auth_info: AuthenticationInformation
147132
:type requester: str
148133
:type requester_name:
149134
:type subject_id: str
150135
:type subject_type: str
151136
:type attributes: dict
152-
:type user_id: str
153-
:type user_id_hash_type: str
154-
:type name_id: str
155-
:type approved_attributes: dict
156137
"""
157138
super().__init__(self, *args, **kwargs)
158139
self.auth_info = (
@@ -166,26 +147,6 @@ def __init__(
166147
if requester_name is not None
167148
else [{"text": requester, "lang": "en"}]
168149
)
169-
self.subject_id = (
170-
subject_id
171-
if subject_id is not None
172-
else user_id
173-
if user_id is not None
174-
else name_id
175-
if name_id is not None
176-
else None
177-
)
178-
self.subject_type = (
179-
subject_type
180-
if subject_type is not None
181-
else user_id_hash_type
182-
if user_id_hash_type is not None
183-
else None
184-
)
185-
self.attributes = (
186-
attributes
187-
if attributes is not None
188-
else approved_attributes
189-
if approved_attributes is not None
190-
else {}
191-
)
150+
self.subject_id = subject_id
151+
self.subject_type = subject_type
152+
self.attributes = attributes if attributes is not None else {}

0 commit comments

Comments
 (0)