Integrate Schema API into v2 Client (#312)

Integrate Schema API into v2 Client
okta · Mar 31, 2022 · d7dd4a3 · d7dd4a3
1 parent f5cbb09
commit d7dd4a3
Show file tree

Hide file tree

Showing 82 changed files with 3,250 additions and 308 deletions.
diff --git a/src/client.js b/src/client.js
@@ -20,8 +20,7 @@ const { Http } = require('./http');
 const DEFAULT_USER_AGENT = `${packageJson.name}/${packageJson.version} node/${process.versions.node} ${os.platform()}/${os.release()}`;
 const repoUrl = 'https://github.com/okta/okta-sdk-nodejs';
 const { OAuth } = require('./oauth');
-const { UserTypeApi } = require('./v3/apis/user-type-api');
-const { AuthenticatorApi } = require('./v3/apis/authenticator-api');
+const { AuthenticatorApi, SchemaApi, UserTypeApi } = require('./v3/api');
 
 
 
@@ -94,7 +93,7 @@ class Client extends GeneratedApiClient {
 
     this.userTypeApi = new UserTypeApi(config, parsedConfig.client.orgUrl, this.http);
     this.authenticatorApi = new AuthenticatorApi(config, parsedConfig.client.orgUrl, this.http);
-
+    this.schemaApi = new SchemaApi(config, parsedConfig.client.orgUrl, this.http);
   }
 }
 

diff --git a/src/collection.js b/src/collection.js
@@ -41,7 +41,7 @@ class Collection {
         const item = self.currentItems.length && self.currentItems.shift();
         const done = !self.currentItems.length && !self.nextUri && !item;
         const result = {
-          value: item ? self.factory.createInstance(item, self.client) : null,
+          value: item ? (self.factory ? self.factory.createInstance(item, self.client) : item) : null,
           done,
         };
         resolve(result);

diff --git a/src/generated-client.js b/src/generated-client.js
@@ -5831,18 +5831,7 @@ class GeneratedApiClient {
     if (!appInstanceId) {
       return Promise.reject(new Error('OKTA API getApplicationUserSchema parameter appInstanceId is required.'));
     }
-    let url = `${this.baseUrl}/api/v1/meta/schemas/apps/${appInstanceId}/default`;
-
-    const resources = [
-      `${this.baseUrl}/api/v1/meta/schemas/apps/${appInstanceId}`
-    ];
-
-    const request = this.http.getJson(
-      url,
-      null,
-      { resources }
-    );
-    return request.then(jsonRes => new models.UserSchema(jsonRes, this));
+    return this.schemaApi.getApplicationUserSchema(appInstanceId);
   }
 
   /**
@@ -5857,20 +5846,7 @@ class GeneratedApiClient {
     if (!appInstanceId) {
       return Promise.reject(new Error('OKTA API updateApplicationUserProfile parameter appInstanceId is required.'));
     }
-    let url = `${this.baseUrl}/api/v1/meta/schemas/apps/${appInstanceId}/default`;
-
-    const resources = [
-      `${this.baseUrl}/api/v1/meta/schemas/apps/${appInstanceId}`
-    ];
-
-    const request = this.http.postJson(
-      url,
-      {
-        body: userSchema
-      },
-      { resources }
-    );
-    return request.then(jsonRes => new models.UserSchema(jsonRes, this));
+    return this.schemaApi.updateApplicationUserProfile(appInstanceId, userSchema);
   }
 
   /**
@@ -5880,16 +5856,7 @@ class GeneratedApiClient {
    * @returns {Promise<GroupSchema>}
    */
   getGroupSchema() {
-    let url = `${this.baseUrl}/api/v1/meta/schemas/group/default`;
-
-    const resources = [];
-
-    const request = this.http.getJson(
-      url,
-      null,
-      { resources }
-    );
-    return request.then(jsonRes => new models.GroupSchema(jsonRes, this));
+    return this.schemaApi.getGroupSchema();
   }
 
   /**
@@ -5900,18 +5867,7 @@ class GeneratedApiClient {
    * @returns {Promise<GroupSchema>}
    */
   updateGroupSchema(groupSchema) {
-    let url = `${this.baseUrl}/api/v1/meta/schemas/group/default`;
-
-    const resources = [];
-
-    const request = this.http.postJson(
-      url,
-      {
-        body: groupSchema
-      },
-      { resources }
-    );
-    return request.then(jsonRes => new models.GroupSchema(jsonRes, this));
+    return this.schemaApi.updateGroupSchema(groupSchema);
   }
 
   /**
@@ -6015,18 +5971,7 @@ class GeneratedApiClient {
     if (!schemaId) {
       return Promise.reject(new Error('OKTA API getUserSchema parameter schemaId is required.'));
     }
-    let url = `${this.baseUrl}/api/v1/meta/schemas/user/${schemaId}`;
-
-    const resources = [
-      `${this.baseUrl}/api/v1/meta/schemas/user/${schemaId}`
-    ];
-
-    const request = this.http.getJson(
-      url,
-      null,
-      { resources }
-    );
-    return request.then(jsonRes => new models.UserSchema(jsonRes, this));
+    return this.schemaApi.getUserSchema(schemaId);
   }
 
   /**
@@ -6044,20 +5989,7 @@ class GeneratedApiClient {
     if (!userSchema) {
       return Promise.reject(new Error('OKTA API updateUserProfile parameter userSchema is required.'));
     }
-    let url = `${this.baseUrl}/api/v1/meta/schemas/user/${schemaId}`;
-
-    const resources = [
-      `${this.baseUrl}/api/v1/meta/schemas/user/${schemaId}`
-    ];
-
-    const request = this.http.postJson(
-      url,
-      {
-        body: userSchema
-      },
-      { resources }
-    );
-    return request.then(jsonRes => new models.UserSchema(jsonRes, this));
+    return this.schemaApi.updateUserProfile(userSchema, schemaId);
   }
 
   /**

diff --git a/src/types/collection.d.ts b/src/types/collection.d.ts
@@ -16,7 +16,7 @@ import { ModelResolutionFactory } from './resolution-factory';
 import { Client } from './client';
 
 export declare class Collection<T> {
-  constructor(client: Client, uri: string, factory: ModelFactory | ModelResolutionFactory, request?: RequestOptions);
+  constructor(client: Client, uri: string, factory?: ModelFactory | ModelResolutionFactory, request?: RequestOptions);
 
   nextUri: string;
   client: Client;

diff --git a/src/types/generated-client.d.ts b/src/types/generated-client.d.ts
@@ -85,9 +85,9 @@ import { InlineHookResponse } from './models/InlineHookResponse';
 import { LogEvent } from './models/LogEvent';
 import { ProfileMapping } from './models/ProfileMapping';
 import { ProfileMappingOptions } from './models/ProfileMapping';
-import { UserSchema } from './models/UserSchema';
+import { UserSchema } from './v3/models';
 import { UserSchemaOptions } from './models/UserSchema';
-import { GroupSchema } from './models/GroupSchema';
+import { GroupSchema } from './v3/models';
 import { GroupSchemaOptions } from './models/GroupSchema';
 import { LinkedObject } from './models/LinkedObject';
 import { LinkedObjectOptions } from './models/LinkedObject';