commit 6117a50db8a6b9a5ca73ec3409987d8b283d6dbd Author: l.gabrysiak Date: Sat Sep 14 16:13:32 2024 +0200 init diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8bcfaae --- /dev/null +++ b/.gitignore @@ -0,0 +1,479 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# Tye +.tye/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +## +## Visual studio for Mac +## + + +# globs +Makefile.in +*.userprefs +*.usertasks +config.make +config.status +aclocal.m4 +install-sh +autom4te.cache/ +*.tar.gz +tarballs/ +test-results/ + +# Mac bundle stuff +*.dmg +*.app + +# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# JetBrains Rider +.idea/ +*.sln.iml + +## +## Visual Studio Code +## +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + +## +## Umbraco CMS +## + +# JSON schema files for appsettings.json +appsettings-schema.json +appsettings-schema.*.json + +# Packages created from the backoffice (package.xml/package.zip) +/umbraco/Data/CreatedPackages/ + +# Temp folder containing Examine indexes, NuCache, MediaCache, etc. +/umbraco/Data/TEMP/ + +# SQLite database files +/umbraco/Data/*.sqlite.db +/umbraco/Data/*.sqlite.db-shm +/umbraco/Data/*.sqlite.db-wal + +# Log files +/umbraco/Logs/ + +# Media files +/wwwroot/media/ diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..1ffcbc6 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,43 @@ +pipeline { + agent any + + environment { + DOCKER_IMAGE = 'docker.cloud.pokash.pl/pokashumbraco' + DOCKER_REGISTRY = 'docker.cloud.pokash.pl' + GIT_REPO = 'https://repo.pokash.pl/POKASH.PL/pokashumbraco.git' + REGISTRY_CREDENTIALS_ID = '2753fc17-5ad1-4c78-b86a-a3e54c543adc' // ID poświadczeń do lokalnego rejestru + } + + stages { + stage('Checkout') { + steps { + git url: "${GIT_REPO}", branch: 'main' + } + } + + stage('Build Docker Image') { + steps { + script { + docker.build("${DOCKER_IMAGE}:latest") + } + } + } + + stage('Push Docker Image') { + steps { + script { + // Logowanie do lokalnego rejestru + docker.withRegistry("http://${DOCKER_REGISTRY}", "${REGISTRY_CREDENTIALS_ID}") { + docker.image("${DOCKER_IMAGE}:latest").push('latest') + } + } + } + } + } + + post { + always { + cleanWs() // Czyści workspace po zakończeniu builda + } + } +} diff --git a/POKASH/CustomAPI/GetMenu.cs b/POKASH/CustomAPI/GetMenu.cs new file mode 100644 index 0000000..14fdfc8 --- /dev/null +++ b/POKASH/CustomAPI/GetMenu.cs @@ -0,0 +1,187 @@ +using Microsoft.AspNetCore.Mvc; +using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Core.Models.PublishedContent; +using Newtonsoft.Json; +using System.Data; + + +namespace UmbracoDocs.Samples; + +[ApiController] +[Route("/umbraco/api/[controller]")] +public class GetMenuController : Controller +{ + private readonly IUmbracoContextAccessor _umbracoContextAccessor; + + public GetMenuController(IUmbracoContextAccessor umbracoContextAccessor) + { + _umbracoContextAccessor = umbracoContextAccessor; + } + + [HttpGet("{organization}/{domain}")] + public IActionResult GetDocumentTree(string organization, string domain) + { + var umbracoContext = _umbracoContextAccessor.GetRequiredUmbracoContext(); + + if (umbracoContext == null) + { + return StatusCode(500, "Umbraco context is not available."); + } + + DataTable dataTable = new DataTable + { + Columns = + { + new DataColumn("id", typeof(int)), + new DataColumn("name", typeof(string)), + new DataColumn("type", typeof(string)), + new DataColumn("parentid", typeof(int)) + } + }; + + var rootContent = umbracoContext.Content?.GetAtRoot(); + + /*var nodes = GetDocumentTreeRecursive(rootContent); + // Find and filter the tree + if (nodes != null) + { + var filteredNodes = FilterTree(nodes, "szkoleniowcy.online"); + string updatedJson = JsonConvert.SerializeObject(filteredNodes, Formatting.Indented); + //Console.WriteLine(updatedJson); + }*/ + + var t = GetMenuTree(rootContent, dataTable); + + var result = ( + from org in dataTable.AsEnumerable() + where + org.Field("type") == "organization" && + org.Field("name")!.ToLower() == Uri.UnescapeDataString(organization).ToLower() + from + dom in dataTable.AsEnumerable() + where + dom.Field("parentid") == org.Field("id") && + dom.Field("type") == "domains" && + dom.Field("name")!.ToLower() == Uri.UnescapeDataString(domain).ToLower() + join child in dataTable.AsEnumerable() on dom.Field("id") equals child.Field("parentid") + select child) + .Union( + from + org in dataTable.AsEnumerable() + where + org.Field("type") == "organization" && + org.Field("name")!.ToLower() == Uri.UnescapeDataString(organization).ToLower() + from + dom in dataTable.AsEnumerable() + where + dom.Field("parentid") == org.Field("id") && + dom.Field("type") == "domains" && + dom.Field("name")!.ToLower() == Uri.UnescapeDataString(domain).ToLower() + join child in dataTable.AsEnumerable() on dom.Field("id") equals child.Field("parentid") + join subChild in dataTable.AsEnumerable() on child.Field("id") equals subChild.Field("parentid") + select subChild) + .Select(child => new + { + id = child.Field("id"), + name = child.Field("name"), + type = child.Field("type"), + parentid = child.Field("parentid") + }); + + var allIds = result.Select(row => row.id).ToHashSet(); + var modifiedResult = result.Select(row => new + { + id = row.id, + name = row.name, + type = row.type, + parentid = row.parentid.HasValue && !allIds.Contains(row.parentid.Value) ? (int?)null : row.parentid + }).ToList(); + + Console.WriteLine(JsonConvert.SerializeObject(modifiedResult, Formatting.Indented)); + + return Ok(modifiedResult); + } + + private List? GetDocumentTreeRecursive(IEnumerable? contents) + { + if (contents != null) + { + return + contents?.Select(x => + new DocumentTreeNode + { + id = x.Id, + name = x.Name, + type = x.ContentType.Alias, + parentId = x.Parent?.Id, + children = GetDocumentTreeRecursive(x.Children) + }).ToList(); + } + + return null; + } + + private DataTable? GetMenuTree(IEnumerable? contents, DataTable dataTable) + { + if (contents != null) + { + contents.ToList().ForEach(x => + { + dataTable.LoadDataRow(new object[] + { + x.Id, + x.Name, + x.ContentType.Alias, + x.Parent?.Id ?? null! + }, LoadOption.PreserveChanges); + if (x.Children != null && x.Children.Any()) + { + GetMenuTree(x.Children, dataTable); + } + }); + } + return dataTable; + } + + static List FilterTree(List nodes, string targetName) + { + // Find the node with the target name and return its subtree + foreach (var node in nodes) + { + if (node.name == targetName) + { + return new List { node }; + } + + if (node.children != null) + { + var filteredChildren = FilterTree(node.children, targetName); + if (filteredChildren.Count > 0) + { + // Copy the current node and set its children to the filtered children + var filteredNode = new DocumentTreeNode + { + id = node.id, + name = node.name, + type = node.type, + parentId = node.parentId, + children = filteredChildren + }; + + return new List { filteredNode }; + } + } + } + + return new List(); + } + + public class DocumentTreeNode + { + public int id { get; set; } + public string? name { get; set; } + public string? type { get; set; } + public int? parentId { get; set; } + public List? children { get; set; } + } +} \ No newline at end of file diff --git a/POKASH/CustomAPI/UrlEncodingMiddleware.cs b/POKASH/CustomAPI/UrlEncodingMiddleware.cs new file mode 100644 index 0000000..584e9ea --- /dev/null +++ b/POKASH/CustomAPI/UrlEncodingMiddleware.cs @@ -0,0 +1,25 @@ +using Microsoft.AspNetCore.Http; +using System.Threading.Tasks; + +public class UrlEncodingMiddleware +{ + private readonly RequestDelegate _next; + + public UrlEncodingMiddleware(RequestDelegate next) + { + _next = next; + } + + public async Task InvokeAsync(HttpContext context) + { + if (context.Request.Path.Value != null && context.Request.Path.Value.StartsWith("/umbraco/api", StringComparison.OrdinalIgnoreCase)) + { + if (context.Request.Path.Value.Contains(".")) + { + var newPath = context.Request.Path.Value.Replace(".", "%2E"); + context.Request.Path = new PathString(newPath); + } + } + await _next(context); + } +} \ No newline at end of file diff --git a/POKASH/Keycloak/Configuration/Configuration.cs b/POKASH/Keycloak/Configuration/Configuration.cs new file mode 100644 index 0000000..9298db8 --- /dev/null +++ b/POKASH/Keycloak/Configuration/Configuration.cs @@ -0,0 +1,18 @@ +namespace Umbraco.KeycloakShowcase.Web.Configuration; + +public class KeycloakConfiguration +{ + private readonly IConfiguration _configuration; + + public KeycloakConfiguration(IConfiguration configuration) + { + _configuration = configuration ?? throw new ArgumentNullException(nameof(configuration)); + } + + public string BaseAddress => _configuration.GetValue("Keycloak:BaseAddress")!; + public string ClientId => _configuration.GetValue("Keycloak:ClientId")!; + public string ClientSecret => _configuration.GetValue("Keycloak:ClientSecret")!; + public string Realm => _configuration.GetValue("Keycloak:Realm")!; + public string? Version => _configuration.GetValue("Keycloak:Version"); + public string CallbackPath => _configuration.GetValue("Keycloak:CallbackPath")!; +} \ No newline at end of file diff --git a/POKASH/Keycloak/Configuration/KeycloakMemberExternalLoginProviderOptions.cs b/POKASH/Keycloak/Configuration/KeycloakMemberExternalLoginProviderOptions.cs new file mode 100644 index 0000000..24a57a2 --- /dev/null +++ b/POKASH/Keycloak/Configuration/KeycloakMemberExternalLoginProviderOptions.cs @@ -0,0 +1,65 @@ +using Microsoft.Extensions.Options; +using Umbraco.Cms.Core; +using Umbraco.Cms.Web.BackOffice.Security; + +namespace Umbraco.KeycloakShowcase.Web.Configuration; + +public class KeycloakMemberExternalLoginProviderOptions : IConfigureNamedOptions +{ + public const string SchemeName = "Keycloak"; + public void Configure(string? name, BackOfficeExternalLoginProviderOptions options) + { + Console.WriteLine("Configure"); + if (name != Constants.Security.BackOfficeExternalAuthenticationTypePrefix + SchemeName) + { + return; + } + + Configure(options); + } + + public void Configure(BackOfficeExternalLoginProviderOptions options) + { + options.AutoLinkOptions = new ExternalSignInAutoLinkOptions( + // Set to true to enable auto-linking + autoLinkExternalAccount: true, + + // [OPTIONAL] + // Default: "Editor" + // Specify User Group. + defaultUserGroups: new[] { Constants.Security.EditorGroupAlias }, + + // [OPTIONAL] + // Default: The culture specified in appsettings.json. + // Specify the default culture to create the User as. + // It can be dynamically assigned in the OnAutoLinking callback. + defaultCulture: null, + + // [OPTIONAL] + // Enable the ability to link/unlink manually from within + // the Umbraco backoffice. + // Set this to false if you don't want the user to unlink + // from this external login provider. + allowManualLinking: true + ) + { + // Optional callback + OnAutoLinking = (autoLinkUser, loginInfo) => + { + // You can customize the member before it's linked. + // i.e. Modify the member's groups based on the Claims returned + // in the externalLogin info + }, + OnExternalLogin = (user, loginInfo) => + { + // You can customize the member before it's saved whenever they have + // logged in with the external provider. + // i.e. Sync the member's name based on the Claims returned + // in the externalLogin info + + return true; //returns a boolean indicating if sign in should continue or not. + } + }; + } + +} \ No newline at end of file diff --git a/POKASH/Keycloak/Extensions/KeycloakAuthenticationExtension.cs b/POKASH/Keycloak/Extensions/KeycloakAuthenticationExtension.cs new file mode 100644 index 0000000..0902cc9 --- /dev/null +++ b/POKASH/Keycloak/Extensions/KeycloakAuthenticationExtension.cs @@ -0,0 +1,81 @@ +using System.IdentityModel.Claims; +using System.Text.Json; +using AspNet.Security.OAuth.Keycloak; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.OAuth; +using Umbraco.Cms.Core.Services; +using Umbraco.KeycloakShowcase.Web.Configuration; + +namespace Umbraco.KeycloakShowcase.Web.Extensions; + +public static class KeycloakAuthenticationExtension +{ + public static IUmbracoBuilder AddBackOfficeKeycloakAuthentication(this IUmbracoBuilder builder) + { + var configuration = new KeycloakConfiguration(builder.Config); + builder.AddBackOfficeExternalLogins(logins => + { + logins.AddBackOfficeLogin( + backOfficeAuthenticationBuilder => + { + var schemeName = backOfficeAuthenticationBuilder.SchemeForBackOffice(KeycloakMemberExternalLoginProviderOptions.SchemeName); + ArgumentNullException.ThrowIfNull(schemeName); + backOfficeAuthenticationBuilder.AddKeycloak( + schemeName, + options => + { + options.BaseAddress = new Uri(configuration.BaseAddress); + options.ClientId = configuration.ClientId; + options.ClientSecret = configuration.ClientSecret; + options.AccessType = KeycloakAuthenticationAccessType.Confidential; + options.Realm = configuration.Realm; + options.Version = new Version(configuration.Version ?? string.Empty); + options.CallbackPath = configuration.CallbackPath; + options.AuthorizationEndpoint = "https://auth.pokash.pl/realms/pokash/protocol/openid-connect/auth"; + options.TokenEndpoint = "https://auth.pokash.pl/realms/pokash/protocol/openid-connect/token"; + options.UserInformationEndpoint = "https://auth.pokash.pl/realms/pokash/protocol/openid-connect/userinfo"; + options.SaveTokens = true; + options.Scope.Add("openid"); + options.Scope.Add("profile"); + options.Scope.Add("email"); + options.ClaimActions.MapJsonKey(ClaimTypes.NameIdentifier, "sub"); + options.ClaimActions.MapJsonKey(ClaimTypes.Name, "preferred_username"); + options.ClaimActions.MapJsonKey(ClaimTypes.Email, "email"); + options.Events = new OAuthEvents + { + OnCreatingTicket = async ctx => + { + var request = new HttpRequestMessage(HttpMethod.Get, ctx.Options.UserInformationEndpoint); + request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", ctx.AccessToken); + var response = await ctx.Backchannel.SendAsync(request, ctx.HttpContext.RequestAborted); + response.EnsureSuccessStatusCode(); + using var responseStream = await response.Content.ReadAsStreamAsync(); + using var jsonDocument = await JsonDocument.ParseAsync(responseStream); + var user = jsonDocument.RootElement; + ctx.RunClaimActions(user); + var userService = ctx.HttpContext.RequestServices.GetRequiredService(); + var email = ctx.Principal?.FindFirst(ClaimTypes.Email)?.Value; + var username = ctx.Principal?.FindFirst(ClaimTypes.Name)?.Value; + if (!string.IsNullOrEmpty(email) && !string.IsNullOrEmpty(username)) + { + var existingUser = userService.GetByEmail(email); + if (existingUser == null) + { + var newUser = userService.CreateUserWithIdentity(username, email); + newUser.IsApproved = true; + userService.Save(newUser); + } + else + { + existingUser.IsApproved = true; + userService.Save(existingUser); + } + } + } + }; + }); + }); + }); + return builder; + } +} \ No newline at end of file diff --git a/Program.cs b/Program.cs new file mode 100644 index 0000000..8ea0c35 --- /dev/null +++ b/Program.cs @@ -0,0 +1,32 @@ +using Umbraco.KeycloakShowcase.Web.Extensions; + +WebApplicationBuilder builder = WebApplication.CreateBuilder(args); + +builder.CreateUmbracoBuilder() + .AddBackOffice() + .AddWebsite() + .AddDeliveryApi() + .AddComposers() + .AddBackOfficeKeycloakAuthentication() + .Build(); + +WebApplication app = builder.Build(); + +await app.BootUmbracoAsync(); + +app.UseMiddleware(); + +app.UseUmbraco() + .WithMiddleware(u => + { + u.UseBackOffice(); + //u.UseWebsite(); + }) + .WithEndpoints(u => + { + u.UseInstallerEndpoints(); + u.UseBackOfficeEndpoints(); + //u.UseWebsiteEndpoints(); + }); + +await app.RunAsync(); diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json new file mode 100644 index 0000000..8f49092 --- /dev/null +++ b/Properties/launchSettings.json @@ -0,0 +1,29 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:30533", + "sslPort": 44319 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "Umbraco.Web.UI": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:44319;http://localhost:30533", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/Views/Partials/blockgrid/area.cshtml b/Views/Partials/blockgrid/area.cshtml new file mode 100644 index 0000000..3614847 --- /dev/null +++ b/Views/Partials/blockgrid/area.cshtml @@ -0,0 +1,10 @@ +@using Umbraco.Extensions +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage + +
+ @await Html.GetBlockGridItemsHtmlAsync(Model) +
diff --git a/Views/Partials/blockgrid/areas.cshtml b/Views/Partials/blockgrid/areas.cshtml new file mode 100644 index 0000000..30f987c --- /dev/null +++ b/Views/Partials/blockgrid/areas.cshtml @@ -0,0 +1,13 @@ +@using Umbraco.Extensions +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage +@{ + if (Model?.Areas.Any() != true) { return; } +} + +
+ @foreach (var area in Model.Areas) + { + @await Html.GetBlockGridItemAreaHtmlAsync(area) + } +
diff --git a/Views/Partials/blockgrid/default.cshtml b/Views/Partials/blockgrid/default.cshtml new file mode 100644 index 0000000..e25839e --- /dev/null +++ b/Views/Partials/blockgrid/default.cshtml @@ -0,0 +1,11 @@ +@using Umbraco.Extensions +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage +@{ + if (Model?.Any() != true) { return; } +} + +
+ @await Html.GetBlockGridItemsHtmlAsync(Model) +
diff --git a/Views/Partials/blockgrid/items.cshtml b/Views/Partials/blockgrid/items.cshtml new file mode 100644 index 0000000..2703fa5 --- /dev/null +++ b/Views/Partials/blockgrid/items.cshtml @@ -0,0 +1,36 @@ +@using Umbraco.Cms.Core.Models.Blocks +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage> +@{ + if (Model?.Any() != true) { return; } +} + +
+ @foreach (var item in Model) + { + +
+ @{ + var partialViewName = "blockgrid/Components/" + item.Content.ContentType.Alias; + try + { + @await Html.PartialAsync(partialViewName, item) + } + catch (InvalidOperationException) + { +

+ Could not render component of type: @(item.Content.ContentType.Alias) +
+ This likely happened because the partial view @partialViewName could not be found. +

+ } + } +
+ } +
diff --git a/Views/Partials/blocklist/default.cshtml b/Views/Partials/blocklist/default.cshtml new file mode 100644 index 0000000..accca2e --- /dev/null +++ b/Views/Partials/blocklist/default.cshtml @@ -0,0 +1,13 @@ +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage +@{ + if (Model?.Any() != true) { return; } +} +
+ @foreach (var block in Model) + { + if (block?.ContentUdi == null) { continue; } + var data = block.Content; + + @await Html.PartialAsync("blocklist/Components/" + data.ContentType.Alias, block) + } +
diff --git a/Views/Partials/grid/bootstrap3-fluid.cshtml b/Views/Partials/grid/bootstrap3-fluid.cshtml new file mode 100644 index 0000000..b92734e --- /dev/null +++ b/Views/Partials/grid/bootstrap3-fluid.cshtml @@ -0,0 +1,106 @@ +@using System.Web +@using Microsoft.AspNetCore.Html +@using Newtonsoft.Json.Linq +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage + +@* + Razor helpers located at the bottom of this file +*@ + +@if (Model is JObject && Model?.sections is not null) +{ + var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1; + +
+ @if (oneColumn) + { + foreach (var section in Model.sections) + { +
+ @foreach (var row in section.rows) + { + renderRow(row); + } +
+ } + } + else + { +
+ @foreach (var sec in Model.sections) + { +
+
+ @foreach (var row in sec.rows) + { + renderRow(row); + } +
+
+ } +
+ } +
+} + +@functions{ + + private async Task renderRow(dynamic row) + { +
+
+ @foreach (var area in row.areas) + { +
+
+ @foreach (var control in area.controls) + { + if (control?.editor?.view != null) + { + @await Html.PartialAsync("grid/editors/base", (object)control) + } + } +
+
+ } +
+
+ } +} + +@functions{ + + public static HtmlString RenderElementAttributes(dynamic contentItem) + { + var attrs = new List(); + JObject cfg = contentItem.config; + + if (cfg != null) + { + foreach (JProperty property in cfg.Properties()) + { + var propertyValue = HttpUtility.HtmlAttributeEncode(property.Value.ToString()); + attrs.Add(property.Name + "=\"" + propertyValue + "\""); + } + } + + JObject style = contentItem.styles; + + if (style != null) { + var cssVals = new List(); + foreach (JProperty property in style.Properties()) + { + var propertyValue = property.Value.ToString(); + if (string.IsNullOrWhiteSpace(propertyValue) == false) + { + cssVals.Add(property.Name + ":" + propertyValue + ";"); + } + } + + if (cssVals.Any()) + attrs.Add("style='" + HttpUtility.HtmlAttributeEncode(string.Join(" ", cssVals)) + "'"); + } + + return new HtmlString(string.Join(" ", attrs)); + } +} diff --git a/Views/Partials/grid/bootstrap3.cshtml b/Views/Partials/grid/bootstrap3.cshtml new file mode 100644 index 0000000..8863788 --- /dev/null +++ b/Views/Partials/grid/bootstrap3.cshtml @@ -0,0 +1,112 @@ +@using System.Web +@using Microsoft.AspNetCore.Html +@using Newtonsoft.Json.Linq +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage + +@if (Model is JObject && Model?.sections is not null) +{ + var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1; + +
+ @if (oneColumn) + { + foreach (var section in Model.sections) + { +
+ @foreach (var row in section.rows) + { + renderRow(row, true); + } +
+ } + } + else + { +
+
+ @foreach (var sec in Model.sections) + { +
+
+ @foreach (var row in sec.rows) + { + renderRow(row, false); + } +
+
+ } +
+
+ } +
+} + +@functions{ + + private async Task renderRow(dynamic row, bool singleColumn) + { +
+ @if (singleColumn) { + @:
+ } +
+ @foreach (var area in row.areas) + { +
+
+ @foreach (var control in area.controls) + { + if (control?.editor?.view != null) + { + @await Html.PartialAsync("grid/editors/base", (object)control) + } + } +
+
+ } +
+ @if (singleColumn) { + @:
+ } +
+ } + +} + +@functions{ + + public static HtmlString RenderElementAttributes(dynamic contentItem) + { + var attrs = new List(); + JObject cfg = contentItem.config; + + if (cfg != null) + { + foreach (JProperty property in cfg.Properties()) + { + var propertyValue = HttpUtility.HtmlAttributeEncode(property.Value.ToString()); + attrs.Add(property.Name + "=\"" + propertyValue + "\""); + } + } + + JObject style = contentItem.styles; + + if (style != null) + { + var cssVals = new List(); + foreach (JProperty property in style.Properties()) + { + var propertyValue = property.Value.ToString(); + if (string.IsNullOrWhiteSpace(propertyValue) == false) + { + cssVals.Add(property.Name + ":" + propertyValue + ";"); + } + } + + if (cssVals.Any()) + attrs.Add("style=\"" + HttpUtility.HtmlAttributeEncode(string.Join(" ", cssVals)) + "\""); + } + + return new HtmlString(string.Join(" ", attrs)); + } +} diff --git a/Views/Partials/grid/editors/base.cshtml b/Views/Partials/grid/editors/base.cshtml new file mode 100644 index 0000000..e40543b --- /dev/null +++ b/Views/Partials/grid/editors/base.cshtml @@ -0,0 +1,27 @@ +@model dynamic + +@try +{ + string editor = EditorView(Model); + @await Html.PartialAsync(editor, Model as object) +} +catch (Exception ex) +{ + 
@ex.ToString()
+} + +@functions{ + + public static string EditorView(dynamic contentItem) + { + string view = contentItem.editor.render != null ? contentItem.editor.render.ToString() : contentItem.editor.view.ToString(); + view = view.Replace(".html", ".cshtml"); + + if (!view.Contains("/")) + { + view = "grid/editors/" + view; + } + + return view; + } +} diff --git a/Views/Partials/grid/editors/embed.cshtml b/Views/Partials/grid/editors/embed.cshtml new file mode 100644 index 0000000..74c8fe2 --- /dev/null +++ b/Views/Partials/grid/editors/embed.cshtml @@ -0,0 +1,11 @@ +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage + +@if (Model is not null) +{ + string embedValue = Convert.ToString(Model.value); + embedValue = embedValue.DetectIsJson() ? Model.value.preview : Model.value; + +
+ @Html.Raw(embedValue) +
+} diff --git a/Views/Partials/grid/editors/macro.cshtml b/Views/Partials/grid/editors/macro.cshtml new file mode 100644 index 0000000..a4450d1 --- /dev/null +++ b/Views/Partials/grid/editors/macro.cshtml @@ -0,0 +1,15 @@ +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage + +@if (Model?.value is not null) +{ + string macroAlias = Model.value.macroAlias.ToString(); + var parameters = new Dictionary(); + foreach (var mpd in Model.value.macroParamsDictionary) + { + parameters.Add(mpd.Name, mpd.Value); + } + + + @await Umbraco.RenderMacroAsync(macroAlias, parameters) + +} diff --git a/Views/Partials/grid/editors/media.cshtml b/Views/Partials/grid/editors/media.cshtml new file mode 100644 index 0000000..bc3b111 --- /dev/null +++ b/Views/Partials/grid/editors/media.cshtml @@ -0,0 +1,64 @@ +@model dynamic +@using Umbraco.Cms.Core.Media +@using Umbraco.Cms.Core.PropertyEditors.ValueConverters +@inject IImageUrlGenerator ImageUrlGenerator + +@if (Model?.value is not null) +{ + var url = Model.value.image; + + if (Model.editor.config != null && Model.editor.config.size != null) + { + if (Model.value.coordinates != null) + { + url = ImageCropperTemplateCoreExtensions.GetCropUrl( + (string)url, + ImageUrlGenerator, + width: (int)Model.editor.config.size.width, + height: (int)Model.editor.config.size.height, + cropAlias: "default", + cropDataSet: new ImageCropperValue + { + Crops = new[] + { + new ImageCropperValue.ImageCropperCrop + { + Alias = "default", + Coordinates = new ImageCropperValue.ImageCropperCropCoordinates + { + X1 = (decimal)Model.value.coordinates.x1, + Y1 = (decimal)Model.value.coordinates.y1, + X2 = (decimal)Model.value.coordinates.x2, + Y2 = (decimal)Model.value.coordinates.y2 + } + } + } + }); + } + else + { + url = ImageCropperTemplateCoreExtensions.GetCropUrl( + (string)url, + ImageUrlGenerator, + width: (int)Model.editor.config.size.width, + height: (int)Model.editor.config.size.height, + cropDataSet: new ImageCropperValue + { + FocalPoint = new ImageCropperValue.ImageCropperFocalPoint + { + Top = Model.value.focalPoint == null ? 0.5m : Model.value.focalPoint.top, + Left = Model.value.focalPoint == null ? 0.5m : Model.value.focalPoint.left + } + }); + } + } + + var altText = Model.value.altText ?? Model.value.caption ?? string.Empty; + + @altText + + if (Model.value.caption != null) + { +

@Model.value.caption

+ } +} diff --git a/Views/Partials/grid/editors/rte.cshtml b/Views/Partials/grid/editors/rte.cshtml new file mode 100644 index 0000000..9445666 --- /dev/null +++ b/Views/Partials/grid/editors/rte.cshtml @@ -0,0 +1,13 @@ +@using Umbraco.Cms.Core.Templates +@model dynamic +@inject HtmlLocalLinkParser HtmlLocalLinkParser; +@inject HtmlUrlParser HtmlUrlParser; +@inject HtmlImageSourceParser HtmlImageSourceParser; + +@{ + var value = HtmlLocalLinkParser.EnsureInternalLinks(Model?.value.ToString()); + value = HtmlUrlParser.EnsureUrls(value); + value = HtmlImageSourceParser.EnsureImageSources(value); +} + +@Html.Raw(value) diff --git a/Views/Partials/grid/editors/textstring.cshtml b/Views/Partials/grid/editors/textstring.cshtml new file mode 100644 index 0000000..e6b9352 --- /dev/null +++ b/Views/Partials/grid/editors/textstring.cshtml @@ -0,0 +1,22 @@ +@model dynamic + +@if (Model?.editor.config.markup is not null) +{ + string markup = Model.editor.config.markup.ToString(); + markup = markup.Replace("#value#", Html.ReplaceLineBreaks((string)Model.value.ToString()).ToString()); + + if (Model.editor.config.style != null) + { + markup = markup.Replace("#style#", Model.editor.config.style.ToString()); + } + + + @Html.Raw(markup) + +} +else +{ + +
@Model?.value
+ +} diff --git a/Views/_ViewImports.cshtml b/Views/_ViewImports.cshtml new file mode 100644 index 0000000..91d671e --- /dev/null +++ b/Views/_ViewImports.cshtml @@ -0,0 +1,8 @@ +@using Umbraco.Extensions +@using Umbraco.Cms.Web.Common.PublishedModels +@using Umbraco.Cms.Web.Common.Views +@using Umbraco.Cms.Core.Models.PublishedContent +@using Microsoft.AspNetCore.Html +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Smidge +@inject Smidge.SmidgeHelper SmidgeHelper diff --git a/appsettings.Development.json b/appsettings.Development.json new file mode 100644 index 0000000..3446566 --- /dev/null +++ b/appsettings.Development.json @@ -0,0 +1,46 @@ +{ + "$schema": "appsettings-schema.json", + "Serilog": { + "MinimumLevel": { + "Default": "Information" + }, + "WriteTo": [ + { + "Name": "Async", + "Args": { + "configure": [ + { + "Name": "Console" + } + ] + } + } + ] + }, + "Umbraco": { + "CMS": { + "Content": { + "MacroErrors": "Throw" + }, + "Hosting": { + "Debug": true + }, + "RuntimeMinification": { + "UseInMemoryCache": true, + "CacheBuster": "Timestamp" + } + } + }, + "Keycloak": { + "BaseAddress": "https://auth.pokash.pl/realms/pokash", + "ClientId": "umbraco", + "ClientSecret": "5i5jgRVIrV276qgNmQ107lh40VNo1sWV", + "Realm": "pokash", + "Version": "21.0.2", + "CallbackPath": "/umbraco/signin-keycloak", + "AuthorizationEndpoint": "https://auth.pokash.pl/realms/pokash/protocol/openid-connect/auth", + "TokenEndpoint": "https://auth.pokash.pl/realms/pokash/protocol/openid-connect/token", + "UserInformationEndpoint": "https://auth.pokash.pl/realms/pokash/protocol/openid-connect/userinfo", + "Domain": "https://auth.pokash.pl/" + } +} diff --git a/appsettings.json b/appsettings.json new file mode 100644 index 0000000..397793e --- /dev/null +++ b/appsettings.json @@ -0,0 +1,48 @@ +{ + "$schema": "appsettings-schema.json", + "Serilog": { + "MinimumLevel": { + "Default": "Information", + "Override": { + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information", + "System": "Warning" + } + } + }, + "Umbraco": { + "CMS": { + "Global": { + "Id": "efe71b1a-dce2-4c7f-9bc7-a9d05746492e", + "SanitizeTinyMce": true + }, + "Content": { + "AllowEditInvariantFromNonDefault": true, + "ContentVersionCleanupPolicy": { + "EnableCleanup": true + } + }, + "Unattended": { + "UpgradeUnattended": true + }, + "Security": { + "AllowConcurrentLogins": false + } + } + }, + "ConnectionStrings": { + "umbracoDbDSN": "Server=192.168.100.101;Database=pokash-umbraco;User Id=sa;Password=Emi96Luk89!.;TrustServerCertificate=true;", + "umbracoDbDSN_ProviderName": "Microsoft.Data.SqlClient" + }, + "Keycloak": { + "BaseAddress": "https://auth.pokash.pl/realms/pokash", + "ClientId": "umbraco", + "ClientSecret": "5i5jgRVIrV276qgNmQ107lh40VNo1sWV", + "Realm": "pokash", + "Version": "21.0.2", + "CallbackPath": "/signin-keycloak", + "AuthorizationEndpoint": "https://auth.pokash.pl/realms/pokash/protocol/openid-connect/auth", + "TokenEndpoint": "https://auth.pokash.pl/realms/pokash/protocol/openid-connect/token", + "UserInformationEndpoint": "https://auth.pokash.pl/realms/pokash/protocol/openid-connect/userinfo" + } +} diff --git a/pokash-umbraco.csproj b/pokash-umbraco.csproj new file mode 100644 index 0000000..9a090b0 --- /dev/null +++ b/pokash-umbraco.csproj @@ -0,0 +1,33 @@ + + + net8.0 + enable + enable + pokash_umbraco + + + + + + + + + + + + + + + + + + true + + + + + false + false + + + diff --git a/pokash-umbraco.sln b/pokash-umbraco.sln new file mode 100644 index 0000000..7b2c998 --- /dev/null +++ b/pokash-umbraco.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.002.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "pokash-umbraco", "pokash-umbraco.csproj", "{98827941-44FA-458E-BF16-92BC91980994}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {98827941-44FA-458E-BF16-92BC91980994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {98827941-44FA-458E-BF16-92BC91980994}.Debug|Any CPU.Build.0 = Debug|Any CPU + {98827941-44FA-458E-BF16-92BC91980994}.Release|Any CPU.ActiveCfg = Release|Any CPU + {98827941-44FA-458E-BF16-92BC91980994}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B6986343-A185-4797-9217-1E647FCC502D} + EndGlobalSection +EndGlobal diff --git a/umbraco/Licenses/umbracoForms.lic b/umbraco/Licenses/umbracoForms.lic new file mode 100644 index 0000000..6504ef6 --- /dev/null +++ b/umbraco/Licenses/umbracoForms.lic @@ -0,0 +1 @@ +76E6-AE74-5179-58AE-2328-901F-475B-9C02-BE96-49A6-65AA-C463-35EE-45E7-2A64-05BF-6824-E5C6-D977-6A35-F78F-6E81-A79B-A5C4-AB0E-B701-DE4C-C12E-F1B9-3A0E-8D5D-B6C8-7DCE-7807-0C1B-2EC2-38B7-7697-B974-5993-CDF1-28EE-E727-91B6-BFEC-E7B6-3063-E91A-FC75-881A-A186-26E8-1B8B-2679-8689-2200-39A4-E2D8-2731-2900-8709-428A-47DA-DA4A-8EDB-79BB-1CC7-78C3-C788-1E6B-9A58-880D-FB49-99F4-E66D-CABF-A4BD-A8C1-C196-E282-3DAD-1CCF-678C-4360-066E-D580-E9BC-69D7-734D-C9D8-813E-28E5-FC9E-BA7E-9B60-5B4E-2EE6-BE9E-410F-2696-7914-58E4-E1C1-E6AE-58B0-1BC7-9C63-D3EE-60B7-724A-C494-8A21-6E69-2FC7-63BD-49F7-ACFA-8F47-0B5F-360D-454E-3FAE-74A0-E1E6-636F-54C7-3F97-C59A-3192-005A-68D4-C6BE-842B-41AD-E06B-515C-7E87-E83A-DBB7-12A1-E5E9-7389-3A20-B928-DD53-A179-CF0A-2503-DAE5-9E95-32DF-2500-6464-28E3-6992-92E1-1933-1ACE-4E4D-03BD-AFE4-37E4-DC3C-60C7-F04D-1033-504C-20AF-2035-FAF7-A8AB-3D9B-9764-B50E-B053-D3E5-2674-106F-B7CD-6E30-F015-4FA2-C940-B86F-EEFF-67C3-4906-19D7-2315-F654-E80A-DD28-D48C-AD40-C12A-66D2-F3DD-BD4A-DB8A-A777-C813-E8AC-E3EE-8916-0E92-3CDF-947F-CFA2-BBD7-CB23-3B8B-4012-466B-9D46-B799-3593-8C3B-9358-EA1D-3338-950E-B06C-AAF6-7949 \ No newline at end of file diff --git a/wwwroot/favicon.ico b/wwwroot/favicon.ico new file mode 100644 index 0000000..c0749dd Binary files /dev/null and b/wwwroot/favicon.ico differ