Merge pull request #2910 from Azure/dpwatrous/entra-issues

Allows users to select browser for authentication

Author: gingi

.vsts/win/ci.yml

@@ -7,14 +7,15 @@ steps:
       npm run build:package
     displayName: Build and package
 
-  - pwsh: |
-      . ../.vsts/win/exec.ps1
-      $ErrorActionPreference = "Stop"
-      $env:BE_TEST_AAD_USER_EMAIL = "$(uiTestingAccountEmail)"
-      $env:BE_TEST_AAD_USER_PASSWORD = "$(uiTestingAccountPassword)"
-      npm run test-e2e
-    workingDirectory: desktop
-    displayName: End to end tests
+  # Disabling end-to-end tests in CI pipeline
+  # - pwsh: |
+  #     . ../.vsts/win/exec.ps1
+  #     $ErrorActionPreference = "Stop"
+  #     $env:BE_TEST_AAD_USER_EMAIL = "$(uiTestingAccountEmail)"
+  #     $env:BE_TEST_AAD_USER_PASSWORD = "$(uiTestingAccountPassword)"
+  #     npm run test-e2e
+  #   workingDirectory: desktop
+  #   displayName: End to end tests
 
   - template: ./security-analysis.yml
 

desktop/i18n/resources.resjson

@@ -50,6 +50,11 @@
   "auth-service.activate-tenant": "Activate tenant to authorize",
   "auth-service.tenant-error": "Cannot access resources for tenant {tenantName}",
   "auth-settings.title": "Authentication Settings",
+  "auth.cancel-button.label": "Cancel",
+  "auth.not-logged-in": "You are not logged in. Please log in to continue.",
+  "auth.signin-button.label": "Sign in",
+  "auth.tenant-sign-in-title": "Sign in to {tenant}",
+  "auth.welcome": "Welcome to Azure Batch Explorer",
   "auto-storage-account-picker.clear-button-label": "Clear",
   "auto-storage-account-picker.fields.classic": "Classic",
   "auto-storage-account-picker.fields.location": "Location",
@@ -82,6 +87,7 @@
   "common.back": "Back",
   "common.configuration": "Configuration",
   "common.confirm": "Confirm",
+  "common.copyright": "Copyright",
   "common.creationTime": "Creation time",
   "common.displayName": "Display name",
   "common.done": "Done",
@@ -109,6 +115,7 @@
   "common.updated": "Updated",
   "common.value": "Value",
   "common.version": "Version",
+  "common.welcome": "Welcome to Batch Explorer",
   "common.yes": "Yes",
   "create-new-aad-app.create": "Create",
   "create-new-aad-app.secret.label": "Secret",
@@ -255,6 +262,7 @@
   "main-navigation.dashboard": "Dash",
   "main-navigation.data": "Data",
   "main-navigation.gallery": "Gallery",
+  "main-navigation.home": "Home",
   "main-navigation.jobs": "Jobs",
   "main-navigation.jobschedules": "Job schedules",
   "main-navigation.label": "Main sidebar",
@@ -357,11 +365,12 @@
   "profile-button.about": "About",
   "profile-button.authentication": "Authentication",
   "profile-button.keybindings": "Keybindings",
-  "profile-button.logout": "Logout",
   "profile-button.playground": "Playground",
   "profile-button.profile": "Profile",
   "profile-button.report": "Report a bug or feature request",
   "profile-button.settings": "Settings",
+  "profile-button.sign-in": "Sign in",
+  "profile-button.sign-out": "Sign out",
   "profile-button.thirdPartyNotices": "Third party notices",
   "profile-button.viewLogs": "View logs",
   "profile-button.viewTheme": "View theme colors",
@@ -397,6 +406,8 @@
   "select-dropdown.unselected": "Unselected",
   "server-error.debug-button-label": "Toggle troubleshooting info",
   "settings.advancedSettings": "Advanced settings",
+  "settings.external-browser-auth": "Use system browser for authentication",
+  "settings.external-browser-auth-hint": "Organizations with certain access policies may require sign-in with an internal window. Unset if you experience issues.",
   "settings.gallerySettings": "Gallery settings",
   "settings.general": "General",
   "settings.reset": "Reset to default settings",

desktop/package-lock.json

