Skip to content

Commit d00588a

Browse files
committed
Updated IdSvr for Xamarin-UWP signin related problems
1 parent 7562919 commit d00588a

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

docker-compose.override.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ services:
3333
- ASPNETCORE_ENVIRONMENT=Development
3434
- ASPNETCORE_URLS=http://0.0.0.0:5105
3535
- SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104
36-
- XamarinCallback=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
36+
- XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback #localhost do not work for UWP login, so we have to use "external" IP always
3737
- ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word
3838
- MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100 #Local: You need to open your local dev-machine firewall at range 5100-5105.
3939
ports:

docker-compose.prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ services:
3838
- SpaClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5104
3939
- ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word
4040
- MvcClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5100 #Local: You need to open your host's firewall at range 5100-5105.
41-
- XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
41+
- XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback
4242
ports:
4343
- "5105:5105"
4444

src/Services/Identity/Identity.API/Configuration/Config.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static IEnumerable<Client> GetClients(Dictionary<string,string> clientsUr
5959
ClientName = "eShop Xamarin OpenId Client",
6060
AllowedGrantTypes = GrantTypes.Implicit,
6161
AllowAccessTokensViaBrowser = true,
62-
RedirectUris = { $"{clientsUrl["Xamarin"]}/" },
62+
RedirectUris = { clientsUrl["Xamarin"] },
6363
RequireConsent = false,
6464
PostLogoutRedirectUris = { "http://13.88.8.119:5105/Account/Redirecting", "http://10.6.1.234:5105/Account/Redirecting" },
6565
AllowedCorsOrigins = { "http://eshopxamarin" },

src/Services/Identity/Identity.API/appsettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
"MvcClient": "http://localhost:5100",
66
"SpaClient": "http://localhost:5104",
7-
"XamarinCallback": "http://localhost:5105",
7+
"XamarinCallback": "http://localhost:5105/xamarincallback",
88
"Logging": {
99
"IncludeScopes": false,
1010
"LogLevel": {

0 commit comments

Comments
 (0)