Impersonation seems to work (but showed a whole host of other problems)

This commit is contained in:
Rick Falkvinge
2017-01-21 12:29:15 +01:00
parent 4f15a25367
commit 3f14be7c58
3 changed files with 26 additions and 7 deletions
+4 -3
View File
@@ -1,4 +1,4 @@
<%@ Master Language="C#" AutoEventWireup="true" Inherits="Swarmops.Frontend.MasterV5" Codebehind="Master-v5.master.cs" %>
<%@ Master Language="C#" AutoEventWireup="true" Inherits="Swarmops.Frontend.MasterV5" CodeFile="Master-v5.master.cs" CodeBehind="Master-v5.master.cs" %>
<%@ Import Namespace="System.Globalization" %>
<%@ Import Namespace="System.Runtime.CompilerServices" %>
<%@ Import Namespace="System.Threading" %>
@@ -150,8 +150,6 @@
<script language="javascript" type="text/javascript">
$(document).ready(function () {
alertify.log('DEBUG: <%=this.CurrentAuthority.Impersonation != null? this.CurrentAuthority.Impersonation.ImpersonatedByPersonId: -1%>');
_masterInitializeSocket('<%=CommonV5.JavascriptEscape(this.CurrentAuthority.ToEncryptedXml())%>');
$('#divTabsEditPerson').tabs();
@@ -213,7 +211,10 @@
<div class="box">
<div class="content">
<a href="/Security/ChangeOrganizations">
<asp:Image ID="ImageLogo" Width="220" runat="server"/>
<asp:Label ID="LabelOrganizationName" runat="server"/>
</a>
</div>
</div>
+13 -4
View File
@@ -65,12 +65,21 @@ namespace Swarmops.Frontend
this.LiteralSidebarInfo.Text = CurrentPageInfoBoxLiteral;
// Set logo image. If custom image is installed, use it instead.
// Set logo image. If there is no logo image, use text.
this.ImageLogo.ImageUrl = "~/Images/Other/swarmops-sandbox-logo--istockphoto.png";
if (File.Exists (Server.MapPath ("~/Images/Logo-Custom.png")))
if (CurrentOrganization.Identity == Organization.SandboxIdentity)
{
this.ImageLogo.ImageUrl = "~/Images/Logo-Custom.png";
this.ImageLogo.ImageUrl = "~/Images/Other/swarmops-sandbox-logo--istockphoto.png";
this.ImageLogo.Visible = true;
this.LabelOrganizationName.Visible = false;
}
else
{
// TODO: Check for corp image
this.ImageLogo.Visible = false;
this.LabelOrganizationName.Visible = true;
this.LabelOrganizationName.Text = CurrentOrganization.Name;
}
// Check for SSL and force it
+9
View File
@@ -201,6 +201,15 @@ namespace Swarmops.Frontend {
/// </remarks>
protected global::System.Web.UI.WebControls.Image ImageLogo;
/// <summary>
/// LabelOrganizationName control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label LabelOrganizationName;
/// <summary>
/// ImpersonationWarning control.
/// </summary>