wkulhanek/bonob
1
0
Fork 0
mirror of https://github.com/wkulhanek/bonob.git synced 2025-12-21 17:33:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix token refresh

Browse Source
This commit is contained in:
Wolfgang Kulhanek
2025-10-17 09:54:48 +02:00
parent ef17fbdcff
commit 42ecea42c2
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/smapi.ts
View File

@@ -462,7 +462,7 @@ function bindSmapiSoapServiceToExpress(
); );
}; };
const swapToken = (expiredToken:string) => (newToken:SmapiToken) => { const swapToken = (expiredToken:string | undefined) => (newToken:SmapiToken) => {
logger.debug("oldToken: "+expiredToken); logger.debug("oldToken: "+expiredToken);
logger.debug("newToken: "+JSON.stringify(newToken)); logger.debug("newToken: "+JSON.stringify(newToken));
sonosSoap.associateCredentialsForToken(newToken.token, newToken, expiredToken); sonosSoap.associateCredentialsForToken(newToken.token, newToken, expiredToken);
@@ -517,10 +517,12 @@ function bindSmapiSoapServiceToExpress(
throw SMAPI_FAULT_LOGIN_UNAUTHORIZED; throw SMAPI_FAULT_LOGIN_UNAUTHORIZED;
}); });
} else if (isExpiredTokenError(authOrFail)) { } else if (isExpiredTokenError(authOrFail)) {
// Get the old SMAPI token from credentials before refreshing
const oldSmapiToken = credentials?.loginToken.token;
throw await pipe( throw await pipe(
musicService.refreshToken(authOrFail.expiredToken), musicService.refreshToken(authOrFail.expiredToken),
TE.map((it) => smapiAuthTokens.issue(it.serviceToken)), TE.map((it) => smapiAuthTokens.issue(it.serviceToken)),
TE.tap(swapToken(authOrFail.expiredToken)), TE.tap(swapToken(oldSmapiToken)),
TE.map((newToken) => ({ TE.map((newToken) => ({
Fault: { Fault: {
faultcode: "Client.TokenRefreshRequired", faultcode: "Client.TokenRefreshRequired",
@@ -570,6 +572,8 @@ function bindSmapiSoapServiceToExpress(
refreshAuthToken: async (_, _2, soapyHeaders: SoapyHeaders, refreshAuthToken: async (_, _2, soapyHeaders: SoapyHeaders,
{ headers }: Pick<Request, "headers">) => { { headers }: Pick<Request, "headers">) => {
const creds = useHeaderIfPresent(soapyHeaders?.credentials, headers); const creds = useHeaderIfPresent(soapyHeaders?.credentials, headers);
// Get the old SMAPI token from credentials before refreshing
const oldSmapiToken = creds?.loginToken.token;
const serviceToken = pipe( const serviceToken = pipe(
auth(creds), auth(creds),
E.fold( E.fold(
@@ -586,7 +590,7 @@ function bindSmapiSoapServiceToExpress(
return pipe( return pipe(
musicService.refreshToken(serviceToken), musicService.refreshToken(serviceToken),
TE.map((it) => smapiAuthTokens.issue(it.serviceToken)), TE.map((it) => smapiAuthTokens.issue(it.serviceToken)),
TE.tap(swapToken(serviceToken)), // ignores the return value, like a tee or peek TE.tap(swapToken(oldSmapiToken)), // ignores the return value, like a tee or peek
TE.map((it) => ({ TE.map((it) => ({
refreshAuthTokenResult: { refreshAuthTokenResult: {
authToken: it.token, authToken: it.token,