Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ThingConnect.Pulse.Server/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static async Task Main(string[] args)
options.Cookie.HttpOnly = true;
options.Cookie.SecurePolicy = builder.Environment.IsDevelopment()
? CookieSecurePolicy.SameAsRequest
: CookieSecurePolicy.Always;
: CookieSecurePolicy.None;
options.Cookie.SameSite = SameSiteMode.Lax;
options.Cookie.Name = "ThingConnect.Pulse.Auth";
options.Events.OnRedirectToLogin = context =>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Linq;
using System.Net;
using System.Net.Sockets;
using System.Text.RegularExpressions;
Expand Down Expand Up @@ -47,7 +48,7 @@ public IEnumerable<string> ExpandCidr(string cidr)
}

byte[] addressBytes = ipAddress.GetAddressBytes();
uint addressInt = BitConverter.ToUInt32(addressBytes.Reverse().ToArray(), 0);
uint addressInt = BitConverter.ToUInt32(addressBytes, 0);

int hostBits = 32 - prefixLength;
uint hostCount = (uint)(1 << hostBits);
Expand All @@ -59,7 +60,8 @@ public IEnumerable<string> ExpandCidr(string cidr)

for (uint address = startAddress; address < endAddress && address > networkAddress; address++)
{
byte[] bytes = BitConverter.GetBytes(address).Reverse().ToArray();
byte[] bytes = BitConverter.GetBytes(address);
System.Array.Reverse(bytes);
var ip = new IPAddress(bytes);
yield return ip.ToString();
}
Expand Down
2 changes: 1 addition & 1 deletion setup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ DefaultDirName={autopf}\ThingConnect.Pulse
DefaultGroupName={#AppName}
DisableProgramGroupPage=yes
OutputDir=installer
OutputBaseFilename=ThingConnect Pulse - Setup {#AppVersion}
OutputBaseFilename=ThingConnect.Pulse.Setup {#AppVersion}
Compression=lzma
SolidCompression=yes
WizardStyle=modern
Expand Down
4 changes: 3 additions & 1 deletion thingconnect.pulse.client/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const target = env.ASPNETCORE_HTTPS_PORT
? `https://localhost:${env.ASPNETCORE_HTTPS_PORT}`
: env.ASPNETCORE_URLS
? env.ASPNETCORE_URLS.split(';')[0]
: 'http://localhost:8080';
: 'http://localhost:8090';

// https://vitejs.dev/config/
export default defineConfig({
Expand All @@ -49,10 +49,12 @@ export default defineConfig({
},
},
server: {
host: '0.0.0.0',
proxy: {
'^/api': {
target,
secure: false,
changeOrigin: true,
},
},
port: parseInt(env.DEV_SERVER_PORT || '55605'),
Expand Down
Loading