From dbe36e3dabf4a2ee72b8daacabd22c8daeed63ee Mon Sep 17 00:00:00 2001
From: Ercan Ucan <ercanucan@gmail.com>
Date: 2018年8月14日 17:35:15 +0200
Subject: [PATCH] refactor(gitlab): simplify allow_publish function
This PR simplifies the allow_publish by keeping the same functionality.
Removes unnecessary over-nesting and minor code duplication.
Makes minor white-space arrangements.
---
 src/authcache.js &#124; 1 -
 src/gitlab.js &#124; 36 +++++++++++-------------------------
 2 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/src/authcache.js b/src/authcache.js
index 6f37795..8f02a75 100644
--- a/src/authcache.js
+++ b/src/authcache.js
@@ -42,7 +42,6 @@ export class AuthCache {
 sha.update(JSON.stringify({ username: username, password: password }));
 return sha.digest('hex');
 }
-
 }
 
 export type UserDataGroups = {
diff --git a/src/gitlab.js b/src/gitlab.js
index ae2fae8..1956b5a 100644
--- a/src/gitlab.js
+++ b/src/gitlab.js
@@ -158,7 +158,7 @@ export default class VerdaccioGitLab implements IPluginAuth {
 }
 
 allow_access(user: RemoteUser, _package: VerdaccioGitlabPackageAccess, cb: Callback) {
- if (!_package.gitlab) { return cb(); }
+ if (!_package.gitlab) return cb();
 
 if ((_package.access &#124;&#124; []).includes('$authenticated') && user.name !== undefined) {
 this.logger.debug(`[gitlab] allow user: ${user.name} access to package: ${_package.name}`);
@@ -170,14 +170,12 @@ export default class VerdaccioGitLab implements IPluginAuth {
 this.logger.debug(`[gitlab] deny user: ${user.name &#124;&#124; ''} access to package: ${_package.name}`);
 return cb(null, false);
 }
-
 }
 
 allow_publish(user: RemoteUser, _package: VerdaccioGitlabPackageAccess, cb: Callback) {
- if (!_package.gitlab) { return cb(); }
+ if (!_package.gitlab) return cb();
 let packageScopePermit = false;
 let packagePermit = false;
-
 // Only allow to publish packages when:
 // - the package has exactly the same name as one of the user groups, or
 // - the package scope is the same as one of the user groups
@@ -186,31 +184,20 @@ export default class VerdaccioGitLab implements IPluginAuth {
 if (real_group === _package.name) {
 packagePermit = true;
 break;
- } else {
- if (_package.name.indexOf('@') === 0) {
- if (real_group === _package.name.slice(1, _package.name.lastIndexOf('/'))) {
- packageScopePermit = true;
- break;
- }
- }
+ } else if (_package.name.indexOf('@') === 0 && real_group === _package.name.slice(1, _package.name.lastIndexOf('/'))) {
+ packageScopePermit = true;
+ break;
 }
 }
 
- if (packagePermit === true) {
- this.logger.debug(`[gitlab] user: ${user.name &#124;&#124; ''} allowed to publish package: ${_package.name} based on package-name`);
+ if (packagePermit &#124;&#124; packageScopePermit) {
+ const perm = packagePermit ? 'package-name' : 'package-scope';
+ this.logger.debug(`[gitlab] user: ${user.name &#124;&#124; ''} allowed to publish package: ${_package.name} based on ${perm}`);
 return cb(null, false);
 } else {
- if (packageScopePermit === true) {
- this.logger.debug(`[gitlab] user: ${user.name &#124;&#124; ''} allowed to publish package: ${_package.name} based on package-scope`);
- return cb(null, false);
- } else {
- this.logger.debug(`[gitlab] user: ${user.name &#124;&#124; ''} denied from publishing package: ${_package.name}`);
- if (_package.name.indexOf('@') === 0) {
- return cb(httperror[403](`must have required permissions: ${this.config.publish &#124;&#124; ''} at package-scope`));
- } else {
- return cb(httperror[403](`must have required permissions: ${this.config.publish &#124;&#124; ''} at package-name`));
- }
- }
+ this.logger.debug(`[gitlab] user: ${user.name &#124;&#124; ''} denied from publishing package: ${_package.name}`);
+ const missingPerm = _package.name.indexOf('@') === 0 ? 'package-scope' : 'package-name';
+ return cb(httperror[403](`must have required permissions: ${this.config.publish &#124;&#124; ''} at ${missingPerm}`));
 }
 }
 
@@ -237,5 +224,4 @@ export default class VerdaccioGitLab implements IPluginAuth {
 }
 });
 }
-
 }
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://patch-diff.githubusercontent.com/raw/bufferoverflow/verdaccio-gitlab/pull/41.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://patch-diff.githubusercontent.com/raw/bufferoverflow/verdaccio-gitlab/pull/41.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>