Commits

Naethra D committed 8e4904b

Configuration file changes.

Comments (0)

Files changed (2)

Source/WebClient/Web.Azure/ServiceConfiguration.Cloud.cscfg

       <Setting name="DataUpEntities" value="metadata=res://*/Entities.csdl|res://*/Entities.ssdl|res://*/Entities.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=tcp:v12h47zv64.database.windows.net;initial catalog=dataupclient;persist security info=True;user id=dataup;password=LakeMerritt!;multipleactiveresultsets=True;App=EntityFramework&quot;" />
       <Setting name="ClientValidationEnabled" value="true" />
       <Setting name="UnobtrusiveJavaScriptEnabled" value="true" />
-      <Setting name="FederationMetadataLocation" value="https://dcxlstaging.accesscontrol.windows.net/FederationMetadata/2007-06/FederationMetadata.xml" />
+      <Setting name="FederationMetadataLocation" value="https://dataup.accesscontrol.windows.net/FederationMetadata/2007-06/FederationMetadata.xml" />
       <Setting name="DataUpWebServiceLink" value="https://dataupadminservice.cloudapp.net/RepositoryService" />
       <Setting name="Reg" value="[&lt;&gt;\?\@\\''\\;\\$\\!\\#\\(\\)\\^\\&amp;\\{\\}\\+\\-\\.\\~\\/\\%\\*\\\&quot;/\|]+" />
       <Setting name="Reg2" value="[&lt;&gt;\⌂\\Ç\\ü\\é\\Æ\\£\\¥\\ó\\ú\\Ñ\\¿\\⌐\\½\\¼\\«\\»\\│\\ß\\µ\\±\\°\\∙\\€\\†\\‡\\Š\\™\\œ\\Ÿ\\©\\®\\Ã\\Î\\Ô\\×\\÷\\ø\\þ\/\|]+" />
       <Setting name="Profile_Identifier" value="oneshare_ark_only" />
       <Setting name="Profile_Post" value="oneshare_dataup_content" />
-      <Setting name="DemoVideoUrl" value="https://adminservicedev.blob.core.windows.net/demo/dataup-web.wmv" />
+      <Setting name="DemoVideoUrl" value="https://datatupstorage.blob.core.windows.net/demo/dataup-web.wmv" />
     </ConfigurationSettings>
     <Certificates>
       <Certificate name="DataUpCertficiate" thumbprint="D7D32A9B4FF37934D2E9E6BB2DF355CA4CE176F1" thumbprintAlgorithm="sha1" />

Source/WebClient/Web.Client/Web.config

   <system.diagnostics>
     <trace>
       <listeners>
-        <add type="Microsoft.WindowsAzure.Diagnostics.DiagnosticMonitorTraceListener, Microsoft.WindowsAzure.Diagnostics, Version=1.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
-          name="AzureDiagnostics">
+        <add type="Microsoft.WindowsAzure.Diagnostics.DiagnosticMonitorTraceListener, Microsoft.WindowsAzure.Diagnostics, Version=1.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" name="AzureDiagnostics">
           <filter type="" />
         </add>
       </listeners>
     <add key="webpages:Version" value="1.0.0.0" />
     <add key="ClientValidationEnabled" value="true" />
     <add key="UnobtrusiveJavaScriptEnabled" value="true" />
-    <add key="Profile_Identifier" value="oneshare_ark_only"/>
-    <add key="Profile_Post" value="oneshare_dataup_content"/>
-    <add key="FederationMetadataLocation" value="https://dcxlstaging.accesscontrol.windows.net/FederationMetadata/2007-06/FederationMetadata.xml" />
-    <!--<add key="FederationMetadataLocation" value="https://dataup.accesscontrol.windows.net/FederationMetadata/2007-06/FederationMetadata.xml" />-->
-    
+    <add key="Profile_Identifier" value="oneshare_ark_only" />
+    <add key="Profile_Post" value="oneshare_dataup_content" />
+    <add key="FederationMetadataLocation" value="https://dataup.accesscontrol.windows.net/FederationMetadata/2007-06/FederationMetadata.xml" />
     <add key="UploadToAzure" value="true" />
-    <!--<add key="DataUpWebServiceLink" value="https://dataupadminservice.cloudapp.net/RepositoryService" />-->
     <add key="DataUpWebServiceLink" value="https://adminservicedev.cloudapp.net/RepositoryService" />
-    <!--<add key="DataUpWebServiceLink" value="http://localhost:2586/RepositoryService" />-->
     <add key="Reg" value="[&lt;&gt;\?\@\\''\\;\\$\\!\\#\\(\\)\\^\\&amp;\\{\\}\\+\\-\\.\\~\\/\\%\\*\\\&quot;/\|]+" />
     <add key="Reg2" value="[&lt;&gt;\⌂\\Ç\\ü\\é\\Æ\\£\\¥\\ó\\ú\\Ñ\\¿\\⌐\\½\\¼\\«\\»\\│\\ß\\µ\\±\\°\\∙\\€\\†\\‡\\Š\\™\\œ\\Ÿ\\©\\®\\Ã\\Î\\Ô\\×\\÷\\ø\\þ\/\|]+" />
-    <!--<add key="PrimaryContainer" value="dataupfiles" />-->
-
-    <add key="PrimaryContainer" value="dcxlcontainer" />
-    <!--<add key="DataUpEntities" value="metadata=res://*/Entities.csdl|res://*/Entities.ssdl|res://*/Entities.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=tcp:v12h47zv64.database.windows.net;initial catalog=dataupclient;persist security info=True;user id=dataup;password=LakeMerritt!;multipleactiveresultsets=True;App=EntityFramework&quot;" />-->
+    <add key="PrimaryContainer" value="dataupfiles" />
     <add key="DataUpEntities" value="metadata=res://*/Entities.csdl|res://*/Entities.ssdl|res://*/Entities.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=tcp:uakxp9zd12.database.windows.net;initial catalog=datauptest;persist security info=True;user id=datacuration;password=dcxl2012!;multipleactiveresultsets=True;App=EntityFramework&quot;" />
