Skip to content

Commit

Permalink
Merge da26f8b into e900d43
Browse files Browse the repository at this point in the history
  • Loading branch information
@nodece
nodece committed Aug 7, 2018
2 parents e900d43 + da26f8b commit 94eff49
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 160 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.idea
.vscode
node_modules
lib
dist
yarn-error.log
19 changes: 0 additions & 19 deletions .vscode/launch.json
View file

This file was deleted.

17 changes: 8 additions & 9 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "node-casbin",
"name": "casbin",
"version": "1.0.0",
"description": "An authorization library that supports access control models like ACL, RBAC, ABAC in Node.JS",
"main": "lib/casbin.js",
"typings": "lib/casbin.d.ts",
"scripts": {
"precommit": "lint-staged",
"build": "node scripts/build.js",
"prepublish": "yarn run lint && yarn run test",
"build": "rimraf lib && tsc",
"lint": "tslint \"src/**/*.ts\"",
"fix": "tslint \"src/**/*.ts\" --fix",
"test": "jest"
Expand All @@ -19,23 +20,21 @@
"husky": "^0.14.3",
"jest": "^23.4.2",
"lint-staged": "^7.2.0",
"lodash": "^4.17.10",
"prettier": "^1.13.7",
"rollup": "^0.62.0",
"rollup-plugin-node-resolve": "^3.3.0",
"rimraf": "^2.6.2",
"ts-jest": "22.4.6",
"ts-node": "^7.0.0",
"tslint": "^5.11.0",
"typescript": "^2.9.2"
},
"dependencies": {
"coveralls": "^3.0.2",
"expression-eval": "^1.3.0",
"fs-extra": "^7.0.0",
"ip": "^1.1.5",
"jsep": "^0.3.4",
"lodash": "^4.17.10"
},
"files": [
"lib",
"examples"
],
"homepage": "http://casbin.org",
"repository": {
"type": "git",
Expand Down
44 changes: 0 additions & 44 deletions scripts/build.js
View file

This file was deleted.

3 changes: 3 additions & 0 deletions src/casbin.ts
View file
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
export * from './enforcer';
export * from './effect';
export * from './persist';
export * from './rbac';
18 changes: 10 additions & 8 deletions src/model/model.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,12 @@ export class Model {
// clearPolicy clears all current policy.
public clearPolicy(): void {
this.model.forEach((value, key) => {
if (key === 'p' || key === 'g') {
value.forEach(ast => {
ast.policy = [];
});
if (!(key === 'p' || key === 'g')) {
return;
}
value.forEach(ast => {
ast.policy = [];
});
});
}

Expand Down Expand Up @@ -269,11 +270,12 @@ export class Model {
public printPolicy(): void {
util.logPrint('Policy:');
this.model.forEach((map, key) => {
if (key === 'p' || key === 'g') {
map.forEach(ast => {
util.logPrint(`key, : ${ast.value}, : , ${ast.policy}`);
});
if (!(key === 'p' || key === 'g')) {
return;
}
map.forEach(ast => {
util.logPrint(`key, : ${ast.value}, : , ${ast.policy}`);
});
});
}
}
9 changes: 2 additions & 7 deletions src/persist/helper.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,19 @@ import { Model } from '../model';

export class Helper {
public static loadPolicyLine(line: string, model: Model) {
if (line === '') {
return;
}

if (line.charAt(0) === '#') {
if (line === '' || line.charAt(0) === '#') {
return;
}

const tokens = line.split(', ').map(n => n.trim());

const key = tokens[0];
const sec = key.substring(0, 1);
const item = model.model.get(sec);
if (!item) {
return;
}
const policy = item.get(key);

const policy = item.get(key);
if (!policy) {
return;
}
Expand Down
5 changes: 3 additions & 2 deletions tsconfig.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"compilerOptions": {
"target": "es6",
"module": "esnext",
"module": "commonjs",
"moduleResolution": "node",
"declaration": true,
"declarationDir": "lib",
"strict": true,
"outDir": "lib/es6",
"outDir": "lib",
"strictPropertyInitialization": false
},
"include": ["src/**/*.ts"]
Expand Down
80 changes: 10 additions & 70 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
dependencies:
any-observable "^0.3.0"

"@types/estree@0.0.39":
version "0.0.39"
resolved "http://registry.npm.taobao.org/@types/estree/download/@types/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"

"@types/ip@^0.0.31":
version "0.0.31"
resolved "http://registry.npm.taobao.org/@types/ip/download/@types/ip-0.0.31.tgz#a363989e72dd11bb21f932d6fe96bd6a85b2b74b"
Expand Down Expand Up @@ -204,7 +200,7 @@ array-unique@^0.3.2:
version "0.3.2"
resolved "http://registry.npm.taobao.org/array-unique/download/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"

arrify@^1.0.0, arrify@^1.0.1:
arrify@^1.0.1:
version "1.0.1"
resolved "http://registry.npm.taobao.org/arrify/download/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"

Expand Down Expand Up @@ -506,18 +502,10 @@ buffer-from@^1.0.0:
version "1.1.0"
resolved "http://registry.npm.taobao.org/buffer-from/download/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04"

buffer-from@^1.1.0:
version "1.1.1"
resolved "http://registry.npm.taobao.org/buffer-from/download/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"

builtin-modules@^1.0.0, builtin-modules@^1.1.1:
version "1.1.1"
resolved "http://registry.npm.taobao.org/builtin-modules/download/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"

builtin-modules@^2.0.0:
version "2.0.0"
resolved "http://registry.npm.taobao.org/builtin-modules/download/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e"

cache-base@^1.0.1:
version "1.0.1"
resolved "http://registry.npm.taobao.org/cache-base/download/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
Expand Down Expand Up @@ -868,7 +856,7 @@ detect-newline@^2.1.0:
version "2.1.0"
resolved "http://registry.npm.taobao.org/detect-newline/download/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"

diff@^3.1.0, diff@^3.2.0:
diff@^3.2.0:
version "3.5.0"
resolved "http://registry.npm.taobao.org/diff/download/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"

Expand Down Expand Up @@ -1197,14 +1185,6 @@ fs-extra@6.0.0:
jsonfile "^4.0.0"
universalify "^0.1.0"

fs-extra@^7.0.0:
version "7.0.0"
resolved "http://registry.npm.taobao.org/fs-extra/download/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
dependencies:
graceful-fs "^4.1.2"
jsonfile "^4.0.0"
universalify "^0.1.0"

fs-minipass@^1.2.5:
version "1.2.5"
resolved "http://registry.npm.taobao.org/fs-minipass/download/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
Expand Down Expand Up @@ -1616,10 +1596,6 @@ is-glob@^4.0.0:
dependencies:
is-extglob "^2.1.1"

is-module@^1.0.0:
version "1.0.0"
resolved "http://registry.npm.taobao.org/is-module/download/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"

is-number@^2.1.0:
version "2.1.0"
resolved "http://registry.npm.taobao.org/is-number/download/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
Expand Down Expand Up @@ -2240,7 +2216,7 @@ jsdom@^11.5.1:
ws "^5.2.0"
xml-name-validator "^3.0.0"

jsep@^0.3.0, jsep@^0.3.4:
jsep@^0.3.0:
version "0.3.4"
resolved "http://registry.npm.taobao.org/jsep/download/jsep-0.3.4.tgz#55ebd4400c5c5861cb1ff949a7a4cd97fcaacaa0"

Expand Down Expand Up @@ -2436,10 +2412,14 @@ lodash.sortby@^4.7.0:
version "4.7.0"
resolved "http://registry.npm.taobao.org/lodash.sortby/download/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"

lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5:
lodash@^4.13.1, lodash@^4.17.4, lodash@^4.17.5:
version "4.17.10"
resolved "http://registry.npm.taobao.org/lodash/download/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"

lodash@^4.17.10:
version "4.17.10"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"

log-driver@^1.2.7:
version "1.2.7"
resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
Expand Down Expand Up @@ -2480,10 +2460,6 @@ lru-cache@^4.0.1:
pseudomap "^1.0.2"
yallist "^2.1.2"

make-error@^1.1.1:
version "1.3.4"
resolved "http://registry.npm.taobao.org/make-error/download/make-error-1.3.4.tgz#19978ed575f9e9545d2ff8c13e33b5d18a67d535"

makeerror@1.0.x:
version "1.0.11"
resolved "http://registry.npm.taobao.org/makeerror/download/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
Expand Down Expand Up @@ -2996,10 +2972,6 @@ preserve@^0.2.0:
version "0.2.0"
resolved "http://registry.npm.taobao.org/preserve/download/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"

prettier@^1.13.7:
version "1.13.7"
resolved "http://registry.npm.taobao.org/prettier/download/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281"

pretty-format@^22.4.0, pretty-format@^22.4.3:
version "22.4.3"
resolved "http://registry.npm.taobao.org/pretty-format/download/pretty-format-22.4.3.tgz#f873d780839a9c02e9664c8a082e9ee79eaac16f"
Expand Down Expand Up @@ -3208,7 +3180,7 @@ resolve@1.1.7:
version "1.1.7"
resolved "http://registry.npm.taobao.org/resolve/download/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"

resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2:
resolve@^1.1.7, resolve@^1.3.2:
version "1.8.1"
resolved "http://registry.npm.taobao.org/resolve/download/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
dependencies:
Expand All @@ -3231,27 +3203,12 @@ right-align@^0.1.1:
dependencies:
align-text "^0.1.1"

rimraf@^2.5.4, rimraf@^2.6.1:
rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
version "2.6.2"
resolved "http://registry.npm.taobao.org/rimraf/download/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
dependencies:
glob "^7.0.5"

rollup-plugin-node-resolve@^3.3.0:
version "3.3.0"
resolved "http://registry.npm.taobao.org/rollup-plugin-node-resolve/download/rollup-plugin-node-resolve-3.3.0.tgz#c26d110a36812cbefa7ce117cadcd3439aa1c713"
dependencies:
builtin-modules "^2.0.0"
is-module "^1.0.0"
resolve "^1.1.6"

rollup@^0.62.0:
version "0.62.0"
resolved "http://registry.npm.taobao.org/rollup/download/rollup-0.62.0.tgz#4ca8b3c9582195dc9341ff8a1375f58319b95bfc"
dependencies:
"@types/estree" "0.0.39"
"@types/node" "*"

rsvp@^3.3.3:
version "3.6.2"
resolved "http://registry.npm.taobao.org/rsvp/download/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
Expand Down Expand Up @@ -3701,19 +3658,6 @@ ts-jest@22.4.6:
source-map-support "^0.5.5"
yargs "^11.0.0"

ts-node@^7.0.0:
version "7.0.0"
resolved "http://registry.npm.taobao.org/ts-node/download/ts-node-7.0.0.tgz#a94a13c75e5e1aa6b82814b84c68deb339ba7bff"
dependencies:
arrify "^1.0.0"
buffer-from "^1.1.0"
diff "^3.1.0"
make-error "^1.1.1"
minimist "^1.2.0"
mkdirp "^0.5.1"
source-map-support "^0.5.6"
yn "^2.0.0"

tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
version "1.9.3"
resolved "http://registry.npm.taobao.org/tslib/download/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
Expand Down Expand Up @@ -3977,7 +3921,3 @@ yargs@~3.10.0:
cliui "^2.1.0"
decamelize "^1.0.0"
window-size "0.1.0"

yn@^2.0.0:
version "2.0.0"
resolved "http://registry.npm.taobao.org/yn/download/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"

0 comments on commit 94eff49

Please sign in to comment.