new uri settings

src/Api/Startup.cs

@@ -178,9 +178,9 @@ namespace Bit.Api
         {
             var options = new IdentityServerAuthenticationOptions
             {
-                Authority = globalSettings.BaseIdentityUri,
+                Authority = globalSettings.BaseServiceUri.InternalIdentity,
                 AllowedScopes = new string[] { "api" },
-                RequireHttpsMetadata = !env.IsDevelopment(),
+                RequireHttpsMetadata = false && !env.IsDevelopment(),
                 ApiName = "api",
                 NameClaimType = ClaimTypes.Email,
                 // Suffix until we retire the old jwt schemes.

src/Api/settings.Preview.json

@@ -1,10 +1,10 @@
 {
   "globalSettings": {
-    "baseVaultUri": "https://preview-vault.bitwarden.com/#",
-    "baseApiUri": "https://preview-api.bitwarden.com",
-    "baseIdentityUri": "https://preview-identity.bitwarden.com",
-    "u2f": {
-      "appId": "https://preview-vault.bitwarden.com/app-id.json"
+    "baseServiceUri": {
+      "vault": "https://preview-vault.bitwarden.com",
+      "api": "https://preview-api.bitwarden.com",
+      "identity": "https://preview-identity.bitwarden.com",
+      "identityInternal": "https://preview-identity.bitwarden.com"
     }
   }
 }

src/Api/settings.Production.json

@@ -1,10 +1,10 @@
 {
   "globalSettings": {
-    "baseVaultUri": "https://vault.bitwarden.com/#",
-    "baseApiUri": "https://api.bitwarden.com",
-    "baseIdentityUri": "https://identity.bitwarden.com",
-    "u2f": {
-      "appId": "https://vault.bitwarden.com/app-id.json"
+    "baseServiceUri": {
+      "vault": "https://vault.bitwarden.com",
+      "api": "https://api.bitwarden.com",
+      "identity": "https://identity.bitwarden.com",
+      "identityInternal": "https://identity.bitwarden.com"
     },
     "braintree": {
       "production": true

src/Api/settings.Staging.json

@@ -1,10 +1,10 @@
 {
   "globalSettings": {
-    "baseVaultUri": "https://vault.bitwarden.com/#",
-    "baseApiUri": "https://api.bitwarden.com",
-    "baseIdentityUri": "https://identity.bitwarden.com",
-    "u2f": {
-      "appId": "https://vault.bitwarden.com/app-id.json"
+    "baseServiceUri": {
+      "vault": "https://vault.bitwarden.com",
+      "api": "https://api.bitwarden.com",
+      "identity": "https://identity.bitwarden.com",
+      "identityInternal": "https://identity.bitwarden.com"
     }
   }
 }

src/Api/settings.json

@@ -2,9 +2,12 @@
   "globalSettings": {
     "selfHosted": false,
     "siteName": "bitwarden",
-    "baseVaultUri": "http://localhost:4001/#",
-    "baseApiUri": "http://localhost:4000",
-    "baseIdentityUri": "http://localhost:33656",
+    "baseServiceUri": {
+      "vault": "http://localhost:4001",
+      "api": "http://localhost:4000",
+      "identity": "http://localhost:33656",
+      "identityInternal": "http://localhost:33656"
+    },
     "stripeApiKey": "SECRET",
     "sqlServer": {
       "connectionString": "SECRET"
@@ -41,9 +44,6 @@
     "duo": {
       "aKey": "SECRET"
     },
-    "u2f": {
-      "appId": "https://localhost:4001/app-id.json"
-    },
     "braintree": {
       "production": false,
       "merchantId": "SECRET",