-
-    <!-- Staging-->
-    <!--<add key="DataUpStorage" value="DefaultEndpointsProtocol=https;AccountName=datatupstorage;AccountKey=JNP40XUjm6C+0pXYmtTMx7MSKg2+bbjUUjj8usDi8rEE9Z6VGy9iQ5kGwcpmmXcLkw8VsROwzPFRt97lafs9+A==" />-->
-    <add key="DataUpStorage" value="DefaultEndpointsProtocol=https;AccountName=dcxldevelopment;AccountKey=GyoG7buqRTJ3qmbGv5hAVqqTjlne8G0vDVuDrokj41oouqnTvdxuCcGjNCwW4KykdPWmkx55XU8GHy13EZlMmg==" />
+    <add key="DataUpStorage" value="DefaultEndpointsProtocol=https;AccountName=datatupstorage;AccountKey=JNP40XUjm6C+0pXYmtTMx7MSKg2+bbjUUjj8usDi8rEE9Z6VGy9iQ5kGwcpmmXcLkw8VsROwzPFRt97lafs9+A==" />
     <add key="DemoVideoUrl" value="https://adminservicedev.blob.core.windows.net/demo/dataup-web.wmv" />
   </appSettings>
   <connectionStrings>
     <add name="DataUpEntities" connectionString="metadata=res://*/Entities.csdl|res://*/Entities.ssdl|res://*/Entities.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=tcp:v12h47zv64.database.windows.net;initial catalog=dataupclient;persist security info=True;user id=dataup;password=LakeMerritt!;multipleactiveresultsets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
+  <location path="FederationMetadata">
+    <system.web>
+      <authorization>
+        <allow users="*" />
+      </authorization>
+    </system.web>
+  </location>
   <system.web>
+    <authorization>
+      <deny users="?" />
+    </authorization>
     <authentication mode="None" />
     <sessionState mode="InProc" timeout="30" />
     <compilation debug="true" targetFramework="4.0">
   <microsoft.identityModel>
     <service>
       <audienceUris>
-        <!--<add value="https://dataup.cloudapp.net/" />-->
-        <add value="https://dcxldevelopment.cloudapp.net/"/>
-        <!--<add value="http://localhost:54238/" />-->
+        <add value="https://www.dataup.org/" />
       </audienceUris>
-      <federatedAuthentication>
-        <!--<wsFederation passiveRedirectEnabled="true" persistentCookiesOnPassiveRedirects="true" issuer="https://dcxlstaging.accesscontrol.windows.net/v2/wsfederation" realm="https://dataup.cloudapp.net/" requireHttps="false" />-->
-        <wsFederation passiveRedirectEnabled="true" persistentCookiesOnPassiveRedirects="true" issuer="https://dcxlstaging.accesscontrol.windows.net/v2/wsfederation" realm="https://dcxldevelopment.cloudapp.net/" requireHttps="false" />
-        <!--<wsFederation passiveRedirectEnabled="true" persistentCookiesOnPassiveRedirects="true" issuer="https://dcxlstaging.accesscontrol.windows.net/v2/wsfederation" realm="http://localhost:54238/" requireHttps="false" />-->
-        <cookieHandler requireSsl="false" persistentSessionLifetime="0.00:30:00.00" />
-      </federatedAuthentication>
       <applicationService>
         <claimTypeRequired>
-          <!--Following are the claims offered by STS 'https://dcxlstaging.accesscontrol.windows.net/'. Add or uncomment claims that you require by your application and then update the federation metadata of this application.-->
+          <!--Following are the claims offered by STS 'https://dataup.accesscontrol.windows.net/'. Add or uncomment claims that you require by your application and then update the federation metadata of this application.-->
           <claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" optional="true" />
           <claimType type="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" optional="true" />
           <!--<claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" optional="true" />-->
           <!--<claimType type="http://schemas.microsoft.com/accesscontrolservice/2010/07/claims/identityprovider" optional="true" />-->
         </claimTypeRequired>
       </applicationService>
+      <certificateValidation certificateValidationMode="None" />
+      <federatedAuthentication>
+        <wsFederation passiveRedirectEnabled="true" issuer="https://dataup.accesscontrol.windows.net/v2/wsfederation" realm="https://www.dataup.org/" requireHttps="true" />
+        <cookieHandler requireSsl="true" persistentSessionLifetime="0.00:30:00.00" />
+      </federatedAuthentication>
       <issuerNameRegistry type="Microsoft.IdentityModel.Tokens.ConfigurationBasedIssuerNameRegistry, Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
         <trustedIssuers>
-          <add thumbprint="8214643D9B4A8349F193BE6B3EA985AC07EE6949" name="https://dcxlstaging.accesscontrol.windows.net/" />
-          <!--<add thumbprint="3DFF0CA15DB2B1327CB03CA7C9813297F50767BF" name="https://dataup.accesscontrol.windows.net/" />-->
-          
+          <add thumbprint="3DFF0CA15DB2B1327CB03CA7C9813297F50767BF" name="https://dataup.accesscontrol.windows.net/" />
         </trustedIssuers>
       </issuerNameRegistry>
-      <certificateValidation certificateValidationMode="None" />
     </service>
   </microsoft.identityModel>
   <entityFramework>