Skip to content

Commit

Permalink
fix: tokenset deserialisation
Browse files Browse the repository at this point in the history
  • Loading branch information
vinceh121 committed Nov 29, 2023
1 parent 9d98b7b commit e921e18
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 6 deletions.
87 changes: 87 additions & 0 deletions src/main/java/me/vinceh121/knb/OIDCTokenSet.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
package me.vinceh121.knb;

import com.fasterxml.jackson.annotation.JsonProperty;

public class OIDCTokenSet {
@JsonProperty("access_token")
private String accessToken;

@JsonProperty("expires_at")
private long expiresAt;

@JsonProperty("id_token")
private String idToken;

@JsonProperty("refresh_token")
private String refreshToken;

@JsonProperty("token_type")
private String token_type;

private String scope;

public String getAccessToken() {
return accessToken;
}

public void setAccessToken(String accessToken) {
this.accessToken = accessToken;
}

public long getExpiresAt() {
return expiresAt;
}

public void setExpiresAt(long expiresAt) {
this.expiresAt = expiresAt;
}

public String getIdToken() {
return idToken;
}

public void setIdToken(String idToken) {
this.idToken = idToken;
}

public String getRefreshToken() {
return refreshToken;
}

public void setRefreshToken(String refreshToken) {
this.refreshToken = refreshToken;
}

public String getToken_type() {
return token_type;
}

public void setToken_type(String token_type) {
this.token_type = token_type;
}

public String getScope() {
return scope;
}

public void setScope(String scope) {
this.scope = scope;
}

@Override
public String toString() {
return "OIDCTokenSet [accessToken="
+ accessToken
+ ", expiresAt="
+ expiresAt
+ ", idToken="
+ idToken
+ ", refreshToken="
+ refreshToken
+ ", token_type="
+ token_type
+ ", scope="
+ scope
+ "]";
}
}
2 changes: 1 addition & 1 deletion src/main/java/me/vinceh121/knb/SkolengoCheckingJob.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void execute(final JobExecutionContext context) throws JobExecutionExcept
this.metricProcessTime.time(() -> {
final TextChannel chan = knb.getJda().getTextChannelById(u.getChannelId());

sko.setBearerToken(u.getTokens().getAccessToken().toString());
sko.setBearerToken(u.getTokens().getAccessToken());
sko.setEmsCode(u.getEmsCode());
sko.setSchoolId(u.getSchoolId());

Expand Down
8 changes: 3 additions & 5 deletions src/main/java/me/vinceh121/knb/SkolengoUserInstance.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package me.vinceh121.knb;

import com.nimbusds.openid.connect.sdk.token.OIDCTokens;

public class SkolengoUserInstance extends AbstractUserInstance {
private OIDCTokens tokens;
private OIDCTokenSet tokens;
private String emsCode;
private String schoolId;

public OIDCTokens getTokens() {
public OIDCTokenSet getTokens() {
return tokens;
}

public void setTokens(OIDCTokens tokens) {
public void setTokens(OIDCTokenSet tokens) {
this.tokens = tokens;
}

Expand Down

0 comments on commit e921e18

Please sign in to comment.