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

DRY #401

Merged
merged 2 commits into from
Feb 17, 2024
+45 −43
Merged

DRY #401

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cea7a2
Single static method to validate, update and set token
NigelBreslaw Feb 17, 2024
9a17a6f
DRY
NigelBreslaw Feb 17, 2024
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
88 changes: 45 additions & 43 deletions native_gg/src/authentication/AuthService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,31 +76,7 @@ class AuthService {
try {
const stringToken = v.parse(v.string(), token);
const validatedToken = v.parse(authTokenSchema, JSON.parse(stringToken));

const isValidRefresh = isValidRefreshToken(validatedToken);
if (!isValidRefresh) {
console.error("Refresh token expired");
return reject(false);
}
console.log("valid refresh token");
const isValidAccess = isValidAccessToken(validatedToken);
if (!isValidAccess) {
console.log("Access token expired");
getAccessToken(validatedToken)
.then((newAuthToken) => {
console.log("Got new access token");
AsyncStorage.setItem(
`${this.currentUserID}${Store._refresh_token}`,
JSON.stringify(newAuthToken),
);
this.setAuthToken(newAuthToken);
return resolve(true);
})
.catch((e) => {
return reject(e);
});
}
this.setAuthToken(validatedToken);
AuthService.validateAndSetToken(validatedToken);
return resolve(true);
} catch (error) {
console.log(error);
Expand All @@ -123,29 +99,55 @@ class AuthService {
static getTokenAsync(): Promise<AuthToken | null> {
return new Promise((resolve, reject) => {
if (AuthService.instance.authToken) {
/// is the access token valid?
const isValid = isValidAccessToken(AuthService.instance.authToken);
if (!isValid) {
console.log("Token expired");
getAccessToken(AuthService.instance.authToken)
.then((authToken) => {
const currentUserID = AuthService.instance.currentUserID;
AsyncStorage.setItem(`${currentUserID}${Store._refresh_token}`, JSON.stringify(authToken));
AuthService.instance.setAuthToken(authToken);
console.log("Got new token");
return resolve(authToken);
})
.catch((e) => {
return reject(e);
});
}
AuthService.validateAndSetToken(AuthService.instance.authToken)
.then(() => {
return resolve(AuthService.instance.authToken);
})
.catch((e) => {
console.error("Failed to validate token", e);
return reject(null);
});
} else {
return reject(null);
}
});
}

return resolve(AuthService.instance.authToken);
// This function validates, gets refreshed tokens, saves and sets them.
private static validateAndSetToken(token: AuthToken): Promise<boolean> {
return new Promise((resolve, reject) => {
let validToken = token;

const isValidRefresh = isValidRefreshToken(token);
if (!isValidRefresh) {
// Nothing can be done. The user needs to re-auth.
console.error("Refresh token expired");
return reject(false);
}

const isValidAccess = isValidAccessToken(token);
if (!isValidAccess) {
getAccessToken(token)
.then((newAuthToken) => {
validToken = newAuthToken;
})
.catch((e) => {
return reject(e);
});
}
reject(AuthService.instance.authToken);

AuthService.saveAndSetToken(validToken);

return resolve(true);
});
}

private static saveAndSetToken(token: AuthToken) {
const currentUserID = AuthService.instance.currentUserID;
AsyncStorage.setItem(`${currentUserID}${Store._refresh_token}`, JSON.stringify(token));
AuthService.getInstance().setAuthToken(token);
}

// Method to subscribe to auth changes
subscribe(dispatch: React.Dispatch<AuthAction>) {
this.dispatch = dispatch;
Expand Down
Loading