Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5988


Ignore:
Timestamp:
04/08/11 16:04:26 (12 years ago)
Author:
dkahn
Message:

#1198 restoring membership provider and removing Query references.

Location:
branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost/Controllers/AccountController.cs

    r5920 r5988  
    3838    public ActionResult LogOn(LogOnModel model, string returnUrl) {
    3939      if (ModelState.IsValid) {
    40         QueryServiceClient client = Query.GetClientFactory(model.UserName, model.Password);
    41         if (client != null) {
    42           Session["Username"] = model.UserName;
    43           Session["Password"] = model.Password;
     40        // QueryServiceClient client = Query.GetClientFactory(model.UserName, model.Password);
     41
     42
     43
     44        if (MembershipService.ValidateUser(model.UserName, model.Password)) {
     45
    4446          FormsService.SignIn(model.UserName, model.RememberMe);
    4547          if (!String.IsNullOrEmpty(returnUrl)) {
  • branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost/HLWebPluginHost.csproj

    r5986 r5988  
    1 <?xml version="1.0" encoding="utf-8"?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup>
     
    7373      <DependentUpon>Global.asax</DependentUpon>
    7474    </Compile>
    75 
    7675    <Compile Include="Lib\HLServiceMembershipProvider.cs" />
    7776    <Compile Include="Helpers\Query.cs" />
     
    8382    <Compile Include="PluginLib\PluginViewEngine.cs" />
    8483    <Compile Include="Properties\AssemblyInfo.cs" />
    85     <Compile Include="Service References\OKBQueryService\Reference.cs">
    86       <AutoGen>True</AutoGen>
    87       <DesignTime>True</DesignTime>
    88       <DependentUpon>Reference.svcmap</DependentUpon>
    89     </Compile>
    9084  </ItemGroup>
    9185  <ItemGroup>
     
    9892    <Content Include="Global.asax" />
    9993    <Content Include="Scripts\lbAlgorithmClassOnClick.js" />
    100     <None Include="Service References\OKBQueryService\HLWebPluginHost.OKBQueryService.Filter.datasource">
    101       <DependentUpon>Reference.svcmap</DependentUpon>
    102     </None>
    103     <None Include="Service References\OKBQueryService\HLWebPluginHost.OKBQueryService.Run.datasource">
    104       <DependentUpon>Reference.svcmap</DependentUpon>
    105     </None>
    106     <None Include="Service References\OKBQueryService\QueryService.disco" />
    107     <None Include="Service References\OKBQueryService\configuration91.svcinfo" />
    108     <None Include="Service References\OKBQueryService\configuration.svcinfo" />
    109     <None Include="Service References\OKBQueryService\Reference.svcmap">
    110       <Generator>WCF Proxy Generator</Generator>
    111       <LastGenOutput>Reference.cs</LastGenOutput>
    112     </None>
    11394    <Content Include="Views\ServicePrototype\Index.aspx" />
    11495    <Content Include="Web.config">
     
    153134    <WCFMetadata Include="Service References\" />
    154135  </ItemGroup>
    155   <ItemGroup>
    156     <WCFMetadataStorage Include="Service References\OKBQueryService\" />
    157   </ItemGroup>
    158   <ItemGroup>
    159     <None Include="Service References\OKBQueryService\QueryService.wsdl" />
    160     <None Include="Service References\OKBQueryService\QueryService.xsd">
    161       <SubType>Designer</SubType>
    162     </None>
    163     <None Include="Service References\OKBQueryService\QueryService1.xsd">
    164       <SubType>Designer</SubType>
    165     </None>
    166     <None Include="Service References\OKBQueryService\QueryService2.xsd">
    167       <SubType>Designer</SubType>
    168     </None>
    169     <None Include="Service References\OKBQueryService\QueryService3.xsd">
    170       <SubType>Designer</SubType>
    171     </None>
    172   </ItemGroup>
    173136  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    174137  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
  • branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost/Lib/HLServiceMembershipProvider.cs

    r5800 r5988  
    119119      // TODO: Add authentication against the HL-Service as soon as it's available.
    120120      try {
     121
    121122        HttpContext.Current.Session["Password"] = password;
     123
    122124        return true;
    123125      } catch (Exception) {
  • branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost/Views/Home/Index.aspx

    r5920 r5988  
    66
    77<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
    8     <h1><%: ViewData["Message"] %></h1>
    98
    10     <h3>Username: <%: Session["Username"]  %></h3>
    11     <h3>Password: <%: Session["Password"]  %></h3>
    129</asp:Content>
  • branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost/Web.config

    r5920 r5988  
    6060    </pages>
    6161 
    62         <!--<membership defaultProvider="HLServiceMembershipProvider">
     62        <membership defaultProvider="HLServiceMembershipProvider">
    6363            <providers>
    6464              <clear/>
     
    6969                   applicationName="HeuristicLab.Authentication" />
    7070            </providers>
    71           </membership>-->
     71          </membership>
    7272<!--
    7373          <roleManager enabled="true">
     
    116116          </security>
    117117        </binding>
    118         <binding name="QueryService" closeTimeout="00:01:00" openTimeout="00:01:00"
    119           receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false"
    120           transactionFlow="false" hostNameComparisonMode="StrongWildcard"
    121           maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text"
    122           textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
    123           <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
    124             maxBytesPerRead="4096" maxNameTableCharCount="16384" />
    125           <reliableSession ordered="true" inactivityTimeout="00:10:00"
    126             enabled="false" />
    127           <security mode="Message">
    128             <transport clientCredentialType="Windows" proxyCredentialType="None"
    129               realm="" />
    130             <message clientCredentialType="UserName" negotiateServiceCredential="true"
    131               algorithmSuite="Default" />
    132           </security>
    133         </binding>
    134118      </wsHttpBinding>
    135119    </bindings>
     
    142126        </identity>
    143127      </endpoint>
    144       <endpoint address="http://services.heuristiclab.com/OKB.SPR-3.3/QueryService.svc"
    145         binding="wsHttpBinding" bindingConfiguration="QueryService"
    146         contract="OKBQueryService.IQueryService" name="QueryService">
    147         <identity>
    148           <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ==" />
    149         </identity>
    150       </endpoint>
    151128    </client>
    152129  </system.serviceModel>
Note: See TracChangeset for help on using the changeset viewer.