Welcome, @User.Identity?.Name (@User.GetUserId())
- -- Sign Out | - Allow | - Deny -
- -@item.Subject - @item.Type - @item.Value
-} diff --git a/apps/AppMvc/Views/Auth/ShowUser.cshtml b/apps/AppMvc/Views/Auth/ShowUser.cshtml deleted file mode 100644 index 8b53d9c43..000000000 --- a/apps/AppMvc/Views/Auth/ShowUser.cshtml +++ /dev/null @@ -1,13 +0,0 @@ -@model AppMvc.Controllers.AuthController.UpdateUserModel - - diff --git a/apps/AppMvc/Views/Auth/SignIn.cshtml b/apps/AppMvc/Views/Auth/SignIn.cshtml deleted file mode 100644 index 14e7b7b25..000000000 --- a/apps/AppMvc/Views/Auth/SignIn.cshtml +++ /dev/null @@ -1,42 +0,0 @@ -@model Jeebs.Mvc.Auth.Models.SignInModel -Ooops, an error has occured.
-@if (Model is Jeebs.Messages.Msg) +@if (Model is FailureValue) {@Model
} \ No newline at end of file diff --git a/apps/AppMvc/Views/Shared/Error/Error404.cshtml b/apps/AppMvc/Views/Shared/Error/Error404.cshtml index f420e1fe1..d0684be10 100644 --- a/apps/AppMvc/Views/Shared/Error/Error404.cshtml +++ b/apps/AppMvc/Views/Shared/Error/Error404.cshtml @@ -1,7 +1,7 @@ -Resource not found.
-@if (Model is Jeebs.Messages.Msg) +@if (Model is FailureValue) {@Model
} \ No newline at end of file diff --git a/apps/AppMvc/Views/_ViewImports.cshtml b/apps/AppMvc/Views/_ViewImports.cshtml index ee0880110..41f01f38d 100644 --- a/apps/AppMvc/Views/_ViewImports.cshtml +++ b/apps/AppMvc/Views/_ViewImports.cshtml @@ -1,5 +1,4 @@ -@using MvcApp -@using Jeebs.Mvc.Auth +@using MvcApp +@using Wrap @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Jeebs.Mvc -@addTagHelper *, Jeebs.Mvc.Auth diff --git a/apps/AppMvc/appsettings.json b/apps/AppMvc/appsettings.json index 48e64cf75..0db3279e4 100644 --- a/apps/AppMvc/appsettings.json +++ b/apps/AppMvc/appsettings.json @@ -1,10 +1,3 @@ { - "Logging": { - "LogLevel": { - "Default": "Debug", - "Microsoft": "Debug", - "Microsoft.Hosting.Lifetime": "Debug" - } - }, - "AllowedHosts": "*" + } diff --git a/apps/AppMvc/jeebsconfig.json b/apps/AppMvc/jeebsconfig.json index b31ec609f..cc8b3f0f2 100644 --- a/apps/AppMvc/jeebsconfig.json +++ b/apps/AppMvc/jeebsconfig.json @@ -20,27 +20,24 @@ "Microsoft.Hosting.Lifetime": "Information" }, "providers": { - "console": { + "console.local": { "enabled": true }, - "seq.server04": { + "seq.live": { "enabled": true } } }, "services": { + "console": { + "local": {} + }, "seq": { - "server04": { + "live": { "server": "", "apiKey": "" } } - }, - "web": { - "auth": { - "enabled": true, - "scheme": "cookies" - } } } } \ No newline at end of file diff --git a/apps/AppRazor/.editorconfig b/apps/AppRazor/.editorconfig deleted file mode 100644 index c0448b0dd..000000000 --- a/apps/AppRazor/.editorconfig +++ /dev/null @@ -1 +0,0 @@ -[*.cs] diff --git a/apps/AppRazor/App.cs b/apps/AppRazor/App.cs deleted file mode 100644 index f2172c978..000000000 --- a/apps/AppRazor/App.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Jeebs Test Applications -// Copyright (c) bfren - licensed under https://mit.bfren.dev/2013 - -using Jeebs.Auth.Data.Clients.MySql; -using Jeebs.Mvc.Auth; - -namespace AppRazor; - -public sealed class App : Jeebs.Apps.Web.RazorApp -{ - public override void ConfigureServices(HostBuilderContext ctx, IServiceCollection services) - { - base.ConfigureServices(ctx, services); - - services.AddAuthentication(ctx.Configuration) - .WithData@item.Subject - @item.Type - @item.Value
-} diff --git a/apps/AppRazor/Pages/Auth/Check.cshtml.cs b/apps/AppRazor/Pages/Auth/Check.cshtml.cs deleted file mode 100644 index 4b5175902..000000000 --- a/apps/AppRazor/Pages/Auth/Check.cshtml.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Jeebs Test Applications -// Copyright (c) bfren - licensed under https://mit.bfren.dev/2013 - -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc.RazorPages; - -namespace AppRazor.Pages.Auth; - -[Authorize("Token")] -public class CheckModel : PageModel -{ - public void OnGet() - { - } -} diff --git a/apps/AppRazor/Pages/Auth/SignIn.cshtml b/apps/AppRazor/Pages/Auth/SignIn.cshtml deleted file mode 100644 index 4b0b03747..000000000 --- a/apps/AppRazor/Pages/Auth/SignIn.cshtml +++ /dev/null @@ -1,10 +0,0 @@ -@page -@model AppRazor.Pages.Auth.SignInModel -@{ -} - -Learn about building Web apps with ASP.NET Core.
-`s get reset. However, we also reset the\n// bottom margin to use `rem` units instead of `em`.\np {\n margin-top: 0;\n margin-bottom: $paragraph-margin-bottom;\n}\n\n// Abbreviations\n//\n// 1. Duplicate behavior to the data-* attribute for our tooltip plugin\n// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.\n// 3. Add explicit cursor to indicate changed behavior.\n// 4. Remove the bottom border in Firefox 39-.\n// 5. Prevent the text-decoration to be skipped.\n\nabbr[title],\nabbr[data-original-title] { // 1\n text-decoration: underline; // 2\n text-decoration: underline dotted; // 2\n cursor: help; // 3\n border-bottom: 0; // 4\n text-decoration-skip-ink: none; // 5\n}\n\naddress {\n margin-bottom: 1rem;\n font-style: normal;\n line-height: inherit;\n}\n\nol,\nul,\ndl {\n margin-top: 0;\n margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n margin-bottom: 0;\n}\n\ndt {\n font-weight: $dt-font-weight;\n}\n\ndd {\n margin-bottom: .5rem;\n margin-left: 0; // Undo browser default\n}\n\nblockquote {\n margin: 0 0 1rem;\n}\n\nb,\nstrong {\n font-weight: $font-weight-bolder; // Add the correct font weight in Chrome, Edge, and Safari\n}\n\nsmall {\n @include font-size(80%); // Add the correct font size in all browsers\n}\n\n//\n// Prevent `sub` and `sup` elements from affecting the line height in\n// all browsers.\n//\n\nsub,\nsup {\n position: relative;\n @include font-size(75%);\n line-height: 0;\n vertical-align: baseline;\n}\n\nsub { bottom: -.25em; }\nsup { top: -.5em; }\n\n\n//\n// Links\n//\n\na {\n color: $link-color;\n text-decoration: $link-decoration;\n background-color: transparent; // Remove the gray background on active links in IE 10.\n\n @include hover {\n color: $link-hover-color;\n text-decoration: $link-hover-decoration;\n }\n}\n\n// And undo these styles for placeholder links/named anchors (without href)\n// which have not been made explicitly keyboard-focusable (without tabindex).\n// It would be more straightforward to just use a[href] in previous block, but that\n// causes specificity issues in many other styles that are too complex to fix.\n// See https://github.com/twbs/bootstrap/issues/19402\n\na:not([href]):not([tabindex]) {\n color: inherit;\n text-decoration: none;\n\n @include hover-focus {\n color: inherit;\n text-decoration: none;\n }\n\n &:focus {\n outline: 0;\n }\n}\n\n\n//\n// Code\n//\n\npre,\ncode,\nkbd,\nsamp {\n font-family: $font-family-monospace;\n @include font-size(1em); // Correct the odd `em` font sizing in all browsers.\n}\n\npre {\n // Remove browser default top margin\n margin-top: 0;\n // Reset browser default of `1em` to use `rem`s\n margin-bottom: 1rem;\n // Don't allow content to break outside\n overflow: auto;\n}\n\n\n//\n// Figures\n//\n\nfigure {\n // Apply a consistent margin strategy (matches our type styles).\n margin: 0 0 1rem;\n}\n\n\n//\n// Images and content\n//\n\nimg {\n vertical-align: middle;\n border-style: none; // Remove the border on images inside links in IE 10-.\n}\n\nsvg {\n // Workaround for the SVG overflow bug in IE10/11 is still required.\n // See https://github.com/twbs/bootstrap/issues/26878\n overflow: hidden;\n vertical-align: middle;\n}\n\n\n//\n// Tables\n//\n\ntable {\n border-collapse: collapse; // Prevent double borders\n}\n\ncaption {\n padding-top: $table-cell-padding;\n padding-bottom: $table-cell-padding;\n color: $table-caption-color;\n text-align: left;\n caption-side: bottom;\n}\n\nth {\n // Matches default `
`s get reset. However, we also reset the\n// bottom margin to use `rem` units instead of `em`.\np {\n margin-top: 0;\n margin-bottom: $paragraph-margin-bottom;\n}\n\n// Abbreviations\n//\n// 1. Duplicate behavior to the data-* attribute for our tooltip plugin\n// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.\n// 3. Add explicit cursor to indicate changed behavior.\n// 4. Remove the bottom border in Firefox 39-.\n// 5. Prevent the text-decoration to be skipped.\n\nabbr[title],\nabbr[data-original-title] { // 1\n text-decoration: underline; // 2\n text-decoration: underline dotted; // 2\n cursor: help; // 3\n border-bottom: 0; // 4\n text-decoration-skip-ink: none; // 5\n}\n\naddress {\n margin-bottom: 1rem;\n font-style: normal;\n line-height: inherit;\n}\n\nol,\nul,\ndl {\n margin-top: 0;\n margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n margin-bottom: 0;\n}\n\ndt {\n font-weight: $dt-font-weight;\n}\n\ndd {\n margin-bottom: .5rem;\n margin-left: 0; // Undo browser default\n}\n\nblockquote {\n margin: 0 0 1rem;\n}\n\nb,\nstrong {\n font-weight: $font-weight-bolder; // Add the correct font weight in Chrome, Edge, and Safari\n}\n\nsmall {\n @include font-size(80%); // Add the correct font size in all browsers\n}\n\n//\n// Prevent `sub` and `sup` elements from affecting the line height in\n// all browsers.\n//\n\nsub,\nsup {\n position: relative;\n @include font-size(75%);\n line-height: 0;\n vertical-align: baseline;\n}\n\nsub { bottom: -.25em; }\nsup { top: -.5em; }\n\n\n//\n// Links\n//\n\na {\n color: $link-color;\n text-decoration: $link-decoration;\n background-color: transparent; // Remove the gray background on active links in IE 10.\n\n @include hover {\n color: $link-hover-color;\n text-decoration: $link-hover-decoration;\n }\n}\n\n// And undo these styles for placeholder links/named anchors (without href)\n// which have not been made explicitly keyboard-focusable (without tabindex).\n// It would be more straightforward to just use a[href] in previous block, but that\n// causes specificity issues in many other styles that are too complex to fix.\n// See https://github.com/twbs/bootstrap/issues/19402\n\na:not([href]):not([tabindex]) {\n color: inherit;\n text-decoration: none;\n\n @include hover-focus {\n color: inherit;\n text-decoration: none;\n }\n\n &:focus {\n outline: 0;\n }\n}\n\n\n//\n// Code\n//\n\npre,\ncode,\nkbd,\nsamp {\n font-family: $font-family-monospace;\n @include font-size(1em); // Correct the odd `em` font sizing in all browsers.\n}\n\npre {\n // Remove browser default top margin\n margin-top: 0;\n // Reset browser default of `1em` to use `rem`s\n margin-bottom: 1rem;\n // Don't allow content to break outside\n overflow: auto;\n}\n\n\n//\n// Figures\n//\n\nfigure {\n // Apply a consistent margin strategy (matches our type styles).\n margin: 0 0 1rem;\n}\n\n\n//\n// Images and content\n//\n\nimg {\n vertical-align: middle;\n border-style: none; // Remove the border on images inside links in IE 10-.\n}\n\nsvg {\n // Workaround for the SVG overflow bug in IE10/11 is still required.\n // See https://github.com/twbs/bootstrap/issues/26878\n overflow: hidden;\n vertical-align: middle;\n}\n\n\n//\n// Tables\n//\n\ntable {\n border-collapse: collapse; // Prevent double borders\n}\n\ncaption {\n padding-top: $table-cell-padding;\n padding-bottom: $table-cell-padding;\n color: $table-caption-color;\n text-align: left;\n caption-side: bottom;\n}\n\nth {\n // Matches default `
`s get reset. However, we also reset the\n// bottom margin to use `rem` units instead of `em`.\np {\n margin-top: 0;\n margin-bottom: $paragraph-margin-bottom;\n}\n\n// Abbreviations\n//\n// 1. Duplicate behavior to the data-* attribute for our tooltip plugin\n// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.\n// 3. Add explicit cursor to indicate changed behavior.\n// 4. Remove the bottom border in Firefox 39-.\n// 5. Prevent the text-decoration to be skipped.\n\nabbr[title],\nabbr[data-original-title] { // 1\n text-decoration: underline; // 2\n text-decoration: underline dotted; // 2\n cursor: help; // 3\n border-bottom: 0; // 4\n text-decoration-skip-ink: none; // 5\n}\n\naddress {\n margin-bottom: 1rem;\n font-style: normal;\n line-height: inherit;\n}\n\nol,\nul,\ndl {\n margin-top: 0;\n margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n margin-bottom: 0;\n}\n\ndt {\n font-weight: $dt-font-weight;\n}\n\ndd {\n margin-bottom: .5rem;\n margin-left: 0; // Undo browser default\n}\n\nblockquote {\n margin: 0 0 1rem;\n}\n\nb,\nstrong {\n font-weight: $font-weight-bolder; // Add the correct font weight in Chrome, Edge, and Safari\n}\n\nsmall {\n @include font-size(80%); // Add the correct font size in all browsers\n}\n\n//\n// Prevent `sub` and `sup` elements from affecting the line height in\n// all browsers.\n//\n\nsub,\nsup {\n position: relative;\n @include font-size(75%);\n line-height: 0;\n vertical-align: baseline;\n}\n\nsub { bottom: -.25em; }\nsup { top: -.5em; }\n\n\n//\n// Links\n//\n\na {\n color: $link-color;\n text-decoration: $link-decoration;\n background-color: transparent; // Remove the gray background on active links in IE 10.\n\n @include hover {\n color: $link-hover-color;\n text-decoration: $link-hover-decoration;\n }\n}\n\n// And undo these styles for placeholder links/named anchors (without href)\n// which have not been made explicitly keyboard-focusable (without tabindex).\n// It would be more straightforward to just use a[href] in previous block, but that\n// causes specificity issues in many other styles that are too complex to fix.\n// See https://github.com/twbs/bootstrap/issues/19402\n\na:not([href]):not([tabindex]) {\n color: inherit;\n text-decoration: none;\n\n @include hover-focus {\n color: inherit;\n text-decoration: none;\n }\n\n &:focus {\n outline: 0;\n }\n}\n\n\n//\n// Code\n//\n\npre,\ncode,\nkbd,\nsamp {\n font-family: $font-family-monospace;\n @include font-size(1em); // Correct the odd `em` font sizing in all browsers.\n}\n\npre {\n // Remove browser default top margin\n margin-top: 0;\n // Reset browser default of `1em` to use `rem`s\n margin-bottom: 1rem;\n // Don't allow content to break outside\n overflow: auto;\n}\n\n\n//\n// Figures\n//\n\nfigure {\n // Apply a consistent margin strategy (matches our type styles).\n margin: 0 0 1rem;\n}\n\n\n//\n// Images and content\n//\n\nimg {\n vertical-align: middle;\n border-style: none; // Remove the border on images inside links in IE 10-.\n}\n\nsvg {\n // Workaround for the SVG overflow bug in IE10/11 is still required.\n // See https://github.com/twbs/bootstrap/issues/26878\n overflow: hidden;\n vertical-align: middle;\n}\n\n\n//\n// Tables\n//\n\ntable {\n border-collapse: collapse; // Prevent double borders\n}\n\ncaption {\n padding-top: $table-cell-padding;\n padding-bottom: $table-cell-padding;\n color: $table-caption-color;\n text-align: left;\n caption-side: bottom;\n}\n\nth {\n // Matches default `