screwdriver-api 7.0.103 → 7.0.105
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/plugins/auth/login.js +4 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "screwdriver-api",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.105",
|
|
4
4
|
"description": "API server for the Screwdriver.cd service",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -120,7 +120,7 @@
|
|
|
120
120
|
"screwdriver-request": "^2.0.1",
|
|
121
121
|
"screwdriver-scm-base": "^8.2.0",
|
|
122
122
|
"screwdriver-scm-bitbucket": "^5.0.1",
|
|
123
|
-
"screwdriver-scm-github": "^12.
|
|
123
|
+
"screwdriver-scm-github": "^12.6.0",
|
|
124
124
|
"screwdriver-scm-gitlab": "^3.1.0",
|
|
125
125
|
"screwdriver-scm-router": "^7.0.0",
|
|
126
126
|
"screwdriver-template-validator": "^7.0.0",
|
package/plugins/auth/login.js
CHANGED
|
@@ -106,11 +106,12 @@ function addOAuthRoutes(config) {
|
|
|
106
106
|
}
|
|
107
107
|
|
|
108
108
|
// check enterprise github cloud
|
|
109
|
-
|
|
109
|
+
const scmConfig = config.scm.scms[scmContext].config;
|
|
110
|
+
|
|
111
|
+
if (scmConfig && scmConfig.gheCloud) {
|
|
110
112
|
const isEnterpriseUser = await userFactory.scm.isEnterpriseUser({
|
|
111
113
|
token: accessToken,
|
|
112
|
-
login: username
|
|
113
|
-
slug: config.scm.gheCloudSlug
|
|
114
|
+
login: username
|
|
114
115
|
});
|
|
115
116
|
|
|
116
117
|
if (!isEnterpriseUser) {
|