@ViewData["Title"]
-You have successfully logged out of the application.
-@ViewData["Title"]
-
-
-
-@section Scripts {
-
-
-
-
-
-
-
-
- @{ - if ((Model.ExternalLogins?.Count ?? 0) == 0) - { -
-
-Use another service to log in.
-- @{ - if ((Model.ExternalLogins?.Count ?? 0) == 0) - { -
-
- }
- else
- {
-
- }
- }
- - There are no external authentication services configured. See this article - for details on setting up this ASP.NET application to support logging in via external services. -
-Error.
-An error occurred while processing your request.
- -Development Mode
-- Swapping to Development environment will display more detailed information about the error that occurred. -
-- The Development environment shouldn't be enabled for deployed applications. - It can result in displaying sensitive information from exceptions to end users. - For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development - and restarting the app. -
\ No newline at end of file diff --git a/src/adminTools/adminBlazorWebsite/src/Pages/Index.razor b/src/adminTools/adminBlazorWebsite/src/Pages/Index.razor deleted file mode 100644 index 5c410eb3..00000000 --- a/src/adminTools/adminBlazorWebsite/src/Pages/Index.razor +++ /dev/null @@ -1,12 +0,0 @@ -@page "/" - -Hello, Cloudies!
--This is a simple admin interface to manage the short URLs generated by the Azure Url Shortener. -
--It's a budget-friendly solution that YOU can have. -
--Check-out the Github AzUrlShortener repository to know more. -
diff --git a/src/adminTools/adminBlazorWebsite/src/Pages/Shared/_Layout.cshtml b/src/adminTools/adminBlazorWebsite/src/Pages/Shared/_Layout.cshtml deleted file mode 100644 index 4d2b2742..00000000 --- a/src/adminTools/adminBlazorWebsite/src/Pages/Shared/_Layout.cshtml +++ /dev/null @@ -1,57 +0,0 @@ -@using Microsoft.AspNetCore.Hosting -@using Microsoft.AspNetCore.Mvc.ViewEngines -@inject IWebHostEnvironment Environment -@inject ICompositeViewEngine Engine - - - - - -
-
- @RenderBody()
-
-
-
-
-
-
- @RenderSection("Scripts", required: false)
-
-
diff --git a/src/adminTools/adminBlazorWebsite/src/Pages/Shared/_LoginPartial.cshtml b/src/adminTools/adminBlazorWebsite/src/Pages/Shared/_LoginPartial.cshtml
deleted file mode 100644
index c2e7a32e..00000000
--- a/src/adminTools/adminBlazorWebsite/src/Pages/Shared/_LoginPartial.cshtml
+++ /dev/null
@@ -1,24 +0,0 @@
-@using Microsoft.AspNetCore.Identity
-
-@inject SignInManager
@@ -16,9 +16,10 @@
-
-
-
+
+
+
+
-
+ @foreach (var (country, clicks) in url.Clicks)
+ {
+
- @country: @clicks + } +
-
@@ -58,27 +64,29 @@ else {
+
-
-
+
-
-
+
-
+
+
}
@@ -88,21 +96,22 @@ else
{
+
-
-
+
adminBlazorWebsite
-
-
-
- ();
- context.Database.Migrate();
+ var services = scope.ServiceProvider;
+
+ try
+ {
+ var context = services.GetRequiredService();
+ context.Database.Migrate();
- // requires using Microsoft.Extensions.Configuration;
- var config = host.Services.GetRequiredService();
- // Set password with the Secret Manager tool.
- // dotnet user-secrets set SeedUserPW
+ // requires using Microsoft.Extensions.Configuration;
+ var config = host.Services.GetRequiredService();
+ // Set password with the Secret Manager tool.
+ // dotnet user-secrets set SeedUserPW
- var defaultAdminEMail = config["defaultAdminEMail"];
- var defaultAdminPW = config["defaultAdminPW"];
+ var defaultAdminEMail = config["defaultAdminEMail"];
+ var defaultAdminPW = config["defaultAdminPW"];
- SeedData.Initialize(services, defaultAdminEMail, defaultAdminPW).Wait();
- }
- catch (Exception ex)
- {
- var logger = services.GetRequiredService>();
- logger.LogError(ex, "An error occurred seeding the DB.");
+ SeedData.Initialize(services, defaultAdminEMail, defaultAdminPW).Wait();
+ }
+ catch (Exception ex)
+ {
+ var logger = services.GetRequiredService>();
+ logger.LogError(ex, "An error occurred seeding the DB.");
+ }
}
- }
-
+
host.Run();
}
diff --git a/src/adminTools/adminBlazorWebsite/src/Shared/LoginDisplay.razor b/src/adminTools/adminBlazorWebsite/src/Shared/LoginDisplay.razor
deleted file mode 100644
index 854ffabe..00000000
--- a/src/adminTools/adminBlazorWebsite/src/Shared/LoginDisplay.razor
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- Hello, @context.User.Identity.Name!
-
-
-
- Log in
-
-
diff --git a/src/adminTools/adminBlazorWebsite/src/Shared/MainLayout.razor b/src/adminTools/adminBlazorWebsite/src/Shared/MainLayout.razor
deleted file mode 100644
index fafa2f55..00000000
--- a/src/adminTools/adminBlazorWebsite/src/Shared/MainLayout.razor
+++ /dev/null
@@ -1,16 +0,0 @@
-@inherits LayoutComponentBase
-
-
-
-(options =>
options.UseSqlite(
- _config.GetConnectionString("DefaultConnection")));
- services.AddDefaultIdentity(options => {options.SignIn.RequireConfirmedAccount = true;})
+ Config.GetConnectionString("DefaultConnection")));
+ services.AddDefaultIdentity(options => { options.SignIn.RequireConfirmedAccount = true; })
.AddRoles()
.AddEntityFrameworkStores();
services.AddRazorPages();
services.AddServerSideBlazor();
services.AddScoped>();
- services.Configure(_config.GetSection("AppSettings"));
- services.AddSingleton();
+ services.Configure(Config.GetSection("AppSettings"));
+ services.AddHttpClient(client =>
+ {
+ client.BaseAddress = new Uri($"{Config["azFunctionUrl"]}/api/");
+ });
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/src/adminTools/adminBlazorWebsite/src/_Imports.razor b/src/adminTools/adminBlazorWebsite/src/_Imports.razor
index fb258e0b..17fe2434 100644
--- a/src/adminTools/adminBlazorWebsite/src/_Imports.razor
+++ b/src/adminTools/adminBlazorWebsite/src/_Imports.razor
@@ -7,3 +7,4 @@
@using Microsoft.JSInterop
@using adminBlazorWebsite
@using adminBlazorWebsite.Shared
+@using Blazored.FluentValidation
\ No newline at end of file
diff --git a/src/adminTools/adminBlazorWebsite/src/adminBlazorWebsite.csproj b/src/adminTools/adminBlazorWebsite/src/adminBlazorWebsite.csproj
index 45188036..52b91a06 100644
--- a/src/adminTools/adminBlazorWebsite/src/adminBlazorWebsite.csproj
+++ b/src/adminTools/adminBlazorWebsite/src/adminBlazorWebsite.csproj
@@ -1,7 +1,7 @@
-
+
- net5.0
+ netcoreapp3.1
aspnet-adminBlazorWebsite-8EFE5E6C-46BA-43FD-9283-8E54D1B14E62
@@ -10,13 +10,17 @@
-
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
diff --git a/src/adminTools/adminBlazorWebsite/src/app.db b/src/adminTools/adminBlazorWebsite/src/app.db
deleted file mode 100644
index 61a201bf..00000000
Binary files a/src/adminTools/adminBlazorWebsite/src/app.db and /dev/null differ
diff --git a/src/adminTools/adminBlazorWebsite/src/appsettings.json b/src/adminTools/adminBlazorWebsite/src/appsettings.json
deleted file mode 100644
index 9f74f57c..00000000
--- a/src/adminTools/adminBlazorWebsite/src/appsettings.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "ConnectionStrings": {
- "DefaultConnection": "DataSource=app.db"
- },
- "Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft": "Warning",
- "Microsoft.Hosting.Lifetime": "Information"
- }
- },
- "AllowedHosts": "*",
- "azFunctionUrl": "http://....../api/UrlList",
- "code": "http://....../api/UrlShortener",
- "defaultAdminEMail": "admin@cloud5mins.com",
- "defaultAdminPW": "_STRONG_PASSWORD_"
-}
diff --git a/src/adminTools/adminBlazorWebsite/src/wwwroot/favicon.ico b/src/adminTools/adminBlazorWebsite/src/wwwroot/favicon.ico
deleted file mode 100644
index a3a79998..00000000
Binary files a/src/adminTools/adminBlazorWebsite/src/wwwroot/favicon.ico and /dev/null differ
diff --git a/src/adminTools/medias/TinyBlazorAdmin.gif b/src/adminTools/medias/TinyBlazorAdmin.gif
deleted file mode 100644
index cd609e6b..00000000
Binary files a/src/adminTools/medias/TinyBlazorAdmin.gif and /dev/null differ
diff --git a/src/adminTools/medias/adminBlazorWebsite.png b/src/adminTools/medias/adminBlazorWebsite.png
deleted file mode 100644
index d2716fd3..00000000
Binary files a/src/adminTools/medias/adminBlazorWebsite.png and /dev/null differ
diff --git a/src/adminTools/medias/postman_createShotUrl.png b/src/adminTools/medias/postman_createShotUrl.png
deleted file mode 100644
index a2ab6c5f..00000000
Binary files a/src/adminTools/medias/postman_createShotUrl.png and /dev/null differ
diff --git a/src/adminTools/postman/README.md b/src/adminTools/postman/README.md
deleted file mode 100644
index 221f1aa9..00000000
--- a/src/adminTools/postman/README.md
+++ /dev/null
@@ -1,93 +0,0 @@
-# Postman
-
-## Deployment
-
-Postman is a API testing tool, so there is no deployment. To get it go to [Postman website](https://www.postman.com/).
-
-## How to use it
-
-With Postman, you will need to create a request for each functions. Here some requirements:
-
-- Set the request to POST.
-- Add a header: Content-Type = application/json
-- Use the URL **WITH** the security `Code` if the function as one. ([Read here](https://github.com/FBoucher/AzUrlShortener/blob/main/doc/post-deployment-configuration.md#how-to-get-the-azure-function-urls) to learn how to get the URLs )
-
-### 1- Create a short Url
-
-In Postman, use the URL from the **UrlShortener** Azure Function. In the body of the request, add a JSON document containing two properties.
-
-See the examples bellow to create short generic URL.
-
-```json
-{
- "url": "http://www.frankysnotes.com/2020/03/reading-notes-416.html",
- "vanity": ""
-}
-```
-
-If you prefer you can pass a `vanity` to have control on the end part of the Url. In this sample the vanity is `rn-416`.
-
-
-```json
-{
- "url": "http://www.frankysnotes.com/2020/03/reading-notes-416.html",
- "vanity": "rn-416"
-}
-```
-
-To execute the call click the *Send button*. The response will be:
-
-```json
-{
- "ShortUrl": "http://localhost:7071/2r",
- "LongUrl": "http://www.frankysnotes.com/2020/03/reading-notes-416.html"
-}
-```
-
-
-
-
-### 2- List all Urls
-
-In Postman, use the URL from the **UrlList** Azure Function. Set the request to GET. No body content is required for this request. However, make sure the url contains the security token `code`.
-
- https://shortenertools.azurewebsites.net/api/UrlList?code=JVzE6CvlEHxDHbq.....
-
-
-To execute the call click the *Send button*. The response will be a json document with an array:
-
-
-```json
-{
- "UrlList": [
- {
- "Url": "http://www.frankysnotes.com/2020/03/reading-notes-416.html",
- "PartitionKey": "2",
- "RowKey": "2r",
- "Timestamp": "2020-03-20T13:43:47.5758051+00:00",
- "ETag": "W/\"datetime'2020-03-20T13%3A43%3A47.5758051Z'\""
- },
- {
- "Url": "http://www.frankysnotes.com/2020/03/reading-notes-416.html",
- "PartitionKey": "t",
- "RowKey": "test10h24",
- "Timestamp": "2020-03-27T14:26:44.4342376+00:00",
- "ETag": "W/\"datetime'2020-03-27T14%3A26%3A44.4342376Z'\""
- },
- {
- "Url": "https://www.frankysnotes.com/2020/03/reading-notes-416.html",
- "PartitionKey": "z",
- "RowKey": "z10test",
- "Timestamp": "2020-03-20T15:27:08.8691188+00:00",
- "ETag": "W/\"datetime'2020-03-20T15%3A27%3A08.8691188Z'\""
- }
- ]
-}
-```
-
-
-
-
-## Question, problem?
-
-If you have question or encounter any problem using this admin interface with AzShortenerUrl please feel free to ask help in the [issues section](https://github.com/FBoucher/AzUrlShortener/issues).
diff --git a/src/adminTools/postman/medias/postman_Urllist.png b/src/adminTools/postman/medias/postman_Urllist.png
deleted file mode 100644
index 43cf7f2d..00000000
Binary files a/src/adminTools/postman/medias/postman_Urllist.png and /dev/null differ
diff --git a/src/adminTools/postman/medias/postman_createShotUrl.png b/src/adminTools/postman/medias/postman_createShotUrl.png
deleted file mode 100644
index e24215d5..00000000
Binary files a/src/adminTools/postman/medias/postman_createShotUrl.png and /dev/null differ
diff --git a/AzUrlShortener.sln b/src/api/AzUrlShortener.sln
similarity index 88%
rename from AzUrlShortener.sln
rename to src/api/AzUrlShortener.sln
index 18c8136d..99c9ad54 100644
--- a/AzUrlShortener.sln
+++ b/src/api/AzUrlShortener.sln
@@ -3,9 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30122.103
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "shortenerTools", "src\shortenerTools\shortenerTools.csproj", "{F2DDB6A9-0522-44D0-A34D-8DBB63B9BCA7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "adminBlazorWebsite", "src\adminTools\adminBlazorWebsite\src\adminBlazorWebsite.csproj", "{C0F1FBEA-E94D-4D65-9DD4-FA3089547354}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "shortenerTools", "shortenerTools\shortenerTools.csproj", "{F2DDB6A9-0522-44D0-A34D-8DBB63B9BCA7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deployment", "Deployment", "{91EC9638-F1E4-4939-837B-206A6E94B7BD}"
ProjectSection(SolutionItems) = preProject
diff --git a/src/shortenerTools/.vscode/extensions.json b/src/api/shortenerTools/.vscode/extensions.json
similarity index 100%
rename from src/shortenerTools/.vscode/extensions.json
rename to src/api/shortenerTools/.vscode/extensions.json
diff --git a/src/shortenerTools/.vscode/launch.json b/src/api/shortenerTools/.vscode/launch.json
similarity index 100%
rename from src/shortenerTools/.vscode/launch.json
rename to src/api/shortenerTools/.vscode/launch.json
diff --git a/src/shortenerTools/.vscode/tasks.json b/src/api/shortenerTools/.vscode/tasks.json
similarity index 100%
rename from src/shortenerTools/.vscode/tasks.json
rename to src/api/shortenerTools/.vscode/tasks.json
diff --git a/src/shortenerTools/Domain/ClickDate.cs b/src/api/shortenerTools/Domain/ClickDate.cs
similarity index 100%
rename from src/shortenerTools/Domain/ClickDate.cs
rename to src/api/shortenerTools/Domain/ClickDate.cs
diff --git a/src/shortenerTools/Domain/ClickDateList.cs b/src/api/shortenerTools/Domain/ClickDateList.cs
similarity index 100%
rename from src/shortenerTools/Domain/ClickDateList.cs
rename to src/api/shortenerTools/Domain/ClickDateList.cs
diff --git a/src/shortenerTools/Domain/ClickStatsEntity.cs b/src/api/shortenerTools/Domain/ClickStatsEntity.cs
similarity index 80%
rename from src/shortenerTools/Domain/ClickStatsEntity.cs
rename to src/api/shortenerTools/Domain/ClickStatsEntity.cs
index ecf91e52..c0cef202 100644
--- a/src/shortenerTools/Domain/ClickStatsEntity.cs
+++ b/src/api/shortenerTools/Domain/ClickStatsEntity.cs
@@ -1,5 +1,5 @@
-using System;
using Microsoft.Azure.Cosmos.Table;
+using System;
namespace Cloud5mins.domain
{
@@ -8,14 +8,13 @@ public class ClickStatsEntity : TableEntity
//public string Id { get; set; }
public string Datetime { get; set; }
- public ClickStatsEntity(){}
+ public ClickStatsEntity() { }
- public ClickStatsEntity(string vanity){
+ public ClickStatsEntity(string vanity)
+ {
PartitionKey = vanity;
RowKey = Guid.NewGuid().ToString();
Datetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm");
}
}
-
-
}
diff --git a/src/shortenerTools/Domain/ClickStatsEntityList.cs b/src/api/shortenerTools/Domain/ClickStatsEntityList.cs
similarity index 66%
rename from src/shortenerTools/Domain/ClickStatsEntityList.cs
rename to src/api/shortenerTools/Domain/ClickStatsEntityList.cs
index 85ac8efd..6f574db8 100644
--- a/src/shortenerTools/Domain/ClickStatsEntityList.cs
+++ b/src/api/shortenerTools/Domain/ClickStatsEntityList.cs
@@ -1,4 +1,3 @@
-using System;
using System.Collections.Generic;
namespace Cloud5mins.domain
@@ -7,8 +6,8 @@ public class ClickStatsEntityList
{
public List ClickStatsList { get; set; }
- public ClickStatsEntityList(){}
- public ClickStatsEntityList (List list)
+ public ClickStatsEntityList() { }
+ public ClickStatsEntityList(List list)
{
ClickStatsList = list;
}
diff --git a/src/shortenerTools/Domain/ListResponse.cs b/src/api/shortenerTools/Domain/ListResponse.cs
similarity index 67%
rename from src/shortenerTools/Domain/ListResponse.cs
rename to src/api/shortenerTools/Domain/ListResponse.cs
index dcb6ed22..dc874c16 100644
--- a/src/shortenerTools/Domain/ListResponse.cs
+++ b/src/api/shortenerTools/Domain/ListResponse.cs
@@ -1,4 +1,3 @@
-using System;
using System.Collections.Generic;
namespace Cloud5mins.domain
@@ -7,8 +6,8 @@ public class ListResponse
{
public List UrlList { get; set; }
- public ListResponse(){}
- public ListResponse (List list)
+ public ListResponse() { }
+ public ListResponse(List list)
{
UrlList = list;
}
diff --git a/src/shortenerTools/Domain/NextId.cs b/src/api/shortenerTools/Domain/NextId.cs
similarity index 74%
rename from src/shortenerTools/Domain/NextId.cs
rename to src/api/shortenerTools/Domain/NextId.cs
index 4b100a7e..47b1d3aa 100644
--- a/src/shortenerTools/Domain/NextId.cs
+++ b/src/api/shortenerTools/Domain/NextId.cs
@@ -2,7 +2,7 @@
namespace Cloud5mins.domain
{
- public class NextId : TableEntity
+ public class NextId : TableEntity
{
public int Id { get; set; }
}
diff --git a/src/shortenerTools/Domain/Schedule.cs b/src/api/shortenerTools/Domain/Schedule.cs
similarity index 100%
rename from src/shortenerTools/Domain/Schedule.cs
rename to src/api/shortenerTools/Domain/Schedule.cs
diff --git a/src/shortenerTools/Domain/ShortRequest.cs b/src/api/shortenerTools/Domain/ShortRequest.cs
similarity index 100%
rename from src/shortenerTools/Domain/ShortRequest.cs
rename to src/api/shortenerTools/Domain/ShortRequest.cs
diff --git a/src/shortenerTools/Domain/ShortResponse.cs b/src/api/shortenerTools/Domain/ShortResponse.cs
similarity index 61%
rename from src/shortenerTools/Domain/ShortResponse.cs
rename to src/api/shortenerTools/Domain/ShortResponse.cs
index 6c4262ae..7352d3d0 100644
--- a/src/shortenerTools/Domain/ShortResponse.cs
+++ b/src/api/shortenerTools/Domain/ShortResponse.cs
@@ -1,15 +1,13 @@
-using System;
-
namespace Cloud5mins.domain
{
public class ShortResponse
{
public string ShortUrl { get; set; }
public string LongUrl { get; set; }
- public string Title { get; set; }
+ public string Title { get; set; }
- public ShortResponse(){}
- public ShortResponse (string host, string longUrl, string endUrl, string title)
+ public ShortResponse() { }
+ public ShortResponse(string host, string longUrl, string endUrl, string title)
{
LongUrl = longUrl;
ShortUrl = string.Concat(host, "/", endUrl);
diff --git a/src/api/shortenerTools/Domain/ShortUrlEntity.cs b/src/api/shortenerTools/Domain/ShortUrlEntity.cs
new file mode 100644
index 00000000..147157b7
--- /dev/null
+++ b/src/api/shortenerTools/Domain/ShortUrlEntity.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Linq;
+using Microsoft.Azure.Cosmos.Table;
+using Newtonsoft.Json;
+
+namespace Cloud5mins.domain
+{
+ public class ShortUrlEntity : TableEntity
+ {
+ public string Url { get; set; }
+ private string _activeUrl { get; set; }
+
+ public string ActiveUrl {
+ get{
+ if(String.IsNullOrEmpty(_activeUrl) )
+ _activeUrl = GetActiveUrl();
+ return _activeUrl;
+ }
+ }
+
+
+ public string Title { get; set; }
+
+ public string ShortUrl { get; set; }
+
+ public int Clicks { get; set; }
+
+ public bool? IsArchived { get; set; }
+ public string SchedulesPropertyRaw { get; set; }
+
+ [IgnoreProperty]
+ public Schedule[] Schedules {
+ get{
+ if(String.IsNullOrEmpty(SchedulesPropertyRaw))
+ return null;
+ return JsonConvert.DeserializeObject(SchedulesPropertyRaw);
+ }
+ set{
+ SchedulesPropertyRaw = JsonConvert.SerializeObject(value);
+ }
+ }
+
+ public ShortUrlEntity(){}
+
+ public ShortUrlEntity(string longUrl, string endUrl)
+ {
+ Initialize(longUrl, endUrl, string.Empty, null);
+ }
+
+ public ShortUrlEntity(string longUrl, string endUrl, Schedule[] schedules)
+ {
+ Initialize(longUrl, endUrl, string.Empty, schedules);
+ }
+
+ public ShortUrlEntity(string longUrl, string endUrl, string title, Schedule[] schedules)
+ {
+ Initialize(longUrl, endUrl, title, schedules);
+ }
+
+ private void Initialize(string longUrl, string endUrl, string title, Schedule[] schedules)
+ {
+ PartitionKey = endUrl.First().ToString();
+ RowKey = endUrl;
+ Url = longUrl;
+ Title = title;
+ Clicks = 0;
+ IsArchived = false;
+ Schedules = schedules;
+ }
+
+ public static ShortUrlEntity GetEntity(string longUrl, string endUrl, string title, Schedule[] schedules){
+ return new ShortUrlEntity
+ {
+ PartitionKey = endUrl.First().ToString(),
+ RowKey = endUrl,
+ Url = longUrl,
+ Title = title,
+ Schedules = schedules
+ };
+ }
+
+ private string GetActiveUrl()
+ {
+ if(Schedules != null)
+ return GetActiveUrl(DateTime.UtcNow);
+ return Url;
+ }
+ private string GetActiveUrl(DateTime pointInTime)
+ {
+ var link = Url;
+ var active = Schedules.Where(s =>
+ s.End > pointInTime && //hasn't ended
+ s.Start < pointInTime //already started
+ ).OrderBy(s => s.Start); //order by start to process first link
+
+ foreach (var sched in active.ToArray())
+ {
+ if (sched.IsActive(pointInTime))
+ {
+ link = sched.AlternativeUrl;
+ break;
+ }
+ }
+ return link;
+ }
+ }
+
+
+}
diff --git a/src/shortenerTools/Domain/StorageTableHelper.cs b/src/api/shortenerTools/Domain/StorageTableHelper.cs
similarity index 58%
rename from src/shortenerTools/Domain/StorageTableHelper.cs
rename to src/api/shortenerTools/Domain/StorageTableHelper.cs
index c5977c02..ac5c6521 100644
--- a/src/shortenerTools/Domain/StorageTableHelper.cs
+++ b/src/api/shortenerTools/Domain/StorageTableHelper.cs
@@ -1,41 +1,36 @@
+using Microsoft.Azure.Cosmos.Table;
+using shortenerTools.Abstractions;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
-using Microsoft.Azure.Cosmos.Table;
namespace Cloud5mins.domain
{
-
- public class StorageTableHelper
+ public class StorageTableHelper : IStorageTableHelper
{
- private string StorageConnectionString { get; set; }
-
- public StorageTableHelper(){}
-
- public StorageTableHelper(string storageConnectionString){
- StorageConnectionString = storageConnectionString;
+ private readonly CloudTableClient _cloudTableClient;
+
+ public StorageTableHelper(CloudTableClient cloudTableClient)
+ {
+ _cloudTableClient = cloudTableClient;
}
-
- public CloudStorageAccount CreateStorageAccountFromConnectionString()
- {
- CloudStorageAccount storageAccount = CloudStorageAccount.Parse(this.StorageConnectionString);
- return storageAccount;
- }
-
- private CloudTable GetStatsTable(){
- CloudTable table = GetTable("ClickStats");
+
+ private CloudTable GetStatsTable()
+ {
+ var table = GetTable("ClickStats");
return table;
}
- private CloudTable GetUrlsTable(){
- CloudTable table = GetTable("UrlsDetails");
+
+ private CloudTable GetUrlsTable()
+ {
+ var table = GetTable("UrlsDetails");
return table;
}
- private CloudTable GetTable(string tableName){
- CloudStorageAccount storageAccount = this.CreateStorageAccountFromConnectionString();
- CloudTableClient tableClient = storageAccount.CreateCloudTableClient(new TableClientConfiguration());
- CloudTable table = tableClient.GetTableReference(tableName);
+ private CloudTable GetTable(string tableName)
+ {
+ var table = _cloudTableClient.GetTableReference(tableName);
table.CreateIfNotExists();
return table;
@@ -43,10 +38,10 @@ private CloudTable GetTable(string tableName){
public async Task GetShortUrlEntity(ShortUrlEntity row)
{
- TableOperation selOperation = TableOperation.Retrieve(row.PartitionKey, row.RowKey);
- TableResult result = await GetUrlsTable().ExecuteAsync(selOperation);
- ShortUrlEntity eShortUrl = result.Result as ShortUrlEntity;
- return eShortUrl;
+ var selOperation = TableOperation.Retrieve(row.PartitionKey, row.RowKey);
+ var result = await GetUrlsTable().ExecuteAsync(selOperation);
+ var eShortUrl = result.Result as ShortUrlEntity;
+ return eShortUrl;
}
public async Task> GetAllShortUrlEntities()
@@ -56,13 +51,13 @@ public async Task> GetAllShortUrlEntities()
var lstShortUrl = new List();
do
{
- // Retreiving all entities that are NOT the NextId entity
- // (it's the only one in the partion "KEY")
- TableQuery rangeQuery = new TableQuery().Where(
+ // Retrieving all entities that are NOT the NextId entity
+ // (it's the only one in the partition "KEY")
+ var rangeQuery = new TableQuery().Where(
filter: TableQuery.GenerateFilterCondition("RowKey", QueryComparisons.NotEqual, "KEY"));
var queryResult = await tblUrls.ExecuteQuerySegmentedAsync(rangeQuery, token);
- lstShortUrl.AddRange(queryResult.Results as List);
+ lstShortUrl.AddRange(queryResult.Results);
token = queryResult.ContinuationToken;
} while (token != null);
return lstShortUrl;
@@ -86,7 +81,7 @@ public async Task> GetAllStatsByVanity(string vanity)
}
var queryResult = await tblUrls.ExecuteQuerySegmentedAsync(rangeQuery, token);
- lstShortUrl.AddRange(queryResult.Results as List);
+ lstShortUrl.AddRange(queryResult.Results);
token = queryResult.ContinuationToken;
} while (token != null);
return lstShortUrl;
@@ -121,68 +116,66 @@ public async Task IfShortUrlEntityExistByVanity(string vanity)
public async Task IfShortUrlEntityExist(ShortUrlEntity row)
{
- ShortUrlEntity eShortUrl = await GetShortUrlEntity(row);
- return (eShortUrl != null);
+ var eShortUrl = await GetShortUrlEntity(row);
+ return (eShortUrl != null);
}
- public async Task UpdateShortUrlEntity(ShortUrlEntity urlEntity)
- {
- ShortUrlEntity originalUrl = await GetShortUrlEntity(urlEntity);
+ public async Task UpdateShortUrlEntity(ShortUrlEntity urlEntity)
+ {
+ var originalUrl = await GetShortUrlEntity(urlEntity);
originalUrl.Url = urlEntity.Url;
originalUrl.Title = urlEntity.Title;
originalUrl.Schedules = urlEntity.Schedules;
return await SaveShortUrlEntity(originalUrl);
- }
+ }
public async Task ArchiveShortUrlEntity(ShortUrlEntity urlEntity)
{
- ShortUrlEntity originalUrl = await GetShortUrlEntity(urlEntity);
+ var originalUrl = await GetShortUrlEntity(urlEntity);
originalUrl.IsArchived = true;
return await SaveShortUrlEntity(originalUrl);
}
-
public async Task SaveShortUrlEntity(ShortUrlEntity newShortUrl)
{
- TableOperation insOperation = TableOperation.InsertOrMerge(newShortUrl);
- TableResult result = await GetUrlsTable().ExecuteAsync(insOperation);
- ShortUrlEntity eShortUrl = result.Result as ShortUrlEntity;
- return eShortUrl;
- }
+ var insOperation = TableOperation.InsertOrMerge(newShortUrl);
+ var result = await GetUrlsTable().ExecuteAsync(insOperation);
+ var eShortUrl = result.Result as ShortUrlEntity;
+ return eShortUrl;
+ }
public async void SaveClickStatsEntity(ClickStatsEntity newStats)
{
- TableOperation insOperation = TableOperation.InsertOrMerge(newStats);
- TableResult result = await GetStatsTable().ExecuteAsync(insOperation);
- }
+ var insOperation = TableOperation.InsertOrMerge(newStats);
+ await GetStatsTable().ExecuteAsync(insOperation);
+ }
public async Task GetNextTableId()
{
//Get current ID
- TableOperation selOperation = TableOperation.Retrieve("1", "KEY");
- TableResult result = await GetUrlsTable().ExecuteAsync(selOperation);
- NextId entity = result.Result as NextId;
+ var selOperation = TableOperation.Retrieve("1", "KEY");
+ var result = await GetUrlsTable().ExecuteAsync(selOperation);
- if(entity == null){
- entity = new NextId{
+ if (!(result.Result is NextId entity))
+ {
+ entity = new NextId
+ {
PartitionKey = "1",
RowKey = "KEY",
Id = 1024
- };
+ };
}
entity.Id++;
//Update
- TableOperation updOperation = TableOperation.InsertOrMerge(entity);
+ var updOperation = TableOperation.InsertOrMerge(entity);
// Execute the operation.
await GetUrlsTable().ExecuteAsync(updOperation);
return entity.Id;
}
-
-
}
}
diff --git a/src/shortenerTools/Domain/UrlClickStatsRequest.cs b/src/api/shortenerTools/Domain/UrlClickStatsRequest.cs
similarity index 100%
rename from src/shortenerTools/Domain/UrlClickStatsRequest.cs
rename to src/api/shortenerTools/Domain/UrlClickStatsRequest.cs
diff --git a/src/shortenerTools/Domain/Utility.cs b/src/api/shortenerTools/Domain/Utility.cs
similarity index 67%
rename from src/shortenerTools/Domain/Utility.cs
rename to src/api/shortenerTools/Domain/Utility.cs
index 8cce1bd6..51de80b1 100644
--- a/src/shortenerTools/Domain/Utility.cs
+++ b/src/api/shortenerTools/Domain/Utility.cs
@@ -1,4 +1,8 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using shortenerTools.Abstractions;
using System.Linq;
+using System.Security.Claims;
using System.Security.Cryptography;
using System.Threading.Tasks;
using System.Security.Claims;
@@ -15,21 +19,16 @@ public static class Utility
//sets the length of the unique code to add to vanity
private const int MinVanityCodeLength = 5;
- public static async Task GetValidEndUrl(string vanity, StorageTableHelper stgHelper)
+ public static async Task GetValidEndUrl(string vanity, IStorageTableHelper stgHelper)
{
- if (string.IsNullOrEmpty(vanity))
- {
- var newKey = await stgHelper.GetNextTableId();
- string getCode() => Encode(newKey);
- if (await stgHelper.IfShortUrlEntityExistByVanity(getCode()))
- return await GetValidEndUrl(vanity, stgHelper);
-
- return string.Join(string.Empty, getCode());
- }
- else
- {
- return string.Join(string.Empty, vanity);
- }
+ if (!string.IsNullOrEmpty(vanity)) return string.Join(string.Empty, vanity);
+
+ var newKey = await stgHelper.GetNextTableId();
+ string GetCode() => Encode(newKey);
+ if (await stgHelper.IfShortUrlEntityExistByVanity(GetCode()))
+ return await GetValidEndUrl(vanity, stgHelper);
+
+ return string.Join(string.Empty, GetCode());
}
public static string Encode(int i)
@@ -62,6 +61,37 @@ public static string GenerateUniqueRandomToken(int uniqueId)
}
}
+ public static IActionResult CatchUnauthorized(ClaimsPrincipal principal, ILogger log)
+ {
+ if (principal == null)
+ {
+ log.LogWarning("No principal.");
+ return new UnauthorizedResult();
+ }
+
+ if (principal.Identity == null)
+ {
+ log.LogWarning("No identity.");
+ return new UnauthorizedResult();
+ }
+
+ if (!principal.Identity.IsAuthenticated)
+ {
+ log.LogWarning("Request was not authenticated.");
+ return new UnauthorizedResult();
+ }
+
+ if (principal.FindFirst(ClaimTypes.GivenName) is { }) return null;
+
+ log.LogError("Claim not Found");
+
+ return new BadRequestObjectResult(new
+ {
+ message = "Claim not Found",
+ StatusCode = System.Net.HttpStatusCode.BadRequest
+ });
+ }
+
public static IActionResult CatchUnauthorize(ClaimsPrincipal principal, ILogger log)
{
if (principal == null)
diff --git a/src/shortenerTools/Properties/PublishProfiles/patientcommsshortenertools2fxfh - Zip Deploy.pubxml b/src/api/shortenerTools/Properties/PublishProfiles/patientcommsshortenertools2fxfh - Zip Deploy.pubxml
similarity index 100%
rename from src/shortenerTools/Properties/PublishProfiles/patientcommsshortenertools2fxfh - Zip Deploy.pubxml
rename to src/api/shortenerTools/Properties/PublishProfiles/patientcommsshortenertools2fxfh - Zip Deploy.pubxml
diff --git a/src/shortenerTools/Properties/ServiceDependencies/patientcommsshortenertools2fxfh - Zip Deploy/profile.arm.json b/src/api/shortenerTools/Properties/ServiceDependencies/patientcommsshortenertools2fxfh - Zip Deploy/profile.arm.json
similarity index 100%
rename from src/shortenerTools/Properties/ServiceDependencies/patientcommsshortenertools2fxfh - Zip Deploy/profile.arm.json
rename to src/api/shortenerTools/Properties/ServiceDependencies/patientcommsshortenertools2fxfh - Zip Deploy/profile.arm.json
diff --git a/src/api/shortenerTools/UrlArchive/UrlArchive.cs b/src/api/shortenerTools/UrlArchive/UrlArchive.cs
new file mode 100644
index 00000000..b9a9bc02
--- /dev/null
+++ b/src/api/shortenerTools/UrlArchive/UrlArchive.cs
@@ -0,0 +1,73 @@
+/*
+```c#
+Input:
+ {
+ // [Required]
+ "PartitionKey": "d",
+
+ // [Required]
+ "RowKey": "doc",
+
+ }
+
+
+*/
+
+using Cloud5mins.domain;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.Extensions.Logging;
+using shortenerTools.Abstractions;
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Security.Claims;
+using System.Threading.Tasks;
+
+namespace Cloud5mins.Function
+{
+ public class UrlArchive : FunctionBase
+ {
+ private readonly IStorageTableHelper _storageTableHelper;
+
+ public UrlArchive(IStorageTableHelper storageTableHelper)
+ {
+ _storageTableHelper = storageTableHelper;
+ }
+
+ [FunctionName("UrlArchive")]
+ public async Task Run(
+ [HttpTrigger(AuthorizationLevel.Function, "post", Route = null)] HttpRequestMessage req,
+ ILogger log,
+ ExecutionContext context,
+ ClaimsPrincipal principal)
+ {
+ log.LogInformation($"C# HTTP trigger function processed this request: {req}");
+
+ var (requestValid, invalidResult, shortUrlEntity) = await ValidateRequestAsync(context, req, principal, log);
+
+ if (!requestValid)
+ {
+ return invalidResult;
+ }
+
+ try
+ {
+ shortUrlEntity = await _storageTableHelper.ArchiveShortUrlEntity(shortUrlEntity);
+ return new OkObjectResult(shortUrlEntity);
+ }
+ catch (Exception ex)
+ {
+ log.LogError(ex, "{functionName} failed due to an unexpected error: {errorMessage}.",
+ context.FunctionName, ex.GetBaseException().Message);
+
+ return new BadRequestObjectResult(new
+ {
+ message = ex.Message,
+ StatusCode = HttpStatusCode.BadRequest
+ });
+ }
+ }
+ }
+}
diff --git a/src/api/shortenerTools/UrlClickStats/UrlClickStats.cs b/src/api/shortenerTools/UrlClickStats/UrlClickStats.cs
new file mode 100644
index 00000000..e5fdba14
--- /dev/null
+++ b/src/api/shortenerTools/UrlClickStats/UrlClickStats.cs
@@ -0,0 +1,63 @@
+using Cloud5mins.domain;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.Extensions.Logging;
+using shortenerTools.Abstractions;
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Security.Claims;
+using System.Threading.Tasks;
+
+namespace Cloud5mins.Function
+{
+ public class UrlClickStats : FunctionBase
+ {
+ private readonly IStorageTableHelper _storageTableHelper;
+
+ public UrlClickStats(IStorageTableHelper storageTableHelper)
+ {
+ _storageTableHelper = storageTableHelper;
+ }
+
+ [FunctionName("UrlClickStats")]
+ public async Task Run(
+ [HttpTrigger(AuthorizationLevel.Function, "post", Route = null)] HttpRequestMessage req,
+ ILogger log,
+ ExecutionContext context,
+ ClaimsPrincipal principal)
+ {
+ log.LogInformation($"C# HTTP trigger function processed this request: {req}");
+
+ var (requestValid, invalidResult, clickStatsRequest) = await ValidateRequestAsync(context, req, principal, log);
+
+ // Validation of the inputs
+ if (!requestValid)
+ {
+ return invalidResult;
+ }
+
+ try
+ {
+ var result = new ClickStatsEntityList
+ {
+ ClickStatsList = await _storageTableHelper.GetAllStatsByVanity(clickStatsRequest.Vanity)
+ };
+
+ return new OkObjectResult(result);
+ }
+ catch (Exception ex)
+ {
+ log.LogError(ex, "{functionName} failed due to an unexpected error: {errorMessage}.",
+ context.FunctionName, ex.GetBaseException().Message);
+
+ return new BadRequestObjectResult(new
+ {
+ message = ex.Message,
+ StatusCode = HttpStatusCode.BadRequest
+ });
+ }
+ }
+ }
+}
diff --git a/src/shortenerTools/UrlClickStats/UrlClickStatsByDay.cs b/src/api/shortenerTools/UrlClickStats/UrlClickStatsByDay.cs
similarity index 100%
rename from src/shortenerTools/UrlClickStats/UrlClickStatsByDay.cs
rename to src/api/shortenerTools/UrlClickStats/UrlClickStatsByDay.cs
diff --git a/src/api/shortenerTools/UrlList/UrlList.cs b/src/api/shortenerTools/UrlList/UrlList.cs
new file mode 100644
index 00000000..b7631d85
--- /dev/null
+++ b/src/api/shortenerTools/UrlList/UrlList.cs
@@ -0,0 +1,96 @@
+/*
+```c#
+Input:
+
+
+Output:
+ {
+ "Url": "https://SOME_URL",
+ "Clicks": 0,
+ "PartitionKey": "d",
+ "title": "Quickstart: Create your first function in Azure using Visual Studio"
+ "RowKey": "doc",
+ "Timestamp": "0001-01-01T00:00:00+00:00",
+ "ETag": "W/\"datetime'2020-05-06T14%3A33%3A51.2639969Z'\""
+ }
+*/
+
+using Cloud5mins.domain;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.Extensions.Logging;
+using shortenerTools.Abstractions;
+using System;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Security.Claims;
+using System.Threading.Tasks;
+
+namespace Cloud5mins.Function
+{
+ public class UrlList : FunctionBase
+ {
+ private readonly IStorageTableHelper _storageTableHelper;
+
+ public UrlList(IStorageTableHelper storageTableHelper)
+ {
+ _storageTableHelper = storageTableHelper;
+ }
+
+ [FunctionName("UrlList")]
+ public async Task Run(
+ [HttpTrigger(AuthorizationLevel.Function, "get", Route = null)] HttpRequestMessage req,
+ ILogger log,
+ ExecutionContext context,
+ ClaimsPrincipal principal)
+ {
+ log.LogInformation($"C# HTTP trigger function processed this request: {req}");
+
+ var (requestValid, invalidResult, result) = await ValidateRequestAsync(context, req, principal, log);
+
+ if (!requestValid)
+ {
+ return invalidResult;
+ }
+
+ try
+ {
+ result.UrlList = await _storageTableHelper.GetAllShortUrlEntities();
+ result.UrlList = result.UrlList.Where(p => !(p.IsArchived ?? false)).ToList();
+ var host = string.IsNullOrEmpty(config["customDomain"]) ? req.Host.Host : config["customDomain"].ToString();
+ foreach (var shortUrl in result.UrlList)
+ {
+ shortUrl.ShortUrl = Utility.GetShortUrl(host, shortUrl.RowKey);
+ }
+
+ return new OkObjectResult(result);
+ }
+ catch (Exception ex)
+ {
+ log.LogError(ex, "{functionName} failed due to an unexpected error: {errorMessage}.",
+ context.FunctionName, ex.GetBaseException().Message);
+
+ return new BadRequestObjectResult(new
+ {
+ message = ex.Message,
+ StatusCode = HttpStatusCode.BadRequest
+ });
+ }
+ }
+
+ public override async Task<(bool isValidRequest, IActionResult invalidResult, T requestType)> ValidateRequestAsync(ExecutionContext context, HttpRequestMessage req, ClaimsPrincipal principal, ILogger log)
+ {
+ var invalidRequest = Utility.CatchUnauthorized(principal, log);
+ if (invalidRequest != null)
+ {
+ return (false, invalidRequest, null as T);
+ }
+
+ LogAuthenticatedUser(principal, context, log);
+
+ return (true, null, new T());
+ }
+ }
+}
diff --git a/src/api/shortenerTools/UrlRedirect/UrlRedirect.cs b/src/api/shortenerTools/UrlRedirect/UrlRedirect.cs
new file mode 100644
index 00000000..1f9f5289
--- /dev/null
+++ b/src/api/shortenerTools/UrlRedirect/UrlRedirect.cs
@@ -0,0 +1,79 @@
+using Cloud5mins.domain;
+using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using shortenerTools.Abstractions;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using ExecutionContext = Microsoft.Azure.WebJobs.ExecutionContext;
+
+namespace Cloud5mins.Function
+{
+ public class UrlRedirect
+ {
+ private readonly IUserIpLocationService _userIpLocationService;
+ private readonly IConfiguration _configuration;
+ private readonly IStorageTableHelper _storageTableHelper;
+
+ public UrlRedirect(IUserIpLocationService userIpLocationService, IConfiguration configuration, IStorageTableHelper storageTableHelper)
+ {
+ _userIpLocationService = userIpLocationService;
+ _configuration = configuration;
+ _storageTableHelper = storageTableHelper;
+ }
+
+ [FunctionName("UrlRedirect")]
+ public async Task Run(
+ [HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = "UrlRedirect/{shortUrl}")] HttpRequestMessage req,
+ string shortUrl,
+ ExecutionContext context,
+ ILogger log)
+ {
+ log.LogInformation($"C# HTTP trigger function processed for Url: {shortUrl}");
+
+ var redirectUrl = "https://azure.com";
+
+ if (!string.IsNullOrWhiteSpace(shortUrl))
+ {
+ redirectUrl = _configuration["defaultRedirectUrl"];
+
+ var tempUrl = new ShortUrlEntity(string.Empty, shortUrl);
+
+ var newUrl = await _storageTableHelper.GetShortUrlEntity(tempUrl);
+
+ if (newUrl != null)
+ {
+ log.LogInformation($"Found it: {newUrl.Url}");
+ await SetUrlClickStatsAsync(newUrl);
+ _storageTableHelper.SaveClickStatsEntity(new ClickStatsEntity(newUrl.RowKey));
+ await _storageTableHelper.SaveShortUrlEntity(newUrl);
+ redirectUrl = WebUtility.UrlDecode(newUrl.ActiveUrl);
+ }
+ }
+ else
+ {
+ log.LogInformation("Bad Link, resorting to fallback.");
+ }
+
+ var res = req.CreateResponse(HttpStatusCode.Redirect);
+ res.Headers.Add("Location", redirectUrl);
+ return res;
+ }
+
+ private async Task SetUrlClickStatsAsync(ShortUrlEntity newUrl)
+ {
+ var userIpResponse = await _userIpLocationService.GetUserIpAsync(CancellationToken.None);
+ if (newUrl.Clicks.ContainsKey(userIpResponse.CountryName))
+ {
+ newUrl.Clicks[userIpResponse.CountryName] = newUrl.Clicks[userIpResponse.CountryName]++;
+ }
+ else
+ {
+ newUrl.Clicks.Add(userIpResponse.CountryName, 1);
+ }
+ }
+ }
+}
diff --git a/src/api/shortenerTools/UrlShortener/UrlShortener.cs b/src/api/shortenerTools/UrlShortener/UrlShortener.cs
new file mode 100644
index 00000000..aeaa69ea
--- /dev/null
+++ b/src/api/shortenerTools/UrlShortener/UrlShortener.cs
@@ -0,0 +1,121 @@
+/*
+```c#
+Input:
+
+ {
+ // [Required] The url you wish to have a short version for
+ "url": "https://docs.microsoft.com/en-ca/azure/azure-functions/functions-create-your-first-function-visual-studio",
+
+ // [Optional] Title of the page, or text description of your choice.
+ "title": "Quickstart: Create your first function in Azure using Visual Studio"
+
+ // [Optional] the end of the URL. If nothing one will be generated for you.
+ "vanity": "azFunc"
+ }
+
+Output:
+ {
+ "ShortUrl": "http://c5m.ca/azFunc",
+ "LongUrl": "https://docs.microsoft.com/en-ca/azure/azure-functions/functions-create-your-first-function-visual-studio"
+ }
+*/
+
+using Cloud5mins.domain;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.Extensions.Logging;
+using shortenerTools.Abstractions;
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Security.Claims;
+using System.Threading.Tasks;
+
+namespace Cloud5mins.Function
+{
+
+ public class UrlShortener : FunctionBase
+ {
+ private readonly IStorageTableHelper _storageTableHelper;
+
+ public UrlShortener(IStorageTableHelper storageTableHelper)
+ {
+ _storageTableHelper = storageTableHelper;
+ }
+
+ [FunctionName("UrlShortener")]
+ public async Task Run(
+ [HttpTrigger(AuthorizationLevel.Function, "get", "post", Route = null)] HttpRequestMessage req,
+ ILogger log,
+ ExecutionContext context,
+ ClaimsPrincipal principal)
+ {
+ log.LogInformation($"C# HTTP trigger function processed this request: {req}");
+
+ // Validation of the inputs
+ var (requestValid, invalidResult, shortRequest) = await ValidateRequestAsync(context, req, principal, log);
+
+ if (!requestValid)
+ {
+ return invalidResult;
+ }
+
+ // If the Url parameter only contains whitespaces or is empty return with BadRequest.
+ if (string.IsNullOrWhiteSpace(shortRequest.Url))
+ {
+ return new BadRequestObjectResult("The url parameter can not be empty.");
+ }
+
+ // Validates if input.url is a valid absolute url, aka is a complete reference to the resource, ex: http(s)://google.com
+ if (!Uri.IsWellFormedUriString(shortRequest.Url, UriKind.Absolute))
+ {
+ return new BadRequestObjectResult($"{shortRequest.Url} is not a valid absolute Url. The Url parameter must start with 'http://' or 'http://'.");
+ }
+
+ try
+ {
+ var longUrl = shortRequest.Url.Trim();
+ var vanity = string.IsNullOrWhiteSpace(shortRequest.Vanity) ? "" : shortRequest.Vanity.Trim();
+ var title = string.IsNullOrWhiteSpace(shortRequest.Title) ? "" : shortRequest.Title.Trim();
+
+ ShortUrlEntity newRow;
+
+ if (!string.IsNullOrEmpty(vanity))
+ {
+ newRow = new ShortUrlEntity(longUrl, vanity, title, input.Schedules);
+ if (await _storageTableHelper.IfShortUrlEntityExist(newRow))
+ {
+ return new ConflictObjectResult("This Short URL already exist.");
+ }
+ }
+ else
+ {
+ newRow = new ShortUrlEntity(longUrl, await Utility.GetValidEndUrl(vanity, _storageTableHelper), title, input.Schedules);
+ }
+
+ await _storageTableHelper.SaveShortUrlEntity(newRow);
+
+ var host = string.IsNullOrEmpty(config["customDomain"]) ? req.Host.Host : config["customDomain"].ToString();
+ log.LogInformation($"-> host = {host}");
+
+ var result = new ShortResponse(host, newRow.Url, newRow.RowKey, newRow.Title);
+
+ log.LogInformation("Short Url created.");
+
+ return new OkObjectResult(result);
+ }
+ catch (Exception ex)
+ {
+ log.LogError(ex, "{functionName} failed due to an unexpected error: {errorMessage}.",
+ context.FunctionName, ex.GetBaseException().Message);
+
+ return new BadRequestObjectResult(new
+ {
+ message = ex.Message,
+ StatusCode = HttpStatusCode.BadRequest
+ });
+ }
+ }
+ }
+}
diff --git a/src/api/shortenerTools/UrlUpdate/UrlUpdate.cs b/src/api/shortenerTools/UrlUpdate/UrlUpdate.cs
new file mode 100644
index 00000000..0c4c6305
--- /dev/null
+++ b/src/api/shortenerTools/UrlUpdate/UrlUpdate.cs
@@ -0,0 +1,104 @@
+/*
+```c#
+Input:
+ {
+ // [Required]
+ "PartitionKey": "d",
+
+ // [Required]
+ "RowKey": "doc",
+
+ // [Optional] New Title for this URL, or text description of your choice.
+ "title": "Quickstart: Create your first function in Azure using Visual Studio"
+
+ // [Optional] New long Url where the the user will be redirect
+ "Url": "https://SOME_URL"
+ }
+
+
+Output:
+ {
+ "Url": "https://SOME_URL",
+ "Clicks": 0,
+ "PartitionKey": "d",
+ "title": "Quickstart: Create your first function in Azure using Visual Studio"
+ "RowKey": "doc",
+ "Timestamp": "0001-01-01T00:00:00+00:00",
+ "ETag": "W/\"datetime'2020-05-06T14%3A33%3A51.2639969Z'\""
+ }
+*/
+
+using Cloud5mins.domain;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.Extensions.Logging;
+using shortenerTools.Abstractions;
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Security.Claims;
+using System.Threading.Tasks;
+
+namespace Cloud5mins.Function
+{
+ public class UrlUpdate : FunctionBase
+ {
+ private readonly IStorageTableHelper _storageTableHelper;
+
+ public UrlUpdate(IStorageTableHelper storageTableHelper)
+ {
+ _storageTableHelper = storageTableHelper;
+ }
+
+ [FunctionName("UrlUpdate")]
+ public async Task Run(
+ [HttpTrigger(AuthorizationLevel.Function, "post", Route = null)] HttpRequestMessage req,
+ ILogger log,
+ ExecutionContext context,
+ ClaimsPrincipal principal)
+ {
+ log.LogInformation($"C# HTTP trigger function processed this request: {req}");
+
+ // Validation of the inputs
+ var (requestValid, invalidResult, shortUrlEntity) = await ValidateRequestAsync(context, req, principal, log);
+
+ if (!requestValid)
+ {
+ return invalidResult;
+ }
+
+ // If the Url parameter only contains whitespaces or is empty return with BadRequest.
+ if (string.IsNullOrWhiteSpace(shortUrlEntity.Url))
+ {
+ return new BadRequestObjectResult("The url parameter can not be empty.");
+ }
+
+ // Validates if input.url is a valid absolute url, aka is a complete reference to the resource, ex: http(s)://google.com
+ if (!Uri.IsWellFormedUriString(shortUrlEntity.Url, UriKind.Absolute))
+ {
+ return new BadRequestObjectResult($"{shortUrlEntity.Url} is not a valid absolute Url. The Url parameter must start with 'http://' or 'http://'.");
+ }
+
+ try
+ {
+ var result = await _storageTableHelper.UpdateShortUrlEntity(shortUrlEntity);
+ var host = string.IsNullOrEmpty(config["customDomain"]) ? req.Host.Host : config["customDomain"].ToString();
+ result.ShortUrl = Utility.GetShortUrl(host, result.RowKey);
+
+ return new OkObjectResult(result);
+ }
+ catch (Exception ex)
+ {
+ log.LogError(ex, "{functionName} failed due to an unexpected error: {errorMessage}.",
+ context.FunctionName, ex.GetBaseException().Message);
+
+ return new BadRequestObjectResult(new
+ {
+ message = ex.Message,
+ StatusCode = HttpStatusCode.BadRequest
+ });
+ }
+ }
+ }
+}
diff --git a/src/shortenerTools/host.json b/src/api/shortenerTools/host.json
similarity index 100%
rename from src/shortenerTools/host.json
rename to src/api/shortenerTools/host.json
diff --git a/src/shortenerTools/proxies.json b/src/api/shortenerTools/proxies.json
similarity index 100%
rename from src/shortenerTools/proxies.json
rename to src/api/shortenerTools/proxies.json
diff --git a/src/shortenerTools/settings.json b/src/api/shortenerTools/settings.json
similarity index 100%
rename from src/shortenerTools/settings.json
rename to src/api/shortenerTools/settings.json
diff --git a/src/shortenerTools/shortenerTools.csproj b/src/api/shortenerTools/shortenerTools.csproj
similarity index 66%
rename from src/shortenerTools/shortenerTools.csproj
rename to src/api/shortenerTools/shortenerTools.csproj
index 900a0965..1ed4063e 100644
--- a/src/shortenerTools/shortenerTools.csproj
+++ b/src/api/shortenerTools/shortenerTools.csproj
@@ -1,14 +1,23 @@
-
+
netcoreapp3.1
v3
+ d3c29c9b-0edf-4596-97b9-bf2008e95706
+
+
+ PreserveNewest
+
diff --git a/src/app/.vscode/launch.json b/src/app/.vscode/launch.json
new file mode 100644
index 00000000..05d6ef37
--- /dev/null
+++ b/src/app/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+ // Use IntelliSense to find out which attributes exist for C# debugging
+ // Use hover for the description of the existing attributes
+ // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "name": "Launch and Debug Standalone Blazor WebAssembly App",
+ "type": "blazorwasm",
+ "request": "launch",
+ "cwd": "${workspaceFolder}/TinyBlazorAdmin"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/app/.vscode/tasks.json b/src/app/.vscode/tasks.json
new file mode 100644
index 00000000..213ab087
--- /dev/null
+++ b/src/app/.vscode/tasks.json
@@ -0,0 +1,42 @@
+{
+ "version": "2.0.0",
+ "tasks": [
+ {
+ "label": "build",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "build",
+ "${workspaceFolder}/TinyBlazorAdmin/TinyBlazorAdmin.csproj",
+ "/property:GenerateFullPaths=true",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "label": "publish",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "publish",
+ "${workspaceFolder}/TinyBlazorAdmin/TinyBlazorAdmin.csproj",
+ "/property:GenerateFullPaths=true",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "label": "watch",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "watch",
+ "run",
+ "${workspaceFolder}/TinyBlazorAdmin/TinyBlazorAdmin.csproj",
+ "/property:GenerateFullPaths=true",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/app/TinyBlazorAdmin.sln b/src/app/TinyBlazorAdmin.sln
new file mode 100644
index 00000000..1c4bb45d
--- /dev/null
+++ b/src/app/TinyBlazorAdmin.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30128.74
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TinyBlazorAdmin", "TinyBlazorAdmin\TinyBlazorAdmin.csproj", "{19BA7B57-9A23-493A-BE6C-7B0664FA53D8}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {19BA7B57-9A23-493A-BE6C-7B0664FA53D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {19BA7B57-9A23-493A-BE6C-7B0664FA53D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {19BA7B57-9A23-493A-BE6C-7B0664FA53D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {19BA7B57-9A23-493A-BE6C-7B0664FA53D8}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {A404BDC3-872E-4946-8814-86603AD419EC}
+ EndGlobalSection
+EndGlobal
diff --git a/src/app/TinyBlazorAdmin/.vscode/launch.json b/src/app/TinyBlazorAdmin/.vscode/launch.json
new file mode 100644
index 00000000..e8c2dbef
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+ // Use IntelliSense to find out which attributes exist for C# debugging
+ // Use hover for the description of the existing attributes
+ // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "name": "Launch and Debug Standalone Blazor WebAssembly App",
+ "type": "blazorwasm",
+ "request": "launch",
+ "cwd": "${workspaceFolder}"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/adminTools/adminBlazorWebsite/src/.vscode/tasks.json b/src/app/TinyBlazorAdmin/.vscode/tasks.json
similarity index 84%
rename from src/adminTools/adminBlazorWebsite/src/.vscode/tasks.json
rename to src/app/TinyBlazorAdmin/.vscode/tasks.json
index 2a8d1560..8abc9fde 100644
--- a/src/adminTools/adminBlazorWebsite/src/.vscode/tasks.json
+++ b/src/app/TinyBlazorAdmin/.vscode/tasks.json
@@ -7,7 +7,7 @@
"type": "process",
"args": [
"build",
- "${workspaceFolder}/adminBlazorWebsite.csproj",
+ "${workspaceFolder}/TinyBlazorAdmin.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
@@ -19,7 +19,7 @@
"type": "process",
"args": [
"publish",
- "${workspaceFolder}/adminBlazorWebsite.csproj",
+ "${workspaceFolder}/TinyBlazorAdmin.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
@@ -32,7 +32,7 @@
"args": [
"watch",
"run",
- "${workspaceFolder}/adminBlazorWebsite.csproj",
+ "${workspaceFolder}/TinyBlazorAdmin.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
diff --git a/src/adminTools/adminBlazorWebsite/src/App.razor b/src/app/TinyBlazorAdmin/App.razor
similarity index 69%
rename from src/adminTools/adminBlazorWebsite/src/App.razor
rename to src/app/TinyBlazorAdmin/App.razor
index ece74891..89256953 100644
--- a/src/adminTools/adminBlazorWebsite/src/App.razor
+++ b/src/app/TinyBlazorAdmin/App.razor
@@ -1,6 +1,7 @@
-
+@using Microsoft.AspNetCore.Components.Authorization
+
-
+
@@ -10,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/app/TinyBlazorAdmin/Data/AzFuncAuthorizationMessageHandler.cs b/src/app/TinyBlazorAdmin/Data/AzFuncAuthorizationMessageHandler.cs
new file mode 100644
index 00000000..46184ed1
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/Data/AzFuncAuthorizationMessageHandler.cs
@@ -0,0 +1,34 @@
+// using Microsoft.AspNetCore.Components;
+// using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
+// using Microsoft.Extensions.Configuration;
+
+// namespace TinyBlazorAdmin.Data
+// {
+// ///
+// /// Handler to ensure proper credentials are sent with requests.
+// ///
+// public class AzFuncAuthorizationMessageHandler : AuthorizationMessageHandler
+// {
+// public string Endpoint { get; set; }
+
+// ///
+// /// Creates a new instance of the
+// /// (nameof(Endpoint));
+// ConfigureHandler(
+// new[] { Endpoint },
+// new[] { string.Concat(Endpoint, "user_impersonation") }
+// );
+// }
+// }
+// }
\ No newline at end of file
diff --git a/src/app/TinyBlazorAdmin/Data/AzFuncClient.cs b/src/app/TinyBlazorAdmin/Data/AzFuncClient.cs
new file mode 100644
index 00000000..1ea2a305
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/Data/AzFuncClient.cs
@@ -0,0 +1,55 @@
+// using System.Threading.Tasks;
+
+// namespace TinyBlazorAdmin.Data
+// {
+// ///
+// /// Service to access the Cosmos DB blog posts.
+// ///
+// public class AzFuncClient
+// {
+// ///
+// /// The
+// private readonly UrlShortenerSecuredService _urlSecuredService;
+
+// ///
+// /// Creates a new instance of the
+// /// The GetUrlList()
+// {
+// var result = await _urlSecuredService.GetUrlList();
+// return result;
+// }
+
+// public async Task CreateShortUrl(ShortUrlRequest shortUrlRequest)
+// {
+// var result = await _urlSecuredService.CreateShortUrl(shortUrlRequest);
+// return result;
+// }
+
+// public async Task UpdateShortUrl(ShortUrlEntity editedUrl)
+// {
+// var result = await _urlSecuredService.UpdateShortUrl(editedUrl);
+// return result;
+// }
+
+// public async Task ArchiveShortUrl(ShortUrlEntity archivedUrl)
+// {
+// var result = await _urlSecuredService.ArchiveShortUrl(archivedUrl);
+// return result;
+// }
+
+// public async Task GetClickStats(string vanity)
+// {
+// var result = await _urlSecuredService.GetClickStats(vanity);
+// return result;
+// }
+
+// }
+// }
\ No newline at end of file
diff --git a/src/app/TinyBlazorAdmin/Data/ClickDate.cs b/src/app/TinyBlazorAdmin/Data/ClickDate.cs
new file mode 100644
index 00000000..23ce8aa7
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/Data/ClickDate.cs
@@ -0,0 +1,8 @@
+namespace TinyBlazorAdmin.Data
+{
+ public class ClickDate
+ {
+ public string DateClicked { get; set; }
+ public int Count { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/app/TinyBlazorAdmin/Data/ClickDateList.cs b/src/app/TinyBlazorAdmin/Data/ClickDateList.cs
new file mode 100644
index 00000000..29329e7d
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/Data/ClickDateList.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace TinyBlazorAdmin.Data
+{
+ public class ClickDateList
+ {
+ public List Items { get; set; }
+ public string Url { get; set; }
+ public ClickDateList(){
+ Url = string.Empty;
+ }
+ public ClickDateList (List list)
+ {
+ Items = list;
+ Url = string.Empty;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/TinyBlazorAdmin/Data/ClickStatsEntity.cs b/src/app/TinyBlazorAdmin/Data/ClickStatsEntity.cs
new file mode 100644
index 00000000..3d86aa4b
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/Data/ClickStatsEntity.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace TinyBlazorAdmin.Data
+{
+ public class ClickStatsEntity
+ {
+ public string PartitionKey { get; set; }
+
+ public string RowKey { get; set; }
+
+ public string Datetime { get; set; }
+
+ public ClickStatsEntity() { }
+
+ public ClickStatsEntity(string vanity)
+ {
+ PartitionKey = vanity;
+ RowKey = Guid.NewGuid().ToString();
+ Datetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm");
+ }
+ }
+}
diff --git a/src/app/TinyBlazorAdmin/Data/ClickStatsEntityList.cs b/src/app/TinyBlazorAdmin/Data/ClickStatsEntityList.cs
new file mode 100644
index 00000000..e0e0f67d
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/Data/ClickStatsEntityList.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace TinyBlazorAdmin.Data
+{
+ public class ClickStatsEntityList
+ {
+ public List ClickStatsList { get; set; }
+ }
+}
diff --git a/src/app/TinyBlazorAdmin/Data/Schedule.cs b/src/app/TinyBlazorAdmin/Data/Schedule.cs
new file mode 100644
index 00000000..d75e5aab
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/Data/Schedule.cs
@@ -0,0 +1,25 @@
+using System;
+
+namespace TinyBlazorAdmin.Data
+{
+public class Schedule
+ {
+ public DateTime Start { get; set; } = DateTime.Now;
+ public DateTime End { get; set; } = DateTime.Now;
+
+ public string AlternativeUrl { get; set; } = "";
+ public string Cron { get; set; } = "0 0 0 0 0";
+
+ public int DurationMinutes { get; set; } = 0;
+
+ public string GetDisplayableUrl(int max)
+ {
+ var length = AlternativeUrl.ToString().Length;
+ if (length >= max)
+ {
+ return string.Concat(AlternativeUrl.Substring(0, max-1), "...");
+ }
+ return AlternativeUrl;
+ }
+ }
+}
diff --git a/src/app/TinyBlazorAdmin/Data/ShortUrlEntity.cs b/src/app/TinyBlazorAdmin/Data/ShortUrlEntity.cs
new file mode 100644
index 00000000..a33e424d
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/Data/ShortUrlEntity.cs
@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace TinyBlazorAdmin.Data
+{
+ public class ShortUrlEntity
+ {
+ public string PartitionKey { get; set; }
+
+ public string RowKey { get; set; }
+
+ public string Title { get; set; }
+
+ public string Url { get; set; }
+
+ public string ShortUrl { get; set; }
+
+ public int Clicks { get; set; }
+
+ private List _schedules;
+
+ public List Schedules {
+ get{
+ if(_schedules == null){
+ _schedules = new List();
+ }
+ return _schedules;
+ }
+ set{
+ _schedules = value;
+ }
+ }
+
+ public ShortUrlEntity()
+ {
+ }
+
+ public static ShortUrlEntity GetEntity(string longUrl, string endUrl)
+ {
+ return new ShortUrlEntity
+ {
+ PartitionKey = endUrl.First().ToString(),
+ RowKey = endUrl,
+ Url = longUrl
+ };
+ }
+
+ public string GetDisplayableUrl(int max)
+ {
+ var length = Url.ToString().Length;
+ if (length >= max)
+ {
+ return string.Concat(Url.Substring(0, max-1), "...");
+ }
+ return Url;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/adminTools/adminBlazorWebsite/src/Data/ShortUrlList.cs b/src/app/TinyBlazorAdmin/Data/ShortUrlList.cs
similarity index 79%
rename from src/adminTools/adminBlazorWebsite/src/Data/ShortUrlList.cs
rename to src/app/TinyBlazorAdmin/Data/ShortUrlList.cs
index a22ad3a9..36149bd6 100644
--- a/src/adminTools/adminBlazorWebsite/src/Data/ShortUrlList.cs
+++ b/src/app/TinyBlazorAdmin/Data/ShortUrlList.cs
@@ -1,9 +1,9 @@
using System.Collections.Generic;
-namespace adminBlazorWebsite.Data
+namespace TinyBlazorAdmin.Data
{
public class ShortUrlList
{
public List UrlList { get; set; }
}
-}
+}
\ No newline at end of file
diff --git a/src/app/TinyBlazorAdmin/Data/ShortUrlRequest.cs b/src/app/TinyBlazorAdmin/Data/ShortUrlRequest.cs
new file mode 100644
index 00000000..cf1b24d5
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/Data/ShortUrlRequest.cs
@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace TinyBlazorAdmin.Data
+{
+ public class ShortUrlRequest
+ {
+ private string _vanity;
+
+ public string Title { get; set; }
+
+ public string Vanity
+ {
+ get
+ {
+ return (_vanity != null) ? _vanity : string.Empty;
+ }
+ set
+ {
+ _vanity = value;
+ }
+ }
+
+ [Required]
+ public string Url { get; set; }
+
+ private List _schedules;
+
+ public List Schedules {
+ get{
+ if(_schedules == null){
+ _schedules = new List();
+ }
+ return _schedules;
+ }
+ set{
+ _schedules = value;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/TinyBlazorAdmin/Data/UrlShortenerSecuredService.cs b/src/app/TinyBlazorAdmin/Data/UrlShortenerSecuredService.cs
new file mode 100644
index 00000000..1136fffc
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/Data/UrlShortenerSecuredService.cs
@@ -0,0 +1,109 @@
+using Microsoft.AspNetCore.Components;
+using Newtonsoft.Json;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System;
+
+
+namespace TinyBlazorAdmin.Data
+{
+ ///
+ /// Client to fetch the Cosmos DB token.
+ ///
+ public class UrlShortenerSecuredService
+ {
+ ///
+ /// An
+ private HttpClient _httpClient;
+
+ private HttpClient Http {
+ get{
+ if(_httpClient == null){
+ _httpClient = new HttpClient();
+ }
+ return _httpClient;
+ }
+ }
+
+
+ // private static StringContent CreateHttpContent(object content)
+ // {
+ // StringContent httpContent = null;
+
+ // if (content != null)
+ // {
+ // var jsonString = JsonConvert.SerializeObject(content);
+ // httpContent = new StringContent(jsonString, Encoding.UTF8, "application/json");
+ // }
+
+ // return httpContent;
+ // }
+
+ // ///
+ // /// Creates a new instance of the
+ // ///
+ // public UrlShortenerSecuredService(IHttpClientFactory factory)
+ // {
+ // _client = factory.CreateClient(nameof(UrlShortenerSecuredService));
+ // }
+
+ public async Task GetUrlList()
+ {
+ string result = string.Empty;
+ var resultList = await Http.GetFromJsonAsync($"/api/UrlList");
+ return resultList;
+ }
+
+ public async Task CreateShortUrl(ShortUrlRequest shortUrlRequest)
+ {
+ CancellationToken cancellationToken = new CancellationToken();
+
+ var response = await Http.PostAsJsonAsync($"/api/UrlShortener", shortUrlRequest, cancellationToken);
+
+ var resultList = await response.Content.ReadAsStringAsync();
+ return JsonConvert.DeserializeObject(resultList);
+ }
+
+ public async Task UpdateShortUrl(ShortUrlEntity editedUrl)
+ {
+ CancellationToken cancellationToken = new CancellationToken();
+
+ var response = await Http.PostAsJsonAsync($"/api/UrlUpdate", editedUrl, cancellationToken);
+
+ var resultList = await response.Content.ReadAsStringAsync();
+ return JsonConvert.DeserializeObject(resultList);
+ }
+
+ public async Task ArchiveShortUrl(ShortUrlEntity archivedUrl)
+ {
+ CancellationToken cancellationToken = new CancellationToken();
+
+ var response = await Http.PostAsJsonAsync($"/api/UrlArchive", archivedUrl, cancellationToken);
+
+ var resultList = await response.Content.ReadAsStringAsync();
+ return JsonConvert.DeserializeObject(resultList);
+ }
+
+ public async Task GetClickStats(string vanity) {
+ try{
+ CancellationToken cancellationToken = new CancellationToken();
+
+ string result = string.Empty;
+ var response = await Http.PostAsJsonAsync($"/api/UrlClickStatsByDay", new { Vanity = vanity }, cancellationToken);
+ var resultList = await response.Content.ReadAsStringAsync();
+ return JsonConvert.DeserializeObject(resultList);;
+
+ }
+ catch(Exception ex){
+ var ttt = ex.Message;
+ return new ClickDateList();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/TinyBlazorAdmin/Data/UrlShortenerService.cs b/src/app/TinyBlazorAdmin/Data/UrlShortenerService.cs
new file mode 100644
index 00000000..0cb845c2
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/Data/UrlShortenerService.cs
@@ -0,0 +1,73 @@
+using Microsoft.Extensions.Configuration;
+
+namespace tinyBlazorAdmin.Data
+{
+ public class UrlShortenerService
+ {
+ public IConfiguration Config { get; set; }
+
+ public UrlShortenerService(IConfiguration config)
+ {
+ //Config = GetConfiguration();
+ Config = config;
+ }
+
+ // private async Task GetFunctionUrl(string functionName){
+ // StringBuilder FuncUrl = new StringBuilder(await GetSecret("AzFunctionURL"));
+ // FuncUrl.Append("/api/");
+ // FuncUrl.Append(functionName);
+
+ // string code = await GetSecret("AzFunctionCode");
+ // if(!string.IsNullOrWhiteSpace(code))
+ // {
+ // FuncUrl.Append("?code=");
+ // FuncUrl.Append(code);
+ // }
+
+ // return FuncUrl.ToString();
+ // }
+
+ // public async Task GetUrlList()
+ // {
+ // var url = await GetFunctionUrl("UrlList");
+
+ // CancellationToken cancellationToken;
+
+ // using (var client = new HttpClient())
+ // using (var request = new HttpRequestMessage(HttpMethod.Get, url))
+ // {
+ // using (var response = await client
+ // .SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken)
+ // .ConfigureAwait(false))
+ // {
+ // var resultList = response.Content.ReadAsStringAsync().Result;
+ // return JsonConvert.DeserializeObject(resultList);
+ // }
+ // }
+ // }
+
+ // private static StringContent CreateHttpContent(object content)
+ // {
+ // StringContent httpContent = null;
+
+ // if (content != null)
+ // {
+ // var jsonString = JsonConvert.SerializeObject(content);
+ // httpContent = new StringContent(jsonString, Encoding.UTF8, "application/json");
+ // }
+
+ // return httpContent;
+ // }
+
+ // public static void SerializeJsonIntoStream(object value, Stream stream)
+ // {
+ // using (var sw = new StreamWriter(stream, new UTF8Encoding(false), 1024, true))
+ // using (var jtw = new JsonTextWriter(sw) { Formatting = Formatting.None })
+ // {
+ // var js = new JsonSerializer();
+ // js.Serialize(jtw, value);
+ // jtw.Flush();
+ // }
+ // }
+ }
+}
\ No newline at end of file
diff --git a/src/app/TinyBlazorAdmin/Pages/Authentication.razor b/src/app/TinyBlazorAdmin/Pages/Authentication.razor
new file mode 100644
index 00000000..ec9aa2f8
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/Pages/Authentication.razor
@@ -0,0 +1,7 @@
+@page "/authentication/{action}"
+@using Microsoft.AspNetCore.Components.WebAssembly.Authentication
+
+ {
+ { "github", new string[3]{ "github", "github", "GitHub"}},
+ { "twitter", new string[3]{ "twitter","twitter", "Twitter" }},
+ { "microsoft", new string[3]{ "windows", "aad", "Azure AD" }}
+ };
+}
+
+
+
+
+
+
+
+
+
+
+
+
+ clicksHistory = new List();
+ private readonly Random _random = new Random();
+ private string test = "";
+
+ public class ClickData
+ {
+ public string XValue;
+ public int YValue;
+ }
+
+ private async Task UpdateUIList()
+ {
+ subTitle = (!String.IsNullOrEmpty(Vanity))? $"Clicks for: {Vanity}": "All clicks";
+
+ clickStatsList = await azClient.GetClickStats(Vanity);
+
+ var temp = clickStatsList.Items.Select(s => new ClickData{
+ XValue = s.DateClicked,
+ YValue = s.Count
+ });
+ clicksHistory = temp.ToList();
+ test += "Day(s): " + clicksHistory.Count.ToString();
+ StateHasChanged();
+
+ }
+
+ protected override async Task OnParametersSetAsync()
+ {
+ //await UpdateUIList();
+ }
+
+
+ protected override void OnInitialized()
+ {
+ UpdateUIList();
+ }
+}
diff --git a/src/app/TinyBlazorAdmin/Pages/UrlManager.razor b/src/app/TinyBlazorAdmin/Pages/UrlManager.razor
new file mode 100644
index 00000000..79263e83
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/Pages/UrlManager.razor
@@ -0,0 +1,296 @@
+@page "/urlmanager"
+@using TinyBlazorAdmin.Data
+@using Microsoft.AspNetCore.Authorization
+@using Syncfusion.Blazor.Calendars
+@using Syncfusion.Blazor.Inputs
+@inject IJSRuntime JSRuntime;
+@implements IDisposable
+@inject NavigationManager NavigationManager;
+@attribute [Authorize(Roles = "admin")]
+
+@inject UrlShortenerSecuredService azClient
+
+
+
+
}
diff --git a/src/adminTools/adminBlazorWebsite/src/Pages/_Host.cshtml b/src/adminTools/adminBlazorWebsite/src/Pages/_Host.cshtml
deleted file mode 100644
index 08dd33bd..00000000
--- a/src/adminTools/adminBlazorWebsite/src/Pages/_Host.cshtml
+++ /dev/null
@@ -1,47 +0,0 @@
-@page "/"
-@namespace adminBlazorWebsite.Pages
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@{
- Layout = null;
-}
-
-
-
-
-
-
-
-
- An error has occurred. This application may no longer respond until reloaded.
-
-
- An unhandled exception has occurred. See browser dev tools for details.
-
- Reload
- 🗙
-
-
-
-
-
diff --git a/src/adminTools/adminBlazorWebsite/src/Pages/_ViewImports.cshtml b/src/adminTools/adminBlazorWebsite/src/Pages/_ViewImports.cshtml
deleted file mode 100644
index c140cee0..00000000
--- a/src/adminTools/adminBlazorWebsite/src/Pages/_ViewImports.cshtml
+++ /dev/null
@@ -1,6 +0,0 @@
-@using Microsoft.AspNetCore.Identity
-@using adminBlazorWebsite.Areas.Identity
-
-
-adminBlazorWebsite.Pages
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/adminTools/adminBlazorWebsite/src/Pages/_ViewStart.cshtml b/src/adminTools/adminBlazorWebsite/src/Pages/_ViewStart.cshtml
deleted file mode 100644
index 820a2f6e..00000000
--- a/src/adminTools/adminBlazorWebsite/src/Pages/_ViewStart.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@{
- Layout = "_Layout";
-}
diff --git a/src/adminTools/adminBlazorWebsite/src/Program.cs b/src/adminTools/adminBlazorWebsite/src/Program.cs
index a398e311..a1f04c3f 100644
--- a/src/adminTools/adminBlazorWebsite/src/Program.cs
+++ b/src/adminTools/adminBlazorWebsite/src/Program.cs
@@ -1,4 +1,3 @@
-using System;
using adminBlazorWebsite.Data;
using Microsoft.AspNetCore.Hosting;
using Microsoft.EntityFrameworkCore;
@@ -6,6 +5,7 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
+using System;
namespace adminBlazorWebsite
{
@@ -14,33 +14,33 @@ public class Program
public static void Main(string[] args)
{
var host = CreateHostBuilder(args).Build();
-
- using (var scope = host.Services.CreateScope())
- {
- var services = scope.ServiceProvider;
- try
+ using (var scope = host.Services.CreateScope())
{
- var context = services.GetRequiredService
-
diff --git a/src/adminTools/adminBlazorWebsite/src/Shared/Modal.razor b/src/adminTools/adminBlazorWebsite/src/Shared/Modal.razor
deleted file mode 100644
index 42f5c504..00000000
--- a/src/adminTools/adminBlazorWebsite/src/Shared/Modal.razor
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
- @Body
-
-
-
-
-
-
-
-
-@code {
- [Parameter]
- public string Title { get; set; }
-
- [Parameter]
- public EventCallback ClosePopup { get; set; }
-
- [Parameter]
- public RenderFragment ChildContent { get; set; }
-}
diff --git a/src/adminTools/adminBlazorWebsite/src/Startup.cs b/src/adminTools/adminBlazorWebsite/src/Startup.cs
index 4871e1ee..0f45f63d 100644
--- a/src/adminTools/adminBlazorWebsite/src/Startup.cs
+++ b/src/adminTools/adminBlazorWebsite/src/Startup.cs
@@ -1,20 +1,15 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using adminBlazorWebsite.Abstractions;
+using adminBlazorWebsite.Areas.Identity;
+using adminBlazorWebsite.Data;
using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Identity.UI;
using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.HttpsPolicy;
+using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
-using adminBlazorWebsite.Areas.Identity;
-using adminBlazorWebsite.Data;
namespace adminBlazorWebsite
{
@@ -22,10 +17,10 @@ public class Startup
{
public Startup(IConfiguration configuration)
{
- _config = configuration;
+ Config = configuration;
}
- public IConfiguration _config { get; }
+ public IConfiguration Config { get; }
// This method gets called by the runtime. Use this method to add services to the container.
// For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
@@ -33,15 +28,18 @@ public void ConfigureServices(IServiceCollection services)
{
services.AddDbContext
-
-
-Tiny Blazor Admin
+ +
+ 
+
+
+
diff --git a/src/app/TinyBlazorAdmin/Pages/LoginProviders.razor b/src/app/TinyBlazorAdmin/Pages/LoginProviders.razor
new file mode 100644
index 00000000..a3e4618d
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/Pages/LoginProviders.razor
@@ -0,0 +1,26 @@
+@page "/login-providers"
+
+@{
+
+ var providers = new Dictionary+ Welcome to the Tiny Blazor Admin +
+ +
+
+
+ This is the frontend of a solution using AzUrlShortener both projects are available on GitHub.
+ +This site is build using .Net Blazor Web Assembly and some Blazor components from Syncfusion (thank you for the Community licence)
+ +If you want to learn more about Tiny Blazor Admin please refer to the documentation.
+Login
+ +
+ @foreach(var provider in providers)
+ {
+
+ }
+
\ No newline at end of file
diff --git a/src/app/TinyBlazorAdmin/Pages/Statistics.razor b/src/app/TinyBlazorAdmin/Pages/Statistics.razor
new file mode 100644
index 00000000..07a050a5
--- /dev/null
+++ b/src/app/TinyBlazorAdmin/Pages/Statistics.razor
@@ -0,0 +1,86 @@
+
+@page "/statistics"
+@page "/statistics/{vanity}"
+
+@using Syncfusion.Blazor.Charts
+@using TinyBlazorAdmin.Data
+@using Microsoft.AspNetCore.Authorization
+@inject IJSRuntime JSRuntime;
+@attribute [Authorize(Roles = "admin")]
+
+@inject UrlShortenerSecuredService azClient
+
+Click Statistics
+@subTitle
+ << Back +@((MarkupString)test)
+ +@code { + [Parameter] + public string Vanity { get; set; } + private string subTitle = ""; + private ClickDateList clickStatsList; + private ListURL Manager
+Create, Edit, Achives your URLs
+ +@if (UrlList == null) +{ +Loading...
+} +else +{ + + +
+
+
+
+
+ @{
+ var url = (context as ShortUrlEntity);
+
+ }
+
+
+
+
+ @{
+ var url = (context as ShortUrlEntity);
+ if(url.Schedules != null){
+ @url.Schedules.Count
+ }
+ else
+ {
+ 0
+ };
+ }
+
+
+
+
+ @{
+ var url = (context as ShortUrlEntity);
+ @url.RowKey
+ }
+
+
+
+
+ @{
+ var url = (context as ShortUrlEntity);
+ @url.Clicks
+
+ }
+
+
+
+
+ @{
+ var url = (context as ShortUrlEntity);
+
+ }
+
+
+
+
+ @{
+ var url = (context as ShortUrlEntity);
+
+ }
+
+
+
+
+
+ + + +
+ +} + +@if (ShowCreatePopup) +{ +
+
+