Skip to content

Commit d3ce0c7

Browse files
merge conflict
2 parents d98c5da + 4453385 commit d3ce0c7

File tree

6 files changed

+512
-885
lines changed

6 files changed

+512
-885
lines changed

scripts/run-local.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ try {
2929
# Build and start Orchestrators Function
3030
Start-Process pwsh { -c cd ServerlessMicroservices.FunctionApp.Orchestrators && func start --csharp -p 7074 }
3131

32+
Start-Sleep -Seconds 90
3233
# Open the browser
33-
start 'http://127.0.0.1:8080/'
34+
start 'http://localhost:4280/'
3435

3536
}
3637
finally {

test/settings.example.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
// Auth
2-
window.authClientId = '';
3-
window.authAuthority = '';
4-
window.authScopes = [''];
5-
window.authEnabled = false;
2+
window.authClientId = 'a298b04d-dbe2-4fc8-8191-b64c1fd287e2';
3+
window.authAuthority = 'https://wviriyab2c.b2clogin.com/wviriyab2c.onmicrosoft.com/B2C_1_default-signin';
4+
window.knownAuthority = 'wviriyab2c.b2clogin.com';
5+
window.redirectUri = 'http://localhost:4280';
6+
window.loginScopes = ['openid','https://wviriyab2c.onmicrosoft.com/3ebcd877-a9a5-4d12-9ac8-2c66a925bd77/rideshare'];
7+
window.apiScopes = ['https://wviriyab2c.onmicrosoft.com/3ebcd877-a9a5-4d12-9ac8-2c66a925bd77/rideshare'];
8+
window.authEnabled = true;
9+
610

711
// API endpoints
812
window.apiKey = '';
913
window.apiBaseUrl = '';
10-
window.apiDriversBaseUrl = `http://localhost:7071/api`;
11-
window.apiTripsBaseUrl = `http://localhost:7072/api`;
12-
window.apiPassengersBaseUrl = `http://localhost:7073/api`;
13-
window.signalrInfoUrl = '';
14+
window.apiDriversBaseUrl = 'http://localhost:7071/api';
15+
window.apiTripsBaseUrl = 'http://localhost:7072/api';
16+
window.apiPassengersBaseUrl = 'http://localhost:7073/api';
17+
window.signalrInfoUrl = 'http://localhost:7072/api/';

0 commit comments

Comments
 (0)