refactor customer interface to attributes
This commit is contained in:
22
nkode_api.py
22
nkode_api.py
@@ -7,7 +7,7 @@ from src.user import User
|
||||
from src.user_cipher_keys import UserCipherKeys
|
||||
from src.user_signup_session import UserSignupSession
|
||||
from src.user_interface import UserInterface
|
||||
from src.customer_interface import CustomerInterface
|
||||
from src.customer_attributes import CustomerAttributes
|
||||
|
||||
|
||||
class NKodeAPI(BaseModel):
|
||||
@@ -17,7 +17,7 @@ class NKodeAPI(BaseModel):
|
||||
def create_new_customer(self, keypad_size: KeypadSize, nkode_policy: NKodePolicy) -> UUID:
|
||||
new_customer = Customer(
|
||||
customer_id=uuid4(),
|
||||
interface=CustomerInterface.new(keypad_size),
|
||||
attributes=CustomerAttributes.new(keypad_size),
|
||||
users={},
|
||||
nkode_policy=nkode_policy
|
||||
)
|
||||
@@ -28,12 +28,12 @@ class NKodeAPI(BaseModel):
|
||||
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.keypad_size)
|
||||
set_interface = UserInterface.new(customer.attributes.keypad_size)
|
||||
new_session = UserSignupSession(
|
||||
session_id=uuid4(),
|
||||
set_interface=set_interface.attr_indices,
|
||||
set_interface=set_interface.interface,
|
||||
customer_id=customer_id,
|
||||
keypad_size=customer.interface.keypad_size,
|
||||
keypad_size=customer.attributes.keypad_size,
|
||||
)
|
||||
self.signup_sessions[new_session.session_id] = new_session
|
||||
return new_session.session_id, new_session.set_interface
|
||||
@@ -61,19 +61,19 @@ class NKodeAPI(BaseModel):
|
||||
|
||||
passcode = self.signup_sessions[session_id].deduce_passcode(confirm_key_entry)
|
||||
new_user_keys = UserCipherKeys.new(
|
||||
customer.interface.keypad_size,
|
||||
customer.interface.set_vals,
|
||||
customer.attributes.keypad_size,
|
||||
customer.attributes.set_vals,
|
||||
customer.nkode_policy.max_nkode_len
|
||||
)
|
||||
|
||||
enciphered_passcode = new_user_keys.encipher_nkode(passcode, customer.interface)
|
||||
enciphered_passcode = new_user_keys.encipher_nkode(passcode, customer.attributes)
|
||||
new_user = User(
|
||||
username=username,
|
||||
enciphered_passcode=enciphered_passcode,
|
||||
user_keys=new_user_keys,
|
||||
user_interface=UserInterface(
|
||||
attr_indices=self.signup_sessions[session_id].confirm_interface,
|
||||
keypad_size=customer.interface.keypad_size
|
||||
interface=self.signup_sessions[session_id].confirm_interface,
|
||||
keypad_size=customer.attributes.keypad_size
|
||||
),
|
||||
)
|
||||
self.customers[customer_id].add_new_user(new_user)
|
||||
@@ -89,7 +89,7 @@ class NKodeAPI(BaseModel):
|
||||
assert (username in customer.users.keys())
|
||||
user = customer.users[username]
|
||||
user.user_interface.shuffle_interface()
|
||||
return user.user_interface.attr_indices
|
||||
return user.user_interface.interface
|
||||
|
||||
def login(self, customer_id: UUID, username: str, key_selection: list[int]) -> bool:
|
||||
assert (customer_id in self.customers.keys())
|
||||
|
||||
Reference in New Issue
Block a user