diff --git a/.gitignore b/.gitignore index f934035..f6610cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,368 @@ +## 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/ +[Oo]ut/ +[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/ + +# 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 + # Directories .vscode/ IPGeolocation/obj/ -IPGeolocation/bin/ -.fake -.ionide - -# Files -IPGeolocation/Main.cs \ No newline at end of file +IPGeolocation/bin/ \ No newline at end of file diff --git a/IPGeolocation.sln b/IPGeolocation.sln index 05b08f4..a7ee986 100644 --- a/IPGeolocation.sln +++ b/IPGeolocation.sln @@ -1,7 +1,13 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IPGeolocation", "IPGeolocation\IPGeolocation.csproj", "{5F73CAA8-4E60-4329-B146-87472FB8054D}" +# Visual Studio Version 17 +VisualStudioVersion = 17.6.33829.357 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IPGeolocation", "IPGeolocation\IPGeolocation.csproj", "{5F73CAA8-4E60-4329-B146-87472FB8054D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E8E9BE24-4497-4C8F-8D8D-9DE7F15DD852}" + ProjectSection(SolutionItems) = preProject + .gitignore = .gitignore + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -14,4 +20,10 @@ Global {5F73CAA8-4E60-4329-B146-87472FB8054D}.Release|Any CPU.ActiveCfg = Release|Any CPU {5F73CAA8-4E60-4329-B146-87472FB8054D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {71E03D23-9840-4BEB-B0D2-2AB5849986C1} + EndGlobalSection EndGlobal diff --git a/IPGeolocation/IIpGeoLocationApi.cs b/IPGeolocation/IIpGeoLocationApi.cs new file mode 100644 index 0000000..9c7993a --- /dev/null +++ b/IPGeolocation/IIpGeoLocationApi.cs @@ -0,0 +1,13 @@ +namespace IPGeolocation +{ + public interface IIpGeoLocationApi + { + String GetApiKey(); + Dictionary GetGeolocation(); + Dictionary GetGeolocation(GeolocationParams geolocationParams); + Dictionary GetBulkGeolocation(GeolocationParams geolocationParams); + Dictionary GetTimezone(); + Dictionary GetUserAgent(String uaString); + Dictionary GetBulkUserAgent(List uaStrings); + } +} diff --git a/IPGeolocation/IPGeolocation.csproj b/IPGeolocation/IPGeolocation.csproj index f17d727..3ca5921 100644 --- a/IPGeolocation/IPGeolocation.csproj +++ b/IPGeolocation/IPGeolocation.csproj @@ -1,14 +1,13 @@ - Exe - netcoreapp6.0.0 + net6.0 + enable + enable - - - - + + diff --git a/IPGeolocation/IPGeolocation.nuspec b/IPGeolocation/IPGeolocation.nuspec index dc9aa77..7d3787a 100644 --- a/IPGeolocation/IPGeolocation.nuspec +++ b/IPGeolocation/IPGeolocation.nuspec @@ -2,20 +2,20 @@ IPGeolocation.IPGeolocation - 1.0.10 + 2.0.0 IPGeoLocation API SDK ipgeolocation.io false https://ipgeolocation.io/static/flags/ipgeo-dark.png Use this SDK to fully leverage IPGeolocation API - First release + .NET 6 release Copyright 2018 (c) Ipgeolocation Corporation. All rights reserved. - + - + diff --git a/IPGeolocation/IPGeolocationAPI.cs b/IPGeolocation/IPGeolocationAPI.cs index 7decd96..7d46579 100644 --- a/IPGeolocation/IPGeolocationAPI.cs +++ b/IPGeolocation/IPGeolocationAPI.cs @@ -1,28 +1,26 @@ -using System; +using Microsoft.Extensions.Options; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using System.Net; -using System.IO; using System.Text; -using Newtonsoft.Json.Linq; -using System.Collections.Generic; -using Newtonsoft.Json; namespace IPGeolocation { - - public class IPGeolocationAPI + public class IPGeolocationAPI : IIpGeoLocationApi { private String apiKey; - public IPGeolocationAPI(String apiKey) + public IPGeolocationAPI(IOptions options) { - if (Strings.IsNullOrEmpty(apiKey)) + IpGeoLocationOptions ipGeoLocationOptions = options.Value; + if (Strings.IsNullOrEmpty(ipGeoLocationOptions.ApiKey)) { throw new ArgumentException("API key must not be null or empty"); } else { - this.apiKey = apiKey; + this.apiKey = ipGeoLocationOptions.ApiKey; } } diff --git a/IPGeolocation/IpGeoLocationOptions.cs b/IPGeolocation/IpGeoLocationOptions.cs new file mode 100644 index 0000000..d5c32f7 --- /dev/null +++ b/IPGeolocation/IpGeoLocationOptions.cs @@ -0,0 +1,9 @@ +namespace IPGeolocation +{ + public class IpGeoLocationOptions + { + public const string IpGeoLocation = "IpGeoLocation"; + + public string ApiKey { get; set; } + } +} diff --git a/IPGeolocation/IpGeoLocationServiceCollectionExtensions.cs b/IPGeolocation/IpGeoLocationServiceCollectionExtensions.cs new file mode 100644 index 0000000..5d0318d --- /dev/null +++ b/IPGeolocation/IpGeoLocationServiceCollectionExtensions.cs @@ -0,0 +1,22 @@ +using IPGeolocation; +using Microsoft.Extensions.Configuration; + +namespace Microsoft.Extensions.DependencyInjection +{ + public static class IpGeoLocationServiceCollectionExtensions + { + public static IServiceCollection AddIpGeoLocation(this IServiceCollection services, IConfiguration config) + { + var ipGeoLocationSection = config.GetSection(IpGeoLocationOptions.IpGeoLocation); + if (!ipGeoLocationSection.Exists()) + { + throw new Exception($"Missing {IpGeoLocationOptions.IpGeoLocation} configuration."); + } + services.Configure(ipGeoLocationSection); + + services.AddSingleton(); + + return services; + } + } +}