@telia-ace/alliance-portal 1.0.7 → 1.0.8-next.0

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/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @telia-ace/alliance-portal
2
2
 
3
+ ## 1.0.8-next.0
4
+
5
+ ### Patch Changes
6
+
7
+ - 321a5d6: Replace `@telia-ace/alliance-databases`, using NestJS + GraphQL, with `@telia-ace/alliance-data`, using Expess 5 + tRPC.
8
+ - Updated dependencies [321a5d6]
9
+ - @telia-ace/alliance-internal-node-utilities@1.0.5-next.0
10
+
3
11
  ## 1.0.7
4
12
 
5
13
  ### Patch Changes
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:true});Object.defineProperty(exports,"createAppController",{enumerable:true,get:function(){return createAppController}});const _axios=require("@nestjs/axios");const _common=require("@nestjs/common");const _config=require("@nestjs/config");const _terminus=require("@nestjs/terminus");const _allianceinternalnodeutilities=require("@telia-ace/alliance-internal-node-utilities");const _express=require("express");const _graphqlrequest=require("graphql-request");const _config1=require("./config");const _graphql=require("./graphql");const _html=require("./html");const _responses=require("./responses");function _ts_decorate(decorators,target,key,desc){var c=arguments.length,r=c<3?target:desc===null?desc=Object.getOwnPropertyDescriptor(target,key):desc,d;if(typeof Reflect==="object"&&typeof Reflect.decorate==="function")r=Reflect.decorate(decorators,target,key,desc);else for(var i=decorators.length-1;i>=0;i--)if(d=decorators[i])r=(c<3?d(r):c>3?d(target,key,r):d(target,key))||r;return c>3&&r&&Object.defineProperty(target,key,r),r}function _ts_metadata(k,v){if(typeof Reflect==="object"&&typeof Reflect.metadata==="function")return Reflect.metadata(k,v)}function _ts_param(paramIndex,decorator){return function(target,key){decorator(target,key,paramIndex)}}function createAppController(){const environmentWorkspace=process.env[_config1.ConfigKeys.Workspace];let AppController=class AppController{async signin(){}async favicon(){return""}async health(workspace){const slug=environmentWorkspace||workspace;if(slug){let existingWorkspace=null;try{const{workspace}=await (0,_graphqlrequest.request)(this.configService.getOrThrow(_allianceinternalnodeutilities.SharedConfigKeys.DbEndpoint),_graphql.GetWorkspaceDocument,{slug},{authorization:(0,_allianceinternalnodeutilities.createSystemUserToken)(this.configService)});existingWorkspace=workspace}catch{}if(!existingWorkspace){throw new _common.NotFoundException}}return this.healthService.check([()=>this.redisHealthCheck.isHealthy()])}async cookiePolicy(){const{data}=await this.httpService.axiosRef.get(this.wpPolicyUrl);return data}async index(req,res,workspaceParam){return this.portal(req,res,environmentWorkspace||workspaceParam)}async workspace(_1,res,_2){return res.status(_common.HttpStatus.NOT_FOUND).send("Not Available")}async portal(req,res,workspaceSlug){let existingWorkspace=null;try{const{workspace}=await (0,_graphqlrequest.request)(this.configService.getOrThrow(_allianceinternalnodeutilities.SharedConfigKeys.DbEndpoint),_graphql.GetWorkspaceDocument,{slug:workspaceSlug},{authorization:(0,_allianceinternalnodeutilities.createSystemUserToken)(this.configService)});existingWorkspace=workspace}catch(error){if(error?.code==="ECONNREFUSED"){return(0,_responses.dbError)(res)}}if(!existingWorkspace){return(0,_responses.workspaceNotFoundError)(res,workspaceSlug)}let userHasAccess=false;try{const objectId=req?.oidc?.user?.sub;const{user}=await (0,_graphqlrequest.request)(this.configService.getOrThrow(_allianceinternalnodeutilities.SharedConfigKeys.DbEndpoint),_graphql.GetUserDocument,{objectId,workspaceSlug},{authorization:(0,_allianceinternalnodeutilities.createSystemUserToken)(this.configService)});userHasAccess=!!user.id}catch{}if(!userHasAccess){return(0,_responses.unauthorizedError)(res,workspaceSlug)}this.logger.info("opening portal",{user:req.oidc.user,workspaceSlug});return(0,_responses.ok)(res,(0,_html.htmlTemplate)(existingWorkspace.slug==="system"?"ACE Enterprise Portal":`ACE Customer Portal - ${existingWorkspace.name}`,(0,_html.loaderHtml)(),(0,_html.globalVariables)(this.configService,workspaceSlug),(0,_html.embedScript)(this.wpUrl,!!req.query["wp-tag"]||!!req.query["wp-version"]?{}:{tag:this.wpTag})))}constructor(logger,configService,httpService,healthService,redisHealthCheck){this.logger=logger;this.configService=configService;this.httpService=httpService;this.healthService=healthService;this.redisHealthCheck=redisHealthCheck;this.wpUrl=this.configService.getOrThrow(_config1.ConfigKeys.WebprovisionsDistributionUrl);this.wpPolicyUrl=this.configService.get(_config1.ConfigKeys.WebprovisionsDistributionCookiePolicyUrl)||`${this.wpUrl}/cookie-policy.html`;this.wpTag=this.configService.get(_config1.ConfigKeys.WebprovisionsTag)}};_ts_decorate([(0,_common.Get)("/signin-oidc"),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[])],AppController.prototype,"signin",null);_ts_decorate([(0,_common.Get)("/favicon*"),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[])],AppController.prototype,"favicon",null);_ts_decorate([(0,_common.Get)(["/-/health","/:workspace/-/health"]),(0,_terminus.HealthCheck)(),_ts_param(0,(0,_common.Param)("workspace")),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[String])],AppController.prototype,"health",null);_ts_decorate([(0,_common.Get)(environmentWorkspace?"/cookie-policy":"/:workspace/cookie-policy"),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[])],AppController.prototype,"cookiePolicy",null);_ts_decorate([(0,_common.Get)(environmentWorkspace?"/*":"/:workspace*"),_ts_param(0,(0,_common.Req)()),_ts_param(1,(0,_common.Res)()),_ts_param(2,(0,_common.Param)("workspace")),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[typeof _express.Request==="undefined"?Object:_express.Request,typeof _express.Response==="undefined"?Object:_express.Response,String])],AppController.prototype,"index",null);_ts_decorate([_ts_param(0,(0,_common.Req)()),_ts_param(1,(0,_common.Res)()),_ts_param(2,(0,_common.Param)("workspace")),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[typeof _express.Request==="undefined"?Object:_express.Request,typeof _express.Response==="undefined"?Object:_express.Response,String])],AppController.prototype,"workspace",null);AppController=_ts_decorate([(0,_common.Controller)(),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[typeof _allianceinternalnodeutilities.LoggerService==="undefined"?Object:_allianceinternalnodeutilities.LoggerService,typeof _config.ConfigService==="undefined"?Object:_config.ConfigService,typeof _axios.HttpService==="undefined"?Object:_axios.HttpService,typeof _terminus.HealthCheckService==="undefined"?Object:_terminus.HealthCheckService,typeof _allianceinternalnodeutilities.RedisHealthIndicator==="undefined"?Object:_allianceinternalnodeutilities.RedisHealthIndicator])],AppController);if(!process.env[_config1.ConfigKeys.LandingPage]||process.env[_config1.ConfigKeys.LandingPage]==="true"){let AppControllerWithLandingPage=class AppControllerWithLandingPage extends AppController{async health(workspace){return super.health(workspace)}async index(_,res){return(0,_responses.ok)(res,(0,_html.htmlTemplate)("ACE Customer Portal - Landing Page",(0,_html.loaderHtml)(),(0,_html.embedScript)("https://embed.webprovisions.io/resource/alliance/landing-page")))}async workspace(req,res,workspaceParam){return super.index(req,res,workspaceParam)}};_ts_decorate([(0,_common.Get)(["/-/health","/:workspace/-/health"]),(0,_terminus.HealthCheck)(),_ts_param(0,(0,_common.Param)("workspace")),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[String])],AppControllerWithLandingPage.prototype,"health",null);_ts_decorate([(0,_common.Get)("/"),_ts_param(0,(0,_common.Req)()),_ts_param(1,(0,_common.Res)()),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[typeof _express.Request==="undefined"?Object:_express.Request,typeof _express.Response==="undefined"?Object:_express.Response])],AppControllerWithLandingPage.prototype,"index",null);_ts_decorate([(0,_common.Get)("/:workspace*"),_ts_param(0,(0,_common.Req)()),_ts_param(1,(0,_common.Res)()),_ts_param(2,(0,_common.Param)("workspace")),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[typeof _express.Request==="undefined"?Object:_express.Request,typeof _express.Response==="undefined"?Object:_express.Response,String])],AppControllerWithLandingPage.prototype,"workspace",null);AppControllerWithLandingPage=_ts_decorate([(0,_common.Controller)()],AppControllerWithLandingPage);return AppControllerWithLandingPage}return AppController}
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:true});Object.defineProperty(exports,"createAppController",{enumerable:true,get:function(){return createAppController}});const _axios=require("@nestjs/axios");const _common=require("@nestjs/common");const _config=require("@nestjs/config");const _terminus=require("@nestjs/terminus");const _allianceinternalnodeutilities=require("@telia-ace/alliance-internal-node-utilities");const _express=require("express");const _config1=require("./config");const _html=require("./html");const _responses=require("./responses");const _trpc=require("./trpc");function _ts_decorate(decorators,target,key,desc){var c=arguments.length,r=c<3?target:desc===null?desc=Object.getOwnPropertyDescriptor(target,key):desc,d;if(typeof Reflect==="object"&&typeof Reflect.decorate==="function")r=Reflect.decorate(decorators,target,key,desc);else for(var i=decorators.length-1;i>=0;i--)if(d=decorators[i])r=(c<3?d(r):c>3?d(target,key,r):d(target,key))||r;return c>3&&r&&Object.defineProperty(target,key,r),r}function _ts_metadata(k,v){if(typeof Reflect==="object"&&typeof Reflect.metadata==="function")return Reflect.metadata(k,v)}function _ts_param(paramIndex,decorator){return function(target,key){decorator(target,key,paramIndex)}}function createAppController(){const environmentWorkspace=process.env[_config1.ConfigKeys.Workspace];let AppController=class AppController{async signin(){}async favicon(){return""}async health(workspace){const slug=environmentWorkspace||workspace;if(slug){let existingWorkspace=null;try{existingWorkspace=await this.trpcClient.workspace.query({slug})}catch{}if(!existingWorkspace){throw new _common.NotFoundException}}return this.healthService.check([()=>this.redisHealthCheck.isHealthy()])}async cookiePolicy(){const{data}=await this.httpService.axiosRef.get(this.wpPolicyUrl);return data}async index(req,res,workspaceParam){return this.portal(req,res,environmentWorkspace||workspaceParam)}async workspace(_1,res,_2){return res.status(_common.HttpStatus.NOT_FOUND).send("Not Available")}async portal(req,res,workspaceSlug){let existingWorkspace=null;try{existingWorkspace=await this.trpcClient.workspace.query({slug:workspaceSlug})}catch(error){if(error?.code==="ECONNREFUSED"){return(0,_responses.dbError)(res)}}if(!existingWorkspace){return(0,_responses.workspaceNotFoundError)(res,workspaceSlug)}let userHasAccess=false;try{userHasAccess=await this.trpcClient.checkAccess.query({objectId:req?.oidc?.user?.sub,workspaceSlug})}catch{}if(!userHasAccess){return(0,_responses.unauthorizedError)(res,workspaceSlug)}this.logger.info("opening portal",{user:req.oidc.user,workspaceSlug});return(0,_responses.ok)(res,(0,_html.htmlTemplate)(workspaceSlug==="system"?"ACE Enterprise Portal":`ACE Customer Portal - ${existingWorkspace.name}`,(0,_html.loaderHtml)(),(0,_html.globalVariables)(this.configService,workspaceSlug),(0,_html.embedScript)(this.wpUrl,!!req.query["wp-tag"]||!!req.query["wp-version"]?{}:{tag:this.wpTag})))}constructor(logger,configService,httpService,healthService,redisHealthCheck){this.logger=logger;this.configService=configService;this.httpService=httpService;this.healthService=healthService;this.redisHealthCheck=redisHealthCheck;this.wpUrl=this.configService.getOrThrow(_config1.ConfigKeys.WebprovisionsDistributionUrl);this.wpPolicyUrl=this.configService.get(_config1.ConfigKeys.WebprovisionsDistributionCookiePolicyUrl)||`${this.wpUrl}/cookie-policy.html`;this.wpTag=this.configService.get(_config1.ConfigKeys.WebprovisionsTag);this.trpcClient=(0,_trpc.createTRPC)(this.configService)}};_ts_decorate([(0,_common.Get)("/signin-oidc"),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[])],AppController.prototype,"signin",null);_ts_decorate([(0,_common.Get)("/favicon*"),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[])],AppController.prototype,"favicon",null);_ts_decorate([(0,_common.Get)(["/-/health","/:workspace/-/health"]),(0,_terminus.HealthCheck)(),_ts_param(0,(0,_common.Param)("workspace")),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[String])],AppController.prototype,"health",null);_ts_decorate([(0,_common.Get)(environmentWorkspace?"/cookie-policy":"/:workspace/cookie-policy"),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[])],AppController.prototype,"cookiePolicy",null);_ts_decorate([(0,_common.Get)(environmentWorkspace?"/*":"/:workspace*"),_ts_param(0,(0,_common.Req)()),_ts_param(1,(0,_common.Res)()),_ts_param(2,(0,_common.Param)("workspace")),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[typeof _express.Request==="undefined"?Object:_express.Request,typeof _express.Response==="undefined"?Object:_express.Response,String])],AppController.prototype,"index",null);_ts_decorate([_ts_param(0,(0,_common.Req)()),_ts_param(1,(0,_common.Res)()),_ts_param(2,(0,_common.Param)("workspace")),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[typeof _express.Request==="undefined"?Object:_express.Request,typeof _express.Response==="undefined"?Object:_express.Response,String])],AppController.prototype,"workspace",null);AppController=_ts_decorate([(0,_common.Controller)(),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[typeof _allianceinternalnodeutilities.LoggerService==="undefined"?Object:_allianceinternalnodeutilities.LoggerService,typeof _config.ConfigService==="undefined"?Object:_config.ConfigService,typeof _axios.HttpService==="undefined"?Object:_axios.HttpService,typeof _terminus.HealthCheckService==="undefined"?Object:_terminus.HealthCheckService,typeof _allianceinternalnodeutilities.RedisHealthIndicator==="undefined"?Object:_allianceinternalnodeutilities.RedisHealthIndicator])],AppController);if(!process.env[_config1.ConfigKeys.LandingPage]||process.env[_config1.ConfigKeys.LandingPage]==="true"){let AppControllerWithLandingPage=class AppControllerWithLandingPage extends AppController{async health(workspace){return super.health(workspace)}async index(_,res){return(0,_responses.ok)(res,(0,_html.htmlTemplate)("ACE Customer Portal - Landing Page",(0,_html.loaderHtml)(),(0,_html.embedScript)("https://embed.webprovisions.io/resource/alliance/landing-page")))}async workspace(req,res,workspaceParam){return super.index(req,res,workspaceParam)}};_ts_decorate([(0,_common.Get)(["/-/health","/:workspace/-/health"]),(0,_terminus.HealthCheck)(),_ts_param(0,(0,_common.Param)("workspace")),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[String])],AppControllerWithLandingPage.prototype,"health",null);_ts_decorate([(0,_common.Get)("/"),_ts_param(0,(0,_common.Req)()),_ts_param(1,(0,_common.Res)()),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[typeof _express.Request==="undefined"?Object:_express.Request,typeof _express.Response==="undefined"?Object:_express.Response])],AppControllerWithLandingPage.prototype,"index",null);_ts_decorate([(0,_common.Get)("/:workspace*"),_ts_param(0,(0,_common.Req)()),_ts_param(1,(0,_common.Res)()),_ts_param(2,(0,_common.Param)("workspace")),_ts_metadata("design:type",Function),_ts_metadata("design:paramtypes",[typeof _express.Request==="undefined"?Object:_express.Request,typeof _express.Response==="undefined"?Object:_express.Response,String])],AppControllerWithLandingPage.prototype,"workspace",null);AppControllerWithLandingPage=_ts_decorate([(0,_common.Controller)()],AppControllerWithLandingPage);return AppControllerWithLandingPage}return AppController}
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:true});const _axios=require("@nestjs/axios");const _common=require("@nestjs/common");const _config=require("@nestjs/config");const _terminus=require("@nestjs/terminus");const _testing=require("@nestjs/testing");const _allianceinternalnodeutilities=require("@telia-ace/alliance-internal-node-utilities");const _vitest=require("vitest");const _config1=require("./config");const _graphql=require("./graphql");function _getRequireWildcardCache(nodeInterop){if(typeof WeakMap!=="function")return null;var cacheBabelInterop=new WeakMap;var cacheNodeInterop=new WeakMap;return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop})(nodeInterop)}function _interop_require_wildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule){return obj}if(obj===null||typeof obj!=="object"&&typeof obj!=="function"){return{default:obj}}var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj)){return cache.get(obj)}var newObj={__proto__:null};var hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj){if(key!=="default"&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;if(desc&&(desc.get||desc.set)){Object.defineProperty(newObj,key,desc)}else{newObj[key]=obj[key]}}}newObj.default=obj;if(cache){cache.set(obj,newObj)}return newObj}_vitest.vi.mock("graphql-request",async()=>{return{request:_vitest.vi.fn().mockImplementation(async(_1,_2,{slug,objectId})=>{if(objectId==="has-access"){return{user:{id:objectId}}}if(slug==="exists"){return{workspace:{slug,name:"Exists"}}}if(slug==="system"){return{workspace:{slug,name:"System"}}}return})}});(0,_vitest.describe)("AppController",()=>{const cfg={[_config1.ConfigKeys.AuthAuthority]:"test authority",[_config1.ConfigKeys.AuthClientSecret]:"test client secret",[_config1.ConfigKeys.AuthClientId]:"test client id",[_config1.ConfigKeys.ServiceBaseUrl]:"http://base-url",[_config1.ConfigKeys.WebprovisionsDistributionUrl]:"http://localhost:1234/distribution",[_config1.ConfigKeys.WebprovisionsDistributionCookiePolicyUrl]:"http://localhost:1234/cookie-policy.html",[_config1.ConfigKeys.WebprovisionsTag]:"the-tag",[_allianceinternalnodeutilities.SharedConfigKeys.DbEndpoint]:"http://localhost:1234/mocked-db"};let mock;async function setupMock(override={}){_vitest.vi.unstubAllEnvs();const{createAppController}=await Promise.resolve().then(()=>_interop_require_wildcard(require("./app.controller")));for(const[key,value]of Object.entries({...cfg,...override})){if(value){_vitest.vi.stubEnv(key,value)}}const AppController=createAppController();const module=await _testing.Test.createTestingModule({controllers:[AppController],providers:[_allianceinternalnodeutilities.RedisHealthIndicator],imports:[_config.ConfigModule.forRoot({isGlobal:true,validate:_config1.zConfig.parse,ignoreEnvFile:true}),_terminus.TerminusModule,_allianceinternalnodeutilities.LoggerModule.forRoot({logLevel:"silent"}),_axios.HttpModule]}).compile();return{ctrl:module.get(AppController),module}}(0,_vitest.beforeEach)(async()=>{mock=await setupMock()});(0,_vitest.afterEach)(async()=>{await mock.module.close();_vitest.vi.clearAllMocks()});(0,_vitest.it)("defines ctrl",()=>{(0,_vitest.expect)(mock.ctrl).toBeDefined()});(0,_vitest.describe)("cookiePolicy",()=>{(0,_vitest.it)("fetches using configured cookie policy url",async()=>{const http=mock.module.get(_axios.HttpService);const spy=_vitest.vi.spyOn(http.axiosRef,"get").mockResolvedValue({});await mock.ctrl.cookiePolicy();(0,_vitest.expect)(spy).toHaveBeenCalledWith("http://localhost:1234/cookie-policy.html")});(0,_vitest.it)("fetches using {WEBPROVISIONS_DISTRIBUTION_URL}/cookie-policy.html by default",async()=>{mock=await setupMock({[_config1.ConfigKeys.WebprovisionsDistributionCookiePolicyUrl]:undefined});const http=mock.module.get(_axios.HttpService);const spy=_vitest.vi.spyOn(http.axiosRef,"get").mockResolvedValue({});await mock.ctrl.cookiePolicy();(0,_vitest.expect)(spy).toHaveBeenCalledWith("http://localhost:1234/distribution/cookie-policy.html")})});(0,_vitest.describe)("health",()=>{(0,_vitest.it)("it calls health service check",async()=>{const health=mock.module.get(_terminus.HealthCheckService);const spy=_vitest.vi.spyOn(health,"check").mockResolvedValue({status:"ok",details:{}});await mock.ctrl.health();(0,_vitest.expect)(spy).toHaveBeenCalled()});(0,_vitest.it)("calls graphql to check for workspace existance if present in url",async()=>{const{request}=await Promise.resolve().then(()=>_interop_require_wildcard(require("graphql-request")));const health=mock.module.get(_terminus.HealthCheckService);const spy=_vitest.vi.spyOn(health,"check").mockResolvedValue({status:"ok",details:{}});await mock.ctrl.health("exists");(0,_vitest.expect)(request).toHaveBeenCalled();(0,_vitest.expect)(spy).toHaveBeenCalled()});(0,_vitest.it)("returns 404 if does not exist",async()=>{await (0,_vitest.expect)(()=>mock.ctrl.health("doesnt exist")).rejects.toThrowError(_common.NotFoundException)})});(0,_vitest.describe)("portal",async()=>{function mockReqRes({objectId,query={}}){const req={oidc:{user:{sub:objectId}},query};const res={statusCode:0,status:code=>{res.statusCode=code;return res},send:r=>r};return[req,res]}(0,_vitest.it)("calls graphql",async()=>{const{request}=await Promise.resolve().then(()=>_interop_require_wildcard(require("graphql-request")));const[req,res]=mockReqRes({objectId:"guid"});await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(request).toHaveBeenCalledTimes(2);const[firstCall,secondCall]=request.mock.calls;const[firstUrl,firstDocument,firstArgs]=firstCall;const[_,secondDocument,secondArgs]=secondCall;(0,_vitest.expect)(firstUrl).toBe("http://localhost:1234/mocked-db");(0,_vitest.expect)(firstDocument).toEqual(_graphql.GetWorkspaceDocument);(0,_vitest.expect)(firstArgs).toEqual({slug:"exists"});(0,_vitest.expect)(secondDocument).toEqual(_graphql.GetUserDocument);(0,_vitest.expect)(secondArgs).toEqual({objectId:"guid",workspaceSlug:"exists"})});(0,_vitest.it)("returns 200 for authorized user",async()=>{const[req,res]=mockReqRes({objectId:"has-access"});const result=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(result).toContain("http://localhost:1234/distribution");(0,_vitest.expect)(res.statusCode).toBe(200)});(0,_vitest.it)("returns 401 for unauthorized user",async()=>{const[req,res]=mockReqRes({objectId:"does-not-have-access"});const result=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(result).toContain("You don't have access to the workspace");(0,_vitest.expect)(res.statusCode).toBe(401)});(0,_vitest.it)("returns 404 for non existant workspace",async()=>{const[req,res]=mockReqRes({objectId:"does-not-have-access"});const result=await mock.ctrl.portal(req,res,"doesnt-exist");(0,_vitest.expect)(result).toContain("The workspace 'doesnt-exist' does not exist");(0,_vitest.expect)(res.statusCode).toBe(404)});(0,_vitest.describe)("web page title",()=>{(0,_vitest.it)("correct for regular workspace",async()=>{const[req,res]=mockReqRes({objectId:"has-access"});const result=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(result).toContain("<title>ACE Customer Portal - Exists</title>")});(0,_vitest.it)("correct for system",async()=>{const[req,res]=mockReqRes({objectId:"has-access"});const result=await mock.ctrl.portal(req,res,"system");(0,_vitest.expect)(result).toContain("<title>ACE Enterprise Portal</title>")})});(0,_vitest.describe)("webprovisions tags",()=>{(0,_vitest.it)("adds webprovisions tag if configured",async()=>{const[req,res]=mockReqRes({objectId:"has-access"});const result=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(result).toContain('{"tag":"the-tag"}')});(0,_vitest.it)("does not add webprovisions tag if not configured",async()=>{mock=await setupMock({[_config1.ConfigKeys.WebprovisionsTag]:undefined});const[req,res]=mockReqRes({objectId:"has-access"});const result=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(result).toContain("{}")});(0,_vitest.it)("does not add configured webprovisions tag when wp query strings are present",async()=>{let[req,res]=mockReqRes({objectId:"has-access",query:{"wp-tag":"some-tag"}});const withTagQuery=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(withTagQuery).not.toContain('{"tag":"the-tag"}');[req,res]=mockReqRes({objectId:"has-access",query:{"wp-version":"some-version"}});const withVersionQuery=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(withVersionQuery).not.toContain('{"tag":"the-tag"}')})});(0,_vitest.describe)("landing page",()=>{(0,_vitest.it)("returns landing page on url root by default",async()=>{const[req,res]=mockReqRes({objectId:"has-access"});const result=await mock.ctrl.index(req,res,"exists");(0,_vitest.expect)(result).toContain("https://embed.webprovisions.io/resource/alliance/landing-page")});(0,_vitest.it)("returns portal with landing page set to false",async()=>{mock=await setupMock({[_config1.ConfigKeys.LandingPage]:"false"});const[req,res]=mockReqRes({objectId:"has-access"});const result=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(result).toContain("http://localhost:1234/distribution")})})})});
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:true});const _axios=require("@nestjs/axios");const _common=require("@nestjs/common");const _config=require("@nestjs/config");const _terminus=require("@nestjs/terminus");const _testing=require("@nestjs/testing");const _allianceinternalnodeutilities=require("@telia-ace/alliance-internal-node-utilities");const _vitest=require("vitest");const _config1=require("./config");function _getRequireWildcardCache(nodeInterop){if(typeof WeakMap!=="function")return null;var cacheBabelInterop=new WeakMap;var cacheNodeInterop=new WeakMap;return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop})(nodeInterop)}function _interop_require_wildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule){return obj}if(obj===null||typeof obj!=="object"&&typeof obj!=="function"){return{default:obj}}var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj)){return cache.get(obj)}var newObj={__proto__:null};var hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj){if(key!=="default"&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;if(desc&&(desc.get||desc.set)){Object.defineProperty(newObj,key,desc)}else{newObj[key]=obj[key]}}}newObj.default=obj;if(cache){cache.set(obj,newObj)}return newObj}_vitest.vi.mock("@trpc/client",async()=>{const actual=await _vitest.vi.importActual("@trpc/client");return{...actual,createTRPCProxyClient:_vitest.vi.fn().mockReturnValue({portal:{checkAccess:{query:_vitest.vi.fn().mockImplementation(({objectId})=>{return objectId==="has-access"})},workspace:{query:_vitest.vi.fn().mockImplementation(({slug})=>{if(slug==="exists"){return{name:"Exists"}}if(slug==="system"){return{name:"System"}}})}}}),httpBatchLink:_vitest.vi.fn()}});(0,_vitest.describe)("AppController",()=>{const cfg={[_config1.ConfigKeys.AuthAuthority]:"test authority",[_config1.ConfigKeys.AuthClientSecret]:"test client secret",[_config1.ConfigKeys.AuthClientId]:"test client id",[_config1.ConfigKeys.ServiceBaseUrl]:"http://base-url",[_config1.ConfigKeys.WebprovisionsDistributionUrl]:"http://localhost:1234/distribution",[_config1.ConfigKeys.WebprovisionsDistributionCookiePolicyUrl]:"http://localhost:1234/cookie-policy.html",[_config1.ConfigKeys.WebprovisionsTag]:"the-tag",[_allianceinternalnodeutilities.SharedConfigKeys.DbEndpoint]:"http://localhost:1234/mocked-db"};let mock;async function setupMock(override={}){_vitest.vi.unstubAllEnvs();const{createAppController}=await Promise.resolve().then(()=>_interop_require_wildcard(require("./app.controller")));for(const[key,value]of Object.entries({...cfg,...override})){if(value){_vitest.vi.stubEnv(key,value)}}const AppController=createAppController();const module=await _testing.Test.createTestingModule({controllers:[AppController],providers:[_allianceinternalnodeutilities.RedisHealthIndicator],imports:[_config.ConfigModule.forRoot({isGlobal:true,validate:_config1.zConfig.parse,ignoreEnvFile:true}),_terminus.TerminusModule,_allianceinternalnodeutilities.LoggerModule.forRoot({logLevel:"silent"}),_axios.HttpModule]}).compile();return{ctrl:module.get(AppController),module}}(0,_vitest.beforeEach)(async()=>{mock=await setupMock()});(0,_vitest.afterEach)(async()=>{await mock.module.close();_vitest.vi.clearAllMocks()});(0,_vitest.it)("defines ctrl",()=>{(0,_vitest.expect)(mock.ctrl).toBeDefined()});(0,_vitest.describe)("cookiePolicy",()=>{(0,_vitest.it)("fetches using configured cookie policy url",async()=>{const http=mock.module.get(_axios.HttpService);const spy=_vitest.vi.spyOn(http.axiosRef,"get").mockResolvedValue({});await mock.ctrl.cookiePolicy();(0,_vitest.expect)(spy).toHaveBeenCalledWith("http://localhost:1234/cookie-policy.html")});(0,_vitest.it)("fetches using {WEBPROVISIONS_DISTRIBUTION_URL}/cookie-policy.html by default",async()=>{mock=await setupMock({[_config1.ConfigKeys.WebprovisionsDistributionCookiePolicyUrl]:undefined});const http=mock.module.get(_axios.HttpService);const spy=_vitest.vi.spyOn(http.axiosRef,"get").mockResolvedValue({});await mock.ctrl.cookiePolicy();(0,_vitest.expect)(spy).toHaveBeenCalledWith("http://localhost:1234/distribution/cookie-policy.html")})});(0,_vitest.describe)("health",()=>{(0,_vitest.it)("it calls health service check",async()=>{const health=mock.module.get(_terminus.HealthCheckService);const spy=_vitest.vi.spyOn(health,"check").mockResolvedValue({status:"ok",details:{}});await mock.ctrl.health();(0,_vitest.expect)(spy).toHaveBeenCalled()});(0,_vitest.it)("calls graphql to check for workspace existance if present in url",async()=>{const health=mock.module.get(_terminus.HealthCheckService);const spy=_vitest.vi.spyOn(health,"check").mockResolvedValue({status:"ok",details:{}});await mock.ctrl.health("exists");(0,_vitest.expect)(mock.ctrl.trpcClient.workspace.query).toHaveBeenCalledOnce();(0,_vitest.expect)(spy).toHaveBeenCalled()});(0,_vitest.it)("returns 404 if does not exist",async()=>{await (0,_vitest.expect)(()=>mock.ctrl.health("doesnt exist")).rejects.toThrowError(_common.NotFoundException)})});(0,_vitest.describe)("portal",async()=>{function mockReqRes({objectId,query={}}){const req={oidc:{user:{sub:objectId}},query};const res={statusCode:0,status:code=>{res.statusCode=code;return res},send:r=>r};return[req,res]}(0,_vitest.it)("calls checkAccess query",async()=>{const[req,res]=mockReqRes({objectId:"guid"});await mock.ctrl.portal(req,res,"system");(0,_vitest.expect)(mock.ctrl.trpcClient.checkAccess.query).toHaveBeenCalledOnce();const[queryArgs]=mock.ctrl.trpcClient.checkAccess.query.mock.lastCall;(0,_vitest.expect)(queryArgs).toEqual({objectId:"guid",workspaceSlug:"system"})});(0,_vitest.it)("calls workspace query",async()=>{const[req,res]=mockReqRes({objectId:"guid"});await mock.ctrl.portal(req,res,"system");(0,_vitest.expect)(mock.ctrl.trpcClient.workspace.query).toHaveBeenCalledOnce();const[queryArgs]=mock.ctrl.trpcClient.workspace.query.mock.lastCall;(0,_vitest.expect)(queryArgs).toEqual({slug:"system"})});(0,_vitest.it)("returns 200 for authorized user",async()=>{const[req,res]=mockReqRes({objectId:"has-access"});const result=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(result).toContain("http://localhost:1234/distribution");(0,_vitest.expect)(res.statusCode).toBe(200)});(0,_vitest.it)("returns 401 for unauthorized user",async()=>{const[req,res]=mockReqRes({objectId:"does-not-have-access"});const result=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(result).toContain("You don't have access to the workspace");(0,_vitest.expect)(res.statusCode).toBe(401)});(0,_vitest.it)("returns 404 for non existant workspace",async()=>{const[req,res]=mockReqRes({objectId:"does-not-have-access"});const result=await mock.ctrl.portal(req,res,"doesnt-exist");(0,_vitest.expect)(result).toContain("The workspace 'doesnt-exist' does not exist");(0,_vitest.expect)(res.statusCode).toBe(404)});(0,_vitest.describe)("web page title",()=>{(0,_vitest.it)("correct for regular workspace",async()=>{const[req,res]=mockReqRes({objectId:"has-access"});const result=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(result).toContain("<title>ACE Customer Portal - Exists</title>")});(0,_vitest.it)("correct for system",async()=>{const[req,res]=mockReqRes({objectId:"has-access"});const result=await mock.ctrl.portal(req,res,"system");(0,_vitest.expect)(result).toContain("<title>ACE Enterprise Portal</title>")})});(0,_vitest.describe)("webprovisions tags",()=>{(0,_vitest.it)("adds webprovisions tag if configured",async()=>{const[req,res]=mockReqRes({objectId:"has-access"});const result=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(result).toContain('{"tag":"the-tag"}')});(0,_vitest.it)("does not add webprovisions tag if not configured",async()=>{mock=await setupMock({[_config1.ConfigKeys.WebprovisionsTag]:undefined});const[req,res]=mockReqRes({objectId:"has-access"});const result=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(result).toContain("{}")});(0,_vitest.it)("does not add configured webprovisions tag when wp query strings are present",async()=>{let[req,res]=mockReqRes({objectId:"has-access",query:{"wp-tag":"some-tag"}});const withTagQuery=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(withTagQuery).not.toContain('{"tag":"the-tag"}');[req,res]=mockReqRes({objectId:"has-access",query:{"wp-version":"some-version"}});const withVersionQuery=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(withVersionQuery).not.toContain('{"tag":"the-tag"}')})});(0,_vitest.describe)("landing page",()=>{(0,_vitest.it)("returns landing page on url root by default",async()=>{const[req,res]=mockReqRes({objectId:"has-access"});const result=await mock.ctrl.index(req,res,"exists");(0,_vitest.expect)(result).toContain("https://embed.webprovisions.io/resource/alliance/landing-page")});(0,_vitest.it)("returns portal with landing page set to false",async()=>{mock=await setupMock({[_config1.ConfigKeys.LandingPage]:"false"});const[req,res]=mockReqRes({objectId:"has-access"});const result=await mock.ctrl.portal(req,res,"exists");(0,_vitest.expect)(result).toContain("http://localhost:1234/distribution")})})})});
package/dist/auth.js CHANGED
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:true});function _export(target,all){for(var name in all)Object.defineProperty(target,name,{enumerable:true,get:all[name]})}_export(exports,{afterCallbackHandler:function(){return afterCallbackHandler},auth:function(){return auth}});const _allianceinternalnodeutilities=require("@telia-ace/alliance-internal-node-utilities");const _graphqlrequest=require("graphql-request");const _jose=require("jose");const _config=require("./config");const _graphql=require("./graphql");function auth(configService,logger){const middleware=(0,_allianceinternalnodeutilities.authMiddleware)(configService,{baseURL:configService.getOrThrow(_config.ConfigKeys.ServiceBaseUrl).replace("{{port}}",configService.getOrThrow(_allianceinternalnodeutilities.SharedConfigKeys.ServicePort)),clientSecret:configService.getOrThrow(_config.ConfigKeys.AuthClientSecret),clientID:configService.getOrThrow(_config.ConfigKeys.AuthClientId),authorizationParams:{response_type:configService.getOrThrow(_config.ConfigKeys.AuthResponseType),scope:configService.getOrThrow(_config.ConfigKeys.AuthScopes)},sessionCookiePath:configService.get(_config.ConfigKeys.AuthCookiePath),issuerBaseURL:`${configService.getOrThrow(_config.ConfigKeys.AuthAuthority)}/.well-known/openid-configuration`,afterCallback:afterCallbackHandler(configService,logger)});const landingPage=configService.getOrThrow(_config.ConfigKeys.LandingPage);return(req,res,next)=>{if(req.path.endsWith("/-/health")){return next()}if(landingPage&&req.path==="/"){return next()}return middleware(req,res,next)}}function afterCallbackHandler(configService,logger){return async(_,__,session)=>{const claims=(0,_jose.decodeJwt)(session.id_token);const user={displayName:claims.name||"Empty displayName",email:claims.email||claims.emails[0]||"Empty email",objectId:claims.sub||claims.oid};const skipGroupClaimCheck=configService.getOrThrow(_config.ConfigKeys.AuthSkipGroupClaimCheck);logger.trace("decoded JWT and mapped claims to user, getting or creating user in database, setting user type if configured to",{claims,user,skipGroupClaimCheck});try{await (0,_graphqlrequest.request)(configService.getOrThrow(_allianceinternalnodeutilities.SharedConfigKeys.DbEndpoint),_graphql.GetOrCreateUserDocument,{input:user},{authorization:(0,_allianceinternalnodeutilities.createSystemUserToken)(configService)});logger.trace("added user to database, if it did not already exist")}catch{}if(!skipGroupClaimCheck){const type=hasEnterpriseAdminRole(claims)?"system-admin":"user";logger.trace("updating user type according to user claims",{type});try{await (0,_graphqlrequest.request)(configService.getOrThrow(_allianceinternalnodeutilities.SharedConfigKeys.DbEndpoint),_graphql.SetUserTypeDocument,{input:{objectId:user.objectId,type}},{authorization:(0,_allianceinternalnodeutilities.createSystemUserToken)(configService)});logger.trace("user type updated")}catch{}}return session}}function hasEnterpriseAdminRole(claims){if(!claims.groups){return false}const aceEnterpriseAdminRoleId="PROD_ACE_Enterprise_Admins";return claims.groups.includes(aceEnterpriseAdminRoleId)}
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:true});function _export(target,all){for(var name in all)Object.defineProperty(target,name,{enumerable:true,get:all[name]})}_export(exports,{afterCallbackHandler:function(){return afterCallbackHandler},auth:function(){return auth}});const _allianceinternalnodeutilities=require("@telia-ace/alliance-internal-node-utilities");const _jose=require("jose");const _config=require("./config");const _trpc=require("./trpc");function auth(configService,logger){const middleware=(0,_allianceinternalnodeutilities.authMiddleware)(configService,{baseURL:configService.getOrThrow(_config.ConfigKeys.ServiceBaseUrl).replace("{{port}}",configService.getOrThrow(_allianceinternalnodeutilities.SharedConfigKeys.ServicePort)),clientSecret:configService.getOrThrow(_config.ConfigKeys.AuthClientSecret),clientID:configService.getOrThrow(_config.ConfigKeys.AuthClientId),authorizationParams:{response_type:configService.getOrThrow(_config.ConfigKeys.AuthResponseType),scope:configService.getOrThrow(_config.ConfigKeys.AuthScopes)},sessionCookiePath:configService.get(_config.ConfigKeys.AuthCookiePath),issuerBaseURL:`${configService.getOrThrow(_config.ConfigKeys.AuthAuthority)}/.well-known/openid-configuration`,afterCallback:afterCallbackHandler(configService,logger)});const landingPage=configService.getOrThrow(_config.ConfigKeys.LandingPage);return(req,res,next)=>{if(req.path.endsWith("/-/health")){return next()}if(landingPage&&req.path==="/"){return next()}return middleware(req,res,next)}}function afterCallbackHandler(configService,logger){const trpcClient=(0,_trpc.createTRPC)(configService);return async(_,__,session)=>{const claims=(0,_jose.decodeJwt)(session.id_token);const user={displayName:claims.name||"Empty displayName",email:claims.email||claims.emails[0]||"Empty email",objectId:claims.sub||claims.oid};const skipGroupClaimCheck=configService.getOrThrow(_config.ConfigKeys.AuthSkipGroupClaimCheck);logger.trace("decoded JWT and mapped claims to user, getting or creating user in database, setting user type if configured to",{claims,user,skipGroupClaimCheck});try{await trpcClient.getOrCreateUser.mutate(user);logger.trace("added user to database, if it did not already exist")}catch{}if(!skipGroupClaimCheck){const type=hasEnterpriseAdminRole(claims)?"system-admin":"user";logger.trace("updating user type according to user claims",{type});try{await trpcClient.setUserType.mutate({objectId:user.objectId,type});logger.trace("user type updated")}catch{}}return session}}function hasEnterpriseAdminRole(claims){if(!claims.groups){return false}const aceEnterpriseAdminRoleId="PROD_ACE_Enterprise_Admins";return claims.groups.includes(aceEnterpriseAdminRoleId)}
package/dist/auth.spec.js CHANGED
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:true});const _config=require("@nestjs/config");const _testing=require("@nestjs/testing");const _allianceinternalnodeutilities=require("@telia-ace/alliance-internal-node-utilities");const _vitest=require("vitest");const _config1=require("./config");const _graphql=require("./graphql");function _getRequireWildcardCache(nodeInterop){if(typeof WeakMap!=="function")return null;var cacheBabelInterop=new WeakMap;var cacheNodeInterop=new WeakMap;return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop})(nodeInterop)}function _interop_require_wildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule){return obj}if(obj===null||typeof obj!=="object"&&typeof obj!=="function"){return{default:obj}}var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj)){return cache.get(obj)}var newObj={__proto__:null};var hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj){if(key!=="default"&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;if(desc&&(desc.get||desc.set)){Object.defineProperty(newObj,key,desc)}else{newObj[key]=obj[key]}}}newObj.default=obj;if(cache){cache.set(obj,newObj)}return newObj}_vitest.vi.mock("graphql-request",async()=>{return{request:_vitest.vi.fn()}});_vitest.vi.mock("jose",async()=>{return{decodeJwt:_vitest.vi.fn().mockImplementation(t=>{return{name:"test name",email:"test email",sub:"test sub",groups:t.includes("system-admin")?["PROD_ACE_Enterprise_Admins"]:[]}})}});(0,_vitest.describe)("afterCallback",()=>{const cfg={AUTH_AUTHORITY:"test authority",AUTH_CLIENT_SECRET:"test client secret",AUTH_CLIENT_ID:"test client id",SERVICE_BASE_URL:"http://base-url",WEBPROVISIONS_DISTRIBUTION_URL:"http://localhost:1234/distribution",WEBPROVISIONS_DISTRIBUTION_COOKIE_POLICY_URL:"http://localhost:1234/cookie-policy.html",WEBPROVISIONS_TAG:"the-tag",DB_ENDPOINT:"http://localhost:1234/mocked-db"};let mock;async function setupMock(override={}){_vitest.vi.unstubAllEnvs();for(const[key,value]of Object.entries({...cfg,...override})){if(value){_vitest.vi.stubEnv(key,value)}}const module=await _testing.Test.createTestingModule({imports:[_config.ConfigModule.forRoot({isGlobal:true,validate:_config1.zConfig.parse,ignoreEnvFile:true})]}).compile();const configService=module.get(_config.ConfigService);const{afterCallbackHandler}=await Promise.resolve().then(()=>_interop_require_wildcard(require("./auth")));return{afterCallback:afterCallbackHandler(module.get(_config.ConfigService),{log:_vitest.vi.fn(),trace:_vitest.vi.fn(),debug:_vitest.vi.fn(),info:_vitest.vi.fn(),warn:_vitest.vi.fn(),error:_vitest.vi.fn(),fatal:_vitest.vi.fn()}),configService}}(0,_vitest.beforeEach)(async()=>{mock=await setupMock()});(0,_vitest.afterEach)(()=>{_vitest.vi.clearAllMocks()});async function getMockedGQLRequest(){const{request}=await Promise.resolve().then(()=>_interop_require_wildcard(require("graphql-request")));return{request,calls:request.mock.calls.map(c=>({url:c[0],document:c[1],args:c[2]}))}}(0,_vitest.it)("calls getOrCreateUser and setUserType graphql endpoints",async()=>{await mock.afterCallback({},{},{id_token:"asdf"},{});const{request,calls}=await getMockedGQLRequest();(0,_vitest.expect)(request).toHaveBeenCalledTimes(2);(0,_vitest.expect)(calls[0].url).toBe(mock.configService.get(_allianceinternalnodeutilities.SharedConfigKeys.DbEndpoint));(0,_vitest.expect)(calls[0].document).toEqual(_graphql.GetOrCreateUserDocument);(0,_vitest.expect)(calls[0].args).toEqual({input:{displayName:"test name",email:"test email",objectId:"test sub"}});(0,_vitest.expect)(calls[1].url).toBe(mock.configService.get(_allianceinternalnodeutilities.SharedConfigKeys.DbEndpoint));(0,_vitest.expect)(calls[1].document).toEqual(_graphql.SetUserTypeDocument);(0,_vitest.expect)(calls[1].args).toEqual({input:{type:"user",objectId:"test sub"}})});(0,_vitest.it)("calls setUserType with system-admin with correct claims",async()=>{await mock.afterCallback({},{},{id_token:"system-admin"},{});const{request,calls}=await getMockedGQLRequest();(0,_vitest.expect)(request).toHaveBeenCalledTimes(2);(0,_vitest.expect)(calls[1].document).toEqual(_graphql.SetUserTypeDocument);(0,_vitest.expect)(calls[1].args).toEqual({input:{type:"system-admin",objectId:"test sub"}})});(0,_vitest.it)("does not call setUserType if configured not to",async()=>{mock=await setupMock({AUTH_SKIP_GROUP_CLAIM_CHECK:"true"});await mock.afterCallback({},{},{id_token:"asdf"},{});const{request,calls}=await getMockedGQLRequest();(0,_vitest.expect)(request).toHaveBeenCalledOnce();(0,_vitest.expect)(calls[0].document).not.toEqual(_graphql.SetUserTypeDocument)})});
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:true});const _config=require("@nestjs/config");const _testing=require("@nestjs/testing");const _vitest=require("vitest");const _config1=require("./config");function _getRequireWildcardCache(nodeInterop){if(typeof WeakMap!=="function")return null;var cacheBabelInterop=new WeakMap;var cacheNodeInterop=new WeakMap;return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop})(nodeInterop)}function _interop_require_wildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule){return obj}if(obj===null||typeof obj!=="object"&&typeof obj!=="function"){return{default:obj}}var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj)){return cache.get(obj)}var newObj={__proto__:null};var hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj){if(key!=="default"&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;if(desc&&(desc.get||desc.set)){Object.defineProperty(newObj,key,desc)}else{newObj[key]=obj[key]}}}newObj.default=obj;if(cache){cache.set(obj,newObj)}return newObj}const trpcMock={getOrCreateUser:{mutate:_vitest.vi.fn()},setUserType:{mutate:_vitest.vi.fn()}};_vitest.vi.mock("./trpc",async()=>{return{createTRPC:_vitest.vi.fn().mockReturnValue(trpcMock)}});_vitest.vi.mock("jose",async()=>{return{decodeJwt:_vitest.vi.fn().mockImplementation(t=>{return{name:"test name",email:"test email",sub:"test sub",groups:t.includes("system-admin")?["PROD_ACE_Enterprise_Admins"]:[]}})}});(0,_vitest.describe)("afterCallback",()=>{const cfg={AUTH_AUTHORITY:"test authority",AUTH_CLIENT_SECRET:"test client secret",AUTH_CLIENT_ID:"test client id",SERVICE_BASE_URL:"http://base-url",WEBPROVISIONS_DISTRIBUTION_URL:"http://localhost:1234/distribution",WEBPROVISIONS_DISTRIBUTION_COOKIE_POLICY_URL:"http://localhost:1234/cookie-policy.html",WEBPROVISIONS_TAG:"the-tag",DB_ENDPOINT:"http://localhost:1234/mocked-db"};let mock;async function setupMock(override={}){_vitest.vi.unstubAllEnvs();for(const[key,value]of Object.entries({...cfg,...override})){if(value){_vitest.vi.stubEnv(key,value)}}const module=await _testing.Test.createTestingModule({imports:[_config.ConfigModule.forRoot({isGlobal:true,validate:_config1.zConfig.parse,ignoreEnvFile:true})]}).compile();const configService=module.get(_config.ConfigService);const{afterCallbackHandler}=await Promise.resolve().then(()=>_interop_require_wildcard(require("./auth")));return{afterCallback:afterCallbackHandler(module.get(_config.ConfigService),{log:_vitest.vi.fn(),trace:_vitest.vi.fn(),debug:_vitest.vi.fn(),info:_vitest.vi.fn(),warn:_vitest.vi.fn(),error:_vitest.vi.fn(),fatal:_vitest.vi.fn()}),configService}}(0,_vitest.beforeEach)(async()=>{mock=await setupMock()});(0,_vitest.afterEach)(()=>{_vitest.vi.clearAllMocks()});(0,_vitest.it)("creates fn",()=>{(0,_vitest.expect)(mock.afterCallback).toBeTypeOf("function")});async function getMockedGQLRequest(){return{setUserType:{mutate:trpcMock.setUserType.mutate,calls:trpcMock.setUserType.mutate.mock.calls.map(c=>c[0])},getOrCreateUser:{mutate:trpcMock.getOrCreateUser.mutate,calls:trpcMock.getOrCreateUser.mutate.mock.calls.map(c=>c[0])}}}(0,_vitest.it)("calls getOrCreateUser and setUserType graphql endpoints",async()=>{await mock.afterCallback({},{},{id_token:"asdf"},{});const{setUserType,getOrCreateUser}=await getMockedGQLRequest();(0,_vitest.expect)(getOrCreateUser.mutate).toHaveBeenCalledOnce();(0,_vitest.expect)(getOrCreateUser.calls[0]).toEqual({displayName:"test name",email:"test email",objectId:"test sub"});(0,_vitest.expect)(setUserType.mutate).toHaveBeenCalledOnce();(0,_vitest.expect)(setUserType.calls[0]).toEqual({type:"user",objectId:"test sub"})});(0,_vitest.it)("calls setUserType with system-admin with correct claims",async()=>{await mock.afterCallback({},{},{id_token:"system-admin"},{});const{setUserType}=await getMockedGQLRequest();(0,_vitest.expect)(setUserType.mutate).toHaveBeenCalledOnce();(0,_vitest.expect)(setUserType.calls[0]).toEqual({type:"system-admin",objectId:"test sub"})});(0,_vitest.it)("does not call setUserType if configured not to",async()=>{mock=await setupMock({AUTH_SKIP_GROUP_CLAIM_CHECK:"true"});await mock.afterCallback({},{},{id_token:"asdf"},{});const{setUserType}=await getMockedGQLRequest();(0,_vitest.expect)(setUserType.mutate).not.toHaveBeenCalled()})});
package/dist/trpc.js ADDED
@@ -0,0 +1 @@
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:true});Object.defineProperty(exports,"createTRPC",{enumerable:true,get:function(){return createTRPC}});const _allianceinternalnodeutilities=require("@telia-ace/alliance-internal-node-utilities");const _client=require("@trpc/client");function createTRPC(configService){return(0,_client.createTRPCProxyClient)({links:[(0,_client.httpBatchLink)({url:configService.getOrThrow(_allianceinternalnodeutilities.SharedConfigKeys.DbEndpoint),fetch(input,init){return fetch(input,{...init,headers:{...init?.headers,authorization:(0,_allianceinternalnodeutilities.createSystemUserToken)(configService)}})}})]}).portal}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@telia-ace/alliance-portal",
3
- "version": "1.0.7",
3
+ "version": "1.0.8-next.0",
4
4
  "description": "ACE Alliance portal",
