![\"This](\"/f46881583c7518a93bb24e94c32320de/a-developer-friendly-dark-theme.webp\")
It is fine when you and the rest of your team are working on different files. But sometimes, multiple people simultaneously work on the same files, and that's where the problems arise.
\nJust a Note: git pull = git fetch + git merge
In this scenario, when you have local changes in your system and you pull the latest contribution, you got this error.
\nerror: your local changes to the following files would be overwritten by merge: readme.md\nplease commit your changes or stash them before you merge.\nAborting...
git stash (stash the local changes clean the workspace)\ngit pull (pull the latest changes from remote )\ngit stash apply (apply the latest stash)
-----------(or)---------------
\ngit fetch (fetch the local machine folder)\ngit stash (stash the local changes clean the workspace)\ngit merge '@{u}' (merge the changes from local folder to workspace folder)\ngit stash pop (apply the latest stash )
By default, the stash changes will become staged. If you want to unstage them, use git restore --staged (git ver > 2.25.0).
git reset --hard HEAD (reset to the head means remove all local changes)\ngit pull (get the latest changes)
-----------(or)---------------
\ngit fetch (fetch the local machine folder)\ngit reset --hard HEAD (reset to the head means remove all local changes)\ngit merge '@{u}' (merge the changes from the local folder to workspace folder)
Now you must be thinking, what is git pull --force then?
it feels like it would help to overwrite local changes. instead, it fetches forcefully but does not merge forcefully (git pull --force = git fetch --force + git merge).
Like git push, git fetch allows us to specify which local and remote branch we want to work on. git fetch origin/ft-1:my-ft means the changes in the ft-1 branch from the remote repository will end up visible on the local branch my-ft. When such kind of operation modifies the existing history, it is not allowed by the Git without an explicit --force parameter.
In September 2020, the Republican members of the Senate Commerce Committee, Science, and Transportation (“the Committee”) introduced the Setting an American Framework to Ensure Data Access, Transparency, and Accountability Act (\"the Safe Data Act\"). The committee was chaired by Roger Wicker and co-sponsored by several other Republicans in the Senate.
\nSenator Wicker had a working staff discussion draft version called the United States Consumer Data Privacy Act of 2019 last November. The Safe Data Act follows the footprints of the 2019 draft but makes a few essential improvements regarding the privacy, cybersecurity, and compliance risks of citizens in the United States.
\nSo, let's help you catch up on this new federal privacy law—what it covers and what businesses have to do to stay compliant.
\nThe Safe Data Act combines three previously introduced privacy protection bills viz.
\nAmericans would have a greater choice of control over their data. In particular, the law would create rights to transparency, access, deletion, correction, and portability for consumers. Additionally, businesses would require to make a baseline level of data security, including opt-in consent for the process and transfer of sensitive data.
\nSome key provisions include:
\nMoving on, when a new legislation is about to come into force, the first step every business should take is to establish a compliance checklist that covers the requirements of that particular law.
\nHere's how you can adopt the best risk management practices to ensure that your business is ready for compliance.
\nIn a bid to ensure businesses the highest level of protection, the LoginRadius consumer identity and access management (CIAM) platform adheres to the major regulatory and privacy regulations around the world.
\nIt is in your businesses' best interest to comply with privacy regulations, like the Safe Data Act. Not only does it help you dodge off data breaches and cyber attacks, but it also confirms businesses that they can trust you with their confidential consumer data—and that's priceless!
\n\n","frontmatter":{"date":"December 03, 2020","updated_date":null,"description":"The Safe Data Act follows the footsteps of the 2019 draught, but makes a few major changes to the threats of people in the United States to privacy, cybersecurity, and compliance.","title":"Safe Data Act: A New Privacy Law in the Town","tags":["privacy-and-compliance"],"pinned":null,"coverImage":{"childImageSharp":{"fluid":{"aspectRatio":1.408450704225352,"src":"/static/bc48ca19417d7dd27fcbb6c26e7685c1/9a31d/safe-data-act-privacy-law.jpg","srcSet":"/static/bc48ca19417d7dd27fcbb6c26e7685c1/f836f/safe-data-act-privacy-law.jpg 200w,\n/static/bc48ca19417d7dd27fcbb6c26e7685c1/2244e/safe-data-act-privacy-law.jpg 400w,\n/static/bc48ca19417d7dd27fcbb6c26e7685c1/9a31d/safe-data-act-privacy-law.jpg 767w","sizes":"(max-width: 767px) 100vw, 767px"}}},"author":{"id":"Rakesh Soni","github":"oyesoni","avatar":"rakesh-soni.jpg"}}}},{"node":{"excerpt":"Emails hacked are the golden words for a hacker to access your personal information and get access to all your accounts. Recovery from a…","fields":{"slug":"/identity/what-to-do-when-email-hacked/"},"html":"Emails hacked are the golden words for a hacker to access your personal information and get access to all your accounts. Recovery from a hack is exceptionally time-sensitive because we connect everything from online banking to other online portals with our emails. If you want to mitigate the harm to your identity, finances and protect those around you, you'll have to act quickly and carefully.
\nYou're probably wondering, \"my account is hacked. How do I repair it?\" If you're a little luckier, you may not be entirely sure that you were hacked. But before (or after) you start to panic, calm down, and go through the article to prevent further damage.
\nOne of these four instances could be the reason your inbox was most likely compromised:
\nYou've been hacked when:
\nHere is an article which talks about what to do when your email is compromised during a data breach.
\nIf your email address has been hacked, what should you do? It's not good enough to get your password changed. And you'll want to make sure the hacker hasn't set up your account to let him get back in or to keep spamming after he's locked out. To get things back in order and keep hackers out of your account for good, follow these seven steps to fix it and prevent any future incident.
\nHave a malware scan run daily. If your account is compromised, search for malware or traces of malware that could be running on your device immediately. Most hackers gather passwords using malware that has been mounted on your gadget (or mobile phone if you have a smartphone). Be sure that your antivirus and anti-malware programs are up to date, no matter which operating system you use.
\nChoose a setting that will update your device automatically when there are new security patches available. Conduct an end-to-end scan of your computer if you're not using an antivirus program.
\nIt's time to update your password until your device is free from malware. You will need to directly contact the email provider, verify who you are, and ask for a password reset if you have lost access to your account.
\nPlease choose a unique password that varies markedly from your old one and make sure that it does not contain repetitive character strings or numbers. Keep away from passwords with obvious links to your name, your birthday, or similar personal information.
\nThis knowledge can be quickly identified by hackers and also used in their first attempts at brute force to access your account. Here is a list of the worst passwords in 2019 to understand how to create a strong password.
\nYou are more likely to open it and click on links inside it when an email comes from someone you know - even if the topic is strange. Help stop the malware from spreading by warning those on your contact list to be careful not to click on the links and to be cautious about any email sent by you that does not seem right.
\nLet the people in your contact list know that your email has been compromised and that any suspicious emails should not be opened or connected to any emails you have recently got.
\n\nIf your email account has been compromised from a computer or location that does not fit your usual use habits, the cybercriminal may need to address a security question correctly. And if the items are general, such as (Q: what's the name of your brother? A: John), that may not be that difficult to guess. Here is a quick guide to choosing a good security question to help you further.
\nThis is time-consuming but an effort worth making. Make sure you change all other accounts that use the same username and password as your compromised email. For multiple accounts, hackers love it when we use the same logins.
\nIf you've been hacked, an ID authentication program is another idea worth considering. Usually, these platforms provide email and online account tracking in real-time. In the case of identity fraud, they also typically offer credit score reporting and personal assistance.
\nBe sure to look for businesses with a good track record, as this form of security is often associated with high costs.
\nIn addition to your password, set your email account to require a second form of authentication if you log into your email account from a new computer. When signing in, you will also need to enter a special one-time use code that the platform will text to your phone or generate via an app.
\nAs an additional security measure, several email providers provide two-factor authentication (2FA). To access an account, this approach requires both a password and some other form of identification.
\n\n","frontmatter":{"date":"December 03, 2020","updated_date":null,"description":"The golden terms for a hacker to access your personal information and get access to all your accounts are hacked emails. Recovery from a hack is extremely time-sensitive, as our emails connect everything from online banking to other online portals. You'll have to move quickly and cautiously if you want to minimise the damage to your identity, finances and protect those around you.","title":"Email is Hacked!: 7 Immediate Steps To Follow","tags":["security"],"pinned":null,"coverImage":{"childImageSharp":{"fluid":{"aspectRatio":1.408450704225352,"src":"/static/2d6421da4f9e2108cfddd0de87218065/9a31d/what-to-do-when-email-is-hacked.jpg","srcSet":"/static/2d6421da4f9e2108cfddd0de87218065/f836f/what-to-do-when-email-is-hacked.jpg 200w,\n/static/2d6421da4f9e2108cfddd0de87218065/2244e/what-to-do-when-email-is-hacked.jpg 400w,\n/static/2d6421da4f9e2108cfddd0de87218065/9a31d/what-to-do-when-email-is-hacked.jpg 767w","sizes":"(max-width: 767px) 100vw, 767px"}}},"author":{"id":"Rakesh Soni","github":"oyesoni","avatar":"rakesh-soni.jpg"}}}},{"node":{"excerpt":"Introduction Consumers are often frustrated with the complex task of entering their passwords through their remote controls or virtual…","fields":{"slug":"/identity/iot-smart-authentication/"},"html":"Consumers are often frustrated with the complex task of entering their passwords through their remote controls or virtual keyboards, while authenticating on apps that they have installed on their smart TVs, game consoles, and other IoT devices.
\nConsumers would love an experience that is simple, quick, and frictionless - after all, no one wants to put the extra effort while enjoying leisure.
\nLoginRadius' Smart authentication and authorization in IOT is a practical approach to ensure effortless login for consumers. It eliminates the burden of password entry and, consequently, sheds off data security risks related to password attacks.
\nWith LoginRadius' Smart and IoT device authentication, we wanted to offer a vastly convenient authentication method for the consumers of smart and IoT devices. A few other intentions include:
\nWe do not want consumers to remember or enter credentials on their smart devices anymore. Our QR code and link-based authentication methods make this possible.
\nBecause login links and QR codes are dynamically generated and sent over email or scanned via authenticated apps, we allow businesses to easily avoid all password-based hacking attempts. And hence we enhance IOT security authentication.
\nWe allow businesses to access risk by tracking the failed login attempts. In return, they can take adaptive security measures like disabling login requests for a limited time.
\nLoginRadius supports two different methods for Smart and IoT Authentication. Here's how they work:
\nThinking about how to authenticate IOT devices? Well, consumers can authenticate themselves on the app by scanning the QR Code displayed on the smart or IoT device using their mobile app.
\nConsumers can log in to an app by delegating the authentication to another device via a link on their registered email id. Clicking on the link will automatically authenticate the consumer account on the device that initiated the login.
\nSince emails are involved in the Link Based Login, LoginRadius also allows businesses to personalize their consumer experience.
\nLoginRadius offers in-built, multilingual email templates for businesses to add or customize their messages based on their requirements.
\nLoginRadius allows businesses to set the login request limits for consumers and also manage the token expiry by restricting the validity of login links to ensure security.
\n\n","frontmatter":{"date":"December 02, 2020","updated_date":null,"description":"Smart and IoT Authentication from LoginRadius is a realistic solution to ensure customers are securely logged in. It removes the password entry burden and as a result, eliminates data protection threats related to password attacks.","title":"Announcement - LoginRadius Smart and IoT Authentication to Offer Hassle-Free Login for Input-Constrained Devices","tags":["authentication","data security","cx"],"pinned":null,"coverImage":{"childImageSharp":{"fluid":{"aspectRatio":1.408450704225352,"src":"/static/5b93f397c2747a3a4e87999b0f943d0e/6051d/loginradius-iot-smart-authentication.png","srcSet":"/static/5b93f397c2747a3a4e87999b0f943d0e/69585/loginradius-iot-smart-authentication.png 200w,\n/static/5b93f397c2747a3a4e87999b0f943d0e/497c6/loginradius-iot-smart-authentication.png 400w,\n/static/5b93f397c2747a3a4e87999b0f943d0e/6051d/loginradius-iot-smart-authentication.png 769w","sizes":"(max-width: 769px) 100vw, 769px"}}},"author":{"id":"Rakesh Soni","github":"oyesoni","avatar":"rakesh-soni.jpg"}}}},{"node":{"excerpt":"Introduction In this blog, I will show you how to create a NodeJS server using core http module. We will create a simple server that will…","fields":{"slug":"/engineering/node-http-module-server/"},"html":"In this blog, I will show you how to create a NodeJS server using core http module. We will create a simple server that will serve static assets and a simple API to return some JSON data.
\nIn the process, you will also learn about the request and response objects provided by NodeJS, which are used by every other framework built on top of NodeJS like ExpressJS etc.
\nWith that in mind, let's begin.
\nCreate a folder by any name and initialize a node project in it using npm init -y
package.json file in your directory.server.js in your directory.public at the root of your project.Add a file named index.html with the following content\nindex.html
<!DOCTYPE html>\n<html lang="en">\n<head>\n <meta charset="UTF-8">\n <meta name="viewport" content="width=device-width, initial-scale=1.0">\n <title>Demo</title>\n</head>\n<body>\n <h1>Coming from the Root </h1>\n</body>\n</html>Now we will create a node server that will serve our index.html file when a request is sent to /.
server.js
const http = require('http');\n const path = require('path');\n const fs = require('fs');\n const PORT = 3000;\n const hostname = 'localhost';\n\n // createServer is the http method used to create a web server that takes a callback.\n const server = http.createServer(serverHandler);\n\n // callback function definition\n function serverHandler(req, res) => {\n if(req.method === 'GET' && req.url === '/') {\n let filePath = path.resolve(__dirname, 'public/index.html')\n let fileExists = fs.existsSync(filePath);\n if (!fileExists) {\n res.statusCode = 404;\n res.setHeader('Content-Type', 'text/html');\n res.end(`\n <html>\n <body>\n <h3>Page not found</h3>\n </body>\n </html>`)\n } else {\n res.statusCode = 200;\n res.setHeader('Content-Type', 'text/html');\n fs.createReadStream(filePath).pipe(res);\n }\n }\n }\n\n server.listen(PORT, hostname, () => {\n console.log(`Server running at ${hostname}:${PORT}`); \n })Let's understand what just happened in the above code snippet:
\ncreateServer method provided by node http module. createServer takes a callback which will be called when there is an incoming request with req and res parameters.serverHandler, we have used an if block to check if the incoming request is a GET request and the request url is / then code inside if statement will be executed.index.html which we want to serve exists or not in our public directory using existsSync, which synchronously checks for the file at the given path and returns true if the file exists.createReadStream method from fs module and pipe it into res object which sends it to the browser.server.listen to start our server on the PORT 3000.Now it's time to test our server. Run node server.js at the root of the project, and you will see the server running on PORT 3000.\nOpen your browser and enter localhost:3000 in the address bar, and you will get the HTML response.
Now we will expand our callback, which we passed to createServer to handle one more GET request at /notes, which will return an array of notes to the browser.
Update the serverHandler function with the following code snippet in your server.js file
server.js
...\n function serverHandler(req, res) {\n if(req.method === 'GET' && req.url === '/') {\n let filePath = path.resolve(__dirname, 'public/index.html')\n let fileExists = fs.existsSync(filePath);\n if (!fileExists) {\n res.statusCode = 404;\n res.setHeader('Content-Type', 'text/html');\n res.end(`\n <html>\n <body>\n <h3>Page not found</h3>\n </body>\n </html>`)\n } else {\n res.statusCode = 200;\n res.setHeader('Content-Type', 'text/html');\n fs.createReadStream(filePath).pipe(res);\n }\n }\n // Newly added code \n if (req.method === 'GET' && req.url === "/notes") {\n const notes = [\n {\n id: 1,\n title: "Demo Note"\n },\n {\n id: 2,\n title: "Another Note"\n }\n ]\n\n res.statusCode = 200;\n res.setHeader('Content-Type', 'application/json');\n res.end(JSON.stringify(notes));\n } else {\n res.setHeader('Content-Type', 'application/json')\n res.end(JSON.stringify({message: `${req.method} is not supported for ${req.url}`}))\n } \n }\n ...if statement to handle the request coming at /notes .application/json for the browser to process it accordingly.With that, we have created a simple node server to serve static content as well a simple API to return JSON data.
\nWe saw how we had to handle each request with its method and the URL. With an increasing number of routes, such things become hard to manage as we will have to add multiple if statements. And that's why frameworks like ExpressJS, HapiJS exist, which makes creating servers in NodeJS very easy. But it's important to know what happens under the hood as there is no magic happening in those frameworks.
\nThe complete code for this blog can be found at Github Repo.
\n","frontmatter":{"date":"November 27, 2020","updated_date":null,"description":"Let us understand the core http module in NodeJS, which is the basic building block of frameworks like ExpressJS etc.","title":"NodeJS Server using Core HTTP Module","tags":["NodeJs","JavaScript"],"pinned":null,"coverImage":{"childImageSharp":{"fluid":{"aspectRatio":1.5037593984962405,"src":"/static/6ee159acf6c294342ec04f86aede5d14/14b42/coverImage.jpg","srcSet":"/static/6ee159acf6c294342ec04f86aede5d14/f836f/coverImage.jpg 200w,\n/static/6ee159acf6c294342ec04f86aede5d14/2244e/coverImage.jpg 400w,\n/static/6ee159acf6c294342ec04f86aede5d14/14b42/coverImage.jpg 800w,\n/static/6ee159acf6c294342ec04f86aede5d14/47498/coverImage.jpg 1200w","sizes":"(max-width: 800px) 100vw, 800px"}}},"author":{"id":"Hridayesh Sharma","github":"vyasriday","avatar":null}}}},{"node":{"excerpt":"Modern consumers expect personalized, valuable, and secure experiences from any application they engage with. As a result, the…","fields":{"slug":"/identity/authentication-sso-native-mobile-apps/"},"html":"Modern consumers expect personalized, valuable, and secure experiences from any application they engage with. As a result, the responsibility falls upon developers to ensure ease of use and seamless access for consumers into their applications.
\nThe recently launched LoginRadius Authentication and SSO for Native Mobile Apps provide ready-to-use, user-friendly, and secure authentication methods for businesses to choose and integrate with native mobile app(s).
\nDeveloping mobile applications have become a top priority for many businesses. We aim to help businesses with the following aspects of the LoginRadius Android and iOS SDKs.
\nIdentity is evolving, and developers are at the forefront of this transformation. Every day brings a new learning—adapting to new standards and refining approaches to building secure, seamless experiences.
\nWe’re here to support developers on that journey. We know how important simplicity, efficiency, and well-structured documentation are when working with identity and access management solutions. That’s why we’ve redesigned the LoginRadius website—to be faster, more intuitive, and developer-first in every way.
\nThe goal? Having them spend less time searching and more time building.
\nLoginRadius’ vision is to give developers a product that simplifies identity management so they can focus on building, deploying, and scaling their applications. To enhance this experience, we’ve spent the last few months redesigning our interface— making navigation more intuitive and reassuring that essential resources are easily accessible.
\nHere’s a closer look at what’s new and why it’s important:
\n
Developers spend long hours working in dark-themed IDEs and terminals, so we’ve designed the LoginRadius experience to be developer-friendly and align with that preference.
\nThe new dark mode reduces eye strain, enhances readability, and provides a seamless transition between a coding environment and our platform. Our new design features a clean, modern aesthetic with a consistent color scheme and Barlow typography, ensuring better readability. High-quality graphics and icons are thoughtfully placed to enhance the content without adding visual clutter.
\nSo, whether you’re navigating our API docs or configuring authentication into your system, our improved interface will make those extended development hours more comfortable and efficient.
\n![\"This](\"/e5358b82be414940f3fb146013845933/capabilities.webp\")
We’ve restructured our website to provide a straightforward breakdown of our customer identity and access management platform capabilities, helping you quickly find what you need:
\nThis structured layout ensures you can quickly understand each capability and how it integrates into your identity ecosystem.
\n![\"This](\"/a8c155c2b6faf3d5f4b4de4e2b14d763/developers-menu.webp\")
We’ve been analyzing developer workflows to identify how you access key resources. That’s why we redesigned our navigation with one goal in mind: to reduce clicks and make essential resources readily available.
\nThe new LoginRadius structure puts APIs, SDKs, and integration guides right at the menu bar under the Developers dropdown so you can get started faster. Our Products, Solutions, and Customer Services are also clearly categorized, helping development teams quickly find the right tools and make informed decisions.
\n![\"This](\"/b2f9a964a2da0ea83e2f8596b833bba7/we-support-your-tech-stack.webp\")
Developers now have a clear view of the tech stack available with LoginRadius, designed to support diverse business needs.
\nOur platform offers pre-built SDKs for Node.js, Python, Java, and more, making CIAM integration seamless across popular programming languages and frameworks.
\nCheck out our revamped LoginRadius website and see how the improved experience makes it easier to build, scale, and secure your applications.
\nDo not forget to explore the improved navigation and API documentation, and get started with our free trial today. We’re excited to see what you’ll build with LoginRadius!
\n","frontmatter":{"date":"February 21, 2025","updated_date":null,"description":"LoginRadius’ vision is to give developers a product that simplifies identity management so they can focus on building, deploying, and scaling their applications. To enhance this experience, we’ve redesigned our website interface, making navigation more intuitive and reassuring that essential resources are easily accessible.","title":"Revamped & Ready: Introducing the New Developer-First LoginRadius Website","tags":["Developer tools","API","Identity Management","User Authentication"],"pinned":true,"coverImage":{"childImageSharp":{"fluid":{"aspectRatio":1.7857142857142858,"src":"/static/80b4e4fbe176a10a327d273504607f32/58556/hero-section.webp","srcSet":"/static/80b4e4fbe176a10a327d273504607f32/61e93/hero-section.webp 200w,\n/static/80b4e4fbe176a10a327d273504607f32/1f5c5/hero-section.webp 400w,\n/static/80b4e4fbe176a10a327d273504607f32/58556/hero-section.webp 800w,\n/static/80b4e4fbe176a10a327d273504607f32/99238/hero-section.webp 1200w,\n/static/80b4e4fbe176a10a327d273504607f32/7c22d/hero-section.webp 1600w,\n/static/80b4e4fbe176a10a327d273504607f32/1258b/hero-section.webp 2732w","sizes":"(max-width: 800px) 100vw, 800px"}}},"author":{"id":"Rakesh Soni","github":"oyesoni","avatar":"rakesh-soni.jpg"}}}},"pageContext":{"limit":6,"skip":642,"currentPage":108,"type":"///","numPages":161,"pinned":"ee8a4479-3471-53b1-bf62-d0d8dc3faaeb"}},"staticQueryHashes":["1171199041","1384082988","2100481360","23180105","528864852"]}