rollback/remove remotecall interfaces, added test for is deletion call

Author: staust

src/main/java/com/staffbase/plugins/sdk/RemoteCall/AbstractRemoteCallHandler.java

@@ -16,8 +16,6 @@
 import java.util.Objects;
 
 
-import com.staffbase.plugins.sdk.RemoteCall.DeleteInstanceCallHandlerInterface;
-import com.staffbase.plugins.sdk.RemoteCall.RemoteCallInterface;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -69,12 +67,6 @@ public static SSOFacade create(final RSAPublicKey rsaPublicKey) {
    */
   private JwtConsumer jwtConsumer;
 
-  /**
-   * An instance handling remote calls
-   */
-  private RemoteCallInterface remoteCallHandler;
-
-
   /**********************************************
    * Constructors
    **********************************************/
@@ -90,19 +82,14 @@ public static SSOFacade create(final RSAPublicKey rsaPublicKey) {
    * Initialization
    **********************************************/
 
-  SSOFacade initialize(final RSAPublicKey rsaPublicKey) {
-    return this.initialize(rsaPublicKey, null);
-  }
-
   /**
    * Initialize this component by building up the consumer for JWT using the
    * pre-configured secret
    *
    * @param rsaPublicKey the RSA public key to be used for verification.
-   * @param remoteCallHandler a class handling remote calls
    * @return Fluent interface.
    */
-  SSOFacade initialize(final RSAPublicKey rsaPublicKey, final RemoteCallInterface remoteCallHandler) {
+  SSOFacade initialize(final RSAPublicKey rsaPublicKey) {
 
     if (logger.isDebugEnabled()) {
       logger.debug("Initializing single-sign-on manager SSOFacade. ");
@@ -122,13 +109,9 @@ SSOFacade initialize(final RSAPublicKey rsaPublicKey, final RemoteCallInterface
       .setRequireNotBefore()
       .setRequireIssuedAt() 
       .build();
-
-    this.remoteCallHandler = remoteCallHandler;
-
     return this;
   }
 
-
   /**********************************************
    * Methods
    **********************************************/
@@ -175,23 +158,7 @@ public SSOData verify(final String raw) throws SSOException {
       }
 
       // Parse and return the container data.
-      SSOData ssoData = new SSOData(jwtClaims);
-      if(ssoData.isDeleteInstanceCall() && this.remoteCallHandler != null) {
-        boolean result = true;
-        if (this.remoteCallHandler instanceof DeleteInstanceCallHandlerInterface){
-          result = ((DeleteInstanceCallHandlerInterface) this.remoteCallHandler).deleteInstance(instanceId);
-        } else {
-          logger.warn("Warning: An instance deletion call for instance $instanceId was not handled.");
-        }
-
-        if(result){
-          this.remoteCallHandler.exitSuccess();
-        } else {
-          this.remoteCallHandler.exitFailure();
-        }
-        exitRemoteCall();
-      }
-      return ssoData;
+      return new SSOData(jwtClaims);
     } catch (final MalformedClaimException malformationException) {
       if (logger.isFatalEnabled()) {
         logger.fatal("Encountered malformed sso attempt.", malformationException);
@@ -206,14 +173,4 @@ public SSOData verify(final String raw) throws SSOException {
       throw new SSOException(invalidJwtException.getMessage(), invalidJwtException);
     }
   }
-
-
-  /**
-   * @throws SSOException if a remote call was not handled by the user
-   */
-  private void exitRemoteCall() throws SSOException {
-    String message = "Warning: The exit procedure for a remote call was not properly handled.";
-    logger.warn(message);
-    throw new SSOException(message);
-  }
 }

src/main/java/com/staffbase/plugins/sdk/RemoteCall/DeleteInstanceCallHandlerInterface.java

@@ -11,6 +11,7 @@
 
 package com.staffbase.plugins.sdk.sso;
 
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
@@ -28,6 +29,7 @@
 public class SSODataTest {
 
   private static final String ROLE_EDITOR = "editor";
+  private static final String REMOTE_CALL_DELETE = "delete";
 
   public static final String DATA_INSTANCE_ID = "55c79b6ee4b06c6fb19bd1e2";
   public static final String DATA_USER_ID = "541954c3e4b08bbdce1a340a";
@@ -104,4 +106,20 @@ public void createWithJwtClaims() throws MalformedClaimException {
 
     assertEquals(Locale.US, ssoData.getUserLocale().get());
   }
+
+  /**
+   * Test deletion claim accessor.
+   * @throws MalformedClaimException
+   */
+  @Test
+  public void testWithDeleteJWTClaims() throws MalformedClaimException {
+
+    final JwtClaims claims = mock(JwtClaims.class);
+
+    when(claims.getClaimValue(SSOData.KEY_INSTANCE_ID, String.class)).thenReturn(DATA_INSTANCE_ID);
+    when(claims.getClaimValue(SSOData.KEY_USER_ID, String.class)).thenReturn(REMOTE_CALL_DELETE);
+
+    final SSOData ssoData = new SSOData(claims);
+    assertTrue(ssoData.isDeleteInstanceCall());
+  }
 }