Add user to group on first login.

coderpros · Mar 13, 2021 · 57406cf · 57406cf
1 parent 0741bbb
commit 57406cf
Show file tree

Hide file tree

Showing 16 changed files with 84 additions and 49 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,10 +1,10 @@
 {
     "appService.preDeployTask": "publish-release",
     "appService.deploySubpath": "bin\\Release\\net5.0\\publish",
-    "appService.defaultWebAppToDeploy": "/subscriptions/84c290c7-23ff-45f5-9f6b-41a65b683505/resourceGroups/appsvc_windows_centralus/providers/Microsoft.Web/sites/mittbalans",
     "azureFunctions.deploySubpath": "bin/Release/netcoreapp3.1/publish",
     "azureFunctions.projectLanguage": "C#",
     "azureFunctions.projectRuntime": "~3",
     "debug.internalConsoleOptions": "neverOpen",
-    "azureFunctions.preDeployTask": "publish"
+    "azureFunctions.preDeployTask": "publish",
+    "appService.defaultWebAppToDeploy": "/subscriptions/84c290c7-23ff-45f5-9f6b-41a65b683505/resourceGroups/Claes/providers/Microsoft.Web/sites/balans-api"
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -82,16 +82,6 @@
             "type": "process",
             "dependsOn": "clean release",
             "problemMatcher": "$msCompile"
-        },
-        {
-            "type": "func",
-            "dependsOn": "build",
-            "options": {
-                "cwd": "${workspaceFolder}/bin/Debug/netcoreapp3.1"
-            },
-            "command": "host start",
-            "isBackground": true,
-            "problemMatcher": "$func-dotnet-watch"
         }
     ]
 }
diff --git a/Books.csproj b/Books.csproj
@@ -10,4 +10,10 @@
     <PackageReference Include="Newtonsoft.json" Version="12.0.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
   </ItemGroup>
+  <ItemGroup>
+  <Content Remove="client\**" />
+  <Compile Remove="client\**" />
+  <EmbeddedResource Remove="client\**" />
+  <None Remove="client\**" />
+</ItemGroup>
 </Project>
diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json
@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:20895/",
+      "sslPort": 44307
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Books": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+    }
+  }
+}
diff --git a/api/Controllers/GroupController.cs b/api/Controllers/GroupController.cs
@@ -3,16 +3,13 @@ namespace Books.Api.Controllers
     using Microsoft.AspNetCore.Mvc;
     using System.Collections.Generic;
 
