feat: extract homepage and repository and description from fpm.toml

README.md

@@ -1,9 +1,24 @@
-# registry
-Registry for Fortran package manager
+# Registry for Fortran package manager
 
-## Python Flask app with Nginx and  Mongo database
+Currently for the testing phase :
+1. backend APIs are hosted at:  http://registry-apis.vercel.app/
+2. frontend is hosted at: https://registry-frontend.vercel.app/
+3. Documentation for the APIs are available at: https://registry-apis.vercel.app/apidocs/
 
-Project structure:
+**Please note: the current registry is a playground: its database will be fully deleted once its functionality is established. Please do not use it for production yet! more information will follow then.**
+
+The fpm release [0.8.2](https://fortran-lang.discourse.group/t/fpm-version-0-8-2-released-centralized-registry-playground/5792) introduces fpm support for uploading packages to the fpm-registry server directly from the command-line interface, via
+
+```
+fpm publish --token <token-here>
+```
+
+fpm will now interact with a web interface that will help to manage the namespaces & packages.
+
+
+## fpm - registry : Python Flask app with Nginx and Mongo database
+
+backend Project structure:
 ```
 .
 ├── compose.yaml
@@ -20,7 +35,7 @@ Project structure:
 
 ```
 
-## Deploy with docker compose
+## Instructions for Deploy with docker compose
 
 ```
 $ sudo chmod 666 /var/run/docker.sock  (for root access)
@@ -38,9 +53,9 @@ Hello world, Mongo Flask
 set MONGO_URI=MONGO_DB_ATLAS_URL (in .env file in flask directory)
 The MONGO_URI must be set in the environment (or, alternatively, in the .env file in the flask directory) to the URL value of the MongoDB to use. For example,If deploying to production, MONGO_URI should be set to mongo container address.
 set the following env variables in the .env file in the flask folder: 
-   - SALT=MYSALT
-    - MONGO_URI
-  -  MONGO_DB_NAME
+   - SALT
+   - MONGO_URI
+   - MONGO_DB_NAME
    - SUDO_PASSWORD
    - MONGO_USER_NAME
    - MONGO_PASSWORD

flask/auth.py

@@ -134,7 +134,7 @@ def signup():
 
     if not registry_user:
         db.users.insert_one(user)
-
+        # send_verify_email(email)        #TODO: uncomment this line
         return (
             jsonify(
                 {
@@ -266,3 +266,77 @@ def forgot_password(*email):
         jsonify({"message": "Password reset link sent to your email", "code": 200}),
         200,
     )
+
+
+def send_verify_email(email):
+
+    user = db.users.find_one({"email": email})
+
+    if not user:
+        return jsonify({"message": "User not found", "code": 404}), 404
+
+    uuid = generate_uuid()
+    db.users.update_one({"email": email}, {"$set": {"uuid": uuid}})
+
+    message = f"""\n
+    Dear {user['username']},
+
+    We received a request to verify your email. To verify your email, please copy paste the link below in a new browser window:
+
+    {env_var['host']}/account/verify/{uuid}
+
+    Thank you,
+    The Fortran-lang Team"""
+
+    message = f'Subject: Verify email \nTo: {email}\n{message}'
+
+    # sending the mail
+    smtp.sendmail(to_addrs=email, msg=message, from_addr=fortran_email)
+
+    return (
+        jsonify({"message": "verification link sent to your email", "code": 200}),
+        200,
+    )
+
+@app.route("/auth/verify-email", methods=["POST"])
+def verify_email():
+    uuid = request.form.get("uuid")
+
+    if not uuid:
+        return jsonify({"message": "Unauthorized", "code": 401}), 401
+
+    user = db.users.find_one({"uuid": uuid})
+
+    if not user:
+        return jsonify({"message": "User not found", "code": 404}), 404
+
+    return jsonify({"message": "Successfully Verified Email", "code": 200}), 200
+
+@app.route("/auth/change-email", methods=["POST"])
+def change_email():
+    uuid = request.form.get("uuid")
+    new_email = request.form.get("new_email")
+
+    if not uuid:
+        return jsonify({"message": "Unauthorized", "code": 401}), 401
+
+    user = db.users.find_one({"uuid": uuid})
+
+    if not user:
+        return jsonify({"message": "User not found", "code": 404}), 404
+
+    if not new_email:
+        return jsonify({"message": "Please enter new email", "code": 400}), 400
+
+    used_email = db.users.find_one({"email": new_email})
+
+    if used_email:
+        return jsonify({"message": "Email already in use", "code": 400}), 400
+
+    db.users.update_one(
+        {"uuid": uuid},
+        {"$set": {"email": new_email}},
+    )
+    send_verify_email(new_email)
+
+    return jsonify({"message": "Email id Successfully changed", "code": 200}), 200

flask/mongo.py

@@ -43,7 +43,7 @@ def generate_latest_tarball():
         os.mkdir(backup_dir)
 
     # Execute the mongodump command
-    command = f"mongodump --host {mongo_uri} --authenticationDatabase admin --username {mongo_username} --password {mongo_password} --db {database_name} --out {backup_dir}"
+    command = f"mongodump --host {mongo_uri} --authenticationDatabase admin --username {mongo_username} --password {mongo_password} --db {database_name} --collection namespaces --collection packages --collection tarballs --out {backup_dir}"
     subprocess.call(command, shell=True)
 
     # Create a tar archive of the backup directory

flask/packages.py

@@ -7,6 +7,8 @@
 from datetime import datetime, timedelta
 from auth import generate_uuid
 from app import swagger
+import zipfile
+import toml
 from flasgger.utils import swag_from
 from urllib.parse import unquote
 import math
@@ -197,6 +199,10 @@ def upload():
     file_object_id = file_storage.put(tarball, content_type="application/gzip", filename=tarball_name)
 
 
+
+    # Extract the package metadata from the tarball's fpm.toml file.
+    package_data = extract_fpm_toml(tarball_name)
+
     # TODO: Uncomment this when the package validation is enabled
 
     # validate the package
@@ -210,7 +216,9 @@ def upload():
         package_obj = {
             "name": package_name,
             "namespace": namespace_doc["_id"],
-            "description": "Sample Test description",
+            "description": package_data["description"],
+            "homepage": package_data["homepage"],
+            "repository": package_data["repository"],
             "license": package_license,
             "createdAt": datetime.utcnow(),
             "updatedAt": datetime.utcnow(),
@@ -429,6 +437,8 @@ def get_package(namespace_name, package_name):
             "name": package["name"],
             "namespace": namespace["namespace"],
             "description": package["description"],
+            "repository": package["repository"],
+            "homepage": package["homepage"],
             "latest_version_data": {
                 "dependencies": package["versions"][-1]["dependencies"],
                 "version": package["versions"][-1]["version"],
@@ -672,4 +682,12 @@ def checkUserUnauthorizedForNamespaceTokenCreation(user_id, namespace_doc):
     admins_id_list = [str(obj_id) for obj_id in namespace_doc["admins"]]
     maintainers_id_list = [str(obj_id) for obj_id in namespace_doc["maintainers"]]
     str_user_id = str(user_id)
-    return str_user_id not in admins_id_list and str_user_id not in maintainers_id_list
+    return str_user_id not in admins_id_list and str_user_id not in maintainers_id_list
+
+def extract_fpm_toml(file_obj):
+    with zipfile.ZipFile(file_obj, 'r') as zip_ref:
+        zip_ref.extract("fpm.toml")
+        with open("fpm.toml", 'r') as file:
+            data = toml.load(file)
+
+    return data

flask/requirements.txt

@@ -8,3 +8,4 @@ flasgger
 license-expression
 semantic-version
 docker
+toml

flask/user.py

@@ -213,46 +213,47 @@ def admin():
         )
 
 
-@app.route("/users/admin/transfer", methods=["POST"])
+@app.route("/users/admin/transfer", methods=["POST"])    # TODO: enable this functionality
 def transfer_account():
-    uuid = request.form.get("uuid")
-    if not uuid:
-        return jsonify({"message": "Unauthorized", "code": 401}), 401
-    else:
-        user = db.users.find_one({"uuid": uuid})
-
-    if not user:
-        return jsonify({"message": "User not found", "code": 404}), 404
-
-    if "admin" not in user["roles"]:
-        return jsonify({"message": "Unauthorized", "code": 401}), 401
-    else:
-        old_user = request.form.get("old_username")
-        new_user = request.form.get("new_username")
-        new_email = request.form.get("new_email")
-        db.users.update_one(
-            {"username": old_user},
-            {
-                "$set": {
-                    "email": new_email,
-                    "username": new_user,
-                    "uuid": "",
-                    "loggedCount": 0,
-                    "loginAt": None,
-                    "lastLogout": None,
-                }
-            },
-        )
-        forgot_password(new_email)
-        return (
-            jsonify(
-                {
-                    "message": "Account Transfer Successful and Password reset request sent.",
-                    "code": 200,
-                }
-            ),
-            200,
-        )
+    return jsonify({"message": "This Functionality has been disabled.", "code": 501}), 501
+    # uuid = request.form.get("uuid")
+    # if not uuid:
+    #     return jsonify({"message": "Unauthorized", "code": 401}), 401
+    # else:
+    #     user = db.users.find_one({"uuid": uuid})
+
+    # if not user:
+    #     return jsonify({"message": "User not found", "code": 404}), 404
+
+    # if "admin" not in user["roles"]:
+    #     return jsonify({"message": "Unauthorized", "code": 401}), 401
+    # else:
+    #     old_user = request.form.get("old_username")
+    #     new_user = request.form.get("new_username")
+    #     new_email = request.form.get("new_email")
+    #     db.users.update_one(
+    #         {"username": old_user},
+    #         {
+    #             "$set": {
+    #                 "email": new_email,
+    #                 "username": new_user,
+    #                 "uuid": "",
+    #                 "loggedCount": 0,
+    #                 "loginAt": None,
+    #                 "lastLogout": None,
+    #             }
+    #         },
+    #     )
+    #     forgot_password(new_email)
+    #     return (
+    #         jsonify(
+    #             {
+    #                 "message": "Account Transfer Successful and Password reset request sent.",
+    #                 "code": 200,
+    #             }
+    #         ),
+    #         200,
+    #     )
 
 
 @app.route("/<username>/maintainer", methods=["POST"])

registry/src/App.js

@@ -12,6 +12,7 @@ import NoPage from "./pages/404";
 import UserPage from "./pages/user";
 import PackagePage from "./pages/package";
 import NamespaceForm from "./pages/createNamespace";
+import VerifyEmail from "./pages/verifyemail";
 import NamespacePage from "./pages/namespace";
 import AdminSection from "./pages/admin";
 import ForgotPassword from "./pages/forgotpassword";
@@ -32,6 +33,10 @@ function App() {
           path="/account/reset-password/:uuid"
           element={<ResetPassword />}
         />
+        <Route
+          path="/account/verify/:uuid"
+          element={<VerifyEmail />}
+        />
         <Route path="/account/register" element={<Register />} />
         <Route path="/help" element={<Help />} />
         <Route path="/search" element={<Search />} />

registry/src/pages/Navbar.js

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { useNavigate, useLocation } from "react-router-dom";
 import { useDispatch, useSelector } from "react-redux";
 import Image from "react-bootstrap/Image";
@@ -8,6 +8,7 @@ import Navbar from "react-bootstrap/Navbar";
 import NavDropdown from "react-bootstrap/NavDropdown";
 import { logout } from "../store/actions/authActions";
 import { searchPackage, setQuery } from "../store/actions/searchActions";
+import { adminAuth } from "../store/actions/adminActions";
 
 const NavbarComponent = () => {
   const dispatch = useDispatch();
@@ -19,6 +20,10 @@ const NavbarComponent = () => {
   const username = useSelector((state) => state.auth.username);
   const uuid = useSelector((state) => state.auth.uuid);
 
+  useEffect(() => {
+    dispatch(adminAuth(uuid));
+  }, [isAuthenticated, uuid]);
+
   const signOut = () => {
     dispatch(logout(uuid));
   };
@@ -127,8 +132,8 @@ const SearchBar = () => {
     }
   };
 
-  const handleKeyDown = event => { 
-    if (event.key === 'Enter') {
+  const handleKeyDown = (event) => {
+    if (event.key === "Enter") {
       search();
     }
   };