refactor user_signup_session.py

This commit is contained in:
2024-07-17 11:51:48 -05:00
parent 802bd46d60
commit 310a86a5f9
6 changed files with 92 additions and 82 deletions

View File

@@ -3,7 +3,7 @@ from pydantic import BaseModel
from src.customer import Customer
from src.models import NKodePolicy
from src.session_cache import SessionCache
from src.user_signup_session import UserSignupSession
from src.user_cipher_keys import UserCipherKeys
from src.user import User
from src.user_interface import UserInterface
@@ -12,13 +12,13 @@ from src.customer_interface import CustomerInterface
class NKodeAPI(BaseModel):
customers: dict[UUID, Customer] = {}
sessions: dict[UUID, SessionCache] = {}
sessions: dict[UUID, UserSignupSession] = {}
def generate_index_interface(self, customer_id: UUID) -> tuple[UUID, list[int]]:
assert (customer_id in self.customers.keys())
customer = self.customers[customer_id]
set_interface = UserInterface.new(customer.interface.attrs_per_key, customer.interface.numb_of_keys)
new_session = SessionCache(
new_session = UserSignupSession(
session_id=uuid4(),
set_interface=set_interface.attr_indices,
customer_id=customer_id,
@@ -38,27 +38,16 @@ class NKodeAPI(BaseModel):
return user.user_interface.attr_indices
def set_nkode(
self, username: str, customer_id: UUID,
key_selection: list[int], session_id: UUID) -> list[int]:
self, username: str,
customer_id: UUID,
key_selection: list[int],
session_id: UUID
) -> list[int]:
assert (customer_id in self.customers.keys())
customer = self.customers[customer_id]
assert (username not in customer.users.keys())
assert (session_id in self.sessions.keys())
session = self.sessions[session_id]
assert (customer_id == session.customer_id)
numb_of_keys = customer.interface.numb_of_keys
attrs_per_key = customer.interface.attrs_per_key
assert (all(0 <= key <= numb_of_keys for key in key_selection))
set_interface = UserInterface(
attr_indices=session.set_interface,
attrs_per_key=attrs_per_key,
numb_of_keys=numb_of_keys,
)
set_interface.disperse_interface()
session.username = username
session.set_key_entry = key_selection
session.confirm_interface = set_interface.attr_indices
self.sessions[session_id] = session
self.sessions[session_id].set_user_nkode(username, customer, key_selection)
return self.sessions[session_id].confirm_interface
def confirm_nkode(self, username: str, customer_id: UUID, confirm_key_entry: list[int], session_id: UUID) -> bool:
@@ -67,30 +56,11 @@ class NKodeAPI(BaseModel):
customer_id == self.sessions[session_id].customer_id and
username == self.sessions[session_id].username
)
session = self.sessions[session_id]
customer = self.customers[customer_id]
numb_of_keys = customer.interface.numb_of_keys
attrs_per_key = customer.interface.attrs_per_key
assert (all(0 <= key <= numb_of_keys for key in confirm_key_entry))
passcode = session.deduce_passcode(attrs_per_key, confirm_key_entry)
set_values = customer.interface.set_vals
if not customer.valid_new_nkode(passcode):
return False
new_user_keys = UserCipherKeys.new(numb_of_keys, attrs_per_key, set_values, customer.nkode_policy.max_nkode_len)
enciphered_passcode = new_user_keys.encipher_nkode(passcode, customer.interface)
new_user = User(
username=username,
enciphered_passcode=enciphered_passcode,
user_keys=new_user_keys,
user_interface=UserInterface(
attr_indices=self.sessions[session_id].confirm_interface,
attrs_per_key=attrs_per_key,
numb_of_keys=numb_of_keys,
),
)
new_user = self.sessions[session_id].create_user(username, customer, confirm_key_entry)
self.customers[customer_id].add_new_user(new_user)
del self.sessions[session_id]
return True
# del self.sessions[session_id]
def login(self, customer_id: UUID, username: str, key_selection: list[int]) -> bool:
assert (customer_id in self.customers.keys())