Merge pull request #692 from sasjs/deploy-to-sasjs-server

fix(deploy): to SASJS with complete JSON object

package-lock.json

@@ -8,7 +8,7 @@
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
-        "@sasjs/utils": "2.40.0",
+        "@sasjs/utils": "2.42.0",
         "axios": "0.26.0",
         "axios-cookiejar-support": "1.0.1",
         "form-data": "4.0.0",
@@ -1142,9 +1142,9 @@
       }
     },
     "node_modules/@sasjs/utils": {
-      "version": "2.40.0",
+      "version": "2.42.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.40.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.42.0.tgz",
-      "integrity": "sha512-U0y/eqRlvfkMHmKDlr1xmeN+Rask7TnJPuRpOz71P8QpGYTw1M9AyZvzRSk503p4KCJb8ysdcqXyGVLfhuoM+A==",
+      "integrity": "sha512-Y69l89PYNF/h9xvVH72om/39xA+cY80bhiVLzp/fJb3BlvzCf4RNswBBanUOv2I5JNa7gPpJuE7mEiXOlhD3eg==",
       "hasInstallScript": true,
       "dependencies": {
         "@types/fs-extra": "9.0.13",
@@ -13870,9 +13870,9 @@
       }
     },
     "@sasjs/utils": {
-      "version": "2.40.0",
+      "version": "2.42.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.40.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.42.0.tgz",
-      "integrity": "sha512-U0y/eqRlvfkMHmKDlr1xmeN+Rask7TnJPuRpOz71P8QpGYTw1M9AyZvzRSk503p4KCJb8ysdcqXyGVLfhuoM+A==",
+      "integrity": "sha512-Y69l89PYNF/h9xvVH72om/39xA+cY80bhiVLzp/fJb3BlvzCf4RNswBBanUOv2I5JNa7gPpJuE7mEiXOlhD3eg==",
       "requires": {
         "@types/fs-extra": "9.0.13",
         "@types/prompts": "2.0.13",

package.json

@@ -72,7 +72,7 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@sasjs/utils": "2.40.0",
+    "@sasjs/utils": "2.42.0",
     "axios": "0.26.0",
     "axios-cookiejar-support": "1.0.1",
     "form-data": "4.0.0",

src/SASjs.ts

@@ -5,8 +5,7 @@ import {
   EditContextInput,
   PollOptions,
   LoginMechanism,
-  ExecutionQuery,
+  ExecutionQuery
-  FileTree
 } from './types'
 import { SASViyaApiClient } from './SASViyaApiClient'
 import { SAS9ApiClient } from './SAS9ApiClient'
@@ -18,7 +17,7 @@ import {
   AuthConfig,
   ExtraResponseAttributes,
   SasAuthResponse,
-  StreamConfig
+  ServicePackSASjs
 } from '@sasjs/utils/types'
 import { RequestClient } from './request/RequestClient'
 import { SasjsRequestClient } from './request/SasjsRequestClient'
@@ -889,27 +888,21 @@ export default class SASjs {
 
   /**
    * Creates the folders and services at the given location `appLoc` on the given server `serverUrl`.
-   * @param members - the JSON specifying the folders and services to be created.
+   * @param dataJson - the JSON specifying the folders and files to be created, can also includes
-   * @param appLoc - the base folder in which to create the new folders and
+   * appLoc, streamServiceName, streamWebFolder, streamLogo
-   * services.  If not provided, is taken from SASjsConfig.
+   * @param appLoc - (optional) the base folder in which to create the new folders and
-   * @param streamConfig - optional configuration object of StreamConfig for deploying streaming app.
+   * services.  If not provided, is taken from SASjsConfig. Precedence will be of appLoc present in dataJson.
-   * @param authConfig - a valid client, secret, refresh and access tokens that are authorised to execute compute jobs.
+   * @param authConfig - (optional) a valid client, secret, refresh and access tokens that are authorised to execute compute jobs.
    */
   public async deployToSASjs(
-    members: FileTree,
+    dataJson: ServicePackSASjs,
     appLoc?: string,
-    streamConfig?: StreamConfig,
     authConfig?: AuthConfig
   ) {
     if (!appLoc) {
       appLoc = this.sasjsConfig.appLoc
     }
-    return await this.sasJSApiClient?.deploy(
+    return await this.sasJSApiClient?.deploy(dataJson, appLoc, authConfig)
-      members,
-      appLoc,
-      streamConfig,
-      authConfig
-    )
   }
 
   public async executeJobSASjs(query: ExecutionQuery) {
@@ -1102,13 +1095,8 @@ export default class SASjs {
     }
 
     if (this.sasjsConfig.serverType === ServerType.Sasjs) {
-      if (this.sasJSApiClient) {
+      if (!this.sasJSApiClient) {
-        this.sasJSApiClient.setConfig(this.sasjsConfig.serverUrl)
+        this.sasJSApiClient = new SASjsApiClient(this.requestClient)
-      } else {
-        this.sasJSApiClient = new SASjsApiClient(
-          this.sasjsConfig.serverUrl,
-          this.requestClient
-        )
       }
     }
 

src/SASjsApiClient.ts

@@ -1,5 +1,5 @@
-import { AuthConfig, ServerType, StreamConfig } from '@sasjs/utils/types'
+import { AuthConfig, ServerType, ServicePackSASjs } from '@sasjs/utils/types'
-import { FileTree, ExecutionQuery } from './types'
+import { ExecutionQuery } from './types'
 import { RequestClient } from './request/RequestClient'
 import { getAccessTokenForSasjs } from './auth/getAccessTokenForSasjs'
 import { refreshTokensForSasjs } from './auth/refreshTokensForSasjs'
@@ -8,19 +8,11 @@ import { parseWeboutResponse } from './utils'
 import { getTokens } from './auth/getTokens'
 
 export class SASjsApiClient {
-  constructor(
+  constructor(private requestClient: RequestClient) {}
-    private serverUrl: string,
-    private requestClient: RequestClient
-  ) {}
-
-  public setConfig(serverUrl: string) {
-    if (serverUrl) this.serverUrl = serverUrl
-  }
 
   public async deploy(
-    members: FileTree,
+    dataJson: ServicePackSASjs,
     appLoc: string,
-    streamConfig?: StreamConfig,
     authConfig?: AuthConfig
   ) {
     let access_token = (authConfig || {}).access_token
@@ -31,6 +23,9 @@ export class SASjsApiClient {
         ServerType.Sasjs
       ))
     }
+
+    dataJson.appLoc = dataJson.appLoc || appLoc
+
     const { result } = await this.requestClient.post<{
       status: string
       message: string
@@ -38,13 +33,7 @@ export class SASjsApiClient {
       example?: {}
     }>(
       'SASjsApi/drive/deploy',
-      {
+      dataJson,
-        fileTree: members,
-        appLoc: appLoc,
-        streamServiceName: streamConfig?.streamServiceName,
-        streamWebFolder: streamConfig?.streamWebFolder,
-        streamLogo: streamConfig?.streamLogo
-      },
       access_token,
       undefined,
       {},

src/types/FileTree.ts

@@ -1,47 +0,0 @@
-export interface FileTree {
-  members: [FolderMember, ServiceMember]
-}
-
-export enum MemberType {
-  folder = 'folder',
-  service = 'service'
-}
-
-export interface FolderMember {
-  name: string
-  type: MemberType.folder
-  members: [FolderMember, ServiceMember]
-}
-
-export interface ServiceMember {
-  name: string
-  type: MemberType.service
-  code: string
-}
-
-export const isFileTree = (arg: any): arg is FileTree =>
-  arg &&
-  arg.members &&
-  Array.isArray(arg.members) &&
-  arg.members.filter(
-    (member: FolderMember | ServiceMember) =>
-      !isFolderMember(member) && !isServiceMember(member)
-  ).length === 0
-
-const isFolderMember = (arg: any): arg is FolderMember =>
-  arg &&
-  typeof arg.name === 'string' &&
-  arg.type === MemberType.folder &&
-  arg.members &&
-  Array.isArray(arg.members) &&
-  arg.members.filter(
-    (member: FolderMember | ServiceMember) =>
-      !isFolderMember(member) && !isServiceMember(member)
-  ).length === 0
-
-const isServiceMember = (arg: any): arg is ServiceMember =>
-  arg &&
-  typeof arg.name === 'string' &&
-  arg.type === MemberType.service &&
-  arg.code &&
-  typeof arg.code === 'string'

src/types/index.ts

@@ -12,5 +12,4 @@ export * from './Session'
 export * from './UploadFile'
 export * from './PollOptions'
 export * from './WriteStream'
-export * from './FileTree'
 export * from './ExecuteScript'