5
5
  "license": "SEE LICENSE IN LICENSE.txt",
6
6
  "author": "Telia Company AB",
@@ -19,25 +19,21 @@
19
19
  "@nestjs/core": "^10.2.7",
20
20
  "@nestjs/platform-express": "^10.2.7",
21
21
  "@nestjs/terminus": "^10.1.1",
22
- "@telia-ace/alliance-internal-node-utilities": "1.0.4",
22
+ "@telia-ace/alliance-internal-node-utilities": "1.0.5-next.0",
23
+ "@trpc/client": "^10.41.0",
23
24
  "dotenv": "^16.3.1",
24
25
  "express": "^4.18.2",
25
- "graphql": "^16.8.1",
26
- "graphql-request": "^6.1.0",
27
26
  "jose": "^4.15.3",
28
27
  "reflect-metadata": "^0.1.13",
29
28
  "rxjs": "^7.8.1",
30
29
  "zod": "^3.22.4"
31
30
  },
32
31
  "devDependencies": {
33
- "@graphql-codegen/cli": "^5.0.0",
34
- "@graphql-codegen/typed-document-node": "^5.0.1",
35
- "@graphql-codegen/typescript-operations": "^4.0.1",
36
- "@graphql-typed-document-node/core": "^3.2.0",
37
32
  "@nestjs/cli": "^10.1.18",
38
33
  "@nestjs/testing": "^10.2.7",
39
34
  "@swc/cli": "^0.1.62",
40
35
  "@swc/core": "^1.3.93",
36
+ "@telia-ace/alliance-data": "1.0.1-next.0",
41
37
  "@types/express": "^4.17.19",
42
38
  "@types/node": "^20.8.5",
43
39
  "unplugin-swc": "^1.4.3",
@@ -51,7 +47,6 @@
51
47
  "build:dev": "nest build",
52
48
  "build:prod": "nest build",
53
49
  "test": "vitest",
54
- "start": "node dist/index",
55
- "generate": "graphql-codegen"
50
+ "start": "node dist/index"
56
51
  }
