Merge pull request #43 from sander110419/Feature/interactivelogin

Added interactive login

Author: sander110419

functions.py

@@ -4,7 +4,7 @@
 import json
 import logging
 from azure_func import azure_imports
-from azure.identity import ClientSecretCredential, CertificateCredential
+from azure.identity import ClientSecretCredential, CertificateCredential, InteractiveBrowserCredential
 
 class CustomEncoder(json.JSONEncoder):
     def default(self, obj):
@@ -22,7 +22,8 @@ def parse_arguments():
     parser.add_argument('--client_secret', type=str, required=False, help='Client Secret')
     parser.add_argument('--certificate_path', type=str, required=False, help='Path to the certificate file')
     parser.add_argument('--use_device_code', action='store_true', help='Use device code authentication')
-    
+    parser.add_argument('--interactive_login', action='store_true', help='Use interactive login')
+   
     #filter args
     parser.add_argument('--subscription_id', type=str, required=False, help='Subscription ID')
     parser.add_argument('--resource_group', type=str, required=False, help='Resource Group')
@@ -63,8 +64,10 @@ def initialize_data():
 
     return data, start_time
 
-def authenticate_to_azure(tenant_id, client_id, client_secret=None, certificate_path=None, use_device_code=False):
-    if use_device_code:
+def authenticate_to_azure(tenant_id, client_id, client_secret=None, certificate_path=None, use_device_code=None, interactive_login=False):
+    if interactive_login:
+        credential = InteractiveBrowserCredential(client_id=client_id)
+    elif use_device_code:
         # Use DeviceCodeCredential when use_device_code is True
         credential = azure_imports.DeviceCodeCredential(client_id=client_id, tenant_id=tenant_id)
     elif certificate_path:

main.py

@@ -17,7 +17,7 @@
 #initialise data
 data, start_time = initialize_data()
 #authenticate to Azure
-credential, subscription_client = authenticate_to_azure(args.tenant_id, args.client_id, args.client_secret, args.certificate_path, args.use_device_code)
+credential, subscription_client = authenticate_to_azure(args.tenant_id, args.client_id, args.client_secret, args.certificate_path, args.use_device_code, args.interactive_login)
 #Get all subscriptions from erguments
 subscriptions = get_subscriptions(subscription_client, args.subscription_id)
 
@@ -263,9 +263,9 @@ def update_progress_bar(total_resources, rg, total_resourcegroups, processing_ti
     total_resourcegroups -= 1
 
 def authenticate(args):
-    client_secret = None if args.use_device_code or args.certificate_path else args.client_secret
+    client_secret = None if args.use_device_code or args.certificate_path or args.interactive_login else args.client_secret
     certificate_path = None if args.use_device_code else args.certificate_path
-    _, subscription_client = authenticate_to_azure(args.tenant_id, args.client_id, client_secret, certificate_path, args.use_device_code)
+    _, subscription_client = authenticate_to_azure(args.tenant_id, args.client_id, client_secret, certificate_path, args.use_device_code, args.interactive_login)
     return subscription_client
 
 def create_directory(output_folder):