@@ -102,9 +102,9 @@
     "@angular-eslint/eslint-plugin": "^13.2.1",
     "@angular-eslint/eslint-plugin-template": "^13.2.1",
     "@angular-eslint/template-parser": "^13.2.1",
-    "@angular/compiler-cli": "^11.0.0",
+    "@angular/compiler-cli": "^11.2.12",
     "@batch/common-config": "^1.0.0",
-    "@ngtools/webpack": "^11.0.0",
+    "@ngtools/webpack": "^11.2.12",
     "@playwright/test": "^1.43.1",
     "@types/chart.js": "^2.9.24",
     "@types/d3": "^7.4.0",
@@ -185,17 +185,17 @@
   },
   "dependencies": {
     "@azure/core-util": "1.4.0",
-    "@angular/animations": "^11.0.0",
-    "@angular/cdk": "^11.0.0",
-    "@angular/common": "^11.0.0",
-    "@angular/compiler": "^11.0.0",
-    "@angular/core": "^11.0.0",
-    "@angular/forms": "^11.0.0",
-    "@angular/material": "^11.0.0",
-    "@angular/platform-browser": "^11.0.0",
-    "@angular/platform-browser-dynamic": "^11.0.0",
-    "@angular/platform-server": "^11.0.0",
-    "@angular/router": "^11.0.0",
+    "@angular/animations": "^11.2.12",
+    "@angular/cdk": "^11.2.12",
+    "@angular/common": "^11.2.12",
+    "@angular/compiler": "^11.2.12",
+    "@angular/core": "^11.2.12",
+    "@angular/forms": "^11.2.12",
+    "@angular/material": "^11.2.12",
+    "@angular/platform-browser": "^11.2.12",
+    "@angular/platform-browser-dynamic": "^11.2.12",
+    "@angular/platform-server": "^11.2.12",
+    "@angular/router": "^11.2.12",
     "@azure/bonito-core": "^1.0.0",
     "@azure/bonito-ui": "^1.0.0",
     "@azure/msal-node": "^2.7.0",

desktop/package.json

@@ -61,3 +61,8 @@ export class AccessToken {
         return `${this.tokenType} ${this.accessToken}`;
     }
 }
+
+export interface AuthEvent {
+    type: "signout" | "cancel";
+    message?: string;
+}

desktop/src/@batch-flask/core/aad/access-token/access-token.model.ts

@@ -3,6 +3,7 @@ import { NgModule } from "@angular/core";
 import { MatAutocompleteModule } from "@angular/material/autocomplete";
 import { MatButtonModule } from "@angular/material/button";
 import { MatButtonToggleModule } from "@angular/material/button-toggle";
+import { MatSlideToggleModule } from "@angular/material/slide-toggle";
 import { MatCheckboxModule } from "@angular/material/checkbox";
 import { MatNativeDateModule } from "@angular/material/core";
 import { MatDatepickerModule } from "@angular/material/datepicker";
@@ -31,6 +32,7 @@ const modules = [
     MatDatepickerModule,
     MatDialogModule,
     MatSidenavModule,
+    MatSlideToggleModule,
     PortalModule,
     MatNativeDateModule,
 ];

desktop/src/@batch-flask/core/material.module.ts

@@ -33,3 +33,5 @@ common:
   value: Value
   version: Version
   yes: "Yes"
+  welcome: Welcome to Batch Explorer
+  copyright: Copyright

desktop/src/@batch-flask/ui/common.i18n.yml

@@ -24,6 +24,7 @@ import { InputDirective } from "./input";
 import { KeyValuePickerComponent } from "./key-value-picker";
 import { SimpleFormComponent } from "./simple-form";
 import { SingleLineTextareaDirective } from "./single-line-textarea";
+import { SlideToggleComponent } from "./slide-toggle";
 
 // components
 // Add submodules there
@@ -47,6 +48,7 @@ const components = [
     FormPickerItemTemplateDirective,
     FormSectionComponent,
     HintComponent,
+    SlideToggleComponent,
     InputDirective,
     KeyValuePickerComponent,
     SimpleFormComponent,

desktop/src/@batch-flask/ui/form/form.module.ts

@@ -4,3 +4,4 @@ export * from "./form-picker";
 export * from "./form-section";
 export * from "./complex-form";
 export * from "./simple-form";
+export * from "./slide-toggle";

desktop/src/@batch-flask/ui/form/index.ts

@@ -0,0 +1 @@
+export * from "./slide-toggle.component";