57
52
  }
@@ -1 +0,0 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:true});function _export(target,all){for(var name in all)Object.defineProperty(target,name,{enumerable:true,get:all[name]})}_export(exports,{GetOrCreateUserDocument:function(){return GetOrCreateUserDocument},GetUserDocument:function(){return GetUserDocument},GetWorkspaceDocument:function(){return GetWorkspaceDocument},SetUserTypeDocument:function(){return SetUserTypeDocument}});const GetOrCreateUserDocument={"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"GetOrCreateUser"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"GetOrCreateUserInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getOrCreateUser"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"objectId"}},{"kind":"Field","name":{"kind":"Name","value":"displayName"}},{"kind":"Field","name":{"kind":"Name","value":"type"}}]}}]}}]};const SetUserTypeDocument={"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SetUserType"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SetUserTypeInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"setUserType"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]};const GetUserDocument={"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetUser"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"objectId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceSlug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"objectId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"objectId"}}},{"kind":"Argument","name":{"kind":"Name","value":"workspaceSlug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceSlug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]};const GetWorkspaceDocument={"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetWorkspace"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"slug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workspace"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"slug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]};
@@ -1 +0,0 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:true});_export_star(require("./generated"),exports);function _export_star(from,to){Object.keys(from).forEach(function(k){if(k!=="default"&&!Object.prototype.hasOwnProperty.call(to,k)){Object.defineProperty(to,k,{enumerable:true,get:function(){return from[k]}})}});return from}