fix: haven't admin permission

ask for tenant name
bsorrentino · Jan 17, 2024 · d0dba94 · d0dba94
1 parent 4bd0384
commit d0dba94
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 23 deletions.
diff --git a/bin/osts-cli.js b/bin/osts-cli.js
@@ -13,7 +13,7 @@ ${chalk.blue("osts-cli version: ")}${chalk.bgBlue(version)}
 
 Usage:
 ========
-osts list[--path]  // list OSTS packages in SPO path. 
+osts list [--path]  // list OSTS packages in SPO path. 
 
 osts unpack [--path, -p <dest dir> [--dts] ] // download OSTS package and extract body (.ts) to dest dir (default '${DEFAULT_PATH}'). 
                                              // If --dts is specified an Office Script Simplified TS Declaration  file will be copied in dest dir

diff --git a/bin/osts-utils.js b/bin/osts-utils.js
@@ -102,7 +102,7 @@ export async function copyOfficeScriptSimplifiedDeclaration(bodyDirPath) {
 export async function listOfficeScript(prefs) {
     const list_parameters = [
         '--webUrl', prefs.weburl,
-        '--folder', prefs.folder,
+        '--folderUrl', prefs.folder,
         '--query', "[?ends_with(Name, '.osts')]",
         '--recursive'
     ];
@@ -119,10 +119,18 @@ export const getWebUrl = async () => {
     const args = [
         '--query', `[?Owner=='${status.connectedAs}'].Url | [0]`
     ];
-    const cmd_list = await $ `m365 onedrive list ${args}`.quiet();
-    const url = JSON.parse(cmd_list.stdout);
-    if (url === null) {
-        throw `Owner '${status.connectedAs}' not found!`;
+    try {
+        const cmd_list = await $ `m365 onedrive list ${args}`.quiet();
+        const url = JSON.parse(cmd_list.stdout);
+        if (url === null) {
+            throw `Owner '${status.connectedAs}' not found!`;
+        }
+        return url;
+    }
+    catch (e) {
+        const tenant = await question(`give me tenant name: `);
+        const url = `https://${tenant}-my.sharepoint.com/personal/${status.connectedAs.replace(/[.@]/g, '_')}`;
+        // console.debug( 'url', url)
+        return url;
     }
-    return url;
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/osts-cli.ts b/src/osts-cli.ts
@@ -18,7 +18,7 @@ ${chalk.blue("osts-cli version: ")}${chalk.bgBlue(version)}
 
 Usage:
 ========
-osts list[--path]  // list OSTS packages in SPO path. 
+osts list [--path]  // list OSTS packages in SPO path. 
 
 osts unpack [--path, -p <dest dir> [--dts] ] // download OSTS package and extract body (.ts) to dest dir (default '${DEFAULT_PATH}'). 
                                              // If --dts is specified an Office Script Simplified TS Declaration  file will be copied in dest dir

diff --git a/src/osts-utils.ts b/src/osts-utils.ts
@@ -180,10 +180,11 @@ export async function copyOfficeScriptSimplifiedDeclaration( bodyDirPath:string
 
     const list_parameters = [
         '--webUrl', prefs.weburl,
-        '--folder', prefs.folder,
+        '--folderUrl', prefs.folder,
         '--query', "[?ends_with(Name, '.osts')]",
         '--recursive'
     ]
+
     const result =  await $`m365 spo file list ${list_parameters}`.quiet()
 
     const spoFileListResult = JSON.parse( result.stdout ) as Array<SPOFile>
@@ -211,13 +212,25 @@ export const getWebUrl = async () => {
         '--query', `[?Owner=='${status.connectedAs}'].Url | [0]`
     ]
 
-    const cmd_list = await $`m365 onedrive list ${args}`.quiet()
-
-    const url = JSON.parse(cmd_list.stdout) 
+    try {
+        const cmd_list = await $`m365 onedrive list ${args}`.quiet()
 
-    if( url === null ) {
-        throw  `Owner '${status.connectedAs}' not found!`
+        const url = JSON.parse(cmd_list.stdout) 
+
+        if( url === null ) {
+            throw  `Owner '${status.connectedAs}' not found!`
+        }
+
+        return url
+
     }
+    catch( e ) {
+
+        const tenant = await question( `give me tenant name: `) 
 
-    return url
+        const url = `https://${tenant}-my.sharepoint.com/personal/${status.connectedAs.replace(/[.@]/g, '_')}`
+
+        // console.debug( 'url', url)
+        return url
+    }
 }