Merge pull request #91 from topcoder-platform/master

Sync Dev with Master

Author: kkartunov

src/core/auth/guards/roles.guard.ts

@@ -24,7 +24,7 @@ export class RolesGuard implements CanActivate {
 
     const { auth0User = {} } = request;
     const userRoles = Object.keys(auth0User).reduce((roles, key) => {
-      if (key.match(/claims\/roles$/gi)) {
+      if (key.match(/\/roles$/gi)) {
         return auth0User[key] as string[];
       }
 
@@ -36,15 +36,15 @@ export class RolesGuard implements CanActivate {
     }
 
     const userHandle = Object.keys(auth0User).reduce((handles, key) => {
-      if (key.match(/claims\/handle$/gi)) {
+      if (key.match(/\/handle$/gi)) {
         return auth0User[key] as string;
       }
 
       return handles;
     }, []);
 
     const userId = Object.keys(auth0User).reduce((ids, key) => {
-      if (key.match(/claims\/userId$/gi)) {
+      if (key.match(/\/userId$/gi)) {
         return auth0User[key] as string;
       }
 

src/main.ts

@@ -30,7 +30,7 @@ async function bootstrap() {
     'http://localhost:3000',
     /\.localhost:3000$/,
     ENV_CONFIG.TOPCODER_WALLET_URL,
-    /^https:\/\/[\w-]+\.topcoder-dev\.com$/, // allow wallet-v6 and other subdomains
+    /^https:\/\/[\w-]+\.topcoder(-dev)?\.com$/, // allow wallet-v6 and other subdomains
   ];
 
   const corsConfig: cors.CorsOptions = {