-    using Books.Api.Models;
-    using Books.Api.Services;
-
     [Route("api/[controller]")]
     [ApiController]
     public class GroupController : ControllerBase
     {
-        private readonly GroupService _groupService;
+        private readonly Services.GroupService _groupService;
 
-        public GroupController(GroupService groupService)
+        public GroupController(Services.GroupService groupService)
         {
             _groupService = groupService;
         }
@@ -21,7 +18,7 @@ public GroupController(GroupService groupService)
         public ActionResult<List<Models.Group>> Get() =>
             _groupService.Get();
 
-        [HttpGet("{id:length(36)}", Name = "GetUserGroups")]
+        [HttpGet("User/{id:length(36)}", Name = "GetUserGroups")]
         public ActionResult<List<Models.Group>> Get(string id)
         {
             var groups = _groupService.Get(id);
@@ -34,7 +31,7 @@ public GroupController(GroupService groupService)
             return groups;
         }
 
-        [HttpGet("{id:length(24)}", Name = "GetUserGroup")]
+        [HttpGet("{id:length(24)}", Name = "GetGroup")]
         public ActionResult<Models.Group> GetUserGroup(string id)
         {
             var group = _groupService.GetGroup(id);

diff --git a/api/Services/GroupService.cs b/api/Services/GroupService.cs
@@ -31,8 +31,11 @@ public Group Create(Models.Group group)
         {
             group.Id = MongoDB.Bson.ObjectId.GenerateNewId().ToString();
 
-            _groups.InsertOne(group);
-
+            if(_groups.CountDocuments(g => g.AzId == group.AzId && g.GroupName == group.GroupName) < 1)
+            {
+                _groups.InsertOne(group);
+            }
+
             return group;
         }
     }

diff --git a/bin/Debug/net5.0/Books.dll b/bin/Debug/net5.0/Books.dll
diff --git a/bin/Debug/net5.0/Books.pdb b/bin/Debug/net5.0/Books.pdb
diff --git a/bin/Debug/net5.0/ref/Books.dll b/bin/Debug/net5.0/ref/Books.dll
diff --git a/client/public/signin-callback.html b/client/public/signin-callback.html
@@ -17,7 +17,7 @@ <h1>Authentification callback processing...</h1>
         //new Oidc.UserManager({ response_mode: "query" }).signinRedirectCallback().then(function () {
         // Settings loadUserInfo: false because b2c does not currently support userinfo endpoint. 
          new Oidc.UserManager({ response_mode: "query",  loadUserInfo: false }).signinRedirectCallback().then(function () {
-
+             
             window.location = "index.html";
         }).catch(function (e) {
             console.error(e);

diff --git a/client/src/components/BookContent.tsx b/client/src/components/BookContent.tsx
@@ -62,7 +62,7 @@ const BookContent = () => {
   const updateData = (id: any, updatedBook: any) => {
     setEditing(false);
 
-    axios.put(`${Constants.apiRoot}Book/${id}`, updatedBook).then(function(test) {
+    axios.put(`${Constants.apiRoot}Book/${id}`, updatedBook).then(function(res) {
       setBooks(books.map((book: { Id: any; Category: string; Name: string; Price: string; Author: string; }) => (book.Id === id ? updatedBook : book)))
     });
   }

diff --git a/client/src/services/AuthService.ts b/client/src/services/AuthService.ts
@@ -1,16 +1,16 @@
 import { Log, User, UserManager, UserManagerSettings } from 'oidc-client';
-import {Constants} from '../helpers/Constants';
+import { Constants } from '../helpers/Constants';
 import axios from 'axios';
 
 export class AuthService {
   public userManager: UserManager;
- 
+
   constructor() {
     const settings = {
       // This is  the metadata endpoint
       authority: `https://mittbalans.b2clogin.com/MittBalans.onmicrosoft.com/b2c_1_react_signup_signin/v2.0/.well-known/openid-configuration`,
       // Turn off calls to user info since CORS will block it
-      loadUserInfo: false, 
+      loadUserInfo: false,
       // The URL where the Web UI receives the login result
       redirect_uri: `http://localhost:48599/signin-callback.html`,
       // The no longer recommended implicit flow must be used if CORS is disabled
@@ -19,32 +19,56 @@ export class AuthService {
       // Other OAuth settings
       client_id: Constants.azureApplicationId,
       // openid is required, remove https://contoso.onmicrosoft.com/test/Read if access_token is not required.
-      scope: 'openid offline_access https://graph.microsoft.com/User.Read.All', 
-       // Supply these details explicitly. Directly copied from azure ad b2c policy metadata endpoint.
-       metadata: {
+      scope: 'openid offline_access https://graph.microsoft.com/User.Read.All',
+      // Supply these details explicitly. Directly copied from azure ad b2c policy metadata endpoint.
+      metadata: {
         issuer: `https://${Constants.azureTenantName}.b2clogin.com/${Constants.azureTenantId}/v2.0/`,
         authorization_endpoint: `https://${Constants.azureTenantName}.b2clogin.com/${Constants.azureTenantName}.onmicrosoft.com/${Constants.azureSignUpSignInPolicy}/oauth2/v2.0/authorize`,
         token_endpoint: `https://${Constants.azureTenantName}.b2clogin.com/${Constants.azureTenantName}.onmicrosoft.com/${Constants.azureSignUpSignInPolicy}/oauth2/v2.0/token`,
-        jwks_uri : `https://${Constants.azureTenantName}.b2clogin.com/${Constants.azureTenantName}.onmicrosoft.com/discovery/v2.0/keys?p=${Constants.azureSignUpSignInPolicy}`,
+        jwks_uri: `https://${Constants.azureTenantName}.b2clogin.com/${Constants.azureTenantName}.onmicrosoft.com/discovery/v2.0/keys?p=${Constants.azureSignUpSignInPolicy}`,
         end_session_endpoint: `https://${Constants.azureTenantName}.b2clogin.com/${Constants.azureTenantName}.onmicrosoft.com/${Constants.azureSignUpSignInPolicy}/oauth2/v2.0/logout?post_logout_redirect_uri=${Constants.redirectRoot}`
       },
 
-  } as UserManagerSettings;
-    
-     this.userManager = new UserManager(settings);
-  
+    } as UserManagerSettings;
+
+    this.userManager = new UserManager(settings);
+
     Log.logger = console;
     Log.level = Log.INFO;
   }
 
   public async getUser(): Promise<User | null> {
-    return await this.userManager.getUser();
+    var user = await this.userManager.getUser();
+
+    // Check if the user is new & assign him to the customer user group if he is not.
+    if (user != null) {
+      if (user.profile.newUser) {
+          var userGroups = await axios.get(`${Constants.apiRoot}Group/User/${user.profile.sub}`);
+
+          if(userGroups.data.length < 1) {
+            var userGroup = {
+              Id: '',
+              AzId: user.profile.sub,
+              GroupName: 'Customer'
+            }
+
+            axios.post(`${Constants.apiRoot}Group`, userGroup);
+          }
+        }
+      }
+
+      return user;
   }
 
   public async getGroup(user: User): Promise<string | null> {
-    var group = await axios.get(`${Constants.apiRoot}Group/${user.profile.sub}`)
+    var group = await axios.get(`${Constants.apiRoot}Group/User/${user.profile.sub}`)
+
+    if(group.data.length > 0) {
+
+      return group.data[0].GroupName;
+    }
 
-    return group.data[0].GroupName;
+    return null;
   }
 
   public login(): Promise<void> {

diff --git a/obj/Debug/net5.0/Books.csproj.FileListAbsolute.txt b/obj/Debug/net5.0/Books.csproj.FileListAbsolute.txt
@@ -58,19 +58,7 @@ D:\Projects\Web\ASP.Net\Core\Books\bin\Debug\net5.0\package-lock.json
 D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\api\Properties\launchSettings.json
 D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\appsettings.Development.json
 D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\appsettings.json
-D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\client\build\asset-manifest.json
-D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\client\build\manifest.json
-D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\client\package-lock.json
-D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\client\package.json
-D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\client\public\manifest.json
-D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\client\tsconfig.json
-D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\client\tslint.json
 D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\package-lock.json
-D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\react-oidc-client-js-master\src\package-lock.json
-D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\react-oidc-client-js-master\src\package.json
-D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\react-oidc-client-js-master\src\public\manifest.json
-D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\react-oidc-client-js-master\src\tsconfig.json
-D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\react-oidc-client-js-master\src\tslint.json
 D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\Books.exe
 D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\Books.deps.json
 D:\Projects\Web\ASP.Net\Core\balans\bin\Debug\net5.0\Books.runtimeconfig.json

diff --git a/obj/Debug/net5.0/Books.dll b/obj/Debug/net5.0/Books.dll
diff --git a/obj/Debug/net5.0/Books.pdb b/obj/Debug/net5.0/Books.pdb
diff --git a/obj/Debug/net5.0/ref/Books.dll b/obj/Debug/net5.0/ref/Books.dll