From 4826be246953be212de032f28bf83b6b94d6c6f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=83=E5=87=9B?= Date: Thu, 10 Feb 2022 09:54:54 +0800 Subject: [PATCH] fix: token --- src/helper/helper.ts | 8 ++++---- src/issue/issue.ts | 13 ++++++------- src/issue/types.ts | 2 +- src/main.ts | 3 +-- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/helper/helper.ts b/src/helper/helper.ts index b05fa3a..36770fd 100644 --- a/src/helper/helper.ts +++ b/src/helper/helper.ts @@ -49,7 +49,7 @@ export class IssueHelperEngine implements IIssueHelperEngine { private owner!: string; private repo!: string; private issueNumber!: number; - private githubToken!: string; + private token?: string | void; private emoji?: string; private labels?: string[] | void; @@ -89,7 +89,7 @@ export class IssueHelperEngine implements IIssueHelperEngine { return; } - this.githubToken = core.getInput('token', { required: true }) as string; + this.token = core.getInput('token'); this.emoji = core.getInput('emoji') || ''; this.labels = dealStringToArr(core.getInput('labels') || ''); @@ -104,12 +104,12 @@ export class IssueHelperEngine implements IIssueHelperEngine { } private initIssueCore() { - const { owner, repo, issueNumber, githubToken } = this; + const { owner, repo, issueNumber, token } = this; this.ICE = new IssueCoreEngine({ owner, repo, issueNumber, - githubToken, + token, }); core.info(`[Init] [${owner}/${repo}] [${issueNumber}]`); } diff --git a/src/issue/issue.ts b/src/issue/issue.ts index e12c60f..623aace 100644 --- a/src/issue/issue.ts +++ b/src/issue/issue.ts @@ -7,17 +7,16 @@ export class IssueCoreEngine implements IIssueCoreEngine { private owner!: string; private repo!: string; private issueNumber!: number; - private githubToken!: string; - private octokit!: Octokit; public constructor(_info: IIssueBaseInfo) { - if (_info.owner && _info.repo && _info.githubToken) { - Object.assign(this, _info); - const octokit = new Octokit({ auth: `token ${this.githubToken}` }); - this.octokit = octokit; + if (_info.owner && _info.repo) { + this.owner = _info.owner; + this.repo = _info.repo; + this.issueNumber = _info.issueNumber; + this.octokit = new Octokit({ auth: `token ${_info.token}` }); } else { - console && console.error && console.error(`Init failed, need owner、repo and token!`); + console && console.error && console.error(`Init failed, need owner、repo!`); } } diff --git a/src/issue/types.ts b/src/issue/types.ts index 6b36eff..8a4a585 100644 --- a/src/issue/types.ts +++ b/src/issue/types.ts @@ -4,7 +4,7 @@ export interface IIssueBaseInfo { owner: string; repo: string; issueNumber: number; - githubToken: string; + token?: string | void; } export interface IListIssuesParams { diff --git a/src/main.ts b/src/main.ts index cf514d7..127c809 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,6 +1,5 @@ -import { dealStringToArr, THANKS } from 'actions-util'; - import * as github from '@actions/github'; +import { dealStringToArr, THANKS } from 'actions-util'; import * as core from './core'; import { IssueHelperEngine } from './helper';