Fix/manual submit confirmation

Description

Answering n to the confirmation prompt for submitting jobs via the manual launch script would launch the jobs anyway.

As Thomas pointed out, this is because Prompt.ask returns the response (in this case an "n"), which the if branch did not check properly.

Changed the check to use Confirm.ask instead, which returns a bool True/False based on the response.

Did not notice this during testing since the prompt had False as the default value, whenever I didn't want to submit the jobs I just pressed enter instead of writing in n.

While testing I also noticed that MyMdC has different behaviour for the xcal account and 'normal' accounts: xcal does not pass a scope through during auth, normal accounts require one. Added a simple check to only include the scope the account is not a dummy one (ending with @example.com).

How Has This Been Tested?

Manually

Relevant Documents (optional)

Types of changes

• Bug fix (non-breaking change which fixes an issue)

Checklist:

• My code follows the code style of this project.

Reviewers

@kluyvert @schmidtp

webservice/manual_launch.py

@@ -18,7 +18,7 @@ from rich.progress import (
     TextColumn,
     TimeElapsedColumn,
 )
-from rich.prompt import Prompt
+from rich.prompt import Confirm
 
 parser = argparse.ArgumentParser(
     description="Manually submit calibration jobs.",
@@ -82,14 +82,17 @@ def get_bearer_token() -> str:
         return BEARER["access_token"]
 
     with Client() as client:
-        response = client.post(
-            f"{config['metadata-client']['token-url']}",
-            data={
-                "grant_type": "client_credentials",
-                "client_id": config["metadata-client"]["user-id"],
-                "client_secret": config["metadata-client"]["user-secret"],
-            },
-        )
+        data = {
+            "grant_type": "client_credentials",
+            "client_id": config["metadata-client"]["user-id"],
+            "client_secret": config["metadata-client"]["user-secret"],
+        }
+
+        # With a real user the scope must be set to public
+        if not str(config["metadata-client"]["user-email"]).endswith("example.com"):
+            data["scope"] = "public"
+
+        response = client.post(f"{config['metadata-client']['token-url']}", data=data)
 
     data = response.json()
 
@@ -192,9 +195,9 @@ def main(
     if not really:
         print("[yellow]`--really` flag missing, not submitting jobs")
 
-    if not noconfirm and not Prompt.ask(
+    if not noconfirm and not Confirm.ask(
         f"Submit [red bold]{len(requests)}[/red bold] jobs for proposal "
-        f"[bold]{proposal_no}[/bold]? [y/[bold]n[/bold]]",
+        f"[bold]{proposal_no}[/bold]?",
         default=False,
     ):
         print("[bold red]Aborted[/bold red]")
@@ -212,7 +215,7 @@ def main(
         )
         con = zmq.Context()
         socket = con.socket(zmq.REQ)
-        con = socket.connect("tcp://max-exfl-cal001:5555")
+        socket.connect("tcp://max-exfl-cal001:5555")
 
         if not really:
             #  Fake socket for testing, just logs what would have been sent via ZMQ