Skip to content

Commit ec82da3

Browse files
committed
Port the Slack provider changes to the ASP.NET Core 2.0 version
2 parents b292804 + 504cc8a commit ec82da3

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

src/AspNet.Security.OAuth.Slack/SlackAuthenticationDefaults.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public static class SlackAuthenticationDefaults
4646

4747
/// <summary>
4848
/// Default value for <see cref="OAuthOptions.UserInformationEndpoint"/>.
49-
/// For more info about this endpoint, see https://api.slack.com/methods/auth.test.
49+
/// For more info about this endpoint, see https://api.slack.com/methods/users.identity.
5050
/// </summary>
51-
public const string UserInformationEndpoint = "https://slack.com/api/auth.test";
51+
public const string UserInformationEndpoint = "https://slack.com/api/users.identity";
5252
}
5353
}

src/AspNet.Security.OAuth.Slack/SlackAuthenticationOptions.cs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,15 @@ public SlackAuthenticationOptions()
2626
TokenEndpoint = SlackAuthenticationDefaults.TokenEndpoint;
2727
UserInformationEndpoint = SlackAuthenticationDefaults.UserInformationEndpoint;
2828

29-
ClaimActions.MapJsonKey(ClaimTypes.NameIdentifier, "user_id");
30-
ClaimActions.MapJsonKey(ClaimTypes.Name, "user");
31-
ClaimActions.MapJsonKey("urn:slack:team_id", "team_id");
32-
ClaimActions.MapJsonKey("urn:slack:team_name", "team");
33-
ClaimActions.MapJsonKey("urn:slack:team_url", "url");
34-
ClaimActions.MapCustomJson("urn:slack:bot:user_id", user => user["bot"]?.Value<string>("bot_user_id"));
35-
ClaimActions.MapCustomJson("urn:slack:bot:access_token", user => user["bot"]?.Value<string>("bot_access_token"));
36-
ClaimActions.MapCustomJson("urn:slack:webhook:channel", user => user["incoming_webhook"]?.Value<string>("channel"));
37-
ClaimActions.MapCustomJson("urn:slack:webhook:url", user => user["incoming_webhook"]?.Value<string>("url"));
38-
ClaimActions.MapCustomJson("urn:slack:webhook:configuration_url", user => user["incoming_webhook"]?.Value<string>("configuration_url"));
29+
ClaimActions.MapCustomJson(ClaimTypes.NameIdentifier, user =>
30+
string.Concat(user["team"]["id"], "|", user["user"]["id"]));
31+
ClaimActions.MapJsonSubKey(ClaimTypes.Name, "user", "name");
32+
ClaimActions.MapJsonSubKey(ClaimTypes.Email, "user", "email");
33+
ClaimActions.MapJsonSubKey("urn:slack:user_id", "user", "id");
34+
ClaimActions.MapJsonSubKey("urn:slack:team_id", "team", "id");
35+
ClaimActions.MapJsonSubKey("urn:slack:team_name", "team", "name");
36+
37+
Scope.Add("identity.basic");
3938
}
4039
}
4140
}

0 commit comments

Comments
 (0)