Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migliorata gestione di token scaduto in AuthInterceptor

Browse Source
This commit is contained in:
Giuseppe Scorrano 2025-02-18 13:22:24 +01:00
parent 26c09c02ab
commit c6a30588e6
5 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -189,6 +189,8 @@ dependencies {
implementation 'io.reactivex.rxjava2:rxjava:2.1.12' implementation 'io.reactivex.rxjava2:rxjava:2.1.12'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.2' implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
implementation 'org.greenrobot:eventbus:3.3.1'
//Barcode generator //Barcode generator
implementation group: 'com.google.zxing', name: 'core', version: '3.5.3' implementation group: 'com.google.zxing', name: 'core', version: '3.5.3'
} }

13
app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java
View File

@ -41,7 +41,6 @@ public class MainContext {
} }
public void init() { public void init() {
try { try {
BarcodeManager.init(applicationContext); BarcodeManager.init(applicationContext);
} catch (Exception exception) { } catch (Exception exception) {
@ -63,8 +62,20 @@ public class MainContext {
this.initServerStatusChecker(); this.initServerStatusChecker();
// EventBus.getDefault().register(this);
} }
// @Subscribe(threadMode = ThreadMode.MAIN)
// public void onSessionExpired(SessionExpiredEvent event) {
// DialogSimpleMessageView.makeErrorDialog(
// new SpannedString("La sessione è scaduta. Effettua nuovamente la login"),
// null,
// () -> {
// logout(MainApplication::exit);
// })
// .show(activity.getSupportFragmentManager(), "expired-session-error");
// }
private void initAuthSession(Runnable onComplete) { private void initAuthSession(Runnable onComplete) {
this.authenticationRESTConsumer.me(obj -> { this.authenticationRESTConsumer.me(obj -> {

4
app/src/main/java/it/integry/integrywmsnative/core/event/SessionExpiredEvent.java Normal file
View File

@ -0,0 +1,4 @@
package it.integry.integrywmsnative.core.event;
public class SessionExpiredEvent {
}

15
app/src/main/java/it/integry/integrywmsnative/core/rest/AuthInterceptor.java
View File

@ -2,10 +2,14 @@ package it.integry.integrywmsnative.core.rest;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import org.greenrobot.eventbus.EventBus;
import java.io.IOException; import java.io.IOException;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import it.integry.integrywmsnative.core.authentication.JwtUtils; import it.integry.integrywmsnative.core.authentication.JwtUtils;
import it.integry.integrywmsnative.core.event.SessionExpiredEvent;
import it.integry.integrywmsnative.core.exception.UnauthorizedAccessException;
import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityDate;
import it.integry.integrywmsnative.gest.login.rest.RefreshRESTConsumer; import it.integry.integrywmsnative.gest.login.rest.RefreshRESTConsumer;
@ -25,7 +29,7 @@ public class AuthInterceptor implements Interceptor {
public Response intercept(@NonNull Chain chain) throws IOException { public Response intercept(@NonNull Chain chain) throws IOException {
var originalRequest = chain.request(); var originalRequest = chain.request();
if(SettingsManager.i().getUserSession() != null) { if (SettingsManager.i().getUserSession() != null) {
var accessToken = SettingsManager.i().getUserSession().getAccessToken(); var accessToken = SettingsManager.i().getUserSession().getAccessToken();
var accessTokenExpiryDate = SettingsManager.i().getUserSession().getAccessTokenExpiryDate(); var accessTokenExpiryDate = SettingsManager.i().getUserSession().getAccessTokenExpiryDate();
@ -45,6 +49,8 @@ public class AuthInterceptor implements Interceptor {
.setRefreshTokenExpiryDate(response.getExpiryDate()); .setRefreshTokenExpiryDate(response.getExpiryDate());
SettingsManager.update(); SettingsManager.update();
} catch (UnauthorizedAccessException uae) {
//Globally managed
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -61,4 +67,11 @@ public class AuthInterceptor implements Interceptor {
} else } else
return chain.proceed(originalRequest); return chain.proceed(originalRequest);
} }
private void notifySessionExpired() {
EventBus.getDefault().post(new SessionExpiredEvent());
}
} }

7
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java
View File

@ -106,10 +106,9 @@ public class AccettazioneBollaPickingViewModel {
this.mBolle = bolle; this.mBolle = bolle;
this.mUseQtaBolla = useQtaOrd; this.mUseQtaBolla = useQtaOrd;
List<SitBollaAccettazioneDTO> mSitArts = Stream.of(sitArts) List<SitBollaAccettazioneDTO> mSitArts = sitArts.stream()
.filter(x -> .filter(x -> UtilityBigDecimal.greaterThan(x.getQtaDaAccettare(), BigDecimal.ZERO))
UtilityBigDecimal.greaterThan(x.getQtaDaAccettare(), BigDecimal.ZERO)) .collect(Collectors.toList());
.toList();
getEmptyPickingList(mSitArts, this.mPickingList::postValue); getEmptyPickingList(mSitArts, this.mPickingList::postValue);