From b12f5d47a52b808503c2e3cee3ba7f09477f7512 Mon Sep 17 00:00:00 2001 From: onucsecu2 Date: Wed, 11 Jan 2023 01:08:21 +0900 Subject: [PATCH 1/3] docs: replaced 'access token' with 'app password' from BitbucketOptions --- docs/configuration/publish.md | 6 +++--- packages/app-builder-lib/scheme.json | 4 ++-- packages/builder-util-runtime/src/publishOptions.ts | 6 +++--- yalc.lock | 4 ++++ 4 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 yalc.lock diff --git a/docs/configuration/publish.md b/docs/configuration/publish.md index 8bd921d0d15..dba65c5e465 100644 --- a/docs/configuration/publish.md +++ b/docs/configuration/publish.md @@ -246,15 +246,15 @@ Define KEYGEN_TOKEN environment variable.

https://bitbucket.org/ Define BITBUCKET_TOKEN environment variable.

For converting an app password to a usable token, you can utilize this

-
convertAppPassword(owner: string, token: string) {
-const base64encodedData = Buffer.from(`${owner}:${token.trim()}`).toString("base64")
+
convertAppPassword(owner: string, appPassword: string) {
+const base64encodedData = Buffer.from(`${owner}:${appPassword.trim()}`).toString("base64")
 return `Basic ${base64encodedData}`
 }
 

 
    
 
  • provider “bitbucket” - The provider. Must be bitbucket.
    • 
 
  • owner String - Repository owner
    • 
-
  • token String | “undefined” - The access token to support auto-update from private bitbucket repositories.
    • 
+
  • token String | “undefined” - The app password (account>settings>app-passwords) to support auto-update from private bitbucket repositories.
    • 
 
  • username String | “undefined” - The user name to support auto-update from private bitbucket repositories.
    • 
 
  • slug String - Repository slug/name
    • 
 
  • channel = latest String | “undefined” - The channel.
    • 
diff --git a/packages/app-builder-lib/scheme.json b/packages/app-builder-lib/scheme.json
index 6ce77956850..772817075b8 100644
--- a/packages/app-builder-lib/scheme.json
+++ b/packages/app-builder-lib/scheme.json
@@ -334,7 +334,7 @@
     },
     "BitbucketOptions": {
       "additionalProperties": false,
-      "description": "Bitbucket options.\nhttps://bitbucket.org/\nDefine `BITBUCKET_TOKEN` environment variable.\n\nFor converting an app password to a usable token, you can utilize this\n```typescript\nconvertAppPassword(owner: string, token: string) {\nconst base64encodedData = Buffer.from(`${owner}:${token.trim()}`).toString(\"base64\")\nreturn `Basic ${base64encodedData}`\n}\n```",
+      "description": "Bitbucket options.\nhttps://bitbucket.org/\nDefine `BITBUCKET_TOKEN` environment variable.\n\nFor converting an app password to a usable token, you can utilize this\n```typescript\nconvertAppPassword(owner: string, appPassword: string) {\nconst base64encodedData = Buffer.from(`${owner}:${appPassword.trim()}`).toString(\"base64\")\nreturn `Basic ${base64encodedData}`\n}\n```",
       "properties": {
         "channel": {
           "default": "latest",
@@ -390,7 +390,7 @@
           ]
         },
         "token": {
-          "description": "The access token to support auto-update from private bitbucket repositories.",
+          "description": "The app password (account>>settings>app-passwords) to support auto-update from private bitbucket repositories.",
           "type": [
             "null",
             "string"
diff --git a/packages/builder-util-runtime/src/publishOptions.ts b/packages/builder-util-runtime/src/publishOptions.ts
index 169b322b0b9..38c8135bd88 100644
--- a/packages/builder-util-runtime/src/publishOptions.ts
+++ b/packages/builder-util-runtime/src/publishOptions.ts
@@ -208,8 +208,8 @@ export interface KeygenOptions extends PublishConfiguration {
  * 
  * For converting an app password to a usable token, you can utilize this
 ```typescript
-convertAppPassword(owner: string, token: string) {
-  const base64encodedData = Buffer.from(`${owner}:${token.trim()}`).toString("base64")
+convertAppPassword(owner: string, appPassword: string) {
+  const base64encodedData = Buffer.from(`${owner}:${appPassword.trim()}`).toString("base64")
   return `Basic ${base64encodedData}`
 }
 ```
@@ -226,7 +226,7 @@ export interface BitbucketOptions extends PublishConfiguration {
   readonly owner: string
 
   /**
-   * The access token to support auto-update from private bitbucket repositories.
+   * The app password (account>settings>app-passwords) to support auto-update from private bitbucket repositories.
    */
   readonly token?: string | null
 
diff --git a/yalc.lock b/yalc.lock
new file mode 100644
index 00000000000..21b9ada439a
--- /dev/null
+++ b/yalc.lock
@@ -0,0 +1,4 @@
+{
+  "version": "v1",
+  "packages": {}
+}
\ No newline at end of file

From 3622ca930535bf7a65515597dd0364a7b9c39b48 Mon Sep 17 00:00:00 2001
From: Mike Maietta 
Date: Tue, 10 Jan 2023 15:50:21 -0800
Subject: [PATCH 2/3] Delete yalc.lock

---
 yalc.lock | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 yalc.lock

diff --git a/yalc.lock b/yalc.lock
deleted file mode 100644
index 21b9ada439a..00000000000
--- a/yalc.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "version": "v1",
-  "packages": {}
-}
\ No newline at end of file

From 43b34869ab429169de9c3fca32ab3d551d81e1b7 Mon Sep 17 00:00:00 2001
From: Mike Maietta 
Date: Tue, 10 Jan 2023 15:50:40 -0800
Subject: [PATCH 3/3] Create old-shrimps-drive.md

---
 .changeset/old-shrimps-drive.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changeset/old-shrimps-drive.md

diff --git a/.changeset/old-shrimps-drive.md b/.changeset/old-shrimps-drive.md
new file mode 100644
index 00000000000..55d555fb385
--- /dev/null
+++ b/.changeset/old-shrimps-drive.md
@@ -0,0 +1,7 @@
+---
+"app-builder-lib": patch
+"builder-util-runtime": patch
+"builder-util": patch
+---
+
+docs: replaced 'access token' with 'app password' from BitbucketOptions