Merge pull request #1 from wultra/issues/activation-helper-improve

Issues/activation helper improve

README.md

@@ -46,18 +46,23 @@ type RNActivationHelper = ActivationHelper<PowerAuth, PowerAuthCreateActivationR
 
 const PA_SERVER_URL = "http://localhost:8080/powerauth-java-server"
 const PA_ENROLLMENT = "http://localhost:8080/enrollment-server"
+const PA_INSTANCE = 'your-app-instance-id'
+
+export interface CustomActivationHelperPrepareData extends ActivationHelperPrepareData {
+    instanceId?: string
+}
 
 /**
  * Function create instnace of activation helper typed with RN wrapper objects.
  */
 async function getActivationHelper(): Promise<RNActivationHelper> {
     const cfg = { connection: { baseUrl: PA_SERVER_URL}}
-    const helper = await ActivationHelper.createWithConfig<PowerAuth>(cfg)
+    const helper: RNActivationHelper = await ActivationHelper.createWithConfig(cfg)
     helper.createSdk = async (appSetup, prepareData) => {
         // Prepare instanceId. We're using custom data in prepare interface to keep instance id.
-        const instanceId = prepareData?.customData?.get('instanceId') ?? 'your-app-instance-id'
+        const instanceId = (prepareData as CustomActivationHelperPrepareData).instanceId ?? PA_INSTANCE
         const sdk = new PowerAuth(instanceId)
-        if (sdk.isConfigured()) {
+        if (await sdk.isConfigured()) {
             await sdk.deconfigure() // depending on whether you expect config changes
         }
         const unsecure = PA_ENROLLMENT.startsWith('http://')
@@ -67,7 +72,7 @@ async function getActivationHelper(): Promise<RNActivationHelper> {
     helper.prepareStep = async (helper, activation, prepareData) => {
         if (!prepareData) throw new Error('Missing prepare data object')
         if (!prepareData.password) throw new Error('Missing password in prepare data object')
-        const sdk = helper.getPowerAuthSdk()
+        const sdk = await helper.getPowerAuthSdk()
         const deviceName = 'Test device'
         const activationData = PowerAuthActivation.createWithActivationCode(activation.activationCode!, deviceName)
         // Create activation
@@ -89,7 +94,7 @@ async function getActivationHelper(): Promise<RNActivationHelper> {
 /**
  * Function prepare activation to active state.
  */
-async function prepareActivationWithHelper(prepareData: ActivationHelperPrepareData): Promise<RNActivationHelper> {
+async function prepareActivationWithHelper(prepareData: CustomActivationHelperPrepareData): Promise<RNActivationHelper> {
     const config = { connection: { baseUrl: PA_SERVER_URL }}
     const helper = await createActivationHelper(config, prepareData)
     await helper.createActivation(helper.userId, prepareData)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "powerauth-js-test-client",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Client library for PowerAuth Server RESTful API to support JavaScript integration tests with PowerAuth Server",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/helpers/ActivationHelper.ts

@@ -47,10 +47,6 @@ export interface ActivationHelperPrepareData {
      * OTP validation mode.
      */
     otpValidation?: ActivationOtpValidation
-    /**
-     * Custom data.
-     */
-    customData?: Map<string, any>
 }
 
 /**
@@ -158,6 +154,16 @@ export class ActivationHelper<SDK, PrepareResult> {
         return await this.withSDK(a => a)
     }
 
+    /**
+     * Return SDK instance. If there's no such instance available, then throws an error.
+     */
+    get powerAuthSdk(): SDK {
+        if (!this.sdkInstance) {
+            throw new Error('PowerAuth SDK instance is not available')
+        }
+        return this.sdkInstance
+    }
+
     /**
      * Result from prepare activation step. If result is not available then throws an error.
      */

tests/Activations.test.ts

@@ -17,7 +17,7 @@
 import { testServerConfiguration } from "./config/config";
 import { ActivationHelper, ActivationHelperPrepareData, ActivationStatus, Config, Logger, PowerAuthTestServer } from "../src/index";
 import { CreateActivationData, MiniMobileClient } from "./crypto/MiniMobileClient";
-import { createActivationHelper } from "./config/helpers";
+import { createActivationHelper, CustomActivationHelperPrepareData } from "./config/helpers";
 
 
 const activationPayload: CreateActivationData = {
@@ -26,10 +26,9 @@ const activationPayload: CreateActivationData = {
     deviceInfo: 'nodejs-tests',
     extras: 'some-extras'
 }
-const preapreData: ActivationHelperPrepareData = {
-    customData: new Map<string, any>()
+const preapreData: CustomActivationHelperPrepareData = {
+    activationPayload: activationPayload
 }
-preapreData.customData!.set('activationPayload', activationPayload)
 
 describe('Manage PowerAuth applications', () => {
 
@@ -68,6 +67,7 @@ describe('Manage PowerAuth applications', () => {
 
     test('Test automatic activation create ', async () => {
         const activation = await activationHelper.createActivation()
+        expect(activationHelper.powerAuthSdk).toBeDefined()
         let status = await activationHelper.getActivationStatus()
         expect(status).toBe(ActivationStatus.ACTIVE)
     })

tests/config/helpers.ts

@@ -20,22 +20,25 @@ import { testServerConfiguration } from "./config";
 
 export type TypedActivationHelper = ActivationHelper<MiniMobileClient, boolean>
 
+export interface CustomActivationHelperPrepareData extends ActivationHelperPrepareData {
+    activationPayload?: CreateActivationData
+}
+
 /**
  * Create activation helper with configured prepare step. This helper can automatically create activation
  * and move it to 'ACTIVE' state.
  */
-export async function createActivationHelper(config: Config | undefined = undefined, prepareData: ActivationHelperPrepareData | undefined = undefined): Promise<TypedActivationHelper> {
+export async function createActivationHelper(config: Config | undefined = undefined, prepareData: CustomActivationHelperPrepareData | undefined = undefined): Promise<TypedActivationHelper> {
     // Acquire config
     const cfg = config ?? await testServerConfiguration()
-    const activationData = prepareData?.customData?.get('activationPayload') as CreateActivationData
-    const activationPayload = activationData ?? {
+    const activationPayload = prepareData?.activationPayload ?? {
         activationName: 'activation-test',
         platform: 'nodejs',
         deviceInfo: 'nodejs-tests',
         extras: 'some-extras'
     }
     // Create activation helper with using MiniMobileClient as SDK implementation
-    const helper = await ActivationHelper.createWithConfig<MiniMobileClient,boolean>(cfg)
+    const helper: TypedActivationHelper = await ActivationHelper.createWithConfig(cfg)
     helper.createSdk = async (appSetup, _) => {
         return new MiniMobileClient(appSetup)
     }
@@ -63,7 +66,7 @@ export async function createActivationHelper(config: Config | undefined = undefi
 /**
  * Create fully prepared activation in ACTIVE state.
  */
-export async function createActivationWithActivationHelper(config: Config | undefined = undefined, prepareData: ActivationHelperPrepareData | undefined = undefined): Promise<TypedActivationHelper> {
+export async function createActivationWithActivationHelper(config: Config | undefined = undefined, prepareData: CustomActivationHelperPrepareData | undefined = undefined): Promise<TypedActivationHelper> {
     const helper = await createActivationHelper(config, prepareData)
     await helper.createActivation(helper.userId, prepareData)
     return helper