fix special character bug

Author: Su-Yong

packages/scope-validator/lib/pattern.ts

@@ -5,7 +5,7 @@ export default class Pattern {
     const regex = this.str
       .replace(/(\${\w+})/g, '*')
       .replace(/[$^.+?]/g, '\\$&')
-      .replace(/\*/g, '(\\w+)');
+      .replace(/\*/g, `([!@#$%^&*\\-\\w]+)`);
 
     return new RegExp(`^${regex}$`);
   }
@@ -29,9 +29,9 @@ export default class Pattern {
     }
 
     const regexStr = this.str
-      .replace(/(\${\w+})/g, '*')
+      .replace(/(\${[!@#$%^&*\-\w]+})/g, '*')
       .replace(/[$^.+?]/g, '\\$&')
-      .replace(/\*/g, '(\\w+)')
+      .replace(/\*/g, '([!@#$%^&*\\-\\w]+)')
       .replace(/(\*)/g, ')(.+)(?:')
       .replace(/^(.*)/, '(?:$&')
       .replace(/(.*)$/, '$&)');

packages/scope-validator/lib/scope-validator-manager.ts

@@ -22,6 +22,7 @@ export default class ScopeValidatorManager<T> {
     const matchValidators = this.scopeValidators.filter((validator) =>
       validator.canValidate(scope)
     );
+
     return (
       matchValidators.length >= 1 &&
       matchValidators.every((validator) =>

packages/scope-validator/test/integration/single-parameter.spec.ts

@@ -8,7 +8,8 @@ const TestValidator1 = ScopeValidatorFactory.create(
 
     if (restricter === 'all') return true;
     if (restricter === 'me') return received?.ownerId === 'asdf';
-    return false;
+
+    return restricter === 'test-all';
   }
 );
 
@@ -29,6 +30,12 @@ const TestValidator4 = ScopeValidatorFactory.create(
   () => true
 );
 
+const TestValidator5 = ScopeValidatorFactory.create(
+  // eslint-disable-next-line no-template-curly-in-string
+  'create:${param1}:${param2}:last',
+  () => true
+);
+
 describe('success', () => {
   it('validate scope', () => {
     const scopeValidatorManager = new ScopeValidatorManager();
@@ -44,6 +51,17 @@ describe('success', () => {
     expect(result).toEqual([true, true, false]);
   });
 
+  it('validate scope: special character', () => {
+    const scopeValidatorManager = new ScopeValidatorManager();
+    scopeValidatorManager.use(TestValidator1);
+
+    const result = scopeValidatorManager.validate(['create:client:test-all'], {
+      ownerId: 'asdf',
+    });
+
+    expect(result).toEqual([true]);
+  });
+
   it('validate one scope', () => {
     const scopeValidatorManager = new ScopeValidatorManager();
     scopeValidatorManager.use(TestValidator1);
@@ -79,6 +97,18 @@ describe('success', () => {
 
     expect(result).toEqual([true]);
   });
+
+  it('validate scope special character 2', () => {
+    const scopeValidatorManager = new ScopeValidatorManager();
+    scopeValidatorManager.use(TestValidator5);
+
+    const result = scopeValidatorManager.validate(
+      ['create:test1:test2:last'],
+      'test'
+    );
+
+    expect(result).toEqual([true]);
+  });
 });
 
 describe('failed', () => {