Added shared account selection module based on the old python API #64

awkrupka · 2023-10-04T12:35:39Z

User can now change his account to one of the accounts shared with him (company and clients) while interacting with the backend. This can be done in one of two ways, by calling:

import flow360 as fl

fl.Accounts.choose_shared_account(<email_address>)

where the account will be switched if the provided email address exists and is shared with the current user or

import flow360 as fl

fl.Accounts.choose_shared_account()

where the user will be prompted to select an account from the list interactively.

Choosing account in interactive mode, please select email from the organization list: 
0: lei@flexcompute.com
1: thomas@flexcompute.com
2: qiqi@flexcompute.com
3: yuwei@flexcompute.com
4: chaitanya@flexcompute.com
5: ben@flexcompute.com
6: runda@flexcompute.com
7: jim@flexcompute.com
8: lin@flexcompute.com
9: james@flexcompute.com
10: yongwei@flexcompute.com
11: maciej@flexcompute.com
12: cj@flexcompute.com
13: feilin@flexcompute.com
Enter address of the account to switch to [0 - 13] or 'q' to abort:

When submitting resources to the server while using a shared account, the user is prompted to confirm the action:

WARNING: You are submitting a resource to a shared account maciej@flexcompute.com.                                             
         This message will not be shown again for this session if you confirm.                                                            
                                                                               
Are you sure you want to proceed? (y/n):

This message shows once per session until the user logs out if the user confirms interactively or by calling

fl.Accounts.confirm_submit()

NOTE: Due to backend issues we currently do not support client accounts, as apikey authentication does not seem to work when requesting their data from the webapi. This will be fixed separately.

maciej-flexcompute · 2023-10-04T18:01:34Z

flow360/error_messages.py

+shared_submit_warning = """\
+You are submitting a resource from a shared account.
+To suppress this message run: flow360 configure --suppress-shared-account-prompt
+"""


I think the message should read:
You are submitting a resource to a shared account (email address).

Fixed in 5035ff0 - the message is updated and confirmation now works per-session and needs to be performed only once until the user logs out, either interactively or by the user calling

fl.Accounts.confirm_submit()

maciej-flexcompute · 2023-10-04T19:31:54Z

flow360/accounts_utils.py

+
+        selected = None
+
+        addresses = [d["userEmail"] for d in company_users]


we try to avoid single letter variables, even in such instances. Use user instead

Renamed to user in 644f8ee

maciej-flexcompute · 2023-10-04T19:36:25Z

flow360/accounts_utils.py

+           user email to impersonate (if email exists among shared accounts),
+           if email is not provided user can select the account interactively
+        """
+        company_users = self._get_company_users()


lets use a list that will have both company users and supported users. Supported in future. Suggest a name shared_accounts

Renamed to shared_accounts in 644f8ee

maciej-flexcompute · 2023-10-04T19:39:55Z

flow360/component/utils.py

@@ -48,6 +50,31 @@ def wrapper_func(*args, **kwargs):
    return wrapper


+def confirm_proceed():


rename function:
shared_account_confirm_proceed() or something similar to indicate that this confirmation is only in case of shared account

Renamed to shared_account_confirm_submit() in 2e584f1

maciej-flexcompute · 2023-10-04T19:41:03Z

flow360/log.py

@@ -289,7 +289,7 @@ def set_logging_file(
    filemode: str = "a",
    level: LogValue = DEFAULT_LEVEL,
    back_up_count: int = 10,
-    max_bytes: int = 10000,
+    max_bytes: int = 100000000,


why changing this again? Is it a conflict?

Accidentally changed when running tests to speed up the process before merging with FLPY-35 fix. Reverting in next commit to prevent conflict.

Reverted in 644f8ee

maciej-flexcompute · 2023-10-05T17:54:52Z

flow360/accounts_utils.py

+
+        return self._current_email
+
+    def leave_shared_account(self):


on leave, we should reset the submit confirm question

awkrupka requested a review from maciej-flexcompute October 4, 2023 12:35

awkrupka force-pushed the andrzej/account_selection branch from 2904f12 to 523db63 Compare October 4, 2023 12:40

maciej-flexcompute reviewed Oct 4, 2023

View reviewed changes

awkrupka force-pushed the andrzej/account_selection branch 3 times, most recently from fb447bd to 2e584f1 Compare October 4, 2023 20:14

maciej-flexcompute approved these changes Oct 5, 2023

View reviewed changes

maciej-flexcompute reviewed Oct 5, 2023

View reviewed changes

[FLPY-37] Added a shared account management module

3441504

awkrupka force-pushed the andrzej/account_selection branch from 2e584f1 to 3441504 Compare October 6, 2023 06:56

awkrupka merged commit 579f543 into develop Oct 6, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added shared account selection module based on the old python API #64

Added shared account selection module based on the old python API #64

awkrupka commented Oct 4, 2023 •

edited

Loading

maciej-flexcompute Oct 4, 2023

awkrupka Oct 4, 2023 •

edited

Loading

maciej-flexcompute Oct 4, 2023

awkrupka Oct 4, 2023

maciej-flexcompute Oct 4, 2023

awkrupka Oct 4, 2023

maciej-flexcompute Oct 4, 2023

awkrupka Oct 4, 2023 •

edited

Loading

maciej-flexcompute Oct 4, 2023

awkrupka Oct 4, 2023 •

edited

Loading

awkrupka Oct 4, 2023

maciej-flexcompute Oct 5, 2023


		selected = None

		addresses = [d["userEmail"] for d in company_users]

		@@ -48,6 +50,31 @@ def wrapper_func(args, *kwargs):
		return wrapper


		def confirm_proceed():

Added shared account selection module based on the old python API #64

Added shared account selection module based on the old python API #64

Conversation

awkrupka commented Oct 4, 2023 • edited Loading

Choose a reason for hiding this comment

awkrupka Oct 4, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

awkrupka Oct 4, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

awkrupka Oct 4, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

awkrupka commented Oct 4, 2023 •

edited

Loading

awkrupka Oct 4, 2023 •

edited

Loading

awkrupka Oct 4, 2023 •

edited

Loading

awkrupka Oct 4, 2023 •

edited

Loading