Skip to content

Commit 94cdac2

Browse files
committed
Admin consent and API call updates
1 parent e458eb3 commit 94cdac2

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

4-WebApp-your-API/4-3-AnyOrg/Readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ In `TodoListController.cs`, the below method `AdminConsentApi` redirects to admi
290290
```csharp
291291
public IActionResult AdminConsentApi()
292292
{
293-
string adminConsent1 = "https://login.microsoftonline.com/common/v2.0/adminconsent?client_id="+ _ApiClientId
293+
string adminConsent1 = "https://login.microsoftonline.com/organizations/v2.0/adminconsent?client_id="+ _ApiClientId
294294
+ "&redirect_uri=" + _ApiRedirectUri
295295
+ "&state=" + _RedirectUri + "Home/AdminConsentClient" + "&scope=" + _ApiScope;
296296

@@ -302,7 +302,7 @@ The method `AdminConsentClient` redirects to admin consent URI for the Web App a
302302
```csharp
303303
public IActionResult AdminConsentClient()
304304
{
305-
string adminConsent2 = "https://login.microsoftonline.com/common/v2.0/adminconsent?client_id=" + _ClientId
305+
string adminConsent2 = "https://login.microsoftonline.com/organizations/v2.0/adminconsent?client_id=" + _ClientId
306306
+ "&redirect_uri=" + _RedirectUri
307307
+ "&state=123&scope=" + _TodoListScope;
308308

4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/Controllers/HomeController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public IActionResult Privacy()
5151
/// <returns></returns>
5252
public IActionResult AdminConsentApi()
5353
{
54-
string adminConsent1 = "https://login.microsoftonline.com/common/v2.0/adminconsent?client_id=" + _ApiClientId
54+
string adminConsent1 = "https://login.microsoftonline.com/organizations/v2.0/adminconsent?client_id=" + _ApiClientId
5555
+ "&redirect_uri=" + _ApiRedirectUri
5656
+ "&state=" + _RedirectUri + "Home/AdminConsentClient" + "&scope=" + _ApiScope;
5757

@@ -64,7 +64,7 @@ public IActionResult AdminConsentApi()
6464
/// <returns></returns>
6565
public IActionResult AdminConsentClient()
6666
{
67-
string adminConsent2 = "https://login.microsoftonline.com/common/v2.0/adminconsent?client_id=" + _ClientId
67+
string adminConsent2 = "https://login.microsoftonline.com/organizations/v2.0/adminconsent?client_id=" + _ClientId
6868
+ "&redirect_uri=" + _RedirectUri
6969
+ "&state=123&scope=" + _TodoListScope;
7070

4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/Services/ToDoListService.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public async Task<ToDoItem> AddAsync(ToDoItem todo)
5454

5555
var jsonRequest = JsonConvert.SerializeObject(todo);
5656
var jsoncontent = new StringContent(jsonRequest, Encoding.UTF8, "application/json");
57-
var response = await this._httpClient.PostAsync($"{ _TodoListBaseAddress}/api/todolist", jsoncontent);
57+
var response = await this._httpClient.PostAsync($"{ _TodoListBaseAddress}api/todolist", jsoncontent);
5858

5959
if (response.StatusCode == HttpStatusCode.OK)
6060
{
@@ -71,7 +71,7 @@ public async Task DeleteAsync(int id)
7171
{
7272
await PrepareAuthenticatedClient();
7373

74-
var response = await _httpClient.DeleteAsync($"{ _TodoListBaseAddress}/api/todolist/{id}");
74+
var response = await _httpClient.DeleteAsync($"{ _TodoListBaseAddress}api/todolist/{id}");
7575

7676
if (response.StatusCode == HttpStatusCode.OK)
7777
{
@@ -87,7 +87,7 @@ public async Task<ToDoItem> EditAsync(ToDoItem todo)
8787

8888
var jsonRequest = JsonConvert.SerializeObject(todo);
8989
var jsoncontent = new StringContent(jsonRequest, Encoding.UTF8, "application/json-patch+json");
90-
var response = await _httpClient.PutAsync($"{ _TodoListBaseAddress}/api/todolist/{todo.Id}", jsoncontent);
90+
var response = await _httpClient.PutAsync($"{ _TodoListBaseAddress}api/todolist/{todo.Id}", jsoncontent);
9191

9292
if (response.StatusCode == HttpStatusCode.OK)
9393
{
@@ -103,7 +103,7 @@ public async Task<ToDoItem> EditAsync(ToDoItem todo)
103103
public async Task<IEnumerable<ToDoItem>> GetAsync()
104104
{
105105
await PrepareAuthenticatedClient();
106-
var response = await _httpClient.GetAsync($"{ _TodoListBaseAddress}/api/todolist");
106+
var response = await _httpClient.GetAsync($"{ _TodoListBaseAddress}api/todolist");
107107
if (response.StatusCode == HttpStatusCode.OK)
108108
{
109109
var content = await response.Content.ReadAsStringAsync();
@@ -117,7 +117,7 @@ public async Task<IEnumerable<ToDoItem>> GetAsync()
117117
public async Task<IEnumerable<string>> GetAllUsersAsync()
118118
{
119119
await PrepareAuthenticatedClient();
120-
var response = await _httpClient.GetAsync($"{ _TodoListBaseAddress}/api/todolist/getallusers");
120+
var response = await _httpClient.GetAsync($"{ _TodoListBaseAddress}api/todolist/getallusers");
121121
if (response.StatusCode == HttpStatusCode.OK)
122122
{
123123
var content = await response.Content.ReadAsStringAsync();
@@ -136,7 +136,7 @@ public async Task<IEnumerable<string>> GetAllUsersAsync()
136136
public async Task<ToDoItem> GetAsync(int id)
137137
{
138138
await PrepareAuthenticatedClient();
139-
var response = await _httpClient.GetAsync($"{ _TodoListBaseAddress}/api/todolist/{id}");
139+
var response = await _httpClient.GetAsync($"{ _TodoListBaseAddress}api/todolist/{id}");
140140
if (response.StatusCode == HttpStatusCode.OK)
141141
{
142142
var content = await response.Content.ReadAsStringAsync();

0 commit comments

Comments
 (0)