Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Newtonsoft.Json from 12.0.1 to 13.0.1 in /Xero.NetStandard.OAuth2.Test #2

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Bump Newtonsoft.Json from 12.0.1 to 13.0.1 in /Xero.NetStandard.OAuth2.Test #2

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
40a55f5
Pass in acrValues
MatthewSteeples Apr 15, 2021
e2e5baa
add support for custom base uris for authorise, token and API
jonpercydev May 25, 2021
75dcd6d
Set up CI Build to Ledgerscope's Azure DevOps
MatthewSteeples May 25, 2021
54f3d48
Use a different version number
MatthewSteeples May 25, 2021
ae8e19e
Publish the right package
MatthewSteeples May 25, 2021
8b66eab
Also apply version to Package
MatthewSteeples May 25, 2021
567f6ef
remove overloaded constructor as no longer necessary with the introdu…
jonpercydev May 25, 2021
618590d
use GetLeftPart for URI building
jonpercydev May 26, 2021
8219c84
need to support passing in a path for the authorize URI
jonpercydev Jun 16, 2021
019096c
revert previous change as no longer necessary to support path
jonpercydev Jun 16, 2021
29aee1c
Bump version number
MatthewSteeples Aug 11, 2021
5c3868f
Allow urls to be overridden in a backward compatible way
MatthewSteeples Aug 11, 2021
daad47a
don't make passing in the httpClient mandatory for the new constructo…
jonathan-ledgerscope Sep 10, 2021
7e668a8
make constructor pass through to other constructor (only one construc…
jonathan-ledgerscope Sep 10, 2021
01abcb3
Embedd source and debug symbols
MatthewSteeples Jun 27, 2022
df2a179
Remain 1 version ahead of Xero
MatthewSteeples Jun 27, 2022
4906c12
Bump Newtonsoft.Json in /Xero.NetStandard.OAuth2.Test
dependabot[bot] Jan 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use GetLeftPart for URI building
  • Loading branch information
@jonpercydev @MatthewSteeples
jonpercydev authored and MatthewSteeples committed Aug 11, 2021
commit 618590de0e47da51d8d902faae89f448d9f4a635
10 changes: 4 additions & 6 deletions Xero.NetStandard.OAuth2Client/src/Client/XeroClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,20 @@ public XeroClient(XeroConfiguration xeroConfig, HttpClient httpClient = null, Ur
var tokenRevocationUri = new Uri("https://identity.xero.com/connect/revocation");
var connectionsUri = new Uri("https://api.xero.com/connections");

var https = Uri.UriSchemeHttps + "://";

_xeroAuthorizeUri = baseAuthorizeUri != null
? new RequestUrl(https + baseAuthorizeUri.Host + authorizeUri.AbsolutePath)
? new RequestUrl(baseAuthorizeUri.GetLeftPart(UriPartial.Authority) + authorizeUri.AbsolutePath)
: new RequestUrl(authorizeUri.ToString());

_xeroTokenUri = baseTokenUri != null
? new Uri(https + baseTokenUri.Host + tokenUri.AbsolutePath)
? new Uri(baseTokenUri.GetLeftPart(UriPartial.Authority) + tokenUri.AbsolutePath)
: new Uri(tokenUri.ToString());

_xeroTokenRevocationUri = baseTokenUri != null
? new Uri(https + baseTokenUri.Host + tokenRevocationUri.AbsolutePath)
? new Uri(baseTokenUri.GetLeftPart(UriPartial.Authority) + tokenRevocationUri.AbsolutePath)
: new Uri(tokenRevocationUri.ToString());

_xeroConnectionsUri = baseApiUri != null
? new Uri(https + baseApiUri.Host + connectionsUri.AbsolutePath)
? new Uri(baseApiUri.GetLeftPart(UriPartial.Authority) + connectionsUri.AbsolutePath)
: new Uri(connectionsUri.ToString());
}

Expand Down