Skip to content

Commit 95412c7

Browse files
committed
removed commented code
1 parent ebdfaf1 commit 95412c7

File tree

3 files changed

+0
-274
lines changed

3 files changed

+0
-274
lines changed

kinde_sdk/auth/oauth.py

Lines changed: 0 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -174,155 +174,6 @@ async def generate_pkce_pair(self) -> Dict[str, str]:
174174
"code_challenge": code_challenge
175175
}
176176

177-
178-
# def code_exchange(self, user_id: str, auth_code: str) -> None:
179-
# """Exchange authorization code for tokens and store in session."""
180-
# data = {
181-
# "grant_type": "authorization_code",
182-
# "code": auth_code,
183-
# "redirect_uri": self.redirect_uri,
184-
# "client_id": self.client_id,
185-
# "client_secret": self.client_secret,
186-
# }
187-
# response = requests.post(self.token_url, data=data)
188-
# response.raise_for_status()
189-
# token_data = response.json()
190-
191-
# user_info = {
192-
# "client_id": self.client_id,
193-
# "client_secret": self.client_secret,
194-
# "token_url": self.token_url,
195-
# }
196-
# self.session_manager.set_user_data(user_id, user_info, token_data)
197-
198-
# # def get_login_url(self, state: Optional[str] = None, scope: Optional[List[str]] = None, login_type: Optional[str] = None) -> str:
199-
# # """
200-
# # Get the login URL for user authentication.
201-
202-
# # Args:
203-
# # state (Optional[str]): A state parameter for CSRF protection.
204-
# # scope (Optional[List[str]]): A list of scopes to request.
205-
206-
# # Returns:
207-
# # str: The login URL.
208-
# # """
209-
# # params = {
210-
# # "client_id": self.client_id,
211-
# # "response_type": "code",
212-
# # "redirect_uri": self.redirect_uri,
213-
# # "scope": " ".join(scope) if scope else "openid profile email",
214-
# # "state": state or "",
215-
# # }
216-
# # if login_type:
217-
# # params["login_type"] = login_type
218-
# # return f"{self.auth_url}?{urlencode(params)}"
219-
220-
# # def get_login_url_with_pkce(self, state: Optional[str] = None, scope: Optional[List[str]] = None) -> str:
221-
# # """
222-
# # Get the login URL for PKCE flow.
223-
224-
# # Args:
225-
# # state (Optional[str]): A state parameter for CSRF protection.
226-
# # scope (Optional[List[str]]): A list of scopes to request.
227-
228-
# # Returns:
229-
# # str: The login URL with PKCE parameters.
230-
# # """
231-
# # code_verifier = self.generate_pkce_code_verifier()
232-
# # code_challenge = self.generate_pkce_code_challenge(code_verifier)
233-
234-
# # params = {
235-
# # "client_id": self.client_id,
236-
# # "response_type": "code",
237-
# # "redirect_uri": self.redirect_uri,
238-
# # "scope": " ".join(scope) if scope else "openid profile email",
239-
# # "state": state or "",
240-
# # "code_challenge": code_challenge,
241-
# # "code_challenge_method": "S256",
242-
# # }
243-
# # return f"{self.auth_url}?{urlencode(params)}"
244-
245-
# # def get_user_details(self, user_id: str) -> Dict[str, Any]:
246-
# # """Retrieve user information using the stored token."""
247-
# # token_manager = self.session_manager.user_sessions.get(user_id, {}).get("token_manager")
248-
# # if not token_manager:
249-
# # raise KindeRetrieveException("User not authenticated")
250-
251-
# # access_token = token_manager.get_access_token()
252-
# # headers = {"Authorization": f"Bearer {access_token}"}
253-
# # response = requests.get(self.userinfo_url, headers=headers)
254-
# # response.raise_for_status()
255-
# # return response.json()
256-
257-
# # def logout(self, params: Optional[Dict[str, Any]] = None) -> str:
258-
# # """
259-
# # Generate the logout URL.
260-
261-
# # Args:
262-
# # params (Optional[Dict[str, Any]]): A dictionary of query parameters to include in the logout URL.
263-
# # Supported keys: state, post_logout_redirect_uri.
264-
265-
# # Returns:
266-
# # str: The logout URL.
267-
# # """
268-
# # # Default parameters
269-
# # default_params = {
270-
# # "client_id": self.client_id,
271-
# # "logout_uri": self.redirect_uri,
272-
# # "state": self.state or "",
273-
# # }
274-
275-
# # # Merge default parameters with user-provided parameters
276-
# # if params:
277-
# # if "state" in params:
278-
# # default_params["state"] = params["state"]
279-
# # if "post_logout_redirect_uri" in params:
280-
# # default_params["post_logout_redirect_uri"] = params["post_logout_redirect_uri"]
281-
282-
# # return f"{self.logout_url}?{urlencode(default_params)}"
283-
284-
# # def generate_pkce_code_verifier(self) -> str:
285-
# # """Generate a PKCE code verifier."""
286-
# # return secrets.token_urlsafe(32)
287-
288-
# # def generate_pkce_code_challenge(self, code_verifier: str) -> str:
289-
# # """Generate a PKCE code challenge from the verifier."""
290-
# # code_challenge = hashlib.sha256(code_verifier.encode()).digest()
291-
# # return base64.urlsafe_b64encode(code_challenge).decode().rstrip("=")
292-
293-
# # def get_tokens_for_core(self, user_id: str) -> Optional[Dict[str, str]]:
294-
# """
295-
# Retrieve tokens for the core module.
296-
297-
# Args:
298-
# user_id (str): The ID of the user whose tokens are being retrieved.
299-
300-
# Returns:
301-
# Optional[Dict[str, str]]: A dictionary containing the access token and refresh token (if available).
302-
# Returns None if the user is not authenticated or the session is invalid.
303-
# """
304-
# session = self.session_manager.storage.get(user_id)
305-
# if not session:
306-
# return None
307-
308-
# token_manager = session.get("token_manager")
309-
# if not token_manager:
310-
# return None
311-
312-
# access_token = token_manager.get_access_token()
313-
# if not access_token:
314-
# return None
315-
316-
# tokens = {
317-
# "access_token": access_token,
318-
# }
319-
320-
# refresh_token = token_manager.tokens.get("refresh_token")
321-
# if refresh_token:
322-
# tokens["refresh_token"] = refresh_token
323-
324-
# return tokens
325-
326177
async def generate_auth_url(
327178
self,
328179
route_type: IssuerRouteTypes = IssuerRouteTypes.LOGIN,

kinde_sdk/auth/token_manager.py

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,6 @@ def __init__(self, user_id, client_id, client_secret, token_url):
2929
self.lock = threading.Lock() # Add a lock for thread safety
3030
self.initialized = True
3131

32-
# def set_tokens(self, access_token, refresh_token, expires_in):
33-
# """ Store tokens with expiration. """
34-
# with self.lock:
35-
# self.tokens = {
36-
# "access_token": access_token,
37-
# "refresh_token": refresh_token,
38-
# "expires_at": time.time() + expires_in,
39-
# }
40-
4132
def set_tokens(self, token_data: Dict[str, Any]):
4233
""" Store tokens with expiration. """
4334
with self.lock:
@@ -70,27 +61,6 @@ def set_redirect_uri(self, redirect_uri: str):
7061
"""Set the redirect URI for token exchange."""
7162
self.redirect_uri = redirect_uri
7263

73-
# # def exchange_code_for_token(self, code):
74-
# """
75-
# Exchange an authorization code for an access token.
76-
# """
77-
# data = {
78-
# "grant_type": "authorization_code",
79-
# "code": code,
80-
# "redirect_uri": self.redirect_uri,
81-
# "client_id": self.client_id,
82-
# "client_secret": self.client_secret,
83-
# }
84-
# response = requests.post(self.token_url, data=data)
85-
# response.raise_for_status()
86-
# token_data = response.json()
87-
# self.set_tokens(
88-
# token_data["access_token"],
89-
# token_data["refresh_token"],
90-
# token_data.get("expires_in", 3600),
91-
# )
92-
# return self.tokens["access_token"]
93-
9464
async def exchange_code_for_token(self, code: str, code_verifier: Optional[str] = None):
9565
"""
9666
Exchange an authorization code for an access token.
@@ -120,15 +90,6 @@ async def exchange_code_for_token(self, code: str, code_verifier: Optional[str]
12090
self.set_tokens(token_data)
12191
return self.tokens["access_token"]
12292

123-
# def get_access_token(self):
124-
# """ Get a valid access token. Refresh if expired. """
125-
# if self.tokens and time.time() < self.tokens["expires_at"]:
126-
# return self.tokens["access_token"]
127-
# elif self.tokens.get("refresh_token"):
128-
# return self.refresh_access_token()
129-
# else:
130-
# raise ValueError("No valid tokens available")
131-
13293
def get_access_token(self):
13394
""" Get a valid access token. Refresh if expired. """
13495
with self.lock:
@@ -145,27 +106,6 @@ def get_access_token(self):
145106

146107
return self.tokens["access_token"]
147108

148-
# def refresh_access_token(self):
149-
# """ Use the refresh token to get a new access token. """
150-
# if "refresh_token" not in self.tokens:
151-
# raise ValueError("No refresh token available")
152-
153-
# data = {
154-
# "grant_type": "refresh_token",
155-
# "refresh_token": self.tokens["refresh_token"],
156-
# "client_id": self.client_id,
157-
# "client_secret": self.client_secret,
158-
# }
159-
# response = requests.post(self.token_url, data=data)
160-
# response.raise_for_status()
161-
# token_data = response.json()
162-
# self.set_tokens(
163-
# token_data["access_token"],
164-
# token_data["refresh_token"],
165-
# token_data.get("expires_in", 3600),
166-
# )
167-
# return self.tokens["access_token"]
168-
169109
def refresh_access_token(self):
170110
""" Use the refresh token to get a new access token. """
171111
if "refresh_token" not in self.tokens:
@@ -196,20 +136,6 @@ def get_claims(self):
196136
"""Get the claims from the ID token if available."""
197137
return self.tokens.get("claims", {})
198138

199-
# def revoke_token(self):
200-
# """ Revoke the current access token. """
201-
# if "access_token" not in self.tokens:
202-
# raise ValueError("No access token to revoke")
203-
204-
# data = {
205-
# "token": self.tokens["access_token"],
206-
# "client_id": self.client_id,
207-
# "client_secret": self.client_secret,
208-
# }
209-
# response = requests.post(f"{self.token_url}/revoke", data=data)
210-
# response.raise_for_status()
211-
# self.tokens = {} # Clear stored tokens
212-
213139
def revoke_token(self):
214140
""" Revoke the current access token. """
215141
if "access_token" not in self.tokens:

kinde_sdk/auth/user_session.py

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,6 @@ def __init__(self, storage: StorageInterface):
1010
self.lock = threading.Lock() # Add a lock for thread safety
1111
self.storage = storage # Use the provided storage backend
1212

13-
# def set_user_data(self, user_id, user_info, token_data):
14-
# """Store user session details and associate tokens."""
15-
# with self.lock: # Acquire the lock
16-
# if user_id not in self.user_sessions:
17-
# self.user_sessions[user_id] = {
18-
# "user_info": user_info,
19-
# "token_manager": TokenManager(
20-
# user_id, user_info["client_id"], user_info["client_secret"], user_info["token_url"]
21-
# ),
22-
# }
23-
# self.user_sessions[user_id]["user_info"] = user_info
24-
# self.user_sessions[user_id]["token_manager"].set_tokens(
25-
# token_data["access_token"],
26-
# token_data["refresh_token"],
27-
# token_data["expires_in"],
28-
# )
29-
# self.storage.set(user_id, {"user_info": user_info, "token_manager": self.user_sessions[user_id]["token_manager"]})
30-
3113
def set_user_data(self, user_id: str, user_info: Dict[str, Any], token_data: Dict[str, Any]):
3214
"""Store user session details and associate tokens."""
3315
with self.lock: # Acquire the lock
@@ -108,14 +90,6 @@ def _load_from_storage(self, user_id: str) -> bool:
10890

10991
return True
11092

111-
112-
# def get_user_data(self, user_id):
113-
# """ Retrieve stored user session details. """
114-
# with self.lock:
115-
# # return self.user_sessions.get(user_id, {}).get("user_info")
116-
# session = self.storage.get(user_id)
117-
# return session.get("user_info") if session else None
118-
11993
def get_user_data(self, user_id: str) -> Optional[Dict[str, Any]]:
12094
"""Retrieve stored user session details."""
12195
with self.lock:
@@ -136,12 +110,6 @@ def get_token_manager(self, user_id: str) -> Optional[TokenManager]:
136110

137111
return self.user_sessions.get(user_id, {}).get("token_manager")
138112

139-
# def is_authenticated(self, user_id):
140-
# """ Check if the user is authenticated. """
141-
# with self.lock:
142-
# token_manager = self.user_sessions.get(user_id, {}).get("token_manager")
143-
# return bool(token_manager and token_manager.get_access_token())
144-
145113
def is_authenticated(self, user_id: str) -> bool:
146114
"""Check if the user is authenticated with a valid token."""
147115
with self.lock:
@@ -156,25 +124,6 @@ def is_authenticated(self, user_id: str) -> bool:
156124
except Exception:
157125
return False
158126

159-
# def logout(self, user_id):
160-
# """ Clear user session and tokens. """
161-
# with self.lock:
162-
# if user_id in self.user_sessions:
163-
# self.user_sessions[user_id]["token_manager"].revoke_token()
164-
# del self.user_sessions[user_id]
165-
166-
# def cleanup_expired_sessions(self):
167-
# """Remove expired sessions."""
168-
# with self.lock: # Acquire the lock
169-
# current_time = time.time()
170-
# expired_users = [
171-
# user_id
172-
# for user_id, session in self.user_sessions.items()
173-
# if session["token_manager"].tokens.get("expires_at", 0) < current_time
174-
# ]
175-
# for user_id in expired_users:
176-
# del self.user_sessions[user_id]
177-
178127
def logout(self, user_id: str) -> None:
179128
"""Clear user session and tokens."""
180129
with self.lock:

0 commit comments

Comments
 (0)