diff --git a/CHANGELOG.md b/CHANGELOG.md index e5b9d2b..346d8b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ # Change Log +## 1.0.7 +- fixed an issue for EU accounts +- fixed a login issue + ## 1.0.6 - fixed a bug where links on the task card where not pointing to the correct url - Creating a task without an active project picked should be a bit more smooth now. diff --git a/out/model/projectConfig.js b/out/model/projectConfig.js index a95098a..db45562 100644 --- a/out/model/projectConfig.js +++ b/out/model/projectConfig.js @@ -28,10 +28,11 @@ class ProjectConfig { } exports.ProjectConfig = ProjectConfig; class ProjectConfigEntry { - constructor(Name, Id, Project) { + constructor(Name, Id, Project, Installation) { this.Name = Name; this.Id = Id; this.Project = Project; + this.Installation = Installation; } } exports.ProjectConfigEntry = ProjectConfigEntry; diff --git a/out/model/projectConfig.js.map b/out/model/projectConfig.js.map index d57d8bc..f573f8c 100644 --- a/out/model/projectConfig.js.map +++ b/out/model/projectConfig.js.map @@ -1 +1 @@ -{"version":3,"file":"projectConfig.js","sourceRoot":"","sources":["../../src/model/projectConfig.ts"],"names":[],"mappings":";;AACA,+BAAyC;AAEzC,MAAa,aAAa;IAMtB,YAAY,QAAQ;QAChB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAGzB,IAAG,wBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAC;YAChC,IAAI,CAAC,iBAAiB,GAAG,qBAAqB,CAAC;YAC/C,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC;YAC3B,OAAO;SACV;QAED,6CAA6C;QAC7C,IAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,EAAC;YAC/D,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;YAC5B,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;SAC7B;QAED,IAAG,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAC;YAC3D,IAAG,QAAQ,EAAE;gBACT,IAAI,CAAC,iBAAiB,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC1C,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;aACzC;iBAAI;gBACD,IAAI,CAAC,iBAAiB,GAAG,qBAAqB,CAAC;gBAC/C,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC;aAC9B;SACJ;IAGL,CAAC;CACJ;AAlCD,sCAkCC;AAED,MAAa,kBAAkB;IAK3B,YAAY,IAAI,EAAC,EAAE,EAAE,OAAO;QACxB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;CACJ;AAVD,gDAUC"} \ No newline at end of file +{"version":3,"file":"projectConfig.js","sourceRoot":"","sources":["../../src/model/projectConfig.ts"],"names":[],"mappings":";;AACA,+BAAyC;AAEzC,MAAa,aAAa;IAMtB,YAAY,QAAQ;QAChB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAGzB,IAAG,wBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAC;YAChC,IAAI,CAAC,iBAAiB,GAAG,qBAAqB,CAAC;YAC/C,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC;YAC3B,OAAO;SACV;QAED,6CAA6C;QAC7C,IAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,EAAC;YAC/D,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;YAC5B,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;SAC7B;QAED,IAAG,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAC;YAC3D,IAAG,QAAQ,EAAE;gBACT,IAAI,CAAC,iBAAiB,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC1C,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;aACzC;iBAAI;gBACD,IAAI,CAAC,iBAAiB,GAAG,qBAAqB,CAAC;gBAC/C,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC;aAC9B;SACJ;IAGL,CAAC;CACJ;AAlCD,sCAkCC;AAED,MAAa,kBAAkB;IAM3B,YAAY,IAAI,EAAC,EAAE,EAAE,OAAO,EAAE,YAAY;QACtC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;CACJ;AAZD,gDAYC"} \ No newline at end of file diff --git a/out/taskProvider.js b/out/taskProvider.js index a116bd5..5cd91ae 100644 --- a/out/taskProvider.js +++ b/out/taskProvider.js @@ -42,15 +42,25 @@ class TaskProvider { } if (!config) { let userData = this.twp._context.globalState.get("twp.data.activeAccount"); - let token = userData.token; - let root = userData.rootUrl; - if (util_1.isNullOrUndefined(token) || util_1.isNullOrUndefined(root)) { + let tempUserData = this.twp.ActiveAccount; + if (util_1.isNullOrUndefined(userData) && !util_1.isNullOrUndefined(tempUserData)) { + userData = tempUserData; + } + if (util_1.isNullOrUndefined(userData)) { items.push(new ProjectErrorNode_1.ProjectErrorNode("-> Please login first.", "", "", 0)); return items; } else { - items.push(new ProjectErrorNode_1.ProjectErrorNode("-> Select Project for Repository", "", "", 0)); - return items; + let token = userData.token; + let root = userData.rootUrl; + if (util_1.isNullOrUndefined(token) || util_1.isNullOrUndefined(root) || token === "" || root === "") { + items.push(new ProjectErrorNode_1.ProjectErrorNode("-> Please login first.", "", "", 0)); + return items; + } + else { + items.push(new ProjectErrorNode_1.ProjectErrorNode("-> Select Project for Repository", "", "", 0)); + return items; + } } } } diff --git a/out/taskProvider.js.map b/out/taskProvider.js.map index 412abf1..27a9b78 100644 --- a/out/taskProvider.js.map +++ b/out/taskProvider.js.map @@ -1 +1 @@ -{"version":3,"file":"taskProvider.js","sourceRoot":"","sources":["../src/taskProvider.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,iCAAiC;AAGjC,2DAAwD;AACxD,qEAAkE;AAClE,+BAAyC;AAIzC,MAAa,YAAY;IAKrB,YAAoB,OAAgC,EAAU,GAAqB;QAA/D,YAAO,GAAP,OAAO,CAAyB;QAAU,QAAG,GAAH,GAAG,CAAkB;QAH5E,yBAAoB,GAA2C,IAAI,MAAM,CAAC,YAAY,EAAqB,CAAC;QACnG,wBAAmB,GAAoC,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC;QAInG,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;IAC3B,CAAC;IAIJ,OAAO,CAAC,IAAY;QAEb,IAAG,IAAI,EAAC;YACJ,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACxC;QAEP,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;IAEe,WAAW,CAAC,OAAe;;YACpC,IAAG;gBACC,IAAI,CAAC,OAAO,EAAE;oBACV,MAAM,KAAK,GAAG,EAAE,CAAC;oBACjB,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAC;oBACtD,IAAG,MAAM,EAAC;wBACL,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;4BAC/B,IAAI,IAAI,GAAG,IAAI,yBAAW,CAAC,WAAW,GAAG,OAAO,CAAC,IAAI,EAAC,OAAO,CAAC,EAAE,EAAC,OAAO,CAAC,OAAO,EAAC,IAAI,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC;4BAChG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;4BAC7B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBACrB,CAAC,CAAC,CAAC;wBAEH,OAAO,KAAK,CAAC;qBAChB;oBACD,IAAG,CAAC,MAAM,EAAC;wBAEP,IAAI,QAAQ,GAAqB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;wBAC7F,IAAI,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;wBAC3B,IAAI,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC;wBAE5B,IAAG,wBAAiB,CAAC,KAAK,CAAC,IAAG,wBAAiB,CAAC,IAAI,CAAC,EAAC;4BAClD,KAAK,CAAC,IAAI,CAAC,IAAI,mCAAgB,CAAC,wBAAwB,EAAC,EAAE,EAAC,EAAE,EAAC,CAAC,CAAC,CAAC,CAAC;4BACnE,OAAO,KAAK,CAAC;yBAChB;6BAAI;4BACD,KAAK,CAAC,IAAI,CAAC,IAAI,mCAAgB,CAAC,kCAAkC,EAAC,EAAE,EAAC,EAAE,EAAC,CAAC,CAAC,CAAC,CAAC;4BAC7E,OAAO,KAAK,CAAC;yBAChB;qBAEJ;iBACJ;gBACD,OAAO,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAC5C;YAAA,WAAK;gBACF,MAAM,KAAK,GAAG,EAAE,CAAC;gBACjB,KAAK,CAAC,IAAI,CAAC,IAAI,mCAAgB,CAAC,kCAAkC,EAAC,EAAE,EAAC,EAAE,EAAC,CAAC,CAAC,CAAC,CAAC;gBAC7E,OAAO,KAAK,CAAC;aAChB;QACL,CAAC;KAAA;IAIM,WAAW,CAAC,OAAc;QAC7B,OAAO,OAAO,CAAC,WAAW,EAAE,CAAC;IACjC,CAAC;CAGJ;AAlED,oCAkEC"} \ No newline at end of file +{"version":3,"file":"taskProvider.js","sourceRoot":"","sources":["../src/taskProvider.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/out/teamworkProjects.js b/out/teamworkProjects.js index c99aa9a..efcdc80 100644 --- a/out/teamworkProjects.js +++ b/out/teamworkProjects.js @@ -26,9 +26,10 @@ class TeamworkProjects { this.IsLoading = false; this._disposables = []; this._context = context; + this.context = context; this._extensionPath = extensionPath; - this.API = new teamworkProjectsApi_1.TeamworkProjectsApi(this._context); - this.WebViews = new webviews_1.WebViews(this._context, this._extensionPath); + this.API = new teamworkProjectsApi_1.TeamworkProjectsApi(this._context, this); + this.WebViews = new webviews_1.WebViews(this._context, this._extensionPath, this.API); } dispose() { // Clean up our resources @@ -129,9 +130,6 @@ class TeamworkProjects { } QuickAddTask() { return __awaiter(this, void 0, void 0, function* () { - if (this.IsLoading) { - return; - } var editor = vscode.window.activeTextEditor; if (!editor) { vscode.window.showInformationMessage("You need to have code selected to use this."); @@ -149,19 +147,20 @@ class TeamworkProjects { const result = yield vscode.window.showInputBox({ placeHolder: 'Task Title @person [today|tomorrow]', }); - const gitExtension = vscode.extensions.getExtension('vscode.git').exports; - var gitLink = ""; - var gitBranch = ""; - if (gitExtension) { + let gitLink = ""; + let gitBranch = ""; + const gitExtensionExports = vscode.extensions.getExtension('vscode.git').exports; + if (gitExtensionExports) { + const gitExtension = gitExtensionExports.exports; const api = gitExtension.getAPI(1); if (api && api.repositories.length > 0) { - var repo = api.repositories[0]; - var remote = repo.state.remotes[0]; + let repo = api.repositories[0]; + let remote = repo.state.remotes[0]; gitBranch = repo.state.HEAD.name; gitLink = remote.fetchUrl.replace(".git", "") + "/blob/" + gitBranch + fileName + "#L" + line; } } - var taskDescription = "Task added from VSCode: \n"; + let taskDescription = "Task added from VSCode: \n"; taskDescription += "File: " + fileName + "\n"; taskDescription += "Line: " + line + "\n"; if (gitBranch.length > 0) { @@ -179,6 +178,9 @@ class TeamworkProjects { var id = newTask["data"]["taskIds"]; var taskDetails = yield this.API.getTodoItem(this._context, parseInt(id), true); var langConfig = utilities_1.Utilities.GetActiveLanguageConfig(); + //Task: Need to find a workaround for files without a comment symbol configured in VSCode + //Link: https://digitalcrew.teamwork.com//tasks/14804255 + //Assigned To: Tim Cadenbach var commentWrapper = langConfig.comments.lineComment; var content = taskDetails.content; var responsible = taskDetails["responsible-party-names"]; @@ -197,28 +199,28 @@ class TeamworkProjects { RefreshData() { return __awaiter(this, void 0, void 0, function* () { let userData = this.context.globalState.get("twp.data.activeAccount"); - let token = userData.token; - let root = userData.rootUrl; - if (!token || !root) { - return; + let tempUserData = this.ActiveAccount; + if ((util_1.isNullOrUndefined(userData) && !util_1.isNullOrUndefined(tempUserData)) + || (!util_1.isNullOrUndefined(userData) && !util_1.isNullOrUndefined(tempUserData) && userData.installationId !== tempUserData.installationId)) { + userData = tempUserData; } - if (this.IsLoading) { + if (util_1.isNullOrUndefined(userData)) { return; } this.IsLoading = true; - this.statusBarItem.text = "Teamwork: Updating Projects"; + this.UpdateStatusBarText("Updating Projects"); if (this.Config === null) { this.Config = yield this.GetProjectForRepository(); } if (this.Config.Projects !== null) { this.Config.Projects.forEach((element) => __awaiter(this, void 0, void 0, function* () { - this.statusBarItem.text = "Teamwork: Refreshing TaskLists"; + this.UpdateStatusBarText("Teamwork: Refreshing TaskLists"); element.Project.TodoLists = yield this.API.getTaskLists(this._context, element.Id, true); - this.statusBarItem.text = "Teamwork: Refreshing TodoItems"; + this.UpdateStatusBarText("Teamwork: Refreshing TodoItems"); element.Project.TodoLists.forEach((subelement) => __awaiter(this, void 0, void 0, function* () { subelement.TodoItems = yield this.API.getTaskItems(this._context, parseInt(subelement.id), true); })); - this.statusBarItem.text = "Teamwork: " + this.Config.ActiveProjectName; + this.UpdateStatusBarText(this.Config.ActiveProjectName); })); } this.IsLoading = false; @@ -251,7 +253,7 @@ class TeamworkProjects { this.Config = yield this.GetProjectForRepository(); } if (this.Config.ActiveProjectId === "") { - this.SelectActiveProject(); + yield this.SelectActiveProject(); } this.Config.Projects.forEach(element => { if (element.Id.toString() === this.Config.ActiveProjectId) { @@ -281,6 +283,14 @@ class TeamworkProjects { return __awaiter(this, void 0, void 0, function* () { try { let userData = this.context.globalState.get("twp.data.activeAccount"); + let tempUserData = this.ActiveAccount; + if ((util_1.isNullOrUndefined(userData) && !util_1.isNullOrUndefined(tempUserData)) + || (!util_1.isNullOrUndefined(userData) && !util_1.isNullOrUndefined(tempUserData) && userData.installationId !== tempUserData.installationId)) { + userData = tempUserData; + } + if (util_1.isNullOrUndefined(userData)) { + return; + } let token = userData.token; let root = userData.rootUrl; if (!token || !root) { @@ -291,7 +301,18 @@ class TeamworkProjects { if (fs.existsSync(path)) { config = JSON.parse(fs.readFileSync(path, 'utf8')); if (config) { - return config; + if (config.Projects.length > 0) { + for (let i = config.Projects.length; i <= 0; i--) { + let element = config.Projects[i]; + if (!util_1.isNullOrUndefined(element.Installation) && element.Installation !== userData.installationId) { + config.Projects.splice(i, 1); + } + } + return config; + } + else { + return new projectConfig_1.ProjectConfig(null); + } } } else { @@ -312,31 +333,52 @@ class TeamworkProjects { } FinishLogin(context, code) { return __awaiter(this, void 0, void 0, function* () { - var api = new teamworkProjectsApi_1.TeamworkProjectsApi(this._context); - var userData = yield api.getLoginData(context, code); - console.log(JSON.stringify(userData)); - context.globalState.update("twp.data.activeAccount", userData); + this.API = new teamworkProjectsApi_1.TeamworkProjectsApi(this._context, this); + var userData = yield this.API.getLoginData(context, code); + yield context.globalState.update("twp.data.activeAccount", null); + yield context.globalState.update("twp.data.activeAccount", userData); + //Task: switch all account references in code to use variable instead of globalState + //Link: https://digitalcrew.teamwork.com//tasks/14849632 + //Assigned To: Tim Cadenbach + this.ActiveAccount = userData; this.RefreshData(); + vscode.window.showInformationMessage("You are now logged in as: " + userData.userEmail + "( " + userData.rootUrl + " )"); return null; }); } SelectProject() { return __awaiter(this, void 0, void 0, function* () { - let userData = this._context.globalState.get("twp.data.activeAccount"); + let userData = this.context.globalState.get("twp.data.activeAccount"); + let tempUserData = this.ActiveAccount; + if ((util_1.isNullOrUndefined(userData) && !util_1.isNullOrUndefined(tempUserData)) + || (!util_1.isNullOrUndefined(userData) && !util_1.isNullOrUndefined(tempUserData) && userData.installationId !== tempUserData.installationId)) { + userData = tempUserData; + } + if (util_1.isNullOrUndefined(userData)) { + this.SelectAccount(); + return; + } let token = userData.token; let root = userData.rootUrl; if (util_1.isNullOrUndefined(token) || util_1.isNullOrUndefined(root)) { this.SelectAccount(); return; } + if (util_1.isNullOrUndefined(vscode.workspace.rootPath) || util_1.isNullOrUndefined(vscode.workspace.getWorkspaceFolder)) { + vscode.window.showErrorMessage("You need to have a workspace or folder opened to select a project"); + return; + } let savedConfig = yield this.GetProjectForRepository(); const projectItem = yield vscode.window.showQuickPick(this.GetProjectQuickTips(true, savedConfig.Projects), { placeHolder: "Select Projects", ignoreFocusOut: true, canPickMany: true }); if (projectItem) { var items = []; projectItem.forEach((element) => __awaiter(this, void 0, void 0, function* () { - items.push(new projectConfig_1.ProjectConfigEntry(element.label, element.id, element)); + items.push(new projectConfig_1.ProjectConfigEntry(element.label, element.id, element, userData.installationId)); })); this.Config = new projectConfig_1.ProjectConfig(items); + //Task: we should probably allow users to customize the filename storing projects + //Link: https://digitalcrew.teamwork.com//tasks/14804236 + //Assigned To: Tim Cadenbach var path = vscode.workspace.rootPath + "/twp.json"; let data = JSON.stringify(this.Config); fs.writeFileSync(path, data); @@ -362,7 +404,7 @@ class TeamworkProjects { if (projectItem) { savedConfig.ActiveProjectId = projectItem.id; savedConfig.ActiveProjectName = projectItem.name; - this.statusBarItem.text = "Teamwork: " + projectItem.name; + this.UpdateStatusBarText(projectItem.name); var path = vscode.workspace.rootPath + "/twp.json"; let data = JSON.stringify(savedConfig); fs.writeFileSync(path, data); @@ -372,10 +414,15 @@ class TeamworkProjects { } }); } + UpdateStatusBarText(text) { + return __awaiter(this, void 0, void 0, function* () { + let userData = this._context.globalState.get("twp.data.activeAccount"); + this.statusBarItem.text = "Teamwork: " + text + ", " + userData.userEmail; + }); + } getTaskLists(context, parentNode, id = 0, force = false) { return __awaiter(this, void 0, void 0, function* () { - var statusBarText = this.statusBarItem.text; - this.statusBarItem.text = "Loading Tasklists......"; + this.UpdateStatusBarText("Loading Tasklists......"); // Load task lists var taskLists = yield this.API.getTaskLists(context, parentNode.id, force); let nodeList = []; @@ -385,13 +432,13 @@ class TeamworkProjects { if (taskLists.length === 0) { nodeList.push(new EmptyNode_1.EmptyNode("No TaskLists", 0)); } - this.statusBarItem.text = "Teamwork: " + this.Config.ActiveProjectName; + this.UpdateStatusBarText(this.Config.ActiveProjectName); return nodeList; }); } getTaskItems(context, node, provider, id = 0, force = false) { return __awaiter(this, void 0, void 0, function* () { - this.statusBarItem.text = "Loading tasks......"; + this.UpdateStatusBarText("Loading tasks......"); let todoItems = yield this.API.getTaskItems(context, node.id, force); let nodeList = []; var config = vscode.workspace.getConfiguration('twp'); @@ -412,7 +459,7 @@ class TeamworkProjects { if (todoItems.length === 0) { nodeList.push(new EmptyNode_1.EmptyNode("No Tasks", 0)); } - this.statusBarItem.text = "Teamwork: " + this.Config.ActiveProjectName; + this.UpdateStatusBarText(this.Config.ActiveProjectName); return nodeList; }); } diff --git a/out/teamworkProjects.js.map b/out/teamworkProjects.js.map index 305d08b..7ca92ed 100644 --- a/out/teamworkProjects.js.map +++ b/out/teamworkProjects.js.map @@ -1 +1 @@ -{"version":3,"file":"teamworkProjects.js","sourceRoot":"","sources":["../src/teamworkProjects.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"teamworkProjects.js","sourceRoot":"","sources":["../src/teamworkProjects.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/out/teamworkProjectsApi.js b/out/teamworkProjectsApi.js index 97f9b52..8597ca8 100644 --- a/out/teamworkProjectsApi.js +++ b/out/teamworkProjectsApi.js @@ -14,16 +14,28 @@ const taskQuickAdd_1 = require("./model/taskQuickAdd"); const teamworkAccount_1 = require("./model/teamworkAccount"); const util_1 = require("util"); class TeamworkProjectsApi { - constructor(context) { + constructor(context, teamwork) { this.axios = require("axios"); + this.twp = teamwork; let userData = context.globalState.get("twp.data.activeAccount"); - let token = userData.token; - this.root = userData.rootUrl; - if (!token || !this.root) { + let tempUserData = this.twp.ActiveAccount; + if ((util_1.isNullOrUndefined(userData) && !util_1.isNullOrUndefined(tempUserData)) + || (!util_1.isNullOrUndefined(userData) && !util_1.isNullOrUndefined(tempUserData) && userData.installationId !== tempUserData.installationId)) { + userData = tempUserData; + } + let token; + if (util_1.isNullOrUndefined(userData)) { this.isConfigured = false; - vscode.window.showErrorMessage("Please Configure the extension first!"); return; } + else { + token = userData.token; + this.root = userData.rootUrl; + if (!token || !this.root) { + this.isConfigured = false; + return; + } + } this.axios.defaults.headers.common = { 'User-Agent': `tw-vscode (${process.platform} | ${vscode.extensions.getExtension('teamwork.twp').packageJSON.version})`, 'Authorization': `Bearer ${token}` @@ -32,6 +44,15 @@ class TeamworkProjectsApi { } GetProjects(context, force = false, includePeople = false, getAll = false, getList = "") { return __awaiter(this, void 0, void 0, function* () { + let userData = context.globalState.get("twp.data.activeAccount"); + let tempUserData = this.twp.ActiveAccount; + if ((util_1.isNullOrUndefined(userData) && !util_1.isNullOrUndefined(tempUserData)) + || (!util_1.isNullOrUndefined(userData) && !util_1.isNullOrUndefined(tempUserData) && userData.installationId !== tempUserData.installationId)) { + userData = tempUserData; + } + if (!util_1.isNullOrUndefined(userData)) { + this.isConfigured = true; + } if (!this.isConfigured) { vscode.window.showErrorMessage("Please Configure the extension first!"); return; @@ -61,10 +82,10 @@ class TeamworkProjectsApi { })); } if (!util_1.isNullOrUndefined(result.data)) { - context.globalState.update("twp.data.project", result.data.projects); + yield context.globalState.update("twp.data.project", result.data.projects); } if (!util_1.isNullOrUndefined(result.data)) { - context.globalState.update("twp.data.projects.lastUpdated", new Date()); + yield context.globalState.update("twp.data.projects.lastUpdated", new Date()); } return result.data.projects; }); @@ -95,8 +116,8 @@ class TeamworkProjectsApi { // Lets check our cache first let response; // Load from cache if duration less than 30 minutes - let cachedNodes = context.globalState.get("twp.data." + id + ".tasklist", null); - let lastUpdated = context.globalState.get("twp.data.tasklists." + id + ".lastUpdated", new Date()); + let cachedNodes = yield context.globalState.get("twp.data." + id + ".tasklist", null); + let lastUpdated = yield context.globalState.get("twp.data.tasklists." + id + ".lastUpdated", new Date()); if (cachedNodes !== null && cachedNodes["data"]["tasklists"].length > 0 && lastUpdated && !force) { if (utilities_1.Utilities.DateCompare(lastUpdated, 30)) { return cachedNodes["data"]["tasklists"]; @@ -110,8 +131,8 @@ class TeamworkProjectsApi { .catch(function (error) { console.log(error); }); - context.globalState.update("twp.data." + id + ".tasklist", response); - context.globalState.update("twp.data.tasklists." + id + ".lastUpdated", Date.now()); + yield context.globalState.update("twp.data." + id + ".tasklist", response); + yield context.globalState.update("twp.data.tasklists." + id + ".lastUpdated", Date.now()); return response["data"]["tasklists"]; }); } @@ -125,7 +146,7 @@ class TeamworkProjectsApi { let todoResponse; // Load from cache if duration less than 30 minutes todoItems = context.globalState.get("twp.data." + id + ".todoitem", []); - let lastUpdated = context.globalState.get("twp.data.tasklists." + id + ".todoitem", new Date()); + let lastUpdated = yield context.globalState.get("twp.data.tasklists." + id + ".todoitem", new Date()); if (todoItems.length > 0 && lastUpdated && !force) { if (utilities_1.Utilities.DateCompare(lastUpdated, 30)) { return todoItems; @@ -169,8 +190,8 @@ class TeamworkProjectsApi { console.log(error); }); todo = json.data["todo-item"]; - context.globalState.update("twp.data.task." + id + ".lastUpdated", Date.now()); - context.globalState.update("twp.data.task." + id, todo); + yield context.globalState.update("twp.data.task." + id + ".lastUpdated", Date.now()); + yield context.globalState.update("twp.data.task." + id, todo); } var dateFormat = require('dateformat'); todo['created-on'] = dateFormat(Date.parse(todo['created-on']), "ddd-mm-yyyy"); diff --git a/out/teamworkProjectsApi.js.map b/out/teamworkProjectsApi.js.map index 08dd263..6662b45 100644 --- a/out/teamworkProjectsApi.js.map +++ b/out/teamworkProjectsApi.js.map @@ -1 +1 @@ -{"version":3,"file":"teamworkProjectsApi.js","sourceRoot":"","sources":["../src/teamworkProjectsApi.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"teamworkProjectsApi.js","sourceRoot":"","sources":["../src/teamworkProjectsApi.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 4dcbbe4..1738c57 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "url": "https://twitter.com/Teamwork" } ], - "version": "1.0.6", + "version": "1.0.7", "engines": { "vscode": "^1.33.0" }, diff --git a/src/teamworkProjects.ts b/src/teamworkProjects.ts index 5f8dfb4..871ed35 100644 --- a/src/teamworkProjects.ts +++ b/src/teamworkProjects.ts @@ -174,21 +174,20 @@ export class TeamworkProjects{ placeHolder: 'Task Title @person [today|tomorrow]', }); - - const gitExtension = vscode.extensions.getExtension('vscode.git').exports; - - var gitLink = ""; - var gitBranch = ""; - if(gitExtension){ + let gitLink = ""; + let gitBranch = ""; + const gitExtensionExports = vscode.extensions.getExtension('vscode.git').exports; + if(gitExtensionExports){ + const gitExtension = gitExtensionExports.exports; const api = gitExtension.getAPI(1); if(api && api.repositories.length > 0){ - var repo = api.repositories[0]; - var remote = repo.state.remotes[0]; + let repo = api.repositories[0]; + let remote = repo.state.remotes[0]; gitBranch = repo.state.HEAD.name; gitLink = remote.fetchUrl.replace(".git","") + "/blob/" + gitBranch + fileName + "#L" + line; } } - var taskDescription = "Task added from VSCode: \n"; + let taskDescription = "Task added from VSCode: \n"; taskDescription += "File: " + fileName + "\n"; taskDescription += "Line: " + line + "\n"; if(gitBranch.length > 0) {taskDescription += "Branch:" + gitBranch + "\n";} @@ -336,6 +335,14 @@ export class TeamworkProjects{ try{ let userData : TeamworkAccount = this.context.globalState.get("twp.data.activeAccount"); + let tempUserData = this.ActiveAccount; + + if((isNullOrUndefined(userData) && !isNullOrUndefined(tempUserData)) + || (!isNullOrUndefined(userData) && !isNullOrUndefined(tempUserData) && userData.installationId !== tempUserData.installationId)){ + userData = tempUserData; + } + + if(isNullOrUndefined(userData)){ return; } @@ -387,6 +394,9 @@ export class TeamworkProjects{ var userData = await this.API.getLoginData(context,code); await context.globalState.update("twp.data.activeAccount",null); await context.globalState.update("twp.data.activeAccount", userData); + //Task: switch all account references in code to use variable instead of globalState + //Link: https://digitalcrew.teamwork.com//tasks/14849632 + //Assigned To: Tim Cadenbach this.ActiveAccount = userData; this.RefreshData(); vscode.window.showInformationMessage("You are now logged in as: " + userData.userEmail + "( " + userData.rootUrl + " )"); diff --git a/twp-1.0.6.vsix b/twp-1.0.7.vsix similarity index 95% rename from twp-1.0.6.vsix rename to twp-1.0.7.vsix index 9102fec..6eacbe7 100644 Binary files a/twp-1.0.6.vsix and b/twp-1.0.7.vsix differ