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

Jump to bottom

ON-40846 #Change customGroups to string #314

Merged
merged 1 commit into from
May 30, 2024
Merged

ON-40846 #Change customGroups to string #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions OneBlink.SDK/FormsAppsClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public async Task<JWTPayload> VerifyJWT(string token)
);
string verifiedToken = Token.VerifyJWT(token, jwk, iss);
RawJWTPayload rawJWTPayload = JsonConvert.DeserializeObject<RawJWTPayload>(verifiedToken);
if (String.IsNullOrEmpty(rawJWTPayload.sub))
if (string.IsNullOrEmpty(rawJWTPayload.sub))
{
throw new ArgumentException("Invalid token");
}
Expand All @@ -51,8 +51,8 @@ public async Task<JWTPayload> VerifyJWT(string token)
jWTPayload.fullName = rawJWTPayload.name;
jWTPayload.picture = rawJWTPayload.picture;
jWTPayload.role = rawJWTPayload.customRole;
jWTPayload.username = !String.IsNullOrEmpty(rawJWTPayload.email) ? rawJWTPayload.email : rawJWTPayload.sub;
if (!String.IsNullOrEmpty(rawJWTPayload.customSupervisorEmail) && !String.IsNullOrEmpty(rawJWTPayload.customSupervisorName) && !String.IsNullOrEmpty(rawJWTPayload.customSupervisorUserId))
jWTPayload.username = !string.IsNullOrEmpty(rawJWTPayload.email) ? rawJWTPayload.email : rawJWTPayload.sub;
if (!string.IsNullOrEmpty(rawJWTPayload.customSupervisorEmail) && !string.IsNullOrEmpty(rawJWTPayload.customSupervisorName) && !string.IsNullOrEmpty(rawJWTPayload.customSupervisorUserId))
{
jWTPayload.supervisor = new FormSubmissionSupervisor();
jWTPayload.supervisor.fullName = rawJWTPayload.customSupervisorName;
Expand All @@ -61,15 +61,15 @@ public async Task<JWTPayload> VerifyJWT(string token)
}
jWTPayload.phoneNumber = rawJWTPayload.customPhoneNumber;
jWTPayload.phoneNumberVerified = rawJWTPayload.customPhoneNumberVerified;
jWTPayload.groups = rawJWTPayload.customGroups;
jWTPayload.groups = !string.IsNullOrEmpty(rawJWTPayload.customGroups) ? new System.Collections.Generic.List<string>(rawJWTPayload.customGroups.Split(',')) : null;
if (rawJWTPayload.identities != null && rawJWTPayload.identities.Count > 0)
{
jWTPayload.providerType = rawJWTPayload.identities[0].providerType;
jWTPayload.providerUserId = rawJWTPayload.identities[0].userId;
jWTPayload.isSAMLUser = rawJWTPayload.identities[0].providerType == "SAML";
if (jWTPayload.isSAMLUser.HasValue && jWTPayload.isSAMLUser.Value == true)
{
jWTPayload.username = !String.IsNullOrEmpty(rawJWTPayload.preferred_username) ? rawJWTPayload.preferred_username : rawJWTPayload.identities[0].userId;
jWTPayload.username = !string.IsNullOrEmpty(rawJWTPayload.preferred_username) ? rawJWTPayload.preferred_username : rawJWTPayload.identities[0].userId;
}
}

Expand Down Expand Up @@ -114,7 +114,7 @@ public async Task<T> UpdateStyles<T>(long id, T styles) where T : FormsAppStyles

public async Task<FormsAppSendingAddressResponse> SetSendingAddress(long id, NewFormsAppSendingAddress newFormsAppSendingAddress)
{
if (String.IsNullOrEmpty(newFormsAppSendingAddress.emailAddress))
if (string.IsNullOrEmpty(newFormsAppSendingAddress.emailAddress))
{
throw new Exception("Email Address must not be empty");
}
Expand Down
2 changes: 1 addition & 1 deletion OneBlink.SDK/models/JWTPayload.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public string preferred_username
get; set;
}
[JsonProperty("custom:groups")]
public List<string> customGroups
public string customGroups
{
get; set;
}
Expand Down
Loading