From 34d4b753f729d9ea38bbf951b4e469f421cb95ce Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Wed, 29 Nov 2017 11:34:36 +0100 Subject: [PATCH] Added ability to send direct URL to Sandbox et al --- Logic/Swarm/DashboardTodos.cs | 2 +- Site/Security/Login.aspx.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Logic/Swarm/DashboardTodos.cs b/Logic/Swarm/DashboardTodos.cs index d8de992c..0145c0b3 100644 --- a/Logic/Swarm/DashboardTodos.cs +++ b/Logic/Swarm/DashboardTodos.cs @@ -39,7 +39,7 @@ namespace Swarmops.Logic.Swarm if (string.IsNullOrEmpty (authority.Person.BitcoinPayoutAddress)) { - if (authority.Organization.FinancialAccounts.AssetsBitcoinHot != null) + if (authority.Organization.FinancialAccounts.AssetsBitcoinHot != null && authority.Organization.Identity != Organization.SandboxIdentity && ! PilotInstallationIds.IsPilot(PilotInstallationIds.DevelopmentSandbox)) { DashboardTodo todo = new DashboardTodo(); todo.Description = Logic_Swarm_DashboardTodos.Bitcoin_SetPayoutAddress; diff --git a/Site/Security/Login.aspx.cs b/Site/Security/Login.aspx.cs index dc403ff6..06ad8240 100644 --- a/Site/Security/Login.aspx.cs +++ b/Site/Security/Login.aspx.cs @@ -44,7 +44,7 @@ namespace Swarmops.Pages.Security { // We should ONLY get here if we're getting a BitId by Webform submission. - Persistence.Key["BitId_RawData"] = Request.ToRaw(); + // Persistence.Key["BitId_RawData"] = Request.ToRaw(); if (Request.Params["address"] != null) { @@ -84,7 +84,7 @@ namespace Swarmops.Pages.Security { DashboardMessage.Set ("

You have been logged on as Sandbox Administrator to the Swarmops Development Sandbox.


This machine runs the latest development build, so you may run into diagnostic code and half-finished features. All data here is bogus test data and is reset every night.


In other words, welcome, and play away!

"); FormsAuthentication.SetAuthCookie (Authority.FromLogin (Person.FromIdentity (1), Organization.Sandbox).ToEncryptedXml(), true); - Response.Redirect ("/"); + Response.Redirect (HttpContext.Current.Request.Path); // Forces a reload of the same URL with auth cookie set } // If we're on an Open Ledgers domain, autologin as Open